diff --git a/src/browser.ui b/src/browser.ui
index 16b59a8..965a966 100644
--- a/src/browser.ui
+++ b/src/browser.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>SwissBrowser</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="resources.qrc">
+    <normaloff>:/icons/32x32/resources/icons/32x32/swissbrowser.png</normaloff>:/icons/32x32/resources/icons/32x32/swissbrowser.png</iconset>
+  </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout_3">
     <item row="0" column="0">
diff --git a/src/main.cxx b/src/main.cxx
index 06aff9f..0d196ad 100644
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -279,7 +279,7 @@ int main(int argv, char** argc) try {
   QTextCodec::setCodecForLocale(utf8);
   QTextCodec::setCodecForTr(utf8);
   QApplication app(argv, argc);
-  app.setWindowIcon(QIcon(":/icons/appicon"));
+  app.setWindowIcon(QIcon(":/icons/32x32/swissbrowser.png"));
   app.setApplicationName(QObject::trUtf8("SwissBrowser", "application name"));
   app.setApplicationVersion(VERSION);
   QTranslator qtTranslator;
diff --git a/src/resources.qrc b/src/resources.qrc
index 8d7b9b5..e6a4098 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="icons/32x32">
+    <file>resources/icons/32x32/swissbrowser.png</file>
     <file alias="butt32_01.png">resources/icons/32x32/butt32_01.png</file>
     <file alias="butt32_02.png">resources/icons/32x32/butt32_02.png</file>
     <file alias="butt32_03.png">resources/icons/32x32/butt32_03.png</file>
@@ -15,6 +16,7 @@
     <file alias="butt32_11.png">resources/icons/32x32/butt32_11.png</file>
   </qresource>
   <qresource prefix="icons/16x16">
+    <file>resources/icons/16x16/swissbrowser.png</file>
     <file alias="butt16_01.png">resources/icons/16x16/butt16_01.png</file>
     <file alias="butt16_02.png">resources/icons/16x16/butt16_02.png</file>
     <file alias="butt16_03.png">resources/icons/16x16/butt16_03.png</file>
diff --git a/src/resources/SW_SwissBrowser.icns b/src/resources/SW_SwissBrowser.icns
deleted file mode 100755
index 23dbaaf..0000000
Binary files a/src/resources/SW_SwissBrowser.icns and /dev/null differ
diff --git a/src/resources/SW_SwissBrowser_128x128x32.png b/src/resources/icons/128x128/SW_SwissBrowser_128x128x32.png
similarity index 100%
rename from src/resources/SW_SwissBrowser_128x128x32.png
rename to src/resources/icons/128x128/SW_SwissBrowser_128x128x32.png
diff --git a/src/resources/favicon_16x16.ico b/src/resources/icons/16x16/favicon.ico
similarity index 100%
rename from src/resources/favicon_16x16.ico
rename to src/resources/icons/16x16/favicon.ico
diff --git a/src/resources/SW_SwissBrowser_16x16x32.png b/src/resources/icons/16x16/swissbrowser.png
similarity index 100%
rename from src/resources/SW_SwissBrowser_16x16x32.png
rename to src/resources/icons/16x16/swissbrowser.png
diff --git a/src/resources/SW_SwissBrowser_256x256x32.png b/src/resources/icons/256x256/SW_SwissBrowser_256x256x32.png
similarity index 100%
rename from src/resources/SW_SwissBrowser_256x256x32.png
rename to src/resources/icons/256x256/SW_SwissBrowser_256x256x32.png
diff --git a/src/resources/favicon_32x32.ico b/src/resources/icons/32x32/favicon.ico
similarity index 100%
rename from src/resources/favicon_32x32.ico
rename to src/resources/icons/32x32/favicon.ico
diff --git a/src/resources/swissbrowser.png b/src/resources/icons/32x32/swissbrowser.png
old mode 100644
new mode 100755
similarity index 100%
rename from src/resources/swissbrowser.png
rename to src/resources/icons/32x32/swissbrowser.png
diff --git a/src/resources/SW_SwissBrowser_48x48x32.png b/src/resources/icons/48x48/SW_SwissBrowser_48x48x32.png
similarity index 100%
rename from src/resources/SW_SwissBrowser_48x48x32.png
rename to src/resources/icons/48x48/SW_SwissBrowser_48x48x32.png
diff --git a/src/resources/SW_SwissBrowser_512x512x32.png b/src/resources/icons/512x512/SW_SwissBrowser_512x512x32.png
similarity index 100%
rename from src/resources/SW_SwissBrowser_512x512x32.png
rename to src/resources/icons/512x512/SW_SwissBrowser_512x512x32.png
diff --git a/src/resources/SW_SwissBrowser.ico b/src/resources/icons/swissbrowser.ico
similarity index 100%
rename from src/resources/SW_SwissBrowser.ico
rename to src/resources/icons/swissbrowser.ico
diff --git a/src/resources/SW_SwissBrowser_32x32x32.png b/src/resources/icons/swissbrowser.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/resources/SW_SwissBrowser_32x32x32.png
rename to src/resources/icons/swissbrowser.png
diff --git a/src/swissbrowser.icns b/src/swissbrowser.icns
old mode 100644
new mode 100755