diff --git a/pip b/pip
index f033119..e1f2c90 160000
--- a/pip
+++ b/pip
@@ -1 +1 @@
-Subproject commit f033119a8bf82633146c458d1165377661df1c9f
+Subproject commit e1f2c90790b473c2d0a8049c982498101d7d68b2
diff --git a/qad/libs/application/aboutwindow.ui b/qad/libs/application/aboutwindow.ui
index b6a1606..8c6fb0d 100644
--- a/qad/libs/application/aboutwindow.ui
+++ b/qad/libs/application/aboutwindow.ui
@@ -114,7 +114,7 @@
         <string>OK</string>
        </property>
        <property name="icon">
-        <iconset resource="../widgets/qad_widgets.qrc">
+        <iconset resource="qad_application.qrc">
          <normaloff>:/icons/dialog-ok-apply.png</normaloff>:/icons/dialog-ok-apply.png</iconset>
        </property>
       </widget>
@@ -131,7 +131,6 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../widgets/qad_widgets.qrc"/>
   <include location="qad_application.qrc"/>
  </resources>
  <connections>
diff --git a/qad/libs/application/qad_application.qrc b/qad/libs/application/qad_application.qrc
index ad3f2fd..a9ad1dc 100644
--- a/qad/libs/application/qad_application.qrc
+++ b/qad/libs/application/qad_application.qrc
@@ -1,34 +1,17 @@
 <RCC>
 	<qresource prefix="/">
-		<file>../../icons/application-exit.png</file>
-		<file>../../icons/dialog-close.png</file>
+		<file>../../icons/dialog-ok-apply.png</file>
 		<file>../../icons/configure.png</file>
-		<file>../../icons/document-edit.png</file>
-		<file>../../icons/document-new.png</file>
-		<file>../../icons/document-save.png</file>
-		<file>../../icons/document-save-all.png</file>
-		<file>../../icons/document-save-as.png</file>
-		<file>../../icons/document-open.png</file>
-		<file>../../icons/document-open-recent.png</file>
-		<file>../../icons/document-close.png</file>
 		<file>../../icons/edit-clear.png</file>
-		<file>../../icons/edit-clear-locationbar-rtl.png</file>
 		<file>../../icons/edit-find.png</file>
-		<file>../../icons/list-add.png</file>
-		<file>../../icons/edit-delete.png</file>
 		<file>../../icons/edit-copy.png</file>
-		<file>../../icons/edit-paste.png</file>
-		<file>../../icons/edit-undo.png</file>
-		<file>../../icons/edit-redo.png</file>
-		<file>../../icons/border-line.png</file>
 		<file>../../icons/edockwidget.png</file>
 		<file>../../icons/historyview.png</file>
+		<file>../../icons/logview.png</file>
 		<file>../../icons/clear-history.png</file>
 		<file>../../icons/layer-visible-off.png</file>
 		<file>../../icons/layer-visible-on.png</file>
-		<file>../../icons/logview.png</file>
 		<file>../../icons/qt.png</file>
 		<file>../../icons/select-all.png</file>
-		<file>../../icons/select-none.png</file>
 	</qresource>
 </RCC>
diff --git a/qad/libs/blockview/blockeditor.ui b/qad/libs/blockview/blockeditor.ui
index 81e4169..0d9dad6 100644
--- a/qad/libs/blockview/blockeditor.ui
+++ b/qad/libs/blockview/blockeditor.ui
@@ -194,7 +194,7 @@
              <string>Add</string>
             </property>
             <property name="icon">
-             <iconset resource="../utils/qad_utils.qrc">
+             <iconset resource="qad_blockview.qrc">
               <normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
             </property>
            </widget>
@@ -205,7 +205,7 @@
              <string>Clone</string>
             </property>
             <property name="icon">
-             <iconset resource="../utils/qad_utils.qrc">
+             <iconset resource="qad_blockview.qrc">
               <normaloff>:/icons/edit-copy.png</normaloff>:/icons/edit-copy.png</iconset>
             </property>
            </widget>
@@ -232,7 +232,7 @@
              <string>Remove selected</string>
             </property>
             <property name="icon">
-             <iconset resource="../utils/qad_utils.qrc">
+             <iconset resource="qad_blockview.qrc">
               <normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset>
             </property>
            </widget>
@@ -243,7 +243,7 @@
              <string>Remove all</string>
             </property>
             <property name="icon">
-             <iconset resource="../utils/qad_utils.qrc">
+             <iconset resource="qad_blockview.qrc">
               <normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
             </property>
            </widget>
@@ -346,7 +346,7 @@
         <string>Save</string>
        </property>
        <property name="icon">
-        <iconset resource="../utils/qad_utils.qrc">
+        <iconset resource="qad_blockview.qrc">
          <normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
        </property>
        <property name="shortcut">
@@ -376,7 +376,7 @@
         <string>Save as ...</string>
        </property>
        <property name="icon">
-        <iconset resource="../utils/qad_utils.qrc">
+        <iconset resource="qad_blockview.qrc">
          <normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
        </property>
        <property name="shortcut">
@@ -406,7 +406,7 @@
         <string>Load ...</string>
        </property>
        <property name="icon">
-        <iconset resource="../application/qad_application.qrc">
+        <iconset resource="qad_blockview.qrc">
          <normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
        </property>
        <property name="shortcut">
@@ -433,7 +433,7 @@
         <string>Clear</string>
        </property>
        <property name="icon">
-        <iconset resource="../utils/qad_utils.qrc">
+        <iconset resource="qad_blockview.qrc">
          <normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
        </property>
       </widget>
@@ -443,7 +443,7 @@
   </layout>
   <action name="actionRemove_items">
    <property name="icon">
-    <iconset resource="../utils/qad_utils.qrc">
+    <iconset resource="qad_blockview.qrc">
      <normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset>
    </property>
    <property name="text">
@@ -467,8 +467,6 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../utils/qad_utils.qrc"/>
-  <include location="../application/qad_application.qrc"/>
   <include location="qad_blockview.qrc"/>
  </resources>
  <connections>
diff --git a/qad/libs/blockview/drawtools.ui b/qad/libs/blockview/drawtools.ui
index 849f997..1977dcb 100644
--- a/qad/libs/blockview/drawtools.ui
+++ b/qad/libs/blockview/drawtools.ui
@@ -94,7 +94,7 @@
           <string>Edit text ...</string>
          </property>
          <property name="icon">
-          <iconset resource="../application/qad_application.qrc">
+          <iconset resource="qad_blockview.qrc">
            <normaloff>:/icons/document-edit.png</normaloff>:/icons/document-edit.png</iconset>
          </property>
          <property name="toolButtonStyle">
@@ -591,7 +591,7 @@
           <string>Load image ...</string>
          </property>
          <property name="icon">
-          <iconset resource="../application/qad_application.qrc">
+          <iconset resource="qad_blockview.qrc">
            <normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
          </property>
         </widget>
@@ -814,7 +814,6 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../application/qad_application.qrc"/>
   <include location="qad_blockview.qrc"/>
  </resources>
  <connections/>
diff --git a/qad/libs/blockview/qad_blockview.qrc b/qad/libs/blockview/qad_blockview.qrc
index fd87c3d..155b00d 100644
--- a/qad/libs/blockview/qad_blockview.qrc
+++ b/qad/libs/blockview/qad_blockview.qrc
@@ -1,39 +1,16 @@
 <RCC>
     <qresource prefix="/">
-        <file>../../icons/draw-line.png</file>
-        <file>../../icons/align-hor.png</file>
-        <file>../../icons/align-ver.png</file>
-        <file>../../icons/dialog-close.png</file>
-        <file>../../icons/edit-clear.png</file>
-        <file>../../icons/edit-guides.png</file>
-        <file>../../icons/view-grid.png</file>
-        <file>../../icons/zoom-fit-best.png</file>
-        <file>../../icons/configure.png</file>
-        <file>../../icons/document-save.png</file>
-        <file>../../icons/edit-clear-locationbar-rtl.png</file>
-        <file>../../icons/edit-find.png</file>
-        <file>../../icons/list-add.png</file>
-        <file>../../icons/edit-delete.png</file>
-        <file>../../icons/item.png</file>
-        <file>../../icons/node-add.png</file>
-        <file>../../icons/node.png</file>
-        <file>../../icons/edit-copy.png</file>
-        <file>../../icons/edit-paste.png</file>
-        <file>../../icons/expand_s_x.png</file>
-        <file>../../icons/expand_s_y.png</file>
-        <file>../../icons/expand_x.png</file>
-        <file>../../icons/expand_y.png</file>
-        <file>../../icons/border-line.png</file>
-        <file>../../icons/legend.png</file>
         <file>../../icons/blockview.png</file>
-        <file>../../icons/view-fullscreen.png</file>
+        <file>../../icons/draw-line.png</file>
         <file>../../icons/draw-ellipse.png</file>
         <file>../../icons/draw-rectangle.png</file>
         <file>../../icons/draw-text.png</file>
-        <file>../../icons/view-preview.png</file>
-        <file>../../icons/format-fill-color.png</file>
-        <file>../../icons/format-stroke-color.png</file>
-        <file>../../icons/document-open.png</file>
+        <file>../../icons/z-bottom.png</file>
+        <file>../../icons/z-down.png</file>
+        <file>../../icons/z-top.png</file>
+        <file>../../icons/z-up.png</file>
+        <file>../../icons/align-hor.png</file>
+        <file>../../icons/align-ver.png</file>
         <file>../../icons/align-bottom-center.png</file>
         <file>../../icons/align-bottom-left.png</file>
         <file>../../icons/align-bottom-right.png</file>
@@ -43,9 +20,15 @@
         <file>../../icons/align-top-center.png</file>
         <file>../../icons/align-top-left.png</file>
         <file>../../icons/align-top-right.png</file>
-        <file>../../icons/z-bottom.png</file>
-        <file>../../icons/z-down.png</file>
-        <file>../../icons/z-top.png</file>
-        <file>../../icons/z-up.png</file>
+        <file>../../icons/dialog-close.png</file>
+        <file>../../icons/edit-clear.png</file>
+        <file>../../icons/edit-delete.png</file>
+        <file>../../icons/edit-copy.png</file>
+        <file>../../icons/document-save.png</file>
+        <file>../../icons/document-open.png</file>
+        <file>../../icons/document-edit.png</file>
+        <file>../../icons/view-preview.png</file>
+        <file>../../icons/format-fill-color.png</file>
+        <file>../../icons/format-stroke-color.png</file>
     </qresource>
 </RCC>
diff --git a/qad/libs/graphic/graphic.ui b/qad/libs/graphic/graphic.ui
index e2c2f4b..3fd5dc1 100644
--- a/qad/libs/graphic/graphic.ui
+++ b/qad/libs/graphic/graphic.ui
@@ -64,7 +64,7 @@
           <string>Grid</string>
          </property>
          <property name="icon">
-          <iconset resource="../blockview/qad_blockview.qrc">
+          <iconset resource="qad_graphic.qrc">
            <normaloff>:/icons/view-grid.png</normaloff>:/icons/view-grid.png</iconset>
          </property>
          <property name="checkable">
@@ -81,7 +81,7 @@
           <string>Cursor axis</string>
          </property>
          <property name="icon">
-          <iconset resource="../blockview/qad_blockview.qrc">
+          <iconset resource="qad_graphic.qrc">
            <normaloff>:/icons/edit-guides.png</normaloff>:/icons/edit-guides.png</iconset>
          </property>
          <property name="checkable">
@@ -95,7 +95,7 @@
           <string>Only expand Y</string>
          </property>
          <property name="icon">
-          <iconset resource="../blockview/qad_blockview.qrc">
+          <iconset resource="qad_graphic.qrc">
            <normaloff>:/icons/expand_s_y.png</normaloff>:/icons/expand_s_y.png</iconset>
          </property>
          <property name="checkable">
@@ -109,7 +109,7 @@
           <string>Only expand X</string>
          </property>
          <property name="icon">
-          <iconset resource="../blockview/qad_blockview.qrc">
+          <iconset resource="qad_graphic.qrc">
            <normaloff>:/icons/expand_s_x.png</normaloff>:/icons/expand_s_x.png</iconset>
          </property>
          <property name="checkable">
@@ -123,7 +123,7 @@
           <string>Fullscreen</string>
          </property>
          <property name="icon">
-          <iconset resource="../blockview/qad_blockview.qrc">
+          <iconset resource="qad_graphic.qrc">
            <normaloff>:/icons/view-fullscreen.png</normaloff>:/icons/view-fullscreen.png</iconset>
          </property>
         </widget>
@@ -134,7 +134,7 @@
           <string>Border inputs</string>
          </property>
          <property name="icon">
-          <iconset resource="../application/qad_application.qrc">
+          <iconset resource="qad_graphic.qrc">
            <normaloff>:/icons/border-line.png</normaloff>:/icons/border-line.png</iconset>
          </property>
          <property name="checkable">
@@ -151,7 +151,7 @@
           <string>Legend</string>
          </property>
          <property name="icon">
-          <iconset resource="../blockview/qad_blockview.qrc">
+          <iconset resource="qad_graphic.qrc">
            <normaloff>:/icons/legend.png</normaloff>:/icons/legend.png</iconset>
          </property>
          <property name="checkable">
@@ -182,7 +182,7 @@
           <string>Configure ...</string>
          </property>
          <property name="icon">
-          <iconset resource="../application/qad_application.qrc">
+          <iconset resource="qad_graphic.qrc">
            <normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset>
          </property>
         </widget>
@@ -193,7 +193,7 @@
           <string>Save image ...</string>
          </property>
          <property name="icon">
-          <iconset resource="../application/qad_application.qrc">
+          <iconset resource="qad_graphic.qrc">
            <normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
          </property>
         </widget>
@@ -220,7 +220,7 @@
           <string>Clear</string>
          </property>
          <property name="icon">
-          <iconset resource="../application/qad_application.qrc">
+          <iconset resource="qad_graphic.qrc">
            <normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
          </property>
         </widget>
@@ -231,7 +231,7 @@
           <string>Close</string>
          </property>
          <property name="icon">
-          <iconset resource="../application/qad_application.qrc">
+          <iconset resource="qad_graphic.qrc">
            <normaloff>:/icons/dialog-close.png</normaloff>:/icons/dialog-close.png</iconset>
          </property>
         </widget>
@@ -458,8 +458,6 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../application/qad_application.qrc"/>
-  <include location="../blockview/qad_blockview.qrc"/>
   <include location="qad_graphic.qrc"/>
  </resources>
  <connections/>
diff --git a/qad/libs/graphic/qad_graphic.qrc b/qad/libs/graphic/qad_graphic.qrc
index 437c9e3..800334a 100644
--- a/qad/libs/graphic/qad_graphic.qrc
+++ b/qad/libs/graphic/qad_graphic.qrc
@@ -1,28 +1,22 @@
 <RCC>
     <qresource prefix="/">
+        <file>../../icons/expand_s_x.png</file>
+        <file>../../icons/expand_s_y.png</file>
+        <file>../../icons/expand_x.png</file>
+        <file>../../icons/expand_y.png</file>
+        <file>../../icons/pause-back.png</file>
+        <file>../../icons/pause-front.png</file>
         <file>../../icons/media-playback-pause.png</file>
         <file>../../icons/dialog-close.png</file>
         <file>../../icons/edit-clear.png</file>
         <file>../../icons/edit-guides.png</file>
         <file>../../icons/view-grid.png</file>
 		<file>../../icons/view-autofit.png</file>
+        <file>../../icons/view-fullscreen.png</file>
         <file>../../icons/configure.png</file>
         <file>../../icons/document-save.png</file>
-        <file>../../icons/edit-clear-locationbar-rtl.png</file>
-        <file>../../icons/edit-find.png</file>
-        <file>../../icons/list-add.png</file>
-        <file>../../icons/edit-delete.png</file>
-        <file>../../icons/edit-copy.png</file>
-        <file>../../icons/edit-paste.png</file>
-        <file>../../icons/expand_s_x.png</file>
-        <file>../../icons/expand_s_y.png</file>
-        <file>../../icons/expand_x.png</file>
-        <file>../../icons/expand_y.png</file>
         <file>../../icons/border-line.png</file>
         <file>../../icons/legend.png</file>
         <file>../../icons/graphic.png</file>
-        <file>../../icons/view-fullscreen.png</file>
-        <file>../../icons/pause-back.png</file>
-        <file>../../icons/pause-front.png</file>
     </qresource>
 </RCC>
diff --git a/qad/libs/sql_table/qad_sql_table.qrc b/qad/libs/sql_table/qad_sql_table.qrc
index 4673462..437d5ad 100644
--- a/qad/libs/sql_table/qad_sql_table.qrc
+++ b/qad/libs/sql_table/qad_sql_table.qrc
@@ -1,26 +1,11 @@
 <RCC>
   <qresource prefix="/">
-    <file>../../icons/edit-table-insert-row-below.png</file>
-    <file>../../icons/dialog-close.png</file>
-    <file>../../icons/edit-clear.png</file>
-    <file>../../icons/edit-guides.png</file>
-    <file>../../icons/view-grid.png</file>
-    <file>../../icons/zoom-fit-best.png</file>
-    <file>../../icons/configure.png</file>
-    <file>../../icons/document-save.png</file>
-    <file>../../icons/edit-clear-locationbar-rtl.png</file>
-    <file>../../icons/edit-find.png</file>
-    <file>../../icons/list-add.png</file>
-    <file>../../icons/edit-delete.png</file>
-    <file>../../icons/item.png</file>
-    <file>../../icons/node-add.png</file>
-    <file>../../icons/node.png</file>
-    <file>../../icons/edit-copy.png</file>
-    <file>../../icons/edit-paste.png</file>
-    <file>../../icons/expand_s_x.png</file>
-    <file>../../icons/expand_s_y.png</file>
-    <file>../../icons/expand_x.png</file>
-    <file>../../icons/expand_y.png</file>
     <file>../../icons/sql_table.png</file>
+    <file>../../icons/configure.png</file>
+    <file>../../icons/edit-delete.png</file>
+    <file>../../icons/edit-table-insert-row-below.png</file>
+    <file>../../icons/edit-find.png</file>
+    <file>../../icons/edit-clear.png</file>
+    <file>../../icons/list-add.png</file>
   </qresource>
 </RCC>
diff --git a/qad/libs/utils/qad_utils.qrc b/qad/libs/utils/qad_utils.qrc
deleted file mode 100644
index 4df8988..0000000
--- a/qad/libs/utils/qad_utils.qrc
+++ /dev/null
@@ -1,17 +0,0 @@
-<RCC>
-	<qresource prefix="/">
-		<file>../../icons/edit-clear.png</file>
-		<file>../../icons/document-save.png</file>
-		<file>../../icons/edit-clear-locationbar-rtl.png</file>
-		<file>../../icons/edit-find.png</file>
-		<file>../../icons/list-add.png</file>
-		<file>../../icons/edit-delete.png</file>
-		<file>../../icons/item-add.png</file>
-		<file>../../icons/item.png</file>
-		<file>../../icons/node-add.png</file>
-		<file>../../icons/node.png</file>
-		<file>../../icons/edit-copy.png</file>
-		<file>../../icons/edit-paste.png</file>
-		<file>../../icons/document-open_16.png</file>
-    </qresource>
-</RCC>
diff --git a/qad/libs/widgets/chardialog.ui b/qad/libs/widgets/chardialog.ui
index 7548b62..09cbfbd 100644
--- a/qad/libs/widgets/chardialog.ui
+++ b/qad/libs/widgets/chardialog.ui
@@ -14,8 +14,8 @@
    <string>Choose symbol</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="mbricks.qrc">
-    <normaloff>:/icons/icons/mbricks_128.png</normaloff>:/icons/icons/mbricks_128.png</iconset>
+   <iconset resource="qad_widgets.qrc">
+    <normaloff>:/icons/chardialog.png</normaloff>:/icons/chardialog.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="margin">
@@ -86,7 +86,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="mbricks.qrc"/>
+  <include location="qad_widgets.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/qad/libs/widgets/plugin/imageviewplugin.cpp b/qad/libs/widgets/plugin/imageviewplugin.cpp
index f20adc9..e4d0b26 100644
--- a/qad/libs/widgets/plugin/imageviewplugin.cpp
+++ b/qad/libs/widgets/plugin/imageviewplugin.cpp
@@ -39,7 +39,7 @@ QString ImageViewPlugin::group() const {
 
 
 QIcon ImageViewPlugin::icon() const {
-	return QIcon(/*":/icons/spinslider.png"*/);
+	return QIcon(":/icons/view-preview.png");
 }
 
 
diff --git a/qad/libs/widgets/plugin/qpointeditplugin.cpp b/qad/libs/widgets/plugin/qpointeditplugin.cpp
index 622c78e..fb4cf8d 100644
--- a/qad/libs/widgets/plugin/qpointeditplugin.cpp
+++ b/qad/libs/widgets/plugin/qpointeditplugin.cpp
@@ -39,7 +39,7 @@ QString QPointEditPlugin::group() const {
 
 
 QIcon QPointEditPlugin::icon() const {
-	return QIcon(":/icons/qpointedit.png");
+	return QIcon();
 }
 
 
diff --git a/qad/libs/widgets/plugin/qrecteditplugin.cpp b/qad/libs/widgets/plugin/qrecteditplugin.cpp
index f64f30c..1ed5a2c 100644
--- a/qad/libs/widgets/plugin/qrecteditplugin.cpp
+++ b/qad/libs/widgets/plugin/qrecteditplugin.cpp
@@ -39,7 +39,7 @@ QString QRectEditPlugin::group() const {
 
 
 QIcon QRectEditPlugin::icon() const {
-	return QIcon(":/icons/qrectedit.png");
+	return QIcon();
 }
 
 
diff --git a/qad/libs/widgets/qad_widgets.qrc b/qad/libs/widgets/qad_widgets.qrc
index 50d5263..1c19139 100644
--- a/qad/libs/widgets/qad_widgets.qrc
+++ b/qad/libs/widgets/qad_widgets.qrc
@@ -1,46 +1,35 @@
 <RCC>
-  <qresource prefix="/">
-    <file>../../icons/go-next.png</file>
-    <file>../../icons/go-previous.png</file>
-    <file>../../icons/dialog-close.png</file>
-    <file>../../icons/edit-clear.png</file>
-    <file>../../icons/edit-guides.png</file>
-    <file>../../icons/view-grid.png</file>
-    <file>../../icons/zoom-fit-best.png</file>
-    <file>../../icons/configure.png</file>
-    <file>../../icons/alpha.png</file>
-    <file>../../icons/document-save.png</file>
-    <file>../../icons/edit-clear-locationbar-rtl.png</file>
-    <file>../../icons/edit-find.png</file>
-    <file>../../icons/list-add.png</file>
-    <file>../../icons/edit-delete.png</file>
-    <file>../../icons/item-add.png</file>
-    <file>../../icons/item.png</file>
-    <file>../../icons/node-add.png</file>
-    <file>../../icons/node.png</file>
-    <file>../../icons/edit-copy.png</file>
-    <file>../../icons/edit-paste.png</file>
-    <file>../../icons/expand_s_x.png</file>
-    <file>../../icons/expand_s_y.png</file>
-    <file>../../icons/expand_x.png</file>
-    <file>../../icons/expand_y.png</file>
-    <file>../../icons/border-line.png</file>
-    <file>../../icons/legend.png</file>
-    <file>../../icons/chardialog.png</file>
-    <file>../../icons/clineedit.png</file>
-    <file>../../icons/colorbutton.png</file>
-    <file>../../icons/ecombobox.png</file>
-    <file>../../icons/qpiconsole.png</file>
-    <file>../../icons/spinslider.png</file>
-    <file>../../icons/etabwidget.png</file>
-    <file>../../icons/qcodeedit.png</file>
-    <file>../../icons/qvariantedit.png</file>
-    <file>../../icons/code-word.png</file>
-    <file>../../icons/f1.png</file>
-    <file>../../icons/dialog-ok-apply.png</file>
-    <file>../../icons/dialog-warning.png</file>
-    <file>../../icons/tools-wizard.png</file>
-    <file>../../icons/evalspinbox.png</file>
-	<file>../../icons/scroll_spin.png</file>
-  </qresource>
+    <qresource prefix="/">
+        <file>../../icons/edit-clear-locationbar-rtl.png</file>
+        <file>../../icons/edit-copy.png</file>
+        <file>../../icons/edit-paste.png</file>
+        <file>../../icons/edit-find.png</file>
+        <file>../../icons/edit-delete.png</file>
+        <file>../../icons/edit-clear.png</file>
+        <file>../../icons/dialog-ok-apply.png</file>
+        <file>../../icons/dialog-warning.png</file>
+        <file>../../icons/tools-wizard.png</file>
+        <file>../../icons/go-next.png</file>
+        <file>../../icons/go-previous.png</file>
+        <file>../../icons/item.png</file>
+        <file>../../icons/item-add.png</file>
+        <file>../../icons/node.png</file>
+        <file>../../icons/node-add.png</file>
+        <file>../../icons/list-add.png</file>
+        <file>../../icons/document-save.png</file>
+        <file>../../icons/document-open.png</file>
+        <file>../../icons/alpha.png</file>
+        <file>../../icons/chardialog.png</file>
+        <file>../../icons/clineedit.png</file>
+        <file>../../icons/colorbutton.png</file>
+        <file>../../icons/ecombobox.png</file>
+        <file>../../icons/evalspinbox.png</file>
+        <file>../../icons/qcodeedit.png</file>
+        <file>../../icons/qpiconsole.png</file>
+        <file>../../icons/qvariantedit.png</file>
+        <file>../../icons/spinslider.png</file>
+        <file>../../icons/code-word.png</file>
+        <file>../../icons/f1.png</file>
+        <file>../../icons/scroll_spin.png</file>
+    </qresource>
 </RCC>
diff --git a/qad/libs/widgets/qcodeedit.ui b/qad/libs/widgets/qcodeedit.ui
index 8874863..1a53c84 100644
--- a/qad/libs/widgets/qcodeedit.ui
+++ b/qad/libs/widgets/qcodeedit.ui
@@ -178,7 +178,7 @@
               <string>Previous</string>
              </property>
              <property name="icon">
-              <iconset resource="../../../SHS/src/designers/SH_designer/SH_designer.qrc">
+              <iconset resource="qad_widgets.qrc">
                <normaloff>:/icons/go-previous.png</normaloff>:/icons/go-previous.png</iconset>
              </property>
             </widget>
@@ -195,7 +195,7 @@
               <string>Next</string>
              </property>
              <property name="icon">
-              <iconset resource="../../../SHS/src/designers/SH_designer/SH_designer.qrc">
+              <iconset resource="qad_widgets.qrc">
                <normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset>
              </property>
             </widget>
@@ -311,7 +311,9 @@
    <header>ecombobox.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="qad_widgets.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonSearchNext</sender>
diff --git a/qad/libs/widgets/scroll_spin_box.ui b/qad/libs/widgets/scroll_spin_box.ui
index c398780..89fc077 100644
--- a/qad/libs/widgets/scroll_spin_box.ui
+++ b/qad/libs/widgets/scroll_spin_box.ui
@@ -64,7 +64,9 @@
    <header>evalspinbox.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="qad_widgets.qrc"/>
+ </resources>
  <connections/>
  <slots>
   <slot>mapChanged()</slot>