diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 5180e1704..5c2a0307c 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -99,7 +99,8 @@
         <file alias="help_16px@2x.png">images/help_16px@2x.png</file>
         <file alias="home_24px.png">images/home_24px.png</file>
         <file alias="home_24px@2x.png">images/home_24px@2x.png</file>
-        <file alias="import.png">images/import.png</file>
+        <file alias="import_16px.png">images/import_16px.png</file>
+        <file alias="import_16px@2x.png">images/import_16px@2x.png</file>
         <file alias="important_16px.png">images/important_16px.png</file>
         <file alias="important_16px@2x.png">images/important_16px@2x.png</file>
         <file alias="instance_24px.png">images/instance_24px.png</file>
@@ -169,7 +170,8 @@
         <file alias="rc_31px@2x.png">images/rc_31px@2x.png</file>
         <file alias="red_flag_16px.png">images/red_flag_16px.png</file>
         <file alias="red_flag_16px@2x.png">images/red_flag_16px@2x.png</file>
-        <file alias="rename.png">images/rename.png</file>
+        <file alias="rename_16px.png">images/rename_16px.png</file>
+        <file alias="rename_16px@2x.png">images/rename_16px@2x.png</file>
         <file alias="replace_16px.png">images/replace_16px.png</file>
         <file alias="replace_16px@2x.png">images/replace_16px@2x.png</file>
         <file alias="replace_all_16px.png">images/replace_all_16px.png</file>
diff --git a/src/icons/images/import.png b/src/icons/images/import.png
deleted file mode 100644
index d89416fe2..000000000
Binary files a/src/icons/images/import.png and /dev/null differ
diff --git a/src/icons/images/import_16px.png b/src/icons/images/import_16px.png
new file mode 100644
index 000000000..70bb4b4c2
Binary files /dev/null and b/src/icons/images/import_16px.png differ
diff --git a/src/icons/images/import_16px@2x.png b/src/icons/images/import_16px@2x.png
new file mode 100644
index 000000000..9faa8eaf0
Binary files /dev/null and b/src/icons/images/import_16px@2x.png differ
diff --git a/src/icons/images/rename.png b/src/icons/images/rename.png
deleted file mode 100644
index 71b798b6f..000000000
Binary files a/src/icons/images/rename.png and /dev/null differ
diff --git a/src/icons/images/rename_16px.png b/src/icons/images/rename_16px.png
new file mode 100644
index 000000000..2cf590039
Binary files /dev/null and b/src/icons/images/rename_16px.png differ
diff --git a/src/icons/images/rename_16px@2x.png b/src/icons/images/rename_16px@2x.png
new file mode 100644
index 000000000..1e21ecdce
Binary files /dev/null and b/src/icons/images/rename_16px@2x.png differ
diff --git a/src/icons/svg/import_16px.svg b/src/icons/svg/import_16px.svg
new file mode 100644
index 000000000..d56df57f0
--- /dev/null
+++ b/src/icons/svg/import_16px.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="import_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449577"
+     inkscape:cx="5.5624685"
+     inkscape:cy="12.98591"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="119"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient2540"
+       x1="0.2645835"
+       y1="1.984375"
+       x2="2.3812444"
+       y2="1.984375"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,4.2333334,0.52916655)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient845"
+       gradientUnits="userSpaceOnUse"
+       x1="0.2645835"
+       y1="1.984375"
+       x2="2.3812444"
+       y2="1.984375"
+       gradientTransform="matrix(-1,0,0,1,4.2333334,0.52916655)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916667;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.5;stroke-opacity:0.5"
+       id="rect1503"
+       width="2.9104168"
+       height="3.4395831"
+       x="0.39687499"
+       y="0.39687499" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#373737;stroke-width:0.264584;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.5;stroke-opacity:1"
+       id="rect871"
+       width="2.9104168"
+       height="3.4395831"
+       x="0.39687499"
+       y="0.39687499" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <path
+       style="fill:url(#linearGradient845);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.7"
+       d="M 3.8364584,2.5135418 V 1.9843751 l -0.79375,-1e-7 V 1.4552084 L 1.984375,2.5135417 3.0427084,3.571875 V 3.0427084 h 0.79375 z"
+       id="path2622"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:url(#linearGradient2540);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.8364584,2.5135418 V 1.9843751 l -0.79375,-1e-7 V 1.4552084 L 1.984375,2.5135417 3.0427084,3.571875 V 3.0427084 h 0.79375 z"
+       id="path2222"
+       sodipodi:nodetypes="ccccccccc" />
+  </g>
+</svg>
diff --git a/src/icons/svg/rename_16px.svg b/src/icons/svg/rename_16px.svg
new file mode 100644
index 000000000..2be41e288
--- /dev/null
+++ b/src/icons/svg/rename_16px.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="rename_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="12.224789"
+     inkscape:cx="-5.3170653"
+     inkscape:cy="14.274275"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="119"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient2540"
+       x1="0.2645835"
+       y1="1.984375"
+       x2="2.3812444"
+       y2="1.984375"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.79375001,0.13229157)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916667;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.5;stroke-opacity:0.5"
+       id="rect12399"
+       width="1.3229165"
+       height="1.5874997"
+       x="0.39687485"
+       y="0.39687502" />
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916667;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.5;stroke-opacity:0.5"
+       id="rect12401"
+       width="1.3229165"
+       height="1.5874997"
+       x="2.5135417"
+       y="2.2489588" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#bcbcbc;stroke-width:0.264584;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.5;stroke-opacity:1"
+       id="rect871"
+       width="1.3229165"
+       height="1.5874997"
+       x="0.39687485"
+       y="0.39687502" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#bcbcbc;stroke-width:0.264584;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.5;stroke-opacity:1"
+       id="rect871-3"
+       width="1.3229165"
+       height="1.5874997"
+       x="2.5135417"
+       y="2.2489588" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.26238px;line-height:125%;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="0.33416888"
+       y="2.0616062"
+       id="text3609"
+       transform="scale(1.0389196,0.96253835)"><tspan
+         sodipodi:role="line"
+         id="tspan3607"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.26238px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono Bold';stroke-width:0.264583px"
+         x="0.33416888"
+         y="2.0616062">A</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.26238px;line-height:125%;font-family:'DejaVu Serif';-inkscape-font-specification:'DejaVu Serif';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2.3715429"
+       y="3.9857719"
+       id="text3609-2"
+       transform="scale(1.0389196,0.96253838)"><tspan
+         sodipodi:role="line"
+         id="tspan3607-2"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.26238px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono Bold';stroke-width:0.264583px"
+         x="2.3715429"
+         y="3.9857719">B</tspan></text>
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.69999999"
+       d="m 1.190625,2.1166668 0,-0.3968751 H 1.9843751 V 1.190625 l 0.79375,0.9260417 -0.79375,0.9260417 V 2.5135417 H 1.190625 Z"
+       id="path10630"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:url(#linearGradient2540);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.190625,2.1166668 0,-0.3968751 H 1.9843751 V 1.190625 l 0.79375,0.9260417 -0.79375,0.9260417 V 2.5135417 H 1.190625 Z"
+       id="path2222"
+       sodipodi:nodetypes="ccccccccc" />
+  </g>
+</svg>
diff --git a/src/lay/lay/CrashMessage.ui b/src/lay/lay/CrashMessage.ui
index 9ac5c81d1..267fe5aef 100644
--- a/src/lay/lay/CrashMessage.ui
+++ b/src/lay/lay/CrashMessage.ui
@@ -67,7 +67,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="layResources.qrc">:/bug.png</pixmap>
+         <pixmap resource="../../icons/icons.qrc">:/bug.png</pixmap>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -126,7 +126,7 @@
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/lay/lay/CustomizeMenuConfigPage.ui b/src/lay/lay/CustomizeMenuConfigPage.ui
index e445e2755..698768e18 100644
--- a/src/lay/lay/CustomizeMenuConfigPage.ui
+++ b/src/lay/lay/CustomizeMenuConfigPage.ui
@@ -195,7 +195,7 @@ For special keys:
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="layResources.qrc">:/find_16px.png</pixmap>
+         <pixmap resource="../../icons/icons.qrc">:/find_16px.png</pixmap>
         </property>
        </widget>
       </item>
@@ -223,7 +223,7 @@ For special keys:
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/lay/lay/HelpAboutDialog.ui b/src/lay/lay/HelpAboutDialog.ui
index 1d04a3545..07b329094 100644
--- a/src/lay/lay/HelpAboutDialog.ui
+++ b/src/lay/lay/HelpAboutDialog.ui
@@ -137,7 +137,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="layResources.qrc">:/logo.png</pixmap>
+         <pixmap resource="../../icons/icons.qrc">:/logo.png</pixmap>
         </property>
        </widget>
       </item>
@@ -226,7 +226,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/lay/lay/LogViewerDialog.ui b/src/lay/lay/LogViewerDialog.ui
index d625b0d06..7d252850d 100644
--- a/src/lay/lay/LogViewerDialog.ui
+++ b/src/lay/lay/LogViewerDialog.ui
@@ -169,7 +169,7 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap resource="layResources.qrc">:/warn_16px.png</pixmap>
+            <pixmap resource="../../icons/icons.qrc">:/warn_16px.png</pixmap>
            </property>
           </widget>
          </item>
@@ -206,7 +206,7 @@
   <tabstop>log_view</tabstop>
  </tabstops>
  <resources>
-  <include location="layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/lay/lay/MacroEditorDialog.ui b/src/lay/lay/MacroEditorDialog.ui
index 3080ac48a..95b142033 100644
--- a/src/lay/lay/MacroEditorDialog.ui
+++ b/src/lay/lay/MacroEditorDialog.ui
@@ -171,7 +171,7 @@ p, li { white-space: pre-wrap; }
              </property>
              <property name="icon">
               <iconset resource="../../icons/icons.qrc">
-               <normaloff>:/rename.png</normaloff>:/rename.png</iconset>
+               <normaloff>:/rename_16px.png</normaloff>:/rename_16px.png</iconset>
              </property>
              <property name="autoRaise">
               <bool>true</bool>
@@ -191,7 +191,7 @@ p, li { white-space: pre-wrap; }
              </property>
              <property name="icon">
               <iconset resource="../../icons/icons.qrc">
-               <normaloff>:/import.png</normaloff>:/import.png</iconset>
+               <normaloff>:/import_16px.png</normaloff>:/import_16px.png</iconset>
              </property>
              <property name="autoRaise">
               <bool>true</bool>
@@ -1404,7 +1404,7 @@ p, li { white-space: pre-wrap; }
   <action name="actionRename">
    <property name="icon">
     <iconset resource="../../icons/icons.qrc">
-     <normaloff>:/rename.png</normaloff>:/rename.png</iconset>
+     <normaloff>:/rename_16px.png</normaloff>:/rename_16px.png</iconset>
    </property>
    <property name="text">
     <string>Rename</string>
@@ -1413,7 +1413,7 @@ p, li { white-space: pre-wrap; }
   <action name="actionImport">
    <property name="icon">
     <iconset resource="../../icons/icons.qrc">
-     <normaloff>:/import.png</normaloff>:/import.png</iconset>
+     <normaloff>:/import_16px.png</normaloff>:/import_16px.png</iconset>
    </property>
    <property name="text">
     <string>Import</string>
diff --git a/src/lay/lay/MainConfigPage6.ui b/src/lay/lay/MainConfigPage6.ui
index 198060873..b3b01f052 100644
--- a/src/lay/lay/MainConfigPage6.ui
+++ b/src/lay/lay/MainConfigPage6.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>MainConfigPage6</class>
- <widget class="QFrame" name="MainConfigPage6" >
-  <property name="geometry" >
+ <widget class="QFrame" name="MainConfigPage6">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,44 +10,44 @@
     <height>130</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Application Settings</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="QGroupBox" name="groupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Circle Resolution</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
+     <layout class="QHBoxLayout">
+      <property name="spacing">
        <number>6</number>
       </property>
+      <property name="margin" stdset="0">
+       <number>9</number>
+      </property>
       <item>
-       <widget class="QLabel" name="label" >
-        <property name="text" >
+       <widget class="QLabel" name="label">
+        <property name="text">
          <string>Number of points per full circle</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QLineEdit" name="circle_points" />
+       <widget class="QLineEdit" name="circle_points"/>
       </item>
       <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>
@@ -59,9 +60,7 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <resources>
-  <include location="layResources.qrc" />
- </resources>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
  <connections/>
 </ui>
diff --git a/src/lay/lay/SaltGrainPropertiesDialog.ui b/src/lay/lay/SaltGrainPropertiesDialog.ui
index 58d1e9411..ebdd65a58 100644
--- a/src/lay/lay/SaltGrainPropertiesDialog.ui
+++ b/src/lay/lay/SaltGrainPropertiesDialog.ui
@@ -48,7 +48,6 @@
        <widget class="QLabel" name="label">
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -85,7 +84,6 @@
        <widget class="QLabel" name="label_14">
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -178,7 +176,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/clear_16px.png</normaloff>:/clear_16px.png</iconset>
            </property>
            <property name="autoRaise">
@@ -195,7 +193,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/add_16px.png</normaloff>:/add_16px.png</iconset>
            </property>
            <property name="autoRaise">
@@ -243,7 +241,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/warn_16px.png</normaloff>:/warn_16px.png</iconset>
            </property>
            <property name="autoRaise">
@@ -258,7 +256,6 @@
        <widget class="QLabel" name="label_2">
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -274,7 +271,6 @@
        <widget class="QLabel" name="label_15">
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -290,7 +286,6 @@
        <widget class="QLabel" name="label_8">
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -344,7 +339,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/clear_edit_16px.png</normaloff>:/clear_edit_16px.png</iconset>
            </property>
            <property name="autoRaise">
@@ -369,7 +364,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/salt_icon.png</normaloff>:/salt_icon.png</iconset>
            </property>
            <property name="iconSize">
@@ -389,7 +384,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/add_16px.png</normaloff>:/add_16px.png</iconset>
            </property>
            <property name="iconSize">
@@ -451,7 +446,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/clear_edit_16px.png</normaloff>:/clear_edit_16px.png</iconset>
            </property>
            <property name="autoRaise">
@@ -516,7 +511,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/warn_16px.png</normaloff>:/warn_16px.png</iconset>
            </property>
            <property name="autoRaise">
@@ -543,7 +538,6 @@
        <widget class="QLabel" name="label_3">
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -559,7 +553,6 @@
        <widget class="QLabel" name="label_9">
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -617,7 +610,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/warn_16px.png</normaloff>:/warn_16px.png</iconset>
            </property>
            <property name="autoRaise">
@@ -660,7 +653,6 @@
        <widget class="QLabel" name="label_12">
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -676,7 +668,6 @@
        <widget class="QLabel" name="label_5">
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -731,7 +722,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/warn_16px.png</normaloff>:/warn_16px.png</iconset>
            </property>
            <property name="autoRaise">
@@ -772,7 +763,6 @@
        <widget class="QLabel" name="label_7">
         <property name="font">
          <font>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -823,7 +813,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/warn_16px.png</normaloff>:/warn_16px.png</iconset>
            </property>
            <property name="autoRaise">
@@ -882,7 +872,7 @@
   <tabstop>remove_dependency</tabstop>
  </tabstops>
  <resources>
-  <include location="layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/lay/lay/SaltGrainTemplateSelectionDialog.ui b/src/lay/lay/SaltGrainTemplateSelectionDialog.ui
index 4bdeab7d3..7ab454058 100644
--- a/src/lay/lay/SaltGrainTemplateSelectionDialog.ui
+++ b/src/lay/lay/SaltGrainTemplateSelectionDialog.ui
@@ -18,7 +18,6 @@
     <widget class="QLabel" name="label">
      <property name="font">
       <font>
-       <weight>75</weight>
        <bold>true</bold>
       </font>
      </property>
@@ -75,7 +74,6 @@
     <widget class="QLabel" name="label_2">
      <property name="font">
       <font>
-       <weight>75</weight>
        <bold>true</bold>
       </font>
      </property>
@@ -117,7 +115,7 @@
          <string>...</string>
         </property>
         <property name="icon">
-         <iconset resource="layResources.qrc">
+         <iconset resource="../../icons/icons.qrc">
           <normaloff>:/warn_16px.png</normaloff>:/warn_16px.png</iconset>
         </property>
         <property name="autoRaise">
@@ -132,7 +130,6 @@
     <widget class="QLabel" name="label_3">
      <property name="font">
       <font>
-       <weight>50</weight>
        <italic>true</italic>
        <bold>false</bold>
       </font>
@@ -155,7 +152,7 @@
   </layout>
   <action name="actionNew">
    <property name="icon">
-    <iconset resource="layResources.qrc">
+    <iconset resource="../../icons/icons.qrc">
      <normaloff>:/add_16px.png</normaloff>:/add_16px.png</iconset>
    </property>
    <property name="text">
@@ -167,7 +164,7 @@
   </action>
   <action name="actionDelete">
    <property name="icon">
-    <iconset resource="layResources.qrc">
+    <iconset resource="../../icons/icons.qrc">
      <normaloff>:/clear_16px.png</normaloff>:/clear_16px.png</iconset>
    </property>
    <property name="text">
@@ -179,8 +176,8 @@
   </action>
   <action name="actionImport">
    <property name="icon">
-    <iconset resource="layResources.qrc">
-     <normaloff>:/import.png</normaloff>:/import.png</iconset>
+    <iconset resource="../../icons/icons.qrc">
+     <normaloff>:/import_16px.png</normaloff>:/import_16px.png</iconset>
    </property>
    <property name="text">
     <string>Import</string>
@@ -198,7 +195,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/lay/lay/SaltManagerDialog.ui b/src/lay/lay/SaltManagerDialog.ui
index eaf406944..4afd2a16c 100644
--- a/src/lay/lay/SaltManagerDialog.ui
+++ b/src/lay/lay/SaltManagerDialog.ui
@@ -76,7 +76,7 @@
                  <string>Mark</string>
                 </property>
                 <property name="icon">
-                 <iconset resource="layResources.qrc">
+                 <iconset resource="../../icons/icons.qrc">
                   <normaloff>:/marked_16px.png</normaloff>:/marked_16px.png</iconset>
                 </property>
                 <property name="autoRaise">
@@ -103,7 +103,7 @@
                  <string/>
                 </property>
                 <property name="pixmap">
-                 <pixmap resource="layResources.qrc">:/find_16px.png</pixmap>
+                 <pixmap resource="../../icons/icons.qrc">:/find_16px.png</pixmap>
                 </property>
                </widget>
               </item>
@@ -219,7 +219,6 @@
                <widget class="QLabel" name="label_6">
                 <property name="font">
                  <font>
-                  <weight>75</weight>
                   <bold>true</bold>
                  </font>
                 </property>
@@ -237,7 +236,7 @@
                  <string>...</string>
                 </property>
                 <property name="icon">
-                 <iconset resource="layResources.qrc">
+                 <iconset resource="../../icons/icons.qrc">
                   <normaloff>:/empty_16px.png</normaloff>:/empty_16px.png</iconset>
                 </property>
                 <property name="autoRaise">
@@ -375,7 +374,7 @@
                  <string>Mark</string>
                 </property>
                 <property name="icon">
-                 <iconset resource="layResources.qrc">
+                 <iconset resource="../../icons/icons.qrc">
                   <normaloff>:/marked_16px.png</normaloff>:/marked_16px.png</iconset>
                 </property>
                 <property name="autoRaise">
@@ -402,7 +401,7 @@
                  <string/>
                 </property>
                 <property name="pixmap">
-                 <pixmap resource="layResources.qrc">:/find_16px.png</pixmap>
+                 <pixmap resource="../../icons/icons.qrc">:/find_16px.png</pixmap>
                 </property>
                </widget>
               </item>
@@ -518,7 +517,6 @@
                <widget class="QLabel" name="label_9">
                 <property name="font">
                  <font>
-                  <weight>75</weight>
                   <bold>true</bold>
                  </font>
                 </property>
@@ -536,7 +534,7 @@
                  <string>...</string>
                 </property>
                 <property name="icon">
-                 <iconset resource="layResources.qrc">
+                 <iconset resource="../../icons/icons.qrc">
                   <normaloff>:/empty_16px.png</normaloff>:/empty_16px.png</iconset>
                 </property>
                 <property name="autoRaise">
@@ -690,7 +688,7 @@
                  <string/>
                 </property>
                 <property name="pixmap">
-                 <pixmap resource="layResources.qrc">:/find_16px.png</pixmap>
+                 <pixmap resource="../../icons/icons.qrc">:/find_16px.png</pixmap>
                 </property>
                </widget>
               </item>
@@ -804,8 +802,8 @@
                       <rect>
                        <x>0</x>
                        <y>0</y>
-                       <width>537</width>
-                       <height>284</height>
+                       <width>334</width>
+                       <height>213</height>
                       </rect>
                      </property>
                      <layout class="QGridLayout" name="gridLayout_2">
@@ -828,7 +826,7 @@
                          <string/>
                         </property>
                         <property name="pixmap">
-                         <pixmap resource="layResources.qrc">:/salt.png</pixmap>
+                         <pixmap resource="../../icons/icons.qrc">:/salt.png</pixmap>
                         </property>
                        </widget>
                       </item>
@@ -843,7 +841,6 @@
                         <property name="font">
                          <font>
                           <pointsize>9</pointsize>
-                          <weight>50</weight>
                           <bold>false</bold>
                          </font>
                         </property>
@@ -942,7 +939,6 @@
             <widget class="QLabel" name="label">
              <property name="font">
               <font>
-               <weight>75</weight>
                <bold>true</bold>
               </font>
              </property>
@@ -960,7 +956,7 @@
               <string>Edit</string>
              </property>
              <property name="icon">
-              <iconset resource="layResources.qrc">
+              <iconset resource="../../icons/icons.qrc">
                <normaloff>:/edit_16px.png</normaloff>:/edit_16px.png</iconset>
              </property>
              <property name="autoRaise">
@@ -1012,7 +1008,7 @@
              <string>Remove Package</string>
             </property>
             <property name="icon">
-             <iconset resource="layResources.qrc">
+             <iconset resource="../../icons/icons.qrc">
               <normaloff>:/clear_16px.png</normaloff>:/clear_16px.png</iconset>
             </property>
            </widget>
@@ -1036,7 +1032,7 @@
              <string>Create (Edit) Package</string>
             </property>
             <property name="icon">
-             <iconset resource="layResources.qrc">
+             <iconset resource="../../icons/icons.qrc">
               <normaloff>:/add_16px.png</normaloff>:/add_16px.png</iconset>
             </property>
             <property name="autoDefault">
@@ -1061,7 +1057,7 @@
   </layout>
   <action name="actionNew">
    <property name="icon">
-    <iconset resource="layResources.qrc">
+    <iconset resource="../../icons/icons.qrc">
      <normaloff>:/add_16px.png</normaloff>:/add_16px.png</iconset>
    </property>
    <property name="text">
@@ -1073,7 +1069,7 @@
   </action>
   <action name="actionDelete">
    <property name="icon">
-    <iconset resource="layResources.qrc">
+    <iconset resource="../../icons/icons.qrc">
      <normaloff>:/clear_16px.png</normaloff>:/clear_16px.png</iconset>
    </property>
    <property name="text">
@@ -1133,7 +1129,7 @@
   </action>
   <action name="actionCreatePackage">
    <property name="icon">
-    <iconset resource="layResources.qrc">
+    <iconset resource="../../icons/icons.qrc">
      <normaloff>:/add_16px.png</normaloff>:/add_16px.png</iconset>
    </property>
    <property name="text">
@@ -1178,7 +1174,7 @@
   <tabstop>scrollArea</tabstop>
  </tabstops>
  <resources>
-  <include location="layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/lay/lay/SaltManagerInstallConfirmationDialog.ui b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui
index eb032592d..ef18920d2 100644
--- a/src/lay/lay/SaltManagerInstallConfirmationDialog.ui
+++ b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui
@@ -260,7 +260,7 @@
                 <string/>
                </property>
                <property name="pixmap">
-                <pixmap resource="layResources.qrc">:/warn_16px.png</pixmap>
+                <pixmap resource="../../icons/icons.qrc">:/warn_16px.png</pixmap>
                </property>
               </widget>
              </item>
@@ -335,7 +335,7 @@
   </layout>
   <action name="actionNew">
    <property name="icon">
-    <iconset resource="layResources.qrc">
+    <iconset resource="../../icons/icons.qrc">
      <normaloff>:/add_16px.png</normaloff>:/add_16px.png</iconset>
    </property>
    <property name="text">
@@ -347,7 +347,7 @@
   </action>
   <action name="actionDelete">
    <property name="icon">
-    <iconset resource="layResources.qrc">
+    <iconset resource="../../icons/icons.qrc">
      <normaloff>:/clear_16px.png</normaloff>:/clear_16px.png</iconset>
    </property>
    <property name="text">
@@ -359,8 +359,8 @@
   </action>
   <action name="actionImport">
    <property name="icon">
-    <iconset resource="layResources.qrc">
-     <normaloff>:/import.png</normaloff>:/import.png</iconset>
+    <iconset resource="../../icons/icons.qrc">
+     <normaloff>:/import_16px.png</normaloff>:/import_16px.png</iconset>
    </property>
    <property name="text">
     <string>Import</string>
@@ -371,7 +371,7 @@
   </action>
  </widget>
  <resources>
-  <include location="layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/lay/lay/SearchReplaceDialog.ui b/src/lay/lay/SearchReplaceDialog.ui
index 21db4a07c..9c24eb188 100644
--- a/src/lay/lay/SearchReplaceDialog.ui
+++ b/src/lay/lay/SearchReplaceDialog.ui
@@ -745,7 +745,7 @@ p, li { white-space: pre-wrap; }
                 </property>
                 <property name="icon">
                  <iconset resource="../../icons/icons.qrc">
-                  <normaloff>:/rename.png</normaloff>:/rename.png</iconset>
+                  <normaloff>:/rename_16px.png</normaloff>:/rename_16px.png</iconset>
                 </property>
                 <property name="autoRaise">
                  <bool>true</bool>
diff --git a/src/lay/lay/TechSetupDialog.ui b/src/lay/lay/TechSetupDialog.ui
index 818fc0b07..71b39a402 100644
--- a/src/lay/lay/TechSetupDialog.ui
+++ b/src/lay/lay/TechSetupDialog.ui
@@ -112,7 +112,7 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset resource="layResources.qrc">
+             <iconset resource="../../icons/icons.qrc">
               <normaloff>:/add_16px.png</normaloff>:/add_16px.png</iconset>
             </property>
             <property name="autoRaise">
@@ -126,7 +126,7 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset resource="layResources.qrc">
+             <iconset resource="../../icons/icons.qrc">
               <normaloff>:/clear_16px.png</normaloff>:/clear_16px.png</iconset>
             </property>
             <property name="autoRaise">
@@ -303,7 +303,7 @@
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/lay/lay/lay.pro b/src/lay/lay/lay.pro
index 8de679cd3..8bd49c256 100644
--- a/src/lay/lay/lay.pro
+++ b/src/lay/lay/lay.pro
@@ -175,7 +175,6 @@ SOURCES = \
 
 RESOURCES = layBuildInMacros.qrc \
     layMacroTemplates.qrc \
-  layResources.qrc \
     laySyntaxHighlighters.qrc \
     laySaltTemplates.qrc \
 
diff --git a/src/layui/layui/MarkerBrowserPage.ui b/src/layui/layui/MarkerBrowserPage.ui
index a5651d155..00e834dce 100644
--- a/src/layui/layui/MarkerBrowserPage.ui
+++ b/src/layui/layui/MarkerBrowserPage.ui
@@ -498,7 +498,7 @@
           </property>
           <property name="icon">
            <iconset resource="../../lay/lay/layResources.qrc">
-            <normaloff>:/photo.png</normaloff>:/photo.png</iconset>
+            <normaloff>:/photo_16px.png</normaloff>:/photo_16px.png</iconset>
           </property>
          </widget>
         </item>
@@ -563,7 +563,7 @@ p, li { white-space: pre-wrap; }
           </property>
           <property name="icon">
            <iconset resource="../../lay/lay/layResources.qrc">
-            <normaloff>:/nophoto.png</normaloff>:/nophoto.png</iconset>
+            <normaloff>:/nophoto_16px.png</normaloff>:/nophoto_16px.png</iconset>
           </property>
          </widget>
         </item>