diff --git a/src/layui/layui/AlignCellOptionsDialog.ui b/src/layui/layui/AlignCellOptionsDialog.ui
index 5d3b2dbff..637bdd8b2 100644
--- a/src/layui/layui/AlignCellOptionsDialog.ui
+++ b/src/layui/layui/AlignCellOptionsDialog.ui
@@ -109,7 +109,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/ct_31px.png</normaloff>:/ct_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -129,7 +129,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/lt_31px.png</normaloff>:/lt_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -149,7 +149,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/rt_31px.png</normaloff>:/rt_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -169,7 +169,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/lc_31px.png</normaloff>:/lc_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -189,7 +189,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/cc_31px.png</normaloff>:/cc_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -209,7 +209,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/rc_31px.png</normaloff>:/rc_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -229,7 +229,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/lb_31px.png</normaloff>:/lb_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -249,7 +249,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/cb_31px.png</normaloff>:/cb_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -269,7 +269,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/rb_31px.png</normaloff>:/rb_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -482,7 +482,7 @@
   <tabstop>adjust_calls_cbx</tabstop>
  </tabstops>
  <resources>
-  <include location="../../lay/lay/layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/layui/layui/BookmarkManagementForm.ui b/src/layui/layui/BookmarkManagementForm.ui
index f6d45b126..958a4cf54 100644
--- a/src/layui/layui/BookmarkManagementForm.ui
+++ b/src/layui/layui/BookmarkManagementForm.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>BookmarkManagementForm</class>
- <widget class="QDialog" name="BookmarkManagementForm" >
-  <property name="geometry" >
+ <widget class="QDialog" name="BookmarkManagementForm">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,69 +10,69 @@
     <height>240</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Manage Bookmarks</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>8</number>
    </property>
-   <property name="spacing" >
+   <property name="margin" stdset="0">
     <number>8</number>
    </property>
    <item>
-    <widget class="QFrame" name="frame5_2" >
-     <property name="frameShape" >
+    <widget class="QFrame" name="frame5_2">
+     <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin" stdset="0">
        <number>0</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="0" column="0" colspan="2" >
-       <widget class="QLabel" name="label" >
-        <property name="text" >
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="label">
+        <property name="text">
          <string>Double-click to edit bookmark name</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QFrame" name="frame6" >
-        <property name="frameShape" >
+      <item row="1" column="1">
+       <widget class="QFrame" name="frame6">
+        <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
-        <property name="frameShadow" >
+        <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QVBoxLayout" >
-         <property name="margin" >
-          <number>0</number>
-         </property>
-         <property name="spacing" >
+        <layout class="QVBoxLayout">
+         <property name="spacing">
           <number>6</number>
          </property>
+         <property name="margin" stdset="0">
+          <number>0</number>
+         </property>
          <item>
-          <widget class="QPushButton" name="delete_button" >
-           <property name="text" >
+          <widget class="QPushButton" name="delete_button">
+           <property name="text">
             <string>Delete</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeType" >
+           <property name="sizeType">
             <enum>QSizePolicy::Expanding</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>46</width>
              <height>111</height>
@@ -82,24 +83,24 @@
         </layout>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QListWidget" name="bookmark_list" >
-        <property name="acceptDrops" >
+      <item row="1" column="0">
+       <widget class="QListWidget" name="bookmark_list">
+        <property name="acceptDrops">
          <bool>true</bool>
         </property>
-        <property name="showDropIndicator" stdset="0" >
+        <property name="showDropIndicator" stdset="0">
          <bool>false</bool>
         </property>
-        <property name="dragEnabled" >
+        <property name="dragEnabled">
          <bool>false</bool>
         </property>
-        <property name="selectionMode" >
+        <property name="selectionMode">
          <enum>QAbstractItemView::ExtendedSelection</enum>
         </property>
-        <property name="movement" >
+        <property name="movement">
          <enum>QListView::Static</enum>
         </property>
-        <property name="viewMode" >
+        <property name="viewMode">
          <enum>QListView::ListMode</enum>
         </property>
        </widget>
@@ -108,36 +109,36 @@
     </widget>
    </item>
    <item>
-    <widget class="Line" name="line" >
-     <property name="orientation" >
+    <widget class="Line" name="line">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="frame5" >
-     <property name="frameShape" >
+    <widget class="QFrame" name="frame5">
+     <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="sizeType" >
+        <property name="sizeType">
          <enum>QSizePolicy::Expanding</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>81</width>
           <height>31</height>
@@ -146,21 +147,21 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="ok_button" >
-        <property name="text" >
+       <widget class="QPushButton" name="ok_button">
+        <property name="text">
          <string>OK</string>
         </property>
-        <property name="default" >
+        <property name="default">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="cancel_button" >
-        <property name="text" >
+       <widget class="QPushButton" name="cancel_button">
+        <property name="text">
          <string>Cancel</string>
         </property>
-        <property name="default" >
+        <property name="default">
          <bool>true</bool>
         </property>
        </widget>
@@ -170,10 +171,8 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <resources>
-  <include location="layResources.qrc" />
- </resources>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
  <connections>
   <connection>
    <sender>ok_button</sender>
@@ -181,11 +180,11 @@
    <receiver>BookmarkManagementForm</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>182</x>
      <y>334</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>163</x>
      <y>178</y>
     </hint>
@@ -197,11 +196,11 @@
    <receiver>BookmarkManagementForm</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>275</x>
      <y>334</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>163</x>
      <y>178</y>
     </hint>
diff --git a/src/layui/layui/BrowseInstancesForm.ui b/src/layui/layui/BrowseInstancesForm.ui
index 8f2f5201c..69ad3dbb7 100644
--- a/src/layui/layui/BrowseInstancesForm.ui
+++ b/src/layui/layui/BrowseInstancesForm.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>BrowseInstancesForm</class>
- <widget class="QDialog" name="BrowseInstancesForm" >
-  <property name="geometry" >
+ <widget class="QDialog" name="BrowseInstancesForm">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,74 +10,68 @@
     <height>193</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>5</hsizetype>
-    <vsizetype>5</vsizetype>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Browse Cell Instances</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>4</number>
-   </property>
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
+   <property name="margin" stdset="0">
+    <number>4</number>
+   </property>
    <item>
-    <widget class="QSplitter" name="splitter2" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>3</vsizetype>
+    <widget class="QSplitter" name="splitter2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
-     <property name="frameShape" >
+     <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Plain</enum>
      </property>
-     <property name="lineWidth" >
+     <property name="lineWidth">
       <number>1</number>
      </property>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <widget class="QFrame" name="cell_frame" >
-      <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>5</hsizetype>
-        <vsizetype>5</vsizetype>
+     <widget class="QFrame" name="cell_frame">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>0</horstretch>
         <verstretch>1</verstretch>
        </sizepolicy>
       </property>
-      <property name="frameShape" >
+      <property name="frameShape">
        <enum>QFrame::NoFrame</enum>
       </property>
-      <property name="frameShadow" >
+      <property name="frameShadow">
        <enum>QFrame::Raised</enum>
       </property>
-      <layout class="QGridLayout" >
-       <property name="margin" >
+      <layout class="QGridLayout">
+       <property name="margin" stdset="0">
         <number>4</number>
        </property>
-       <property name="spacing" >
+       <property name="spacing">
         <number>6</number>
        </property>
-       <item row="1" column="2" >
+       <item row="1" column="2">
         <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>
@@ -84,96 +79,95 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="1" >
-        <widget class="QToolButton" name="pb_next_cell" >
-         <property name="text" >
-          <string>></string>
+       <item row="1" column="1">
+        <widget class="QToolButton" name="pb_next_cell">
+         <property name="text">
+          <string>&gt;</string>
          </property>
-         <property name="icon" >
-          <iconset resource="layResources.qrc" >:/down_16px.png</iconset>
+         <property name="icon">
+          <iconset resource="../../icons/icons.qrc">
+           <normaloff>:/down_16px.png</normaloff>:/down_16px.png</iconset>
          </property>
         </widget>
        </item>
-       <item row="0" column="0" colspan="3" >
-        <widget class="QTreeWidget" name="lv_cell" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>13</vsizetype>
+       <item row="0" column="0" colspan="3">
+        <widget class="QTreeWidget" name="lv_cell">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="rootIsDecorated" >
+         <property name="rootIsDecorated">
           <bool>false</bool>
          </property>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Parent</string>
           </property>
          </column>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Count</string>
           </property>
          </column>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Flat</string>
           </property>
          </column>
         </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QToolButton" name="pb_prev_cell" >
-         <property name="text" >
+       <item row="1" column="0">
+        <widget class="QToolButton" name="pb_prev_cell">
+         <property name="text">
           <string>&lt;</string>
          </property>
-         <property name="icon" >
-          <iconset resource="layResources.qrc" >:/up_16px.png</iconset>
+         <property name="icon">
+          <iconset resource="../../icons/icons.qrc">
+           <normaloff>:/up_16px.png</normaloff>:/up_16px.png</iconset>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
-     <widget class="QFrame" name="inst_frame" >
-      <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>5</hsizetype>
-        <vsizetype>5</vsizetype>
+     <widget class="QFrame" name="inst_frame">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
-      <property name="frameShape" >
+      <property name="frameShape">
        <enum>QFrame::NoFrame</enum>
       </property>
-      <property name="frameShadow" >
+      <property name="frameShadow">
        <enum>QFrame::Raised</enum>
       </property>
-      <layout class="QGridLayout" >
-       <property name="margin" >
+      <layout class="QGridLayout">
+       <property name="margin" stdset="0">
         <number>4</number>
        </property>
-       <property name="spacing" >
+       <property name="spacing">
         <number>6</number>
        </property>
-       <item row="1" column="1" >
-        <widget class="QToolButton" name="pb_next_inst" >
-         <property name="text" >
-          <string>></string>
+       <item row="1" column="1">
+        <widget class="QToolButton" name="pb_next_inst">
+         <property name="text">
+          <string>&gt;</string>
          </property>
-         <property name="icon" >
-          <iconset resource="layResources.qrc" >:/down_16px.png</iconset>
+         <property name="icon">
+          <iconset resource="../../icons/icons.qrc">
+           <normaloff>:/down_16px.png</normaloff>:/down_16px.png</iconset>
          </property>
         </widget>
        </item>
-       <item row="1" column="2" >
+       <item row="1" column="2">
         <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>
@@ -181,38 +175,37 @@
          </property>
         </spacer>
        </item>
-       <item row="0" column="0" colspan="3" >
-        <widget class="QTreeWidget" name="lv_cell_instance" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>13</vsizetype>
+       <item row="0" column="0" colspan="3">
+        <widget class="QTreeWidget" name="lv_cell_instance">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="rootIsDecorated" >
+         <property name="rootIsDecorated">
           <bool>false</bool>
          </property>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Cell instance</string>
           </property>
          </column>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Path</string>
           </property>
          </column>
         </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QToolButton" name="pb_prev_inst" >
-         <property name="text" >
+       <item row="1" column="0">
+        <widget class="QToolButton" name="pb_prev_inst">
+         <property name="text">
           <string>&lt;</string>
          </property>
-         <property name="icon" >
-          <iconset resource="layResources.qrc" >:/up_16px.png</iconset>
+         <property name="icon">
+          <iconset resource="../../icons/icons.qrc">
+           <normaloff>:/up_16px.png</normaloff>:/up_16px.png</iconset>
          </property>
         </widget>
        </item>
@@ -221,43 +214,43 @@
     </widget>
    </item>
    <item>
-    <widget class="Line" name="line" >
-     <property name="orientation" >
+    <widget class="Line" name="line">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <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>
-      <widget class="QPushButton" name="configureButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="configureButton">
+       <property name="text">
         <string>Configure</string>
        </property>
-       <property name="autoDefault" >
+       <property name="autoDefault">
         <bool>false</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="chooseCellButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="chooseCellButton">
+       <property name="text">
         <string>Choose Cell</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>283</width>
          <height>29</height>
@@ -266,8 +259,8 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="okButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="okButton">
+       <property name="text">
         <string>Close</string>
        </property>
       </widget>
@@ -276,9 +269,9 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="layResources.qrc" />
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -287,11 +280,11 @@
    <receiver>BrowseInstancesForm</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>437</x>
      <y>234</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>245</x>
      <y>129</y>
     </hint>
diff --git a/src/layui/layui/BrowseShapesForm.ui b/src/layui/layui/BrowseShapesForm.ui
index f4a4797da..fbf617eff 100644
--- a/src/layui/layui/BrowseShapesForm.ui
+++ b/src/layui/layui/BrowseShapesForm.ui
@@ -1,10 +1,8 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>BrowseShapesForm</class>
- <widget class="QDialog" name="BrowseShapesForm" >
-  <property name="geometry" >
+ <widget class="QDialog" name="BrowseShapesForm">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -12,113 +10,109 @@
     <height>199</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Browse Shapes</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>4</number>
-   </property>
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
+   <property name="margin" stdset="0">
+    <number>4</number>
+   </property>
    <item>
-    <widget class="QSplitter" name="splitter" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>3</vsizetype>
+    <widget class="QSplitter" name="splitter">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
-     <property name="frameShape" >
+     <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <property name="lineWidth" >
+     <property name="lineWidth">
       <number>1</number>
      </property>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <widget class="QFrame" name="cell_frame" >
-      <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>5</hsizetype>
-        <vsizetype>5</vsizetype>
+     <widget class="QFrame" name="cell_frame">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>1</horstretch>
         <verstretch>1</verstretch>
        </sizepolicy>
       </property>
-      <property name="frameShape" >
+      <property name="frameShape">
        <enum>QFrame::NoFrame</enum>
       </property>
-      <property name="frameShadow" >
+      <property name="frameShadow">
        <enum>QFrame::Raised</enum>
       </property>
-      <layout class="QGridLayout" >
-       <property name="margin" >
+      <layout class="QGridLayout">
+       <property name="margin" stdset="0">
         <number>4</number>
        </property>
-       <property name="spacing" >
+       <property name="spacing">
         <number>6</number>
        </property>
-       <item row="1" column="1" >
-        <widget class="QToolButton" name="pb_next_cell" >
-         <property name="text" >
-          <string>></string>
+       <item row="1" column="1">
+        <widget class="QToolButton" name="pb_next_cell">
+         <property name="text">
+          <string>&gt;</string>
          </property>
-         <property name="icon" >
-          <iconset resource="layResources.qrc" >:/down_16px.png</iconset>
+         <property name="icon">
+          <iconset resource="../../icons/icons.qrc">
+           <normaloff>:/down_16px.png</normaloff>:/down_16px.png</iconset>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QToolButton" name="pb_prev_cell" >
-         <property name="text" >
+       <item row="1" column="0">
+        <widget class="QToolButton" name="pb_prev_cell">
+         <property name="text">
           <string>&lt;</string>
          </property>
-         <property name="icon" >
-          <iconset resource="layResources.qrc" >:/up_16px.png</iconset>
+         <property name="icon">
+          <iconset resource="../../icons/icons.qrc">
+           <normaloff>:/up_16px.png</normaloff>:/up_16px.png</iconset>
          </property>
         </widget>
        </item>
-       <item row="0" column="0" colspan="3" >
-        <widget class="QTreeWidget" name="lv_cell" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>13</vsizetype>
+       <item row="0" column="0" colspan="3">
+        <widget class="QTreeWidget" name="lv_cell">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Cell</string>
           </property>
          </column>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Shapes</string>
           </property>
          </column>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Flat</string>
           </property>
          </column>
         </widget>
        </item>
-       <item row="1" column="2" >
+       <item row="1" column="2">
         <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>
@@ -128,34 +122,32 @@
        </item>
       </layout>
      </widget>
-     <widget class="QFrame" name="shape_inst_frame" >
-      <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>5</hsizetype>
-        <vsizetype>5</vsizetype>
+     <widget class="QFrame" name="shape_inst_frame">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>1</horstretch>
         <verstretch>1</verstretch>
        </sizepolicy>
       </property>
-      <property name="frameShape" >
+      <property name="frameShape">
        <enum>QFrame::NoFrame</enum>
       </property>
-      <property name="frameShadow" >
+      <property name="frameShadow">
        <enum>QFrame::Raised</enum>
       </property>
-      <layout class="QGridLayout" >
-       <property name="margin" >
+      <layout class="QGridLayout">
+       <property name="margin" stdset="0">
         <number>4</number>
        </property>
-       <property name="spacing" >
+       <property name="spacing">
         <number>6</number>
        </property>
-       <item row="1" column="2" >
+       <item row="1" column="2">
         <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>
@@ -163,41 +155,41 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="1" >
-        <widget class="QToolButton" name="pb_next_shape" >
-         <property name="text" >
-          <string>></string>
+       <item row="1" column="1">
+        <widget class="QToolButton" name="pb_next_shape">
+         <property name="text">
+          <string>&gt;</string>
          </property>
-         <property name="icon" >
-          <iconset resource="layResources.qrc" >:/down_16px.png</iconset>
+         <property name="icon">
+          <iconset resource="../../icons/icons.qrc">
+           <normaloff>:/down_16px.png</normaloff>:/down_16px.png</iconset>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QToolButton" name="pb_prev_shape" >
-         <property name="text" >
+       <item row="1" column="0">
+        <widget class="QToolButton" name="pb_prev_shape">
+         <property name="text">
           <string>&lt;</string>
          </property>
-         <property name="icon" >
-          <iconset resource="layResources.qrc" >:/up_16px.png</iconset>
+         <property name="icon">
+          <iconset resource="../../icons/icons.qrc">
+           <normaloff>:/up_16px.png</normaloff>:/up_16px.png</iconset>
          </property>
         </widget>
        </item>
-       <item row="0" column="0" colspan="3" >
-        <widget class="QTreeWidget" name="lv_shape_instance" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>13</vsizetype>
+       <item row="0" column="0" colspan="3">
+        <widget class="QTreeWidget" name="lv_shape_instance">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="rootIsDecorated" >
+         <property name="rootIsDecorated">
           <bool>false</bool>
          </property>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Shape instance       </string>
           </property>
          </column>
@@ -205,34 +197,32 @@
        </item>
       </layout>
      </widget>
-     <widget class="QFrame" name="inst_frame" >
-      <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>5</hsizetype>
-        <vsizetype>5</vsizetype>
+     <widget class="QFrame" name="inst_frame">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>1</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
-      <property name="frameShape" >
+      <property name="frameShape">
        <enum>QFrame::NoFrame</enum>
       </property>
-      <property name="frameShadow" >
+      <property name="frameShadow">
        <enum>QFrame::Raised</enum>
       </property>
-      <layout class="QGridLayout" >
-       <property name="margin" >
+      <layout class="QGridLayout">
+       <property name="margin" stdset="0">
         <number>4</number>
        </property>
-       <property name="spacing" >
+       <property name="spacing">
         <number>6</number>
        </property>
-       <item row="1" column="2" >
+       <item row="1" column="2">
         <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>
@@ -240,46 +230,46 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="1" >
-        <widget class="QToolButton" name="pb_next_inst" >
-         <property name="text" >
-          <string>></string>
+       <item row="1" column="1">
+        <widget class="QToolButton" name="pb_next_inst">
+         <property name="text">
+          <string>&gt;</string>
          </property>
-         <property name="icon" >
-          <iconset resource="layResources.qrc" >:/down_16px.png</iconset>
+         <property name="icon">
+          <iconset resource="../../icons/icons.qrc">
+           <normaloff>:/down_16px.png</normaloff>:/down_16px.png</iconset>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QToolButton" name="pb_prev_inst" >
-         <property name="text" >
+       <item row="1" column="0">
+        <widget class="QToolButton" name="pb_prev_inst">
+         <property name="text">
           <string>&lt;</string>
          </property>
-         <property name="icon" >
-          <iconset resource="layResources.qrc" >:/up_16px.png</iconset>
+         <property name="icon">
+          <iconset resource="../../icons/icons.qrc">
+           <normaloff>:/up_16px.png</normaloff>:/up_16px.png</iconset>
          </property>
         </widget>
        </item>
-       <item row="0" column="0" colspan="3" >
-        <widget class="QTreeWidget" name="lv_cell_instance" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>13</vsizetype>
+       <item row="0" column="0" colspan="3">
+        <widget class="QTreeWidget" name="lv_cell_instance">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="rootIsDecorated" >
+         <property name="rootIsDecorated">
           <bool>false</bool>
          </property>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Cell instance</string>
           </property>
          </column>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Path</string>
           </property>
          </column>
@@ -290,36 +280,36 @@
     </widget>
    </item>
    <item>
-    <widget class="Line" name="line" >
-     <property name="orientation" >
+    <widget class="Line" name="line">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <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>
-      <widget class="QPushButton" name="configureButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="configureButton">
+       <property name="text">
         <string>Configure</string>
        </property>
-       <property name="autoDefault" >
+       <property name="autoDefault">
         <bool>false</bool>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>325</width>
          <height>29</height>
@@ -328,8 +318,8 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="okButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="okButton">
+       <property name="text">
         <string>Close</string>
        </property>
       </widget>
@@ -338,10 +328,9 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
+ <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="layResources.qrc" />
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -350,11 +339,11 @@
    <receiver>BrowseShapesForm</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>479</x>
      <y>212</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>266</x>
      <y>118</y>
     </hint>
diff --git a/src/layui/layui/CellSelectionForm.ui b/src/layui/layui/CellSelectionForm.ui
index 56f67ab88..2e2aa4b06 100644
--- a/src/layui/layui/CellSelectionForm.ui
+++ b/src/layui/layui/CellSelectionForm.ui
@@ -205,7 +205,7 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap resource="../lay/layResources.qrc">:/right_16px.png</pixmap>
+            <pixmap resource="../../icons/icons.qrc">:/right_16px.png</pixmap>
            </property>
           </widget>
          </item>
@@ -285,7 +285,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/find_16px.png</normaloff>:/find_16px.png</iconset>
            </property>
            <property name="autoRaise">
@@ -428,7 +428,7 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap resource="../lay/layResources.qrc">:/right_16px.png</pixmap>
+            <pixmap resource="../../icons/icons.qrc">:/right_16px.png</pixmap>
            </property>
           </widget>
          </item>
@@ -546,7 +546,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../lay/layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/layui/layui/EditLineStylesForm.ui b/src/layui/layui/EditLineStylesForm.ui
index 341b45eb0..885142f58 100644
--- a/src/layui/layui/EditLineStylesForm.ui
+++ b/src/layui/layui/EditLineStylesForm.ui
@@ -206,7 +206,7 @@
          <item row="1" column="1">
           <widget class="QToolButton" name="down_button">
            <property name="icon">
-            <iconset resource="../lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/down_16px.png</normaloff>:/down_16px.png</iconset>
            </property>
           </widget>
@@ -254,7 +254,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/up_16px.png</normaloff>:/up_16px.png</iconset>
            </property>
           </widget>
@@ -391,7 +391,7 @@
                <string>Clear</string>
               </property>
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset resource="../../icons/icons.qrc">
                 <normaloff>:/clear_16px.png</normaloff>:/clear_16px.png</iconset>
               </property>
               <property name="iconSize">
@@ -405,7 +405,7 @@
             <item>
              <widget class="QToolButton" name="invert_button">
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset>
                 <normaloff>:/invert.png</normaloff>:/invert.png</iconset>
               </property>
              </widget>
@@ -416,7 +416,7 @@
                <string>Flip h.</string>
               </property>
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset>
                 <normaloff>:/fliph.png</normaloff>:/fliph.png</iconset>
               </property>
              </widget>
@@ -427,7 +427,7 @@
                <string>Left</string>
               </property>
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset resource="../../icons/icons.qrc">
                 <normaloff>:/left_16px.png</normaloff>:/left_16px.png</iconset>
               </property>
              </widget>
@@ -438,7 +438,7 @@
                <string>Right</string>
               </property>
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset resource="../../icons/icons.qrc">
                 <normaloff>:/right_16px.png</normaloff>:/right_16px.png</iconset>
               </property>
              </widget>
@@ -546,7 +546,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../lay/layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/layui/layui/EditStipplesForm.ui b/src/layui/layui/EditStipplesForm.ui
index f96b62e22..9f536ffcd 100644
--- a/src/layui/layui/EditStipplesForm.ui
+++ b/src/layui/layui/EditStipplesForm.ui
@@ -200,7 +200,7 @@
          <item row="1" column="1">
           <widget class="QToolButton" name="down_button">
            <property name="icon">
-            <iconset resource="../lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/down_16px.png</normaloff>:/down_16px.png</iconset>
            </property>
           </widget>
@@ -248,7 +248,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/up_16px.png</normaloff>:/up_16px.png</iconset>
            </property>
           </widget>
@@ -376,7 +376,7 @@
                <string>Clear</string>
               </property>
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset resource="../../icons/icons.qrc">
                 <normaloff>:/clear_16px.png</normaloff>:/clear_16px.png</iconset>
               </property>
               <property name="iconSize">
@@ -390,7 +390,7 @@
             <item>
              <widget class="QToolButton" name="invert_button">
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset resource="../../icons/icons.qrc">
                 <normaloff>:/invert_16px.png</normaloff>:/invert_16px.png</iconset>
               </property>
              </widget>
@@ -401,7 +401,7 @@
                <string>Flip h.</string>
               </property>
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset resource="../../icons/icons.qrc">
                 <normaloff>:/fliph_16px.png</normaloff>:/fliph_16px.png</iconset>
               </property>
              </widget>
@@ -412,7 +412,7 @@
                <string>Flip v.</string>
               </property>
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset resource="../../icons/icons.qrc">
                 <normaloff>:/flipv_16px.png</normaloff>:/flipv_16px.png</iconset>
               </property>
              </widget>
@@ -423,7 +423,7 @@
                <string>Rotate</string>
               </property>
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset resource="../../icons/icons.qrc">
                 <normaloff>:/rotate_16px.png</normaloff>:/rotate_16px.png</iconset>
               </property>
              </widget>
@@ -434,7 +434,7 @@
                <string>Up</string>
               </property>
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset resource="../../icons/icons.qrc">
                 <normaloff>:/up_16px.png</normaloff>:/up_16px.png</iconset>
               </property>
              </widget>
@@ -445,7 +445,7 @@
                <string>Left</string>
               </property>
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset resource="../../icons/icons.qrc">
                 <normaloff>:/left_16px.png</normaloff>:/left_16px.png</iconset>
               </property>
              </widget>
@@ -456,7 +456,7 @@
                <string>Right</string>
               </property>
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset resource="../../icons/icons.qrc">
                 <normaloff>:/right_16px.png</normaloff>:/right_16px.png</iconset>
               </property>
              </widget>
@@ -467,7 +467,7 @@
                <string>Down</string>
               </property>
               <property name="icon">
-               <iconset resource="../lay/layResources.qrc">
+               <iconset resource="../../icons/icons.qrc">
                 <normaloff>:/down_16px.png</normaloff>:/down_16px.png</iconset>
               </property>
              </widget>
@@ -588,7 +588,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../lay/layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/layui/layui/LayerMappingWidget.ui b/src/layui/layui/LayerMappingWidget.ui
index a7ea6a8cc..64e070fc8 100644
--- a/src/layui/layui/LayerMappingWidget.ui
+++ b/src/layui/layui/LayerMappingWidget.ui
@@ -102,7 +102,7 @@
           <string>Add</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/add_16px.png</normaloff>:/add_16px.png</iconset>
          </property>
         </widget>
@@ -116,7 +116,7 @@
           <string>Delete</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/clear_16px.png</normaloff>:/clear_16px.png</iconset>
          </property>
         </widget>
@@ -130,7 +130,7 @@
           <string>Edit</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/edit_16px.png</normaloff>:/edit_16px.png</iconset>
          </property>
         </widget>
@@ -165,7 +165,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../lay/lay/layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/layui/layui/LayoutViewConfigPage7.ui b/src/layui/layui/LayoutViewConfigPage7.ui
index f19d1d18c..ae9b834a9 100644
--- a/src/layui/layui/LayoutViewConfigPage7.ui
+++ b/src/layui/layui/LayoutViewConfigPage7.ui
@@ -200,7 +200,7 @@
           <string>(r0)</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/r0_24px.png</normaloff>:/r0_24px.png</iconset>
          </property>
         </item>
@@ -209,7 +209,7 @@
           <string>(r90)</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/r90_24px.png</normaloff>:/r90_24px.png</iconset>
          </property>
         </item>
@@ -218,7 +218,7 @@
           <string>(r180)</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/r180_24px.png</normaloff>:/r180_24px.png</iconset>
          </property>
         </item>
@@ -227,7 +227,7 @@
           <string>(r270)</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/r270_24px.png</normaloff>:/r270_24px.png</iconset>
          </property>
         </item>
@@ -236,7 +236,7 @@
           <string>(m0)</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/m0_24px.png</normaloff>:/m0_24px.png</iconset>
          </property>
         </item>
@@ -245,7 +245,7 @@
           <string>(m45)</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/m45_24px.png</normaloff>:/m45_24px.png</iconset>
          </property>
         </item>
@@ -254,7 +254,7 @@
           <string>(m90)</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/m90_24px.png</normaloff>:/m90_24px.png</iconset>
          </property>
         </item>
@@ -263,7 +263,7 @@
           <string>(m135)</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/m135_24px.png</normaloff>:/m135_24px.png</iconset>
          </property>
         </item>
@@ -350,7 +350,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="../../lay/lay/layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/layui/layui/LibraryCellSelectionForm.ui b/src/layui/layui/LibraryCellSelectionForm.ui
index 278a2b57f..aadc63877 100644
--- a/src/layui/layui/LibraryCellSelectionForm.ui
+++ b/src/layui/layui/LibraryCellSelectionForm.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>LibraryCellSelectionForm</class>
- <widget class="QDialog" name="LibraryCellSelectionForm" >
-  <property name="geometry" >
+ <widget class="QDialog" name="LibraryCellSelectionForm">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,58 +10,56 @@
     <height>488</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Select Cell</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="QFrame" name="frame8" >
-     <property name="frameShape" >
+    <widget class="QFrame" name="frame8">
+     <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin" stdset="0">
        <number>0</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="4" column="0" colspan="2" >
-       <widget class="QTreeView" name="lv_cells" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>7</vsizetype>
+      <item row="4" column="0" colspan="2">
+       <widget class="QTreeView" name="lv_cells">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
           <horstretch>1</horstretch>
           <verstretch>1</verstretch>
          </sizepolicy>
         </property>
-        <property name="selectionMode" >
+        <property name="selectionMode">
          <enum>QAbstractItemView::ExtendedSelection</enum>
         </property>
-        <property name="uniformRowHeights" >
+        <property name="uniformRowHeights">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="2" >
+      <item row="2" column="0" colspan="2">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name="sizeType" >
+        <property name="sizeType">
          <enum>QSizePolicy::Fixed</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>200</width>
           <height>16</height>
@@ -68,82 +67,81 @@
         </property>
        </spacer>
       </item>
-      <item row="3" column="0" colspan="2" >
-       <widget class="QLabel" name="label_3" >
-        <property name="text" >
+      <item row="3" column="0" colspan="2">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
          <string>Cell list</string>
         </property>
        </widget>
       </item>
-      <item rowspan="2" row="0" column="0" colspan="2" >
-       <widget class="QFrame" name="frame" >
-        <property name="frameShape" >
+      <item row="0" column="0" rowspan="2" colspan="2">
+       <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="QGridLayout" >
-         <property name="margin" >
+        <layout class="QGridLayout">
+         <property name="margin" stdset="0">
           <number>0</number>
          </property>
-         <property name="spacing" >
+         <property name="spacing">
           <number>6</number>
          </property>
-         <item row="1" column="3" >
-          <widget class="QToolButton" name="find_next" >
-           <property name="toolTip" >
-            <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+         <item row="1" column="3">
+          <widget class="QToolButton" name="find_next">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Find next&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Find next&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
-           <property name="text" >
+           <property name="text">
             <string>...</string>
            </property>
-           <property name="icon" >
-            <iconset resource="layResources.qrc" >:/find_16px.png</iconset>
+           <property name="icon">
+            <iconset resource="../../icons/icons.qrc">
+             <normaloff>:/find_16px.png</normaloff>:/find_16px.png</iconset>
            </property>
-           <property name="autoRaise" >
+           <property name="autoRaise">
             <bool>true</bool>
            </property>
           </widget>
          </item>
-         <item row="2" column="1" colspan="3" >
-          <widget class="QLabel" name="label" >
-           <property name="text" >
+         <item row="2" column="1" colspan="3">
+          <widget class="QLabel" name="label">
+           <property name="text">
             <string>(* and ? can be used to match any text)</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="0" >
-          <widget class="QLabel" name="label_2" >
-           <property name="text" >
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
             <string>Filter</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="1" colspan="2" >
-          <widget class="QLineEdit" name="le_cell_name" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>7</hsizetype>
-             <vsizetype>0</vsizetype>
+         <item row="1" column="1" colspan="2">
+          <widget class="QLineEdit" name="le_cell_name">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>1</horstretch>
              <verstretch>1</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
-         <item row="0" column="0" >
-          <widget class="QLabel" name="lib_label" >
-           <property name="text" >
+         <item row="0" column="0">
+          <widget class="QLabel" name="lib_label">
+           <property name="text">
             <string>Library</string>
            </property>
           </widget>
          </item>
-         <item row="0" column="1" colspan="2" >
-          <widget class="lay::LibrarySelectionComboBox" name="lib_cb" />
+         <item row="0" column="1" colspan="2">
+          <widget class="lay::LibrarySelectionComboBox" name="lib_cb"/>
          </item>
         </layout>
        </widget>
@@ -152,21 +150,21 @@ p, li { white-space: pre-wrap; }
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="cb_show_all_cells" >
-     <property name="text" >
+    <widget class="QCheckBox" name="cb_show_all_cells">
+     <property name="text">
       <string>Show all cells</string>
      </property>
     </widget>
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>200</width>
        <height>16</height>
@@ -175,36 +173,36 @@ p, li { white-space: pre-wrap; }
     </spacer>
    </item>
    <item>
-    <widget class="Line" name="line_4" >
-     <property name="orientation" >
+    <widget class="Line" name="line_4">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="frame5" >
-     <property name="frameShape" >
+    <widget class="QFrame" name="frame5">
+     <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="sizeType" >
+        <property name="sizeType">
          <enum>QSizePolicy::Expanding</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>91</width>
           <height>31</height>
@@ -213,18 +211,18 @@ p, li { white-space: pre-wrap; }
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="ok_button" >
-        <property name="text" >
+       <widget class="QPushButton" name="ok_button">
+        <property name="text">
          <string>_ok</string>
         </property>
-        <property name="default" >
+        <property name="default">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="cancel_button" >
-        <property name="text" >
+       <widget class="QPushButton" name="cancel_button">
+        <property name="text">
          <string>_cancel</string>
         </property>
        </widget>
@@ -234,7 +232,7 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>lay::LibrarySelectionComboBox</class>
@@ -243,7 +241,7 @@ p, li { white-space: pre-wrap; }
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="layResources.qrc" />
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/layui/layui/MarkerBrowserPage.ui b/src/layui/layui/MarkerBrowserPage.ui
index 00e834dce..604547cde 100644
--- a/src/layui/layui/MarkerBrowserPage.ui
+++ b/src/layui/layui/MarkerBrowserPage.ui
@@ -62,7 +62,7 @@
          <string>...</string>
         </property>
         <property name="icon">
-         <iconset resource="../../lay/lay/layResources.qrc">
+         <iconset>
           <normaloff>:/run.png</normaloff>:/run.png</iconset>
         </property>
         <property name="shortcut">
@@ -188,7 +188,7 @@
              <string/>
             </property>
             <property name="pixmap">
-             <pixmap resource="../../lay/lay/layResources.qrc">:/find_16px.png</pixmap>
+             <pixmap resource="../../icons/icons.qrc">:/find_16px.png</pixmap>
             </property>
            </widget>
           </item>
@@ -247,7 +247,7 @@
           <string>...</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/down_16px.png</normaloff>:/down_16px.png</iconset>
          </property>
         </widget>
@@ -258,7 +258,7 @@
           <string>...</string>
          </property>
          <property name="icon">
-          <iconset resource="../../lay/lay/layResources.qrc">
+          <iconset resource="../../icons/icons.qrc">
            <normaloff>:/up_16px.png</normaloff>:/up_16px.png</iconset>
          </property>
         </widget>
@@ -355,7 +355,7 @@
            <string>...</string>
           </property>
           <property name="icon">
-           <iconset resource="../../lay/lay/layResources.qrc">
+           <iconset resource="../../icons/icons.qrc">
             <normaloff>:/up_16px.png</normaloff>:/up_16px.png</iconset>
           </property>
          </widget>
@@ -373,7 +373,7 @@
            <string>...</string>
           </property>
           <property name="icon">
-           <iconset resource="../../lay/lay/layResources.qrc">
+           <iconset resource="../../icons/icons.qrc">
             <normaloff>:/down_16px.png</normaloff>:/down_16px.png</iconset>
           </property>
          </widget>
@@ -419,7 +419,6 @@
           </property>
           <property name="font">
            <font>
-            <weight>75</weight>
             <bold>true</bold>
            </font>
           </property>
@@ -497,7 +496,7 @@
            <string>Photo</string>
           </property>
           <property name="icon">
-           <iconset resource="../../lay/lay/layResources.qrc">
+           <iconset resource="../../icons/icons.qrc">
             <normaloff>:/photo_16px.png</normaloff>:/photo_16px.png</iconset>
           </property>
          </widget>
@@ -511,7 +510,7 @@
            <string>W</string>
           </property>
           <property name="icon">
-           <iconset resource="../../lay/lay/layResources.qrc">
+           <iconset resource="../../icons/icons.qrc">
             <normaloff>:/waived_16px.png</normaloff>:/waived_16px.png</iconset>
           </property>
          </widget>
@@ -545,7 +544,7 @@
            <string>Imp</string>
           </property>
           <property name="icon">
-           <iconset resource="../../lay/lay/layResources.qrc">
+           <iconset resource="../../icons/icons.qrc">
             <normaloff>:/important_16px.png</normaloff>:/important_16px.png</iconset>
           </property>
          </widget>
@@ -562,7 +561,7 @@ p, li { white-space: pre-wrap; }
            <string>...</string>
           </property>
           <property name="icon">
-           <iconset resource="../../lay/lay/layResources.qrc">
+           <iconset resource="../../icons/icons.qrc">
             <normaloff>:/nophoto_16px.png</normaloff>:/nophoto_16px.png</iconset>
           </property>
          </widget>
@@ -644,7 +643,7 @@ p, li { white-space: pre-wrap; }
   <tabstop>photo_pb</tabstop>
  </tabstops>
  <resources>
-  <include location="../../lay/lay/layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/layui/layui/MoveToOptionsDialog.ui b/src/layui/layui/MoveToOptionsDialog.ui
index f8155d23e..448a5e6b7 100644
--- a/src/layui/layui/MoveToOptionsDialog.ui
+++ b/src/layui/layui/MoveToOptionsDialog.ui
@@ -17,7 +17,7 @@
    <property name="spacing">
     <number>6</number>
    </property>
-   <property name="margin">
+   <property name="margin" stdset="0">
     <number>9</number>
    </property>
    <item>
@@ -121,7 +121,7 @@
       <property name="spacing">
        <number>6</number>
       </property>
-      <property name="margin">
+      <property name="margin" stdset="0">
        <number>9</number>
       </property>
       <item>
@@ -149,7 +149,7 @@
          <enum>QFrame::Plain</enum>
         </property>
         <layout class="QGridLayout">
-         <property name="margin">
+         <property name="margin" stdset="0">
           <number>15</number>
          </property>
          <property name="spacing">
@@ -161,7 +161,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/ct_31px.png</normaloff>:/ct_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -181,7 +181,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/lt_31px.png</normaloff>:/lt_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -201,7 +201,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/rt_31px.png</normaloff>:/rt_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -221,7 +221,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/lc_31px.png</normaloff>:/lc_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -241,7 +241,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/cc_31px.png</normaloff>:/cc_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -261,7 +261,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/rc_31px.png</normaloff>:/rc_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -281,7 +281,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/lb_31px.png</normaloff>:/lb_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -301,7 +301,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/cb_31px.png</normaloff>:/cb_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -321,7 +321,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/rb_31px.png</normaloff>:/rb_31px.png</iconset>
            </property>
            <property name="iconSize">
@@ -366,7 +366,7 @@
       <property name="spacing">
        <number>6</number>
       </property>
-      <property name="margin">
+      <property name="margin" stdset="0">
        <number>0</number>
       </property>
       <item>
@@ -418,7 +418,7 @@
   <tabstop>rb</tabstop>
  </tabstops>
  <resources>
-  <include location="layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/layui/layui/NetlistBrowserPage.ui b/src/layui/layui/NetlistBrowserPage.ui
index 6874d6910..0f887e8a8 100644
--- a/src/layui/layui/NetlistBrowserPage.ui
+++ b/src/layui/layui/NetlistBrowserPage.ui
@@ -89,7 +89,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset>
              <normaloff>:/back_16.png</normaloff>:/back_16.png</iconset>
            </property>
            <property name="autoRaise">
@@ -103,7 +103,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset>
              <normaloff>:/forward_16.png</normaloff>:/forward_16.png</iconset>
            </property>
            <property name="autoRaise">
@@ -120,7 +120,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/info_16px.png</normaloff>:/info_16px.png</iconset>
            </property>
            <property name="autoRaise">
@@ -134,7 +134,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset>
              <normaloff>:/run.png</normaloff>:/run.png</iconset>
            </property>
            <property name="shortcut">
@@ -189,7 +189,7 @@
             <string>...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../lay/lay/layResources.qrc">
+            <iconset resource="../../icons/icons.qrc">
              <normaloff>:/find_16px.png</normaloff>:/find_16px.png</iconset>
            </property>
            <property name="autoRaise">
@@ -673,7 +673,7 @@
   <tabstop>find_button</tabstop>
  </tabstops>
  <resources>
-  <include location="../../lay/lay/layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/layui/layui/PropertiesDialog.ui b/src/layui/layui/PropertiesDialog.ui
index c2af6c108..112840254 100644
--- a/src/layui/layui/PropertiesDialog.ui
+++ b/src/layui/layui/PropertiesDialog.ui
@@ -87,7 +87,7 @@
          <string>Previous</string>
         </property>
         <property name="icon">
-         <iconset resource="../../lay/lay/layResources.qrc">
+         <iconset resource="../../icons/icons.qrc">
           <normaloff>:/left_16px.png</normaloff>:/left_16px.png</iconset>
         </property>
         <property name="default">
@@ -107,7 +107,7 @@
          <string>Next</string>
         </property>
         <property name="icon">
-         <iconset resource="../../lay/lay/layResources.qrc">
+         <iconset resource="../../icons/icons.qrc">
           <normaloff>:/right_16px.png</normaloff>:/right_16px.png</iconset>
         </property>
         <property name="default">
@@ -185,7 +185,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="../../lay/lay/layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/layui/layui/TipDialog.ui b/src/layui/layui/TipDialog.ui
index 8edc3f517..e634e5c6b 100644
--- a/src/layui/layui/TipDialog.ui
+++ b/src/layui/layui/TipDialog.ui
@@ -202,7 +202,10 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../../lay/lay/layResources.qrc">:/bulb.png</pixmap>
+         <pixmap resource="../../icons/icons.qrc">:/bulb.png</pixmap>
+        </property>
+        <property name="scaledContents">
+         <bool>false</bool>
         </property>
        </widget>
       </item>
@@ -313,7 +316,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../lay/lay/layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/layui/layui/UserPropertiesForm.ui b/src/layui/layui/UserPropertiesForm.ui
index d6c767157..76ba34ca4 100644
--- a/src/layui/layui/UserPropertiesForm.ui
+++ b/src/layui/layui/UserPropertiesForm.ui
@@ -122,7 +122,7 @@
              <string/>
             </property>
             <property name="icon">
-             <iconset resource="../../lay/lay/layResources.qrc">
+             <iconset resource="../../icons/icons.qrc">
               <normaloff>:/del_16px.png</normaloff>:/del_16px.png</iconset>
             </property>
            </widget>
@@ -133,7 +133,7 @@
              <string/>
             </property>
             <property name="icon">
-             <iconset resource="../../lay/lay/layResources.qrc">
+             <iconset resource="../../icons/icons.qrc">
               <normaloff>:/add_16px.png</normaloff>:/add_16px.png</iconset>
             </property>
            </widget>
@@ -195,7 +195,7 @@
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../../lay/lay/layResources.qrc"/>
+  <include location="../../icons/icons.qrc"/>
  </resources>
  <connections>
   <connection>