diff --git a/qad/graphic/graphic.ui b/qad/graphic/graphic.ui
index ee68f6b..7b23d2b 100644
--- a/qad/graphic/graphic.ui
+++ b/qad/graphic/graphic.ui
@@ -54,7 +54,7 @@
          </property>
          <property name="icon">
           <iconset resource="qad_graphic.qrc">
-           <normaloff>:/icons/zoom-fit-best.png</normaloff>:/icons/zoom-fit-best.png</iconset>
+           <normaloff>:/icons/view-autofit.png</normaloff>:/icons/view-autofit.png</iconset>
          </property>
         </widget>
        </item>
@@ -64,7 +64,7 @@
           <string>Grid</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.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="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.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="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.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="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.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="qad_graphic.qrc">
+          <iconset resource="../blockview/qad_blockview.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="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.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="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.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="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.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="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.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="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.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="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/dialog-close.png</normaloff>:/icons/dialog-close.png</iconset>
          </property>
         </widget>
@@ -446,6 +446,8 @@
   </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/graphic/qad_graphic.qrc b/qad/graphic/qad_graphic.qrc
index 89e779c..3ca1b8e 100644
--- a/qad/graphic/qad_graphic.qrc
+++ b/qad/graphic/qad_graphic.qrc
@@ -5,16 +5,13 @@
         <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/view-autofit.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>
diff --git a/qad/icons/application-exit.png b/qad/icons/application-exit.png
new file mode 100644
index 0000000..8adbcba
Binary files /dev/null and b/qad/icons/application-exit.png differ
diff --git a/qad/icons/archive-extract.png b/qad/icons/archive-extract.png
index aa7b1fa..0e64c87 100644
Binary files a/qad/icons/archive-extract.png and b/qad/icons/archive-extract.png differ
diff --git a/qad/icons/archive-insert-directory.png b/qad/icons/archive-insert-directory.png
index 0672205..e26f51c 100644
Binary files a/qad/icons/archive-insert-directory.png and b/qad/icons/archive-insert-directory.png differ
diff --git a/qad/icons/archive-insert.png b/qad/icons/archive-insert.png
index 193c25c..4143a38 100644
Binary files a/qad/icons/archive-insert.png and b/qad/icons/archive-insert.png differ
diff --git a/qad/icons/arrow-down.png b/qad/icons/arrow-down.png
index 03f2014..61f2f1d 100644
Binary files a/qad/icons/arrow-down.png and b/qad/icons/arrow-down.png differ
diff --git a/qad/icons/arrow-up.png b/qad/icons/arrow-up.png
index 5e42321..2b1453b 100644
Binary files a/qad/icons/arrow-up.png and b/qad/icons/arrow-up.png differ
diff --git a/qad/icons/border-line.png b/qad/icons/border-line.png
index dbae386..4b47837 100644
Binary files a/qad/icons/border-line.png and b/qad/icons/border-line.png differ
diff --git a/qad/icons/configure.png b/qad/icons/configure.png
index 5ce478b..2a81957 100644
Binary files a/qad/icons/configure.png and b/qad/icons/configure.png differ
diff --git a/qad/icons/configure_16.png b/qad/icons/configure_16.png
new file mode 100644
index 0000000..5ce478b
Binary files /dev/null and b/qad/icons/configure_16.png differ
diff --git a/qad/icons/database.png b/qad/icons/database.png
index 3041814..9c773d5 100644
Binary files a/qad/icons/database.png and b/qad/icons/database.png differ
diff --git a/qad/icons/dialog-cancel.png b/qad/icons/dialog-cancel.png
new file mode 100644
index 0000000..ace88ab
Binary files /dev/null and b/qad/icons/dialog-cancel.png differ
diff --git a/qad/icons/dialog-close.png b/qad/icons/dialog-close.png
index 2c2f99e..6072634 100644
Binary files a/qad/icons/dialog-close.png and b/qad/icons/dialog-close.png differ
diff --git a/qad/icons/dialog-ok-apply.png b/qad/icons/dialog-ok-apply.png
index b86f473..3260f60 100644
Binary files a/qad/icons/dialog-ok-apply.png and b/qad/icons/dialog-ok-apply.png differ
diff --git a/qad/icons/document-close.png b/qad/icons/document-close.png
new file mode 100644
index 0000000..0ea563e
Binary files /dev/null and b/qad/icons/document-close.png differ
diff --git a/qad/icons/document-edit.png b/qad/icons/document-edit.png
index 84e345d..1ecb10c 100644
Binary files a/qad/icons/document-edit.png and b/qad/icons/document-edit.png differ
diff --git a/qad/icons/document-new.png b/qad/icons/document-new.png
index 8431237..e4d8b47 100644
Binary files a/qad/icons/document-new.png and b/qad/icons/document-new.png differ
diff --git a/qad/icons/document-open.png b/qad/icons/document-open.png
index 3432ed2..63380e4 100644
Binary files a/qad/icons/document-open.png and b/qad/icons/document-open.png differ
diff --git a/qad/icons/document-print.png b/qad/icons/document-print.png
index 8eb1c67..6c5e351 100644
Binary files a/qad/icons/document-print.png and b/qad/icons/document-print.png differ
diff --git a/qad/icons/document-save-all.png b/qad/icons/document-save-all.png
new file mode 100644
index 0000000..73405f7
Binary files /dev/null and b/qad/icons/document-save-all.png differ
diff --git a/qad/icons/document-save-as.png b/qad/icons/document-save-as.png
new file mode 100644
index 0000000..b5da838
Binary files /dev/null and b/qad/icons/document-save-as.png differ
diff --git a/qad/icons/document-save.png b/qad/icons/document-save.png
index cc380a0..aee3e22 100644
Binary files a/qad/icons/document-save.png and b/qad/icons/document-save.png differ
diff --git a/qad/icons/draw-ellipse.png b/qad/icons/draw-ellipse.png
index 6aa51ef..a3e67ac 100644
Binary files a/qad/icons/draw-ellipse.png and b/qad/icons/draw-ellipse.png differ
diff --git a/qad/icons/draw-line.png b/qad/icons/draw-line.png
index fff6f25..a521e62 100644
Binary files a/qad/icons/draw-line.png and b/qad/icons/draw-line.png differ
diff --git a/qad/icons/draw-rectangle.png b/qad/icons/draw-rectangle.png
index 2e0e1ca..77a682f 100644
Binary files a/qad/icons/draw-rectangle.png and b/qad/icons/draw-rectangle.png differ
diff --git a/qad/icons/draw-text.png b/qad/icons/draw-text.png
index b653b25..c8efb7d 100644
Binary files a/qad/icons/draw-text.png and b/qad/icons/draw-text.png differ
diff --git a/qad/icons/edit-clear-locationbar-rtl.png b/qad/icons/edit-clear-locationbar-rtl.png
index 6c4b83b..0e6d645 100644
Binary files a/qad/icons/edit-clear-locationbar-rtl.png and b/qad/icons/edit-clear-locationbar-rtl.png differ
diff --git a/qad/icons/edit-clear.png b/qad/icons/edit-clear.png
index cee7af6..cae930b 100644
Binary files a/qad/icons/edit-clear.png and b/qad/icons/edit-clear.png differ
diff --git a/qad/icons/edit-copy.png b/qad/icons/edit-copy.png
index 5cdeb5f..a8178ca 100644
Binary files a/qad/icons/edit-copy.png and b/qad/icons/edit-copy.png differ
diff --git a/qad/icons/edit-delete.png b/qad/icons/edit-delete.png
index 49fd217..38f11cd 100644
Binary files a/qad/icons/edit-delete.png and b/qad/icons/edit-delete.png differ
diff --git a/qad/icons/edit-find.png b/qad/icons/edit-find.png
index 9a462c0..140e581 100644
Binary files a/qad/icons/edit-find.png and b/qad/icons/edit-find.png differ
diff --git a/qad/icons/edit-find_16.png b/qad/icons/edit-find_16.png
new file mode 100644
index 0000000..9a462c0
Binary files /dev/null and b/qad/icons/edit-find_16.png differ
diff --git a/qad/icons/edit-guides.png b/qad/icons/edit-guides.png
index d264839..0065b28 100644
Binary files a/qad/icons/edit-guides.png and b/qad/icons/edit-guides.png differ
diff --git a/qad/icons/edit-paste.png b/qad/icons/edit-paste.png
index a4e0a02..a9aac10 100644
Binary files a/qad/icons/edit-paste.png and b/qad/icons/edit-paste.png differ
diff --git a/qad/icons/edit-redo.png b/qad/icons/edit-redo.png
new file mode 100644
index 0000000..353a6c0
Binary files /dev/null and b/qad/icons/edit-redo.png differ
diff --git a/qad/icons/edit-table-insert-row-below.png b/qad/icons/edit-table-insert-row-below.png
index a194a68..c3695c7 100644
Binary files a/qad/icons/edit-table-insert-row-below.png and b/qad/icons/edit-table-insert-row-below.png differ
diff --git a/qad/icons/edit-undo.png b/qad/icons/edit-undo.png
new file mode 100644
index 0000000..a677409
Binary files /dev/null and b/qad/icons/edit-undo.png differ
diff --git a/qad/icons/expand_s_x.png b/qad/icons/expand_s_x.png
index b66cb40..185dcd9 100644
Binary files a/qad/icons/expand_s_x.png and b/qad/icons/expand_s_x.png differ
diff --git a/qad/icons/expand_s_y.png b/qad/icons/expand_s_y.png
index c2e8f78..9707071 100644
Binary files a/qad/icons/expand_s_y.png and b/qad/icons/expand_s_y.png differ
diff --git a/qad/icons/expand_x.png b/qad/icons/expand_x.png
index 217e3ea..0089290 100644
Binary files a/qad/icons/expand_x.png and b/qad/icons/expand_x.png differ
diff --git a/qad/icons/expand_y.png b/qad/icons/expand_y.png
index fedf936..0e01625 100644
Binary files a/qad/icons/expand_y.png and b/qad/icons/expand_y.png differ
diff --git a/qad/icons/games-solve.png b/qad/icons/games-solve.png
index 1fcac96..2177b4d 100644
Binary files a/qad/icons/games-solve.png and b/qad/icons/games-solve.png differ
diff --git a/qad/icons/go-next.png b/qad/icons/go-next.png
index aa7cbb9..cacea05 100644
Binary files a/qad/icons/go-next.png and b/qad/icons/go-next.png differ
diff --git a/qad/icons/go-previous.png b/qad/icons/go-previous.png
index 8230340..b4b00f5 100644
Binary files a/qad/icons/go-previous.png and b/qad/icons/go-previous.png differ
diff --git a/qad/icons/legend.png b/qad/icons/legend.png
index 02ca274..94447c2 100644
Binary files a/qad/icons/legend.png and b/qad/icons/legend.png differ
diff --git a/qad/icons/list-add.png b/qad/icons/list-add.png
index af5b56e..a15dd10 100644
Binary files a/qad/icons/list-add.png and b/qad/icons/list-add.png differ
diff --git a/qad/icons/list-remove.png b/qad/icons/list-remove.png
index 5a4d15b..fffb248 100644
Binary files a/qad/icons/list-remove.png and b/qad/icons/list-remove.png differ
diff --git a/qad/icons/media-playback-pause.png b/qad/icons/media-playback-pause.png
index d133bdc..db3bd3b 100644
Binary files a/qad/icons/media-playback-pause.png and b/qad/icons/media-playback-pause.png differ
diff --git a/qad/icons/media-playback-start.png b/qad/icons/media-playback-start.png
new file mode 100644
index 0000000..c53ff0f
Binary files /dev/null and b/qad/icons/media-playback-start.png differ
diff --git a/qad/icons/media-playback-stop.png b/qad/icons/media-playback-stop.png
index 4ecbdf6..fef42cc 100644
Binary files a/qad/icons/media-playback-stop.png and b/qad/icons/media-playback-stop.png differ
diff --git a/qad/icons/media-record.png b/qad/icons/media-record.png
index 73688e8..7adb749 100644
Binary files a/qad/icons/media-record.png and b/qad/icons/media-record.png differ
diff --git a/qad/icons/media-skip-forward.png b/qad/icons/media-skip-forward.png
new file mode 100644
index 0000000..3b25f45
Binary files /dev/null and b/qad/icons/media-skip-forward.png differ
diff --git a/qad/icons/quickopen.png b/qad/icons/quickopen.png
index 22927ed..d758fff 100644
Binary files a/qad/icons/quickopen.png and b/qad/icons/quickopen.png differ
diff --git a/qad/icons/tools-wizard.png b/qad/icons/tools-wizard.png
index f67fb4c..0101c36 100644
Binary files a/qad/icons/tools-wizard.png and b/qad/icons/tools-wizard.png differ
diff --git a/qad/icons/transform-move.png b/qad/icons/transform-move.png
index 0bd8d04..b20fc44 100644
Binary files a/qad/icons/transform-move.png and b/qad/icons/transform-move.png differ
diff --git a/qad/icons/view-autofit.png b/qad/icons/view-autofit.png
new file mode 100644
index 0000000..d8defba
Binary files /dev/null and b/qad/icons/view-autofit.png differ
diff --git a/qad/icons/view-fullscreen.png b/qad/icons/view-fullscreen.png
index 75f8a59..4a7c152 100644
Binary files a/qad/icons/view-fullscreen.png and b/qad/icons/view-fullscreen.png differ
diff --git a/qad/icons/view-grid.png b/qad/icons/view-grid.png
index 0f1d70c..9a0a458 100644
Binary files a/qad/icons/view-grid.png and b/qad/icons/view-grid.png differ
diff --git a/qad/icons/view-refresh.png b/qad/icons/view-refresh.png
index 45b5535..66f0ceb 100644
Binary files a/qad/icons/view-refresh.png and b/qad/icons/view-refresh.png differ
diff --git a/qad/icons/z-bottom.png b/qad/icons/z-bottom.png
index 89c3eff..fa05b36 100644
Binary files a/qad/icons/z-bottom.png and b/qad/icons/z-bottom.png differ
diff --git a/qad/icons/z-down.png b/qad/icons/z-down.png
index abe0017..6f72223 100644
Binary files a/qad/icons/z-down.png and b/qad/icons/z-down.png differ
diff --git a/qad/icons/z-top.png b/qad/icons/z-top.png
index 309b458..75a6eec 100644
Binary files a/qad/icons/z-top.png and b/qad/icons/z-top.png differ
diff --git a/qad/icons/z-up.png b/qad/icons/z-up.png
index c5b574e..d4b3806 100644
Binary files a/qad/icons/z-up.png and b/qad/icons/z-up.png differ
diff --git a/qad/icons/zoom-draw.png b/qad/icons/zoom-draw.png
new file mode 100644
index 0000000..470b7f0
Binary files /dev/null and b/qad/icons/zoom-draw.png differ
diff --git a/qad/icons/zoom-fit-best.png b/qad/icons/zoom-fit-best.png
index 07cfc98..a1395b4 100644
Binary files a/qad/icons/zoom-fit-best.png and b/qad/icons/zoom-fit-best.png differ
diff --git a/qad/icons/zoom-in.png b/qad/icons/zoom-in.png
index 8393e28..9a97124 100644
Binary files a/qad/icons/zoom-in.png and b/qad/icons/zoom-in.png differ
diff --git a/qad/icons/zoom-original.png b/qad/icons/zoom-original.png
new file mode 100644
index 0000000..55b3ac8
Binary files /dev/null and b/qad/icons/zoom-original.png differ
diff --git a/qad/icons/zoom-out.png b/qad/icons/zoom-out.png
index f66575e..6e4e03f 100644
Binary files a/qad/icons/zoom-out.png and b/qad/icons/zoom-out.png differ
diff --git a/qad/icons/zoom-range.png b/qad/icons/zoom-range.png
index c052512..070a16f 100644
Binary files a/qad/icons/zoom-range.png and b/qad/icons/zoom-range.png differ
diff --git a/qad/icons/zoom-rect.png b/qad/icons/zoom-rect.png
index da44fd5..5fa6283 100644
Binary files a/qad/icons/zoom-rect.png and b/qad/icons/zoom-rect.png differ
diff --git a/qad/icons/zoom-select.png b/qad/icons/zoom-select.png
new file mode 100644
index 0000000..220d42c
Binary files /dev/null and b/qad/icons/zoom-select.png differ