diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 5f3094346..c020690d8 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -9,8 +9,10 @@
         <file alias="align_right.png">images/align_right.png</file>
         <file alias="align_top.png">images/align_top.png</file>
         <file alias="align_vcenter.png">images/align_vcenter.png</file>
-        <file alias="back.png">images/back.png</file>
-        <file alias="back_16.png">images/back_16.png</file>
+        <file alias="back_24px.png">images/back_24px.png</file>
+        <file alias="back_24px@2x.png">images/back_24px@2x.png</file>
+        <file alias="back_16px.png">images/back_16px.png</file>
+        <file alias="back_16px@2x.png">images/back_16px@2x.png</file>
         <file alias="blue_flag.png">images/blue_flag.png</file>
         <file alias="box.png">images/box.png</file>
         <file alias="breakpoint.png">images/breakpoint.png</file>
@@ -41,8 +43,10 @@
         <file alias="fliph.png">images/fliph.png</file>
         <file alias="flipv.png">images/flipv.png</file>
         <file alias="folder.png">images/folder.png</file>
-        <file alias="forward.png">images/forward.png</file>
-        <file alias="forward_16.png">images/forward_16.png</file>
+        <file alias="forward_24px.png">images/forward_24px.png</file>
+        <file alias="forward_24px@2x.png">images/forward_24px@2x.png</file>
+        <file alias="forward_16px.png">images/forward_16px.png</file>
+        <file alias="forward_16px@2x.png">images/forward_16px@2x.png</file>
         <file alias="generalmacroicon.png">images/generalmacroicon.png</file>
         <file alias="generalmacroiconactive.png">images/generalmacroiconactive.png</file>
         <file alias="green_flag.png">images/green_flag.png</file>
diff --git a/src/lay/lay/layApplication.cc b/src/lay/lay/layApplication.cc
index 1632461e0..fe517860e 100644
--- a/src/lay/lay/layApplication.cc
+++ b/src/lay/lay/layApplication.cc
@@ -1437,6 +1437,9 @@ GuiApplication::GuiApplication (int &argc, char **argv)
 #if QT_VERSION >= 0x040500
   setAttribute (Qt::AA_DontShowIconsInMenus, false);
 #endif
+#if QT_VERSION >= 0x050000
+  setAttribute (Qt::AA_UseHighDpiPixmaps, true);
+#endif
 }
 
 GuiApplication::~GuiApplication ()
diff --git a/src/lay/lay/layMainWindow.cc b/src/lay/lay/layMainWindow.cc
index 524fda937..79bc45a17 100644
--- a/src/lay/lay/layMainWindow.cc
+++ b/src/lay/lay/layMainWindow.cc
@@ -4255,8 +4255,8 @@ public:
     menu_entries.push_back (lay::separator ("macros_group", at));
 
     at = "@toolbar.end";
-    menu_entries.push_back (lay::menu_item ("cm_prev_display_state", "prev_display_state", at, tl::to_string (QObject::tr ("Back<:/back.png>"))));
-    menu_entries.push_back (lay::menu_item ("cm_next_display_state", "next_display_state", at, tl::to_string (QObject::tr ("Forward<:/forward.png>"))));
+    menu_entries.push_back (lay::menu_item ("cm_prev_display_state", "prev_display_state", at, tl::to_string (QObject::tr ("Back<:/back_24px.png>"))));
+    menu_entries.push_back (lay::menu_item ("cm_next_display_state", "next_display_state", at, tl::to_string (QObject::tr ("Forward<:/forward_24px.png>"))));
     menu_entries.push_back (lay::separator ("toolbar_post_navigation_group", at));
   }
 };
diff --git a/src/layui/layui/BrowserDialog.ui b/src/layui/layui/BrowserDialog.ui
index 85b455b50..e15f1b54b 100644
--- a/src/layui/layui/BrowserDialog.ui
+++ b/src/layui/layui/BrowserDialog.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>BrowserDialog</class>
- <widget class="QDialog" name="BrowserDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="BrowserDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,22 +10,20 @@
     <height>461</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Browser</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
+   <property name="margin" stdset="0">
+    <number>9</number>
+   </property>
    <item>
-    <widget class="lay::BrowserPanel" native="1" name="browser" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>13</hsizetype>
-       <vsizetype>7</vsizetype>
+    <widget class="lay::BrowserPanel" name="browser" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Ignored" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -32,26 +31,26 @@
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="frame" >
-     <property name="frameShape" >
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>0</number>
-      </property>
-      <property name="spacing" >
+     <layout class="QHBoxLayout">
+      <property name="spacing">
        <number>6</number>
       </property>
+      <property name="margin" stdset="0">
+       <number>0</number>
+      </property>
       <item>
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
@@ -60,8 +59,8 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="close_pb" >
-        <property name="text" >
+       <widget class="QPushButton" name="close_pb">
+        <property name="text">
          <string>Close</string>
         </property>
        </widget>
@@ -78,9 +77,7 @@
    <header>layBrowserPanel.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="layResources.qrc" />
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>close_pb</sender>
@@ -88,11 +85,11 @@
    <receiver>BrowserDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>469</x>
      <y>422</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>257</x>
      <y>222</y>
     </hint>
diff --git a/src/layui/layui/BrowserPanel.ui b/src/layui/layui/BrowserPanel.ui
index 66071a8ee..eb985f044 100644
--- a/src/layui/layui/BrowserPanel.ui
+++ b/src/layui/layui/BrowserPanel.ui
@@ -223,7 +223,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../../lay/lay/layResources.qrc">
+                <iconset resource="../../icons/icons.qrc">
                  <normaloff>:/find.png</normaloff>:/find.png</iconset>
                </property>
                <property name="autoRaise">
@@ -240,7 +240,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../../lay/lay/layResources.qrc">
+                <iconset resource="../../icons/icons.qrc">
                  <normaloff>:/clear_edit.png</normaloff>:/clear_edit.png</iconset>
                </property>
                <property name="autoRaise">
@@ -267,8 +267,8 @@
       <string>...</string>
      </property>
      <property name="icon">
-      <iconset resource="../../lay/lay/layResources.qrc">
-       <normaloff>:/forward.png</normaloff>:/forward.png</iconset>
+      <iconset resource="../../icons/icons.qrc">
+       <normaloff>:/forward_24px.png</normaloff>:/forward_24px.png</iconset>
      </property>
      <property name="iconSize">
       <size>
@@ -290,8 +290,8 @@
       <string>...</string>
      </property>
      <property name="icon">
-      <iconset resource="../../lay/lay/layResources.qrc">
-       <normaloff>:/back.png</normaloff>:/back.png</iconset>
+      <iconset resource="../../icons/icons.qrc">
+       <normaloff>:/back_24px.png</normaloff>:/back_24px.png</iconset>
      </property>
      <property name="iconSize">
       <size>
@@ -313,7 +313,7 @@
       <string>...</string>
      </property>
      <property name="icon">
-      <iconset resource="../../lay/lay/layResources.qrc">
+      <iconset resource="../../icons/icons.qrc">
        <normaloff>:/home.png</normaloff>:/home.png</iconset>
      </property>
      <property name="iconSize">
@@ -352,7 +352,7 @@
       <string>...</string>
      </property>
      <property name="icon">
-      <iconset resource="../../lay/lay/layResources.qrc">
+      <iconset resource="../../icons/icons.qrc">
        <normaloff>:/prev_topic.png</normaloff>:/prev_topic.png</iconset>
      </property>
      <property name="iconSize">
@@ -388,7 +388,7 @@
       <string>...</string>
      </property>
      <property name="icon">
-      <iconset resource="../../lay/lay/layResources.qrc">
+      <iconset resource="../../icons/icons.qrc">
        <normaloff>:/find.png</normaloff>:/find.png</iconset>
      </property>
      <property name="autoRaise">
@@ -405,7 +405,7 @@
       <string>...</string>
      </property>
      <property name="icon">
-      <iconset resource="../../lay/lay/layResources.qrc">
+      <iconset resource="../../icons/icons.qrc">
        <normaloff>:/next_topic.png</normaloff>:/next_topic.png</iconset>
      </property>
      <property name="iconSize">
@@ -461,7 +461,7 @@
       <string>...</string>
      </property>
      <property name="icon">
-      <iconset resource="../../lay/lay/layResources.qrc">
+      <iconset resource="../../icons/icons.qrc">
        <normaloff>:/bookmark.png</normaloff>:/bookmark.png</iconset>
      </property>
      <property name="iconSize">
@@ -512,7 +512,7 @@
   <tabstop>home_pb</tabstop>
  </tabstops>
  <resources>
-  <include location="../../lay/lay/layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/plugins/streamers/pcb/lay_plugin/GerberImportDialog.ui b/src/plugins/streamers/pcb/lay_plugin/GerberImportDialog.ui
index 02421de0e..f47f3ff1d 100644
--- a/src/plugins/streamers/pcb/lay_plugin/GerberImportDialog.ui
+++ b/src/plugins/streamers/pcb/lay_plugin/GerberImportDialog.ui
@@ -229,7 +229,7 @@ surface.</string>
              <string>...</string>
             </property>
             <property name="icon" >
-             <iconset resource="layResources.qrc" >:/down.png</iconset>
+             <iconset resource="icons.qrc" >:/down.png</iconset>
             </property>
             <property name="shortcut" >
              <string>Ctrl+Down</string>
@@ -245,7 +245,7 @@ surface.</string>
              <string>...</string>
             </property>
             <property name="icon" >
-             <iconset resource="layResources.qrc" >:/up.png</iconset>
+             <iconset resource="icons.qrc" >:/up.png</iconset>
             </property>
             <property name="shortcut" >
              <string>Ctrl+Up</string>
@@ -261,7 +261,7 @@ surface.</string>
              <string>...</string>
             </property>
             <property name="icon" >
-             <iconset resource="layResources.qrc" >:/clear.png</iconset>
+             <iconset resource="icons.qrc" >:/clear.png</iconset>
             </property>
             <property name="shortcut" >
              <string>Del</string>
@@ -277,7 +277,7 @@ surface.</string>
              <string>...</string>
             </property>
             <property name="icon" >
-             <iconset resource="layResources.qrc" >:/add.png</iconset>
+             <iconset resource="icons.qrc" >:/add.png</iconset>
             </property>
             <property name="shortcut" >
              <string>Return</string>
@@ -586,7 +586,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="layResources.qrc" >:/up.png</iconset>
+          <iconset resource="icons.qrc" >:/up.png</iconset>
          </property>
          <property name="shortcut" >
           <string>Ctrl+Up</string>
@@ -602,7 +602,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="layResources.qrc" >:/add.png</iconset>
+          <iconset resource="icons.qrc" >:/add.png</iconset>
          </property>
          <property name="shortcut" >
           <string>Return</string>
@@ -618,7 +618,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="layResources.qrc" >:/down.png</iconset>
+          <iconset resource="icons.qrc" >:/down.png</iconset>
          </property>
          <property name="shortcut" >
           <string>Ctrl+Down</string>
@@ -634,7 +634,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="layResources.qrc" >:/clear.png</iconset>
+          <iconset resource="icons.qrc" >:/clear.png</iconset>
          </property>
          <property name="shortcut" >
           <string>Del</string>
@@ -704,7 +704,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="layResources.qrc" >:/down.png</iconset>
+          <iconset resource="icons.qrc" >:/down.png</iconset>
          </property>
          <property name="shortcut" >
           <string>Ctrl+Down</string>
@@ -720,7 +720,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="layResources.qrc" >:/up.png</iconset>
+          <iconset resource="icons.qrc" >:/up.png</iconset>
          </property>
          <property name="shortcut" >
           <string>Ctrl+Up</string>
@@ -736,7 +736,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="layResources.qrc" >:/clear.png</iconset>
+          <iconset resource="icons.qrc" >:/clear.png</iconset>
          </property>
          <property name="shortcut" >
           <string>Del</string>
@@ -752,7 +752,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="layResources.qrc" >:/add.png</iconset>
+          <iconset resource="icons.qrc" >:/add.png</iconset>
          </property>
          <property name="shortcut" >
           <string>Return</string>
@@ -791,7 +791,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="layResources.qrc" >:/clear.png</iconset>
+          <iconset resource="icons.qrc" >:/clear.png</iconset>
          </property>
          <property name="shortcut" >
           <string>Del</string>
@@ -1278,7 +1278,7 @@ Alternatively the transformation (imported to existing layout) can be specified
       <string>Next</string>
      </property>
      <property name="icon" >
-      <iconset resource="layResources.qrc" >:/forward.png</iconset>
+      <iconset resource="icons.qrc" >:/forward_24px.png</iconset>
      </property>
     </widget>
    </item>
@@ -1302,7 +1302,7 @@ Alternatively the transformation (imported to existing layout) can be specified
       <string>Back</string>
      </property>
      <property name="icon" >
-      <iconset resource="layResources.qrc" >:/back.png</iconset>
+      <iconset resource="icons.qrc" >:/back_24px.png</iconset>
      </property>
     </widget>
    </item>
@@ -1461,7 +1461,7 @@ Alternatively the transformation (imported to existing layout) can be specified
   <tabstop>cancel_pb</tabstop>
  </tabstops>
  <resources>
-  <include location="layResources.qrc" />
+  <include location="icons.qrc" />
  </resources>
  <connections>
   <connection>
diff --git a/src/plugins/tools/import/lay_plugin/StreamImportDialog.ui b/src/plugins/tools/import/lay_plugin/StreamImportDialog.ui
index 9ada7a02d..1850e7b9a 100644
--- a/src/plugins/tools/import/lay_plugin/StreamImportDialog.ui
+++ b/src/plugins/tools/import/lay_plugin/StreamImportDialog.ui
@@ -35,8 +35,8 @@
       <string>Back</string>
      </property>
      <property name="icon">
-      <iconset resource="../../../../lay/lay/layResources.qrc">
-       <normaloff>:/back.png</normaloff>:/back.png</iconset>
+      <iconset resource="../../../../icons/icons.qrc">
+       <normaloff>:/back_24px.png</normaloff>:/back_24px.png</iconset>
      </property>
     </widget>
    </item>
@@ -66,8 +66,8 @@
       <string>Next</string>
      </property>
      <property name="icon">
-      <iconset resource="../../../../lay/lay/layResources.qrc">
-       <normaloff>:/forward.png</normaloff>:/forward.png</iconset>
+      <iconset resource="../../../../icons/icons.qrc">
+       <normaloff>:/forward_24px.png</normaloff>:/forward_24px.png</iconset>
      </property>
     </widget>
    </item>
@@ -938,7 +938,7 @@ Alternatively the transformation (imported to existing layout) can be specified
   <tabstop>cancel_pb</tabstop>
  </tabstops>
  <resources>
-  <include location="../../../../lay/lay/layResources.qrc"/>
+  <include location="../../../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>