diff --git a/src/app/app.pro b/src/app/app.pro
index 6f18ab6bd..d7c2b4ba9 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -57,7 +57,8 @@ RESOURCES += \
     share/resources/cursor.qrc \ # Tools cursor icons.
     share/resources/theme.qrc \ # Windows theme icons.
     share/resources/measurements.qrc \ # For measurements files that we save as resource.
-    share/resources/flags.qrc
+    share/resources/flags.qrc \
+    share/resources/toolicon.qrc
 
 # Compilation will fail without this files after we added them to this section.
 OTHER_FILES += \
diff --git a/src/app/main.cpp b/src/app/main.cpp
index b17b8b4a4..0bbb8004a 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
     Q_INIT_RESOURCE(theme);
     Q_INIT_RESOURCE(flags);
     Q_INIT_RESOURCE(icons);
+    Q_INIT_RESOURCE(toolicon);
 
     QT_REQUIRE_VERSION(argc, argv, "5.0.0");
 
diff --git a/src/app/mainwindow.ui b/src/app/mainwindow.ui
index 3860bec9b..6174541bb 100644
--- a/src/app/mainwindow.ui
+++ b/src/app/mainwindow.ui
@@ -48,7 +48,7 @@
        <string/>
       </property>
       <property name="currentIndex">
-       <number>3</number>
+       <number>4</number>
       </property>
       <widget class="QWidget" name="page">
        <property name="geometry">
@@ -87,8 +87,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/normal.png</normaloff>:/icon/32x32/normal.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/normal.png</normaloff>:/toolicon/32x32/normal.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -113,8 +113,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/shoulder.png</normaloff>:/icon/32x32/shoulder.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/shoulder.png</normaloff>:/toolicon/32x32/shoulder.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -139,8 +139,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/triangle.png</normaloff>:/icon/32x32/triangle.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/triangle.png</normaloff>:/toolicon/32x32/triangle.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -165,8 +165,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/height.png</normaloff>:/icon/32x32/height.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/height.png</normaloff>:/toolicon/32x32/height.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -191,8 +191,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/bisector.png</normaloff>:/icon/32x32/bisector.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/bisector.png</normaloff>:/toolicon/32x32/bisector.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -217,8 +217,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/point_of_contact.png</normaloff>:/icon/32x32/point_of_contact.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/point_of_contact.png</normaloff>:/toolicon/32x32/point_of_contact.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -243,8 +243,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/point_of_intersection.png</normaloff>:/icon/32x32/point_of_intersection.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/point_of_intersection.png</normaloff>:/toolicon/32x32/point_of_intersection.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -269,8 +269,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/segment.png</normaloff>:/icon/32x32/segment.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/segment.png</normaloff>:/toolicon/32x32/segment.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -295,8 +295,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/along_line.png</normaloff>:/icon/32x32/along_line.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/along_line.png</normaloff>:/toolicon/32x32/along_line.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -321,8 +321,8 @@
            <string>...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/line_intersect_axis.png</normaloff>:/icon/32x32/line_intersect_axis.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/line_intersect_axis.png</normaloff>:/toolicon/32x32/line_intersect_axis.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -371,8 +371,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/line.png</normaloff>:/icon/32x32/line.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/line.png</normaloff>:/toolicon/32x32/line.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -397,8 +397,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/intersect.png</normaloff>:/icon/32x32/intersect.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/intersect.png</normaloff>:/toolicon/32x32/intersect.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -447,8 +447,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/spline.png</normaloff>:/icon/32x32/spline.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/spline.png</normaloff>:/toolicon/32x32/spline.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -473,8 +473,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/splinePath.png</normaloff>:/icon/32x32/splinePath.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/splinePath.png</normaloff>:/toolicon/32x32/splinePath.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -499,8 +499,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/spline_cut_point.png</normaloff>:/icon/32x32/spline_cut_point.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/spline_cut_point.png</normaloff>:/toolicon/32x32/spline_cut_point.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -525,8 +525,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/splinePath_cut_point.png</normaloff>:/icon/32x32/splinePath_cut_point.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/splinePath_cut_point.png</normaloff>:/toolicon/32x32/splinePath_cut_point.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -551,8 +551,8 @@
            <string>...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/curve_intersect_axis.png</normaloff>:/icon/32x32/curve_intersect_axis.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/curve_intersect_axis.png</normaloff>:/toolicon/32x32/curve_intersect_axis.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -601,8 +601,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/arc.png</normaloff>:/icon/32x32/arc.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/arc.png</normaloff>:/toolicon/32x32/arc.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -627,8 +627,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/arc_cut.png</normaloff>:/icon/32x32/arc_cut.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/arc_cut.png</normaloff>:/toolicon/32x32/arc_cut.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -653,8 +653,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/arc_intersect_axis.png</normaloff>:/icon/32x32/arc_intersect_axis.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/arc_intersect_axis.png</normaloff>:/toolicon/32x32/arc_intersect_axis.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -679,8 +679,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/point_of_intersection_arcs.png</normaloff>:/icon/32x32/point_of_intersection_arcs.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/point_of_intersection_arcs.png</normaloff>:/toolicon/32x32/point_of_intersection_arcs.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -705,8 +705,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/point_of_intersection_circles.png</normaloff>:/icon/32x32/point_of_intersection_circles.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/point_of_intersection_circles.png</normaloff>:/toolicon/32x32/point_of_intersection_circles.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -731,8 +731,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/point_from_circle_and_tangent.png</normaloff>:/icon/32x32/point_from_circle_and_tangent.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/point_from_circle_and_tangent.png</normaloff>:/toolicon/32x32/point_from_circle_and_tangent.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -757,8 +757,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/point_from_arc_and_tangent.png</normaloff>:/icon/32x32/point_from_arc_and_tangent.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/point_from_arc_and_tangent.png</normaloff>:/toolicon/32x32/point_from_arc_and_tangent.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -807,8 +807,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/new_detail.png</normaloff>:/icon/32x32/new_detail.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/new_detail.png</normaloff>:/toolicon/32x32/new_detail.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -833,8 +833,8 @@
            <string notr="true">...</string>
           </property>
           <property name="icon">
-           <iconset resource="share/resources/icon.qrc">
-            <normaloff>:/icon/32x32/union.png</normaloff>:/icon/32x32/union.png</iconset>
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/union.png</normaloff>:/toolicon/32x32/union.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -1762,6 +1762,7 @@
  </tabstops>
  <resources>
   <include location="share/resources/icon.qrc"/>
+  <include location="share/resources/toolicon.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/app/share/resources/icon.qrc b/src/app/share/resources/icon.qrc
index bd9405c17..b04575823 100644
--- a/src/app/share/resources/icon.qrc
+++ b/src/app/share/resources/icon.qrc
@@ -9,29 +9,10 @@
         <file>icon/32x32/table.png</file>
         <file>icon/24x24/putHere.png</file>
         <file>icon/24x24/equal.png</file>
-        <file>icon/32x32/segment.png</file>
-        <file>icon/32x32/line.png</file>
-        <file>icon/32x32/along_line.png</file>
-        <file>icon/32x32/shoulder.png</file>
-        <file>icon/32x32/normal.png</file>
-        <file>icon/32x32/bisector.png</file>
-        <file>icon/32x32/intersect.png</file>
-        <file>icon/32x32/spline.png</file>
-        <file>icon/32x32/arc.png</file>
-        <file>icon/32x32/splinePath.png</file>
         <file>icon/32x32/history.png</file>
         <file>icon/32x32/put_after.png</file>
-        <file>icon/32x32/point_of_contact.png</file>
-        <file>icon/32x32/new_detail.png</file>
         <file>icon/32x32/layout.png</file>
         <file>icon/16x16/mirror.png</file>
-        <file>icon/32x32/height.png</file>
-        <file>icon/32x32/triangle.png</file>
-        <file>icon/32x32/point_of_intersection.png</file>
-        <file>icon/32x32/spline_cut_point.png</file>
-        <file>icon/32x32/splinePath_cut_point.png</file>
-        <file>icon/32x32/union.png</file>
-        <file>icon/32x32/arc_cut.png</file>
         <file>icon/config.png</file>
         <file>icon/pattern_config.png</file>
         <file>icon/Graduation.png</file>
@@ -49,9 +30,6 @@
         <file>icon/path_config.png</file>
         <file>icon/16x16/info.png</file>
         <file>icon/16x16/measurement.png</file>
-        <file>icon/32x32/line_intersect_axis.png</file>
-        <file>icon/32x32/arc_intersect_axis.png</file>
-        <file>icon/32x32/curve_intersect_axis.png</file>
         <file>icon/16x16/landscape.png</file>
         <file>icon/16x16/portrait.png</file>
         <file>icon/16x16/template.png</file>
@@ -61,9 +39,5 @@
         <file>icon/16x16/roll.png</file>
         <file>icon/16x16/progress.gif</file>
         <file>icon/32x32/export_to_picture_document.png</file>
-        <file>icon/32x32/point_of_intersection_arcs.png</file>
-        <file>icon/32x32/point_of_intersection_circles.png</file>
-        <file>icon/32x32/point_from_circle_and_tangent.png</file>
-        <file>icon/32x32/point_from_arc_and_tangent.png</file>
     </qresource>
 </RCC>
diff --git a/src/app/share/resources/toolicon.qrc b/src/app/share/resources/toolicon.qrc
new file mode 100644
index 000000000..b54b46c86
--- /dev/null
+++ b/src/app/share/resources/toolicon.qrc
@@ -0,0 +1,30 @@
+<RCC>
+    <qresource prefix="/">
+        <file>toolicon/32x32/along_line.png</file>
+        <file>toolicon/32x32/arc.png</file>
+        <file>toolicon/32x32/arc_cut.png</file>
+        <file>toolicon/32x32/arc_intersect_axis.png</file>
+        <file>toolicon/32x32/bisector.png</file>
+        <file>toolicon/32x32/curve_intersect_axis.png</file>
+        <file>toolicon/32x32/height.png</file>
+        <file>toolicon/32x32/intersect.png</file>
+        <file>toolicon/32x32/line.png</file>
+        <file>toolicon/32x32/line_intersect_axis.png</file>
+        <file>toolicon/32x32/normal.png</file>
+        <file>toolicon/32x32/point_from_arc_and_tangent.png</file>
+        <file>toolicon/32x32/point_from_circle_and_tangent.png</file>
+        <file>toolicon/32x32/point_of_contact.png</file>
+        <file>toolicon/32x32/point_of_intersection.png</file>
+        <file>toolicon/32x32/point_of_intersection_arcs.png</file>
+        <file>toolicon/32x32/point_of_intersection_circles.png</file>
+        <file>toolicon/32x32/segment.png</file>
+        <file>toolicon/32x32/shoulder.png</file>
+        <file>toolicon/32x32/spline.png</file>
+        <file>toolicon/32x32/spline_cut_point.png</file>
+        <file>toolicon/32x32/splinePath.png</file>
+        <file>toolicon/32x32/splinePath_cut_point.png</file>
+        <file>toolicon/32x32/triangle.png</file>
+        <file>toolicon/32x32/union.png</file>
+        <file>toolicon/32x32/new_detail.png</file>
+    </qresource>
+</RCC>
diff --git a/src/app/share/resources/icon/32x32/along_line.png b/src/app/share/resources/toolicon/32x32/along_line.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/along_line.png
rename to src/app/share/resources/toolicon/32x32/along_line.png
diff --git a/src/app/share/resources/icon/32x32/arc.png b/src/app/share/resources/toolicon/32x32/arc.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/arc.png
rename to src/app/share/resources/toolicon/32x32/arc.png
diff --git a/src/app/share/resources/icon/32x32/arc_cut.png b/src/app/share/resources/toolicon/32x32/arc_cut.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/arc_cut.png
rename to src/app/share/resources/toolicon/32x32/arc_cut.png
diff --git a/src/app/share/resources/icon/32x32/arc_intersect_axis.png b/src/app/share/resources/toolicon/32x32/arc_intersect_axis.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/arc_intersect_axis.png
rename to src/app/share/resources/toolicon/32x32/arc_intersect_axis.png
diff --git a/src/app/share/resources/icon/32x32/bisector.png b/src/app/share/resources/toolicon/32x32/bisector.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/bisector.png
rename to src/app/share/resources/toolicon/32x32/bisector.png
diff --git a/src/app/share/resources/icon/32x32/curve_intersect_axis.png b/src/app/share/resources/toolicon/32x32/curve_intersect_axis.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/curve_intersect_axis.png
rename to src/app/share/resources/toolicon/32x32/curve_intersect_axis.png
diff --git a/src/app/share/resources/icon/32x32/height.png b/src/app/share/resources/toolicon/32x32/height.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/height.png
rename to src/app/share/resources/toolicon/32x32/height.png
diff --git a/src/app/share/resources/icon/32x32/intersect.png b/src/app/share/resources/toolicon/32x32/intersect.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/intersect.png
rename to src/app/share/resources/toolicon/32x32/intersect.png
diff --git a/src/app/share/resources/icon/32x32/line.png b/src/app/share/resources/toolicon/32x32/line.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/line.png
rename to src/app/share/resources/toolicon/32x32/line.png
diff --git a/src/app/share/resources/icon/32x32/line_intersect_axis.png b/src/app/share/resources/toolicon/32x32/line_intersect_axis.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/line_intersect_axis.png
rename to src/app/share/resources/toolicon/32x32/line_intersect_axis.png
diff --git a/src/app/share/resources/icon/32x32/new_detail.png b/src/app/share/resources/toolicon/32x32/new_detail.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/new_detail.png
rename to src/app/share/resources/toolicon/32x32/new_detail.png
diff --git a/src/app/share/resources/icon/32x32/normal.png b/src/app/share/resources/toolicon/32x32/normal.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/normal.png
rename to src/app/share/resources/toolicon/32x32/normal.png
diff --git a/src/app/share/resources/icon/32x32/point_from_arc_and_tangent.png b/src/app/share/resources/toolicon/32x32/point_from_arc_and_tangent.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/point_from_arc_and_tangent.png
rename to src/app/share/resources/toolicon/32x32/point_from_arc_and_tangent.png
diff --git a/src/app/share/resources/icon/32x32/point_from_circle_and_tangent.png b/src/app/share/resources/toolicon/32x32/point_from_circle_and_tangent.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/point_from_circle_and_tangent.png
rename to src/app/share/resources/toolicon/32x32/point_from_circle_and_tangent.png
diff --git a/src/app/share/resources/icon/32x32/point_of_contact.png b/src/app/share/resources/toolicon/32x32/point_of_contact.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/point_of_contact.png
rename to src/app/share/resources/toolicon/32x32/point_of_contact.png
diff --git a/src/app/share/resources/icon/32x32/point_of_intersection.png b/src/app/share/resources/toolicon/32x32/point_of_intersection.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/point_of_intersection.png
rename to src/app/share/resources/toolicon/32x32/point_of_intersection.png
diff --git a/src/app/share/resources/icon/32x32/point_of_intersection_arcs.png b/src/app/share/resources/toolicon/32x32/point_of_intersection_arcs.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/point_of_intersection_arcs.png
rename to src/app/share/resources/toolicon/32x32/point_of_intersection_arcs.png
diff --git a/src/app/share/resources/icon/32x32/point_of_intersection_circles.png b/src/app/share/resources/toolicon/32x32/point_of_intersection_circles.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/point_of_intersection_circles.png
rename to src/app/share/resources/toolicon/32x32/point_of_intersection_circles.png
diff --git a/src/app/share/resources/icon/32x32/segment.png b/src/app/share/resources/toolicon/32x32/segment.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/segment.png
rename to src/app/share/resources/toolicon/32x32/segment.png
diff --git a/src/app/share/resources/icon/32x32/shoulder.png b/src/app/share/resources/toolicon/32x32/shoulder.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/shoulder.png
rename to src/app/share/resources/toolicon/32x32/shoulder.png
diff --git a/src/app/share/resources/icon/32x32/spline.png b/src/app/share/resources/toolicon/32x32/spline.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/spline.png
rename to src/app/share/resources/toolicon/32x32/spline.png
diff --git a/src/app/share/resources/icon/32x32/splinePath.png b/src/app/share/resources/toolicon/32x32/splinePath.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/splinePath.png
rename to src/app/share/resources/toolicon/32x32/splinePath.png
diff --git a/src/app/share/resources/icon/32x32/splinePath_cut_point.png b/src/app/share/resources/toolicon/32x32/splinePath_cut_point.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/splinePath_cut_point.png
rename to src/app/share/resources/toolicon/32x32/splinePath_cut_point.png
diff --git a/src/app/share/resources/icon/32x32/spline_cut_point.png b/src/app/share/resources/toolicon/32x32/spline_cut_point.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/spline_cut_point.png
rename to src/app/share/resources/toolicon/32x32/spline_cut_point.png
diff --git a/src/app/share/resources/icon/32x32/triangle.png b/src/app/share/resources/toolicon/32x32/triangle.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/triangle.png
rename to src/app/share/resources/toolicon/32x32/triangle.png
diff --git a/src/app/share/resources/icon/32x32/union.png b/src/app/share/resources/toolicon/32x32/union.png
similarity index 100%
rename from src/app/share/resources/icon/32x32/union.png
rename to src/app/share/resources/toolicon/32x32/union.png
diff --git a/src/app/share/resources/icon/svg/arc_intersect_axis.svg b/src/app/share/resources/toolicon/svg/arc_intersect_axis.svg
similarity index 100%
rename from src/app/share/resources/icon/svg/arc_intersect_axis.svg
rename to src/app/share/resources/toolicon/svg/arc_intersect_axis.svg
diff --git a/src/app/share/resources/icon/svg/curve_intersect_axis.svg b/src/app/share/resources/toolicon/svg/curve_intersect_axis.svg
similarity index 100%
rename from src/app/share/resources/icon/svg/curve_intersect_axis.svg
rename to src/app/share/resources/toolicon/svg/curve_intersect_axis.svg
diff --git a/src/app/share/resources/icon/svg/line_intersect_axis.svg b/src/app/share/resources/toolicon/svg/line_intersect_axis.svg
similarity index 100%
rename from src/app/share/resources/icon/svg/line_intersect_axis.svg
rename to src/app/share/resources/toolicon/svg/line_intersect_axis.svg
diff --git a/src/app/share/resources/icon/svg/point_from_arc_and_tangent.svg b/src/app/share/resources/toolicon/svg/point_from_arc_and_tangent.svg
similarity index 100%
rename from src/app/share/resources/icon/svg/point_from_arc_and_tangent.svg
rename to src/app/share/resources/toolicon/svg/point_from_arc_and_tangent.svg
diff --git a/src/app/share/resources/icon/svg/point_from_circle_and_tangent.svg b/src/app/share/resources/toolicon/svg/point_from_circle_and_tangent.svg
similarity index 100%
rename from src/app/share/resources/icon/svg/point_from_circle_and_tangent.svg
rename to src/app/share/resources/toolicon/svg/point_from_circle_and_tangent.svg
diff --git a/src/app/share/resources/icon/svg/point_of_contact.svg b/src/app/share/resources/toolicon/svg/point_of_contact.svg
similarity index 100%
rename from src/app/share/resources/icon/svg/point_of_contact.svg
rename to src/app/share/resources/toolicon/svg/point_of_contact.svg
diff --git a/src/app/share/resources/icon/svg/point_of_intersection_arcs.svg b/src/app/share/resources/toolicon/svg/point_of_intersection_arcs.svg
similarity index 100%
rename from src/app/share/resources/icon/svg/point_of_intersection_arcs.svg
rename to src/app/share/resources/toolicon/svg/point_of_intersection_arcs.svg
diff --git a/src/app/share/resources/icon/svg/point_of_intersection_circles.svg b/src/app/share/resources/toolicon/svg/point_of_intersection_circles.svg
similarity index 100%
rename from src/app/share/resources/icon/svg/point_of_intersection_circles.svg
rename to src/app/share/resources/toolicon/svg/point_of_intersection_circles.svg