diff --git a/icons/dark/process-stop.png b/icons/cancel.png
similarity index 100%
rename from icons/dark/process-stop.png
rename to icons/cancel.png
diff --git a/icons/process-stop.png b/icons/close.png
similarity index 100%
rename from icons/process-stop.png
rename to icons/close.png
diff --git a/icons/dark/cancel.png b/icons/dark/cancel.png
new file mode 100644
index 0000000..6dc8f93
Binary files /dev/null and b/icons/dark/cancel.png differ
diff --git a/icons/dark/close.png b/icons/dark/close.png
new file mode 100644
index 0000000..f4b32a3
Binary files /dev/null and b/icons/dark/close.png differ
diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
index 5d386ab..1e5ea3c 100644
--- a/ui/mainwindow.ui
+++ b/ui/mainwindow.ui
@@ -482,7 +482,7 @@
      </widget>
     </item>
     <item>
-     <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0,0,0,0,0,0">
+     <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0,0,0,0,0,0,0">
       <item>
        <widget class="QPushButton" name="pbSettings">
         <property name="sizePolicy">
@@ -519,19 +519,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QPushButton" name="pbCancel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>&amp;Cancel</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QPushButton" name="pbFullscreen">
         <property name="sizePolicy">
@@ -545,6 +532,32 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QPushButton" name="pbClose">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>&amp;Close</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pbCancel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>&amp;Cancel</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QPushButton" name="pbApply">
         <property name="sizePolicy">
@@ -624,7 +637,6 @@
   <tabstop>previewWidget</tabstop>
   <tabstop>cbPreview</tabstop>
   <tabstop>pbCancel</tabstop>
-  <tabstop>pbFullscreen</tabstop>
   <tabstop>pbApply</tabstop>
   <tabstop>pbOk</tabstop>
  </tabstops>