diff --git a/icons/apps.png b/icons/apps.png
new file mode 100644
index 0000000..24e6ec9
Binary files /dev/null and b/icons/apps.png differ
diff --git a/icons/firewall.png b/icons/firewall.png
deleted file mode 100644
index dd93c58..0000000
Binary files a/icons/firewall.png and /dev/null differ
diff --git a/icons/settings.png b/icons/settings.png
new file mode 100644
index 0000000..e579edb
Binary files /dev/null and b/icons/settings.png differ
diff --git a/icons/wall.png b/icons/wall.png
new file mode 100644
index 0000000..de94384
Binary files /dev/null and b/icons/wall.png differ
diff --git a/mainwindow.ui b/mainwindow.ui
index b8f312a..da77c7d 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -357,7 +357,7 @@
    </property>
    <property name="icon">
     <iconset resource="resources.qrc">
-     <normaloff>:/appsprefs.png</normaloff>:/appsprefs.png</iconset>
+     <normaloff>:/apps.png</normaloff>:/apps.png</iconset>
    </property>
    <property name="text">
     <string>Select VM applications</string>
@@ -403,7 +403,7 @@
   <action name="action_editfwrules">
    <property name="icon">
     <iconset resource="resources.qrc">
-     <normaloff>:/redfirewall.png</normaloff>:/redfirewall.png</iconset>
+     <normaloff>:/firewall.png</normaloff>:/firewall.png</iconset>
    </property>
    <property name="text">
     <string>Edit VM Firewall rules</string>
@@ -506,7 +506,7 @@
   <action name="action_settings">
    <property name="icon">
     <iconset resource="resources.qrc">
-     <normaloff>:/root.png</normaloff>:/root.png</iconset>
+     <normaloff>:/settings.png</normaloff>:/settings.png</iconset>
    </property>
    <property name="text">
     <string>Settings</string>
diff --git a/resources.qrc b/resources.qrc
index 6df88f9..40b632f 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -1,5 +1,8 @@
 <RCC>
   <qresource>
+    <file alias="apps.png">icons/apps.png</file>
+    <file alias="settings.png">icons/settings.png</file>
+    <file alias="firewall.png">icons/wall.png</file>
     <file alias="restore.png">icons/restore.png</file>
     <file alias="backup.png">icons/backup.png</file>
     <file alias="global-settings.png">icons/global-settings.png</file>
@@ -16,7 +19,6 @@
     <file alias="flag-yellow.png">icons/flag-yellow.png</file>
     <file alias="remove.png">icons/remove.png</file>
     <file alias="appsprefs.png">icons/appsprefs.png</file>
-    <file alias="newfirewall.png">icons/newfirewall.png</file>
     <file alias="qubes.png">icons/qubes.png</file>
     <file alias="appvm.png">icons/appvm.png</file>
     <file alias="netvm.png">icons/netvm.png</file>
@@ -34,7 +36,6 @@
     <file alias="pausevm.png">icons/pausevm.png</file>
     <file alias="showallvms.png">icons/showallvms.png</file>
     <file alias="showcpuload.png">icons/showcpuload.png</file>
-    <file alias="firewall.png">icons/firewall.png</file>
   </qresource>
   <qresource/>
 </RCC>
diff --git a/settingsdlg.ui b/settingsdlg.ui
index 4cb4d8a..c485c2a 100644
--- a/settingsdlg.ui
+++ b/settingsdlg.ui
@@ -29,7 +29,7 @@
         <locale language="English" country="UnitedStates"/>
        </property>
        <property name="currentIndex">
-        <number>1</number>
+        <number>4</number>
        </property>
        <widget class="QWidget" name="basic_tab">
         <property name="locale">
@@ -586,6 +586,10 @@
         </layout>
        </widget>
        <widget class="QWidget" name="firewall_tab">
+        <attribute name="icon">
+         <iconset resource="resources.qrc">
+          <normaloff>:/firewall.png</normaloff>:/firewall.png</iconset>
+        </attribute>
         <attribute name="title">
          <string>Firewall rules</string>
         </attribute>
@@ -746,6 +750,10 @@
         <property name="enabled">
          <bool>true</bool>
         </property>
+        <attribute name="icon">
+         <iconset resource="resources.qrc">
+          <normaloff>:/storagevm.png</normaloff>:/storagevm.png</iconset>
+        </attribute>
         <attribute name="title">
          <string>Devices</string>
         </attribute>
@@ -776,7 +784,7 @@
        <widget class="QWidget" name="apps_tab">
         <attribute name="icon">
          <iconset resource="resources.qrc">
-          <normaloff>:/appsprefs.png</normaloff>:/appsprefs.png</iconset>
+          <normaloff>:/apps.png</normaloff>:/apps.png</iconset>
         </attribute>
         <attribute name="title">
          <string>Applications</string>