diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 1bf1cc09..4ce7932b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -26,6 +26,7 @@
 #include <QImageWriter>
 #include <QClipboard>
 #include <QPainter>
+#include <QInputDialog>
 #include <QPrintDialog>
 #include <QPrinter>
 #include <QWheelEvent>
@@ -645,37 +646,32 @@ QGraphicsItem* MainWindow::getGraphicsItem() {
 }
 
 void MainWindow::on_actionRotateClockwise_triggered() {
-  QGraphicsItem *graphItem = getGraphicsItem();
-  bool isGifOrSvg (graphItem->isWidget() // we have gif animation
-                   || dynamic_cast<QGraphicsSvgItem*>(graphItem)); // an SVG image;
-  if(!image_.isNull()) {
-    QTransform transform;
-    transform.rotate(90.0);
-    image_ = image_.transformed(transform, Qt::SmoothTransformation);
-    /* when this is GIF or SVG, we need to rotate its corresponding QImage
-       without showing it to have the right measure for auto-zooming */
-    ui.view->setImage(image_, isGifOrSvg ? false : true);
-    setModified(true);
-  }
+    rotateImage(90);
+}
 
-  if(isGifOrSvg) {
-    QTransform transform;
-    transform.translate(graphItem->sceneBoundingRect().height(), 0);
-    transform.rotate(90);
-    // we need to apply transformations in the reverse order
-    QTransform prevTrans = graphItem->transform();
-    graphItem->setTransform(transform, false);
-    graphItem->setTransform(prevTrans, true);
+void MainWindow::on_actionRotateCounterclockwise_triggered() {
+    rotateImage(-90);
+}
+
+void MainWindow::on_actionRotateCustom_triggered() {
+  bool rotateImageConfirm;
+
+  int customRotation = QInputDialog::getInt(this, tr("Custom rotation"),
+                                              tr("Rotate in degrees"), 0, -360, 360, 1, &rotateImageConfirm);
+
+  if (rotateImageConfirm && customRotation) {
+      rotateImage(customRotation);
   }
 }
 
-void MainWindow::on_actionRotateCounterclockwise_triggered() {
+void MainWindow::rotateImage(int rotationInDegrees) {
   QGraphicsItem *graphItem = getGraphicsItem();
   bool isGifOrSvg (graphItem->isWidget()
                    || dynamic_cast<QGraphicsSvgItem*>(graphItem));
+
   if(!image_.isNull()) {
     QTransform transform;
-    transform.rotate(-90.0);
+    transform.rotate(rotationInDegrees);
     image_ = image_.transformed(transform, Qt::SmoothTransformation);
     ui.view->setImage(image_, isGifOrSvg ? false : true);
     setModified(true);
@@ -683,8 +679,12 @@ void MainWindow::on_actionRotateCounterclockwise_triggered() {
 
   if(isGifOrSvg) {
     QTransform transform;
-    transform.translate(0, graphItem->sceneBoundingRect().width());
-    transform.rotate(-90);
+
+    // FIXME: Better center point calculation on custom rotation
+    transform.translate(graphItem->sceneBoundingRect().width() / 2, graphItem->sceneBoundingRect().height() / 2);
+    transform.rotate(rotationInDegrees);
+    transform.translate(-(graphItem->sceneBoundingRect().width() / 2), -(graphItem->sceneBoundingRect().height() / 2));
+
     QTransform prevTrans = graphItem->transform();
     graphItem->setTransform(transform, false);
     graphItem->setTransform(prevTrans, true);
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 0139484e..f7fec9fe 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -97,6 +97,7 @@ private Q_SLOTS:
 
   void on_actionRotateClockwise_triggered();
   void on_actionRotateCounterclockwise_triggered();
+  void on_actionRotateCustom_triggered();
   void on_actionFlipVertical_triggered();
   void on_actionFlipHorizontal_triggered();
   void on_actionCopy_triggered();
@@ -125,6 +126,7 @@ private Q_SLOTS:
   void onFolderLoaded(FmFolder* folder);
   void updateUI();
   void setModified(bool modified);
+  void rotateImage(int rotationInDegrees);
   QModelIndex indexFromPath(FmPath* filePath);
   QGraphicsItem* getGraphicsItem();
 
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index ad78addb..53db2d34 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -15,15 +15,23 @@
   </property>
   <property name="windowIcon">
    <iconset theme="lximage-qt">
-    <normaloff/>
-   </iconset>
+    <normaloff>.</normaloff>.</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
     <property name="spacing">
      <number>0</number>
     </property>
-    <property name="margin">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
      <number>0</number>
     </property>
     <item>
@@ -101,6 +109,7 @@
     </property>
     <addaction name="actionRotateClockwise"/>
     <addaction name="actionRotateCounterclockwise"/>
+    <addaction name="actionRotateCustom"/>
     <addaction name="actionFlipHorizontal"/>
     <addaction name="actionFlipVertical"/>
     <addaction name="separator"/>
@@ -152,8 +161,7 @@
   <action name="actionAbout">
    <property name="icon">
     <iconset theme="help-about">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;About</string>
@@ -162,8 +170,7 @@
   <action name="actionOpenFile">
    <property name="icon">
     <iconset theme="document-open">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Open File</string>
@@ -175,8 +182,7 @@
   <action name="actionSave">
    <property name="icon">
     <iconset theme="document-save">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Save</string>
@@ -188,8 +194,7 @@
   <action name="actionSaveAs">
    <property name="icon">
     <iconset theme="document-save-as">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Save &amp;As</string>
@@ -201,8 +206,7 @@
   <action name="actionClose">
    <property name="icon">
     <iconset theme="application-exit">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Close</string>
@@ -214,8 +218,7 @@
   <action name="actionZoomIn">
    <property name="icon">
     <iconset theme="zoom-in">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Zoom &amp;In</string>
@@ -227,8 +230,7 @@
   <action name="actionZoomOut">
    <property name="icon">
     <iconset theme="zoom-out">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Zoom &amp;Out</string>
@@ -240,8 +242,7 @@
   <action name="actionCopy">
    <property name="icon">
     <iconset theme="edit-copy">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Copy to Clipboard</string>
@@ -250,8 +251,7 @@
   <action name="actionNext">
    <property name="icon">
     <iconset theme="go-next">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Next File</string>
@@ -266,8 +266,7 @@
   <action name="actionPrevious">
    <property name="icon">
     <iconset theme="go-previous">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Previous File</string>
@@ -282,8 +281,7 @@
   <action name="actionOriginalSize">
    <property name="icon">
     <iconset theme="zoom-original">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Original Size</string>
@@ -295,8 +293,7 @@
   <action name="actionZoomFit">
    <property name="icon">
     <iconset theme="zoom-fit-best">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Fit</string>
@@ -305,8 +302,7 @@
   <action name="actionRotateClockwise">
    <property name="icon">
     <iconset theme="object-rotate-right">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Rotate Clockwise</string>
@@ -315,8 +311,7 @@
   <action name="actionRotateCounterclockwise">
    <property name="icon">
     <iconset theme="object-rotate-left">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Rotate &amp;Counterclockwise</string>
@@ -338,8 +333,7 @@
   <action name="actionFirst">
    <property name="icon">
     <iconset theme="go-first">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>First File</string>
@@ -351,8 +345,7 @@
   <action name="actionLast">
    <property name="icon">
     <iconset theme="go-last">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Last File</string>
@@ -364,8 +357,7 @@
   <action name="actionNewWindow">
    <property name="icon">
     <iconset theme="document-new">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;New Window</string>
@@ -382,8 +374,7 @@
   <action name="actionScreenshot">
    <property name="icon">
     <iconset theme="camera-photo">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Capture Screenshot</string>
@@ -408,8 +399,7 @@
   <action name="actionPaste">
    <property name="icon">
     <iconset theme="edit-paste">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Paste from Clipboard</string>
@@ -421,8 +411,7 @@
    </property>
    <property name="icon">
     <iconset theme="media-playback-start">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Slide Show</string>
@@ -431,8 +420,7 @@
   <action name="actionDelete">
    <property name="icon">
     <iconset theme="edit-delete">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Delete</string>
@@ -454,6 +442,11 @@
     <string>File Properties</string>
    </property>
   </action>
+  <action name="actionRotateCustom">
+   <property name="text">
+    <string>Rotate Custom</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>