From: nds <nds@opencascade.com>
Date: Mon, 18 Apr 2016 08:28:21 +0000 (+0300)
Subject: Issue #1309 Management of icons - icons are moved into corresponded plugins. The... 
X-Git-Tag: V_2.3.0~205
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=42a0eadea64d278ba043680cfee74fa2f1c0f688;p=modules%2Fshaper.git

Issue #1309 Management of icons - icons are moved into corresponded plugins. The installation path is the plugin XML directory with icons/<plugin_name> subfolders.
---

diff --git a/src/ConnectorPlugin/CMakeLists.txt b/src/ConnectorPlugin/CMakeLists.txt
index cc988831e..66d39800c 100644
--- a/src/ConnectorPlugin/CMakeLists.txt
+++ b/src/ConnectorPlugin/CMakeLists.txt
@@ -9,7 +9,12 @@ SET(XML_RESOURCES
   plugin-Connector.xml
 )
 
+SET(ICON_RESOURCES
+  icons/geom_export.png
+)
+
 ADD_CUSTOM_TARGET(ConnectorPlugin SOURCES ${PYTHON_FILES} ${XML_RESOURCES})
 
 INSTALL(FILES ${PYTHON_FILES} DESTINATION ${SHAPER_INSTALL_PYTHON_FILES})
 INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
+INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Connector)
diff --git a/src/ConnectorPlugin/icons/geom_export.png b/src/ConnectorPlugin/icons/geom_export.png
new file mode 100644
index 000000000..cb8bc6bd9
Binary files /dev/null and b/src/ConnectorPlugin/icons/geom_export.png differ
diff --git a/src/ConstructionPlugin/CMakeLists.txt b/src/ConstructionPlugin/CMakeLists.txt
index 2d379a45d..2d926b9d5 100644
--- a/src/ConstructionPlugin/CMakeLists.txt
+++ b/src/ConstructionPlugin/CMakeLists.txt
@@ -32,12 +32,22 @@ SET(PROJECT_LIBRARIES
     GeomAlgoAPI
 )
 
+SET(ICON_RESOURCES
+  icons/axis.png
+  icons/by_two_points_32x32.png
+  icons/circle.png
+  icons/cylindrical_face_32x32.png
+  icons/plane.png
+  icons/point.png
+)
+
 ADD_DEFINITIONS(-DCONSTRUCTIONPLUGIN_EXPORTS)
 ADD_LIBRARY(ConstructionPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
 TARGET_LINK_LIBRARIES(ConstructionPlugin ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS ConstructionPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
 INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
+INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Construction)
 
 INCLUDE_DIRECTORIES(
   ../Config
diff --git a/src/ConstructionPlugin/axis_widget.xml b/src/ConstructionPlugin/axis_widget.xml
index b683cceed..4f0711c14 100644
--- a/src/ConstructionPlugin/axis_widget.xml
+++ b/src/ConstructionPlugin/axis_widget.xml
@@ -2,10 +2,10 @@
 
 <source>
   <toolbox id="CreationMethod">
-    <box id="AxisByPointsCase" title="By two points" icon=":icons/by_two_points_32x32.png">
+    <box id="AxisByPointsCase" title="By two points" icon="icons/Construction/by_two_points_32x32.png">
       <shape_selector id="FirstPoint"
         label="First point"
-        icon=":icons/point.png"
+        icon="icons/Construction/point.png"
         tooltip="Select a first point"
         shape_types="vertex">
         <validator id="GeomValidators_ConstructionComposite"/>
@@ -13,7 +13,7 @@
       </shape_selector>
       <shape_selector id="SecondPoint"
         label="Second point"
-        icon=":icons/point.png"
+        icon="icons/Construction/point.png"
         tooltip="Select a second point"
         shape_types="vertex">
         <validator id="GeomValidators_ConstructionComposite"/>
@@ -21,10 +21,10 @@
         <validator id="GeomValidators_DifferentShapes"/>
       </shape_selector>
     </box>
-    <box id="AxisByCylindricalFaceCase" title="As axis of cylindrical face" icon=":icons/cylindrical_face_32x32.png">
+    <box id="AxisByCylindricalFaceCase" title="As axis of cylindrical face" icon="icons/Construction/cylindrical_face_32x32.png">
       <shape_selector id="CylindricalFace"
         label="Main object" 
-        icon=":icons/circle.png" 
+        icon="icons/Construction/circle.png" 
         tooltip="Select a cylindrical object"
         shape_types="face solid shell">
         <validator id="GeomValidators_Face" parameters="cylinder"/>
diff --git a/src/ConstructionPlugin/icons/axis.png b/src/ConstructionPlugin/icons/axis.png
new file mode 100755
index 000000000..015d270bf
Binary files /dev/null and b/src/ConstructionPlugin/icons/axis.png differ
diff --git a/src/ConstructionPlugin/icons/by_two_points_32x32.png b/src/ConstructionPlugin/icons/by_two_points_32x32.png
new file mode 100644
index 000000000..5f20fb8b7
Binary files /dev/null and b/src/ConstructionPlugin/icons/by_two_points_32x32.png differ
diff --git a/src/ConstructionPlugin/icons/circle.png b/src/ConstructionPlugin/icons/circle.png
new file mode 100755
index 000000000..6f311635d
Binary files /dev/null and b/src/ConstructionPlugin/icons/circle.png differ
diff --git a/src/ConstructionPlugin/icons/cylindrical_face_32x32.png b/src/ConstructionPlugin/icons/cylindrical_face_32x32.png
new file mode 100644
index 000000000..e82010154
Binary files /dev/null and b/src/ConstructionPlugin/icons/cylindrical_face_32x32.png differ
diff --git a/src/ConstructionPlugin/icons/plane.png b/src/ConstructionPlugin/icons/plane.png
new file mode 100755
index 000000000..1da328269
Binary files /dev/null and b/src/ConstructionPlugin/icons/plane.png differ
diff --git a/src/ConstructionPlugin/icons/plane_32x32.png b/src/ConstructionPlugin/icons/plane_32x32.png
new file mode 100644
index 000000000..8487d8282
Binary files /dev/null and b/src/ConstructionPlugin/icons/plane_32x32.png differ
diff --git a/src/ConstructionPlugin/icons/point.png b/src/ConstructionPlugin/icons/point.png
new file mode 100755
index 000000000..96149ebf3
Binary files /dev/null and b/src/ConstructionPlugin/icons/point.png differ
diff --git a/src/ConstructionPlugin/plugin-Construction.xml b/src/ConstructionPlugin/plugin-Construction.xml
index aad7e762a..5ee7c849f 100644
--- a/src/ConstructionPlugin/plugin-Construction.xml
+++ b/src/ConstructionPlugin/plugin-Construction.xml
@@ -7,21 +7,21 @@
         id="Point"
         title="Point"
         tooltip="Create point"
-        icon=":icons/point.png">
+        icon="icons/Construction/point.png">
         <source path="point_widget.xml" />
       </feature>
       <feature
         id="Axis"
         title="Axis"
         tooltip="Create axis"
-        icon=":icons/axis.png">
+        icon="icons/Construction/axis.png">
         <source path="axis_widget.xml" />
       </feature>
       <feature
         id="Plane"
         title="Plane"
         tooltip="Create plane"
-        icon=":icons/plane.png">
+        icon="icons/Construction/plane.png">
         <source path="plane_widget.xml" />
       </feature>
     </group>
diff --git a/src/ExchangePlugin/CMakeLists.txt b/src/ExchangePlugin/CMakeLists.txt
index 73d251f10..d170f309f 100644
--- a/src/ExchangePlugin/CMakeLists.txt
+++ b/src/ExchangePlugin/CMakeLists.txt
@@ -39,6 +39,11 @@ SET(PROJECT_LIBRARIES
     GeomAlgoAPI
 )
 
+SET(ICON_RESOURCES
+  icons/export.png
+  icons/import.png
+)
+
 ADD_DEFINITIONS(-DEXCHANGEPLUGIN_EXPORTS)
 ADD_LIBRARY(ExchangePlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
 
@@ -46,6 +51,7 @@ TARGET_LINK_LIBRARIES(ExchangePlugin ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS ExchangePlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
 INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
+INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Exchange)
 
 ADD_UNIT_TESTS(TestImport.py TestExport.py)
 
diff --git a/src/ExchangePlugin/icons/export.png b/src/ExchangePlugin/icons/export.png
new file mode 100644
index 000000000..55ebd4526
Binary files /dev/null and b/src/ExchangePlugin/icons/export.png differ
diff --git a/src/ExchangePlugin/icons/import.png b/src/ExchangePlugin/icons/import.png
new file mode 100644
index 000000000..c1d417542
Binary files /dev/null and b/src/ExchangePlugin/icons/import.png differ
diff --git a/src/ExchangePlugin/plugin-Exchange.xml b/src/ExchangePlugin/plugin-Exchange.xml
index 1dfef175e..9555ff2ee 100644
--- a/src/ExchangePlugin/plugin-Exchange.xml
+++ b/src/ExchangePlugin/plugin-Exchange.xml
@@ -3,12 +3,12 @@
 <plugin>
   <workbench id="Part">
     <group id="Exchange">
-      <feature id="Import" title="Import" tooltip="Import a file" icon=":icons/import.png" document="Part">
+      <feature id="Import" title="Import" tooltip="Import a file" icon="icons/Exchange/import.png" document="Part">
         <file_selector id="file_path" title="Import file" path="">
           <validator id="ExchangePlugin_ImportFormat" parameters="BREP|BRP:BREP,STEP|STP:STEP,IGES|IGS:IGES" />
         </file_selector>
       </feature>
-      <feature id="Export" title="Export" tooltip="Export to file" icon=":icons/export.png">
+      <feature id="Export" title="Export" tooltip="Export to file" icon="icons/Exchange/export.png">
         <export_file_selector id="file_path" type="save" title="Export file" path="">
           <validator id="ExchangePlugin_ExportFormat" parameters="BREP|BRP:BREP,STEP|STP:STEP,IGES|IGS:IGES-5.1,IGES|IGS:IGES-5.3" />
         </export_file_selector>
diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index 3e9bbfd27..3e8e87e19 100644
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -89,12 +89,64 @@ SET(PROJECT_LIBRARIES
     GeomValidators
 )
 
+SET(ICON_RESOURCES
+  icons/angle.png
+  icons/angle_down.png
+  icons/angle_up.png
+  icons/angle_up_down.png
+  icons/angle_up_down_32x32.png
+  icons/axis.png
+  icons/bool_common.png
+  icons/bool_cut.png
+  icons/bool_fuse.png
+  icons/bool_smash.png
+  icons/common.png
+  icons/cut.png
+  icons/cut_shape.png
+  icons/cut_tool.png
+  icons/dimension_down.png
+  icons/dimension_down_32x32.png
+  icons/dimension_up.png
+  icons/dimension_up_32x32.png
+  icons/dimension_up_down.png
+  icons/dimension_up_down_32x32.png
+  icons/dimension_v.png
+  icons/dimension_v_32x32.png
+  icons/dimension_vert_32x32.png
+  icons/extrusion.png
+  icons/extrusion_cut.png
+  icons/extrusion_fuse.png
+  icons/extrusionsketch.png
+  icons/feature_wire.png
+  icons/fusion.png
+  icons/intersection.png
+  icons/movement.png
+  icons/partition.png
+  icons/pipe.png
+  icons/pipe_binormal_32x32.png
+  icons/pipe_locations_32x32.png
+  icons/pipe_simple_32x32.png
+  icons/placement.png
+  icons/placement_from.png
+  icons/placement_to.png
+  icons/plane.png
+  icons/plane_inverted.png
+  icons/plane_inverted_32x32.png
+  icons/revol_cut.png
+  icons/revol_fuse.png
+  icons/revolsketch.png
+  icons/rotation.png
+  icons/shape_group.png
+  icons/sketch.png
+)
+
 ADD_DEFINITIONS(-DFEATURESPLUGIN_EXPORTS)
 ADD_LIBRARY(FeaturesPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
 TARGET_LINK_LIBRARIES(FeaturesPlugin ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS FeaturesPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
 INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
+INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Features)
 
 ADD_UNIT_TESTS(TestExtrusion.py
                TestExtrusionCut.py
diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index 75be156a4..109fa58cb 100644
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -8,7 +8,7 @@
     tooltip="Type of boolean operation"
     string_list="Cut Fuse Common Smash"
     use_in_title="true"
-    icons_list=":icons/bool_cut.png :icons/bool_fuse.png :icons/bool_common.png :icons/bool_smash.png"
+    icons_list="icons/Features/bool_cut.png :icons/bool_fuse.png :icons/bool_common.png :icons/bool_smash.png"
     default="0"
   />
   <multi_selector id="main_objects"
diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml
index 9ed078fbb..012d5671e 100644
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -17,7 +17,7 @@
     <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell"/>
   </multi_selector>
   <shape_selector id="direction_object"
-                  icon=":icons/axis.png"
+                  icon="icons/Features/axis.png"
                   label="Direction"
                   tooltip="Select an edge for direction"
                   shape_types="edge"
@@ -27,13 +27,13 @@
   <toolbox id="CreationMethod">
     <box id="BySizes"
          title="By sizes"
-         icon=":icons/dimension_up_down_32x32.png">
+         icon="icons/Features/dimension_up_down_32x32.png">
       <groupbox>
         <doublevalue id="to_size"
                      label="Size"
                      step="1.0"
                      default="10"
-                     icon=":icons/dimension_up.png"
+                     icon="icons/Features/dimension_up.png"
                      tooltip="To size"/>
       </groupbox>
       <groupbox>
@@ -41,16 +41,16 @@
                      label="Size"
                      step="1.0"
                      default="0"
-                     icon=":icons/dimension_down.png"
+                     icon="icons/Features/dimension_down.png"
                      tooltip="From size"/>
       </groupbox>
     </box>
     <box id="ByPlanesAndOffsets"
          title="By bounding planes and offsets"
-         icon=":icons/plane_inverted_32x32.png">
+         icon="icons/Features/plane_inverted_32x32.png">
       <groupbox title="From">
         <shape_selector id="from_object"
-                        icon=":icons/plane.png"
+                        icon="icons/Features/plane.png"
                         label="Plane face"
                         tooltip="Bounding plane (select a planar face)"
                         shape_types="face"
@@ -61,12 +61,12 @@
                      label="Offset"
                      step="1.0"
                      default="0"
-                     icon=":icons/dimension_up_down.png"
+                     icon="icons/Features/dimension_up_down.png"
                      tooltip="Offset for &quot;from&quot; bounding plane"/>
       </groupbox>
       <groupbox title="To">
         <shape_selector id="to_object"
-                        icon=":icons/plane_inverted.png"
+                        icon="icons/Features/plane_inverted.png"
                         label="Plane face"
                         tooltip="Bounding plane (select a planar face)"
                         shape_types="face"
@@ -77,7 +77,7 @@
                      label="Offset"
                      step="1.0"
                      default="0"
-                     icon=":icons/dimension_up_down.png"
+                     icon="icons/Features/dimension_up_down.png"
                      tooltip="Offset for &quot;to&quot; bounding plane"/>
       </groupbox>
     </box>
diff --git a/src/FeaturesPlugin/extrusioncut_widget.xml b/src/FeaturesPlugin/extrusioncut_widget.xml
index 7f6bf48ff..833f390ef 100755
--- a/src/FeaturesPlugin/extrusioncut_widget.xml
+++ b/src/FeaturesPlugin/extrusioncut_widget.xml
@@ -13,13 +13,13 @@
     </sketch_launcher>
     <multi_selector id="base"
       label="Select a sketch face"
-      icon=":icons/sketch.png"
+      icon="icons/Features/sketch.png"
       tooltip="Select a sketch face"
       type_choice="Faces Objects">
       <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="face,shell"/>
     </multi_selector>
     <shape_selector id="direction_object"
-                    icon=":icons/axis.png"
+                    icon="icons/Features/axis.png"
                     label="Direction"
                     tooltip="Select an edge for direction"
                     shape_types="edge"
@@ -27,14 +27,14 @@
       <validator id="GeomValidators_ShapeType" parameters="empty,line"/>
     </shape_selector>
     <toolbox id="CreationMethod">
-      <box id="BySizes" title="By sizes" icon=":icons/dimension_up_down_32x32.png">
+      <box id="BySizes" title="By sizes" icon="icons/Features/dimension_up_down_32x32.png">
         <groupbox>
           <doublevalue
             id="to_size"
             label="Size"
             step="1.0"
             default="0"
-            icon=":icons/dimension_up.png"
+            icon="icons/Features/dimension_up.png"
             tooltip="To size">
           </doublevalue>
         </groupbox>
@@ -44,15 +44,15 @@
             label="Size"
             step="1.0"
             default="10"
-            icon=":icons/dimension_down.png"
+            icon="icons/Features/dimension_down.png"
             tooltip="From size">
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
+      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon="icons/Features/plane_inverted_32x32.png">
         <groupbox title="From">
           <shape_selector id="from_object"
-                          icon=":icons/plane.png"
+                          icon="icons/Features/plane.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
@@ -61,13 +61,13 @@
           </shape_selector>
           <doublevalue id="from_offset"
             label="Offset" step="1.0" default="0"
-            icon=":icons/dimension_up_down.png"
+            icon="icons/Features/dimension_up_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
         <groupbox title="To">
           <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+                          icon="icons/Features/plane_inverted.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
@@ -76,7 +76,7 @@
           </shape_selector>
           <doublevalue  id="to_offset"
             label="Offset" step="1.0" default="0"
-            icon=":icons/dimension_up_down.png"
+            icon="icons/Features/dimension_up_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
@@ -85,7 +85,7 @@
   </groupbox>
   <multi_selector id="main_objects"
     label="Cut from:"
-    icon=":icons/cut_shape.png"
+    icon="icons/Features/cut_shape.png"
     tooltip="Objects to Cut"
     type_choice="Solids"
     concealment="true">
diff --git a/src/FeaturesPlugin/extrusionfuse_widget.xml b/src/FeaturesPlugin/extrusionfuse_widget.xml
index f6d9675c9..9dfda52f4 100644
--- a/src/FeaturesPlugin/extrusionfuse_widget.xml
+++ b/src/FeaturesPlugin/extrusionfuse_widget.xml
@@ -13,13 +13,13 @@
     </sketch_launcher>
     <multi_selector id="base"
       label="Select a sketch face"
-      icon=":icons/sketch.png"
+      icon="icons/Features/sketch.png"
       tooltip="Select a sketch face"
       type_choice="Faces Objects">
       <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell"/>
     </multi_selector>
     <shape_selector id="direction_object"
-                    icon=":icons/axis.png"
+                    icon="icons/Features/axis.png"
                     label="Direction"
                     tooltip="Select an edge for direction"
                     shape_types="edge"
@@ -27,14 +27,14 @@
       <validator id="GeomValidators_ShapeType" parameters="empty,line"/>
     </shape_selector>
     <toolbox id="CreationMethod">
-      <box id="BySizes" title="By sizes" icon=":icons/dimension_up_down_32x32.png">
+      <box id="BySizes" title="By sizes" icon="icons/Features/dimension_up_down_32x32.png">
         <groupbox>
           <doublevalue
             id="to_size"
             label="Size"
             step="1.0"
             default="10"
-            icon=":icons/dimension_up.png"
+            icon="icons/Features/dimension_up.png"
             tooltip="To size">
           </doublevalue>
         </groupbox>
@@ -44,15 +44,15 @@
             label="Size"
             step="1.0"
             default="0"
-            icon=":icons/dimension_down.png"
+            icon="icons/Features/dimension_down.png"
             tooltip="From size">
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
+      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon="icons/Features/plane_inverted_32x32.png">
         <groupbox title="From">
           <shape_selector id="from_object"
-                          icon=":icons/plane.png"
+                          icon="icons/Features/plane.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
@@ -61,13 +61,13 @@
           </shape_selector>
           <doublevalue id="from_offset"
             label="Offset" step="1.0" default="0"
-            icon=":icons/dimension_up_down.png"
+            icon="icons/Features/dimension_up_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
         <groupbox title="To">
           <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+                          icon="icons/Features/plane_inverted.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
@@ -76,7 +76,7 @@
           </shape_selector>
           <doublevalue  id="to_offset"
             label="Offset" step="1.0" default="0"
-            icon=":icons/dimension_up_down.png"
+            icon="icons/Features/dimension_up_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
@@ -85,7 +85,7 @@
   </groupbox>
   <multi_selector id="main_objects"
     label="Fuse with:"
-    icon=":icons/cut_shape.png"
+    icon="icons/Features/cut_shape.png"
     tooltip="Objects to Fuse"
     type_choice="Solids"
     concealment="true">
diff --git a/src/FeaturesPlugin/icons/angle.png b/src/FeaturesPlugin/icons/angle.png
new file mode 100755
index 000000000..e401acd67
Binary files /dev/null and b/src/FeaturesPlugin/icons/angle.png differ
diff --git a/src/FeaturesPlugin/icons/angle_down.png b/src/FeaturesPlugin/icons/angle_down.png
new file mode 100644
index 000000000..688699c11
Binary files /dev/null and b/src/FeaturesPlugin/icons/angle_down.png differ
diff --git a/src/FeaturesPlugin/icons/angle_up.png b/src/FeaturesPlugin/icons/angle_up.png
new file mode 100644
index 000000000..c1d244283
Binary files /dev/null and b/src/FeaturesPlugin/icons/angle_up.png differ
diff --git a/src/FeaturesPlugin/icons/angle_up_down.png b/src/FeaturesPlugin/icons/angle_up_down.png
new file mode 100644
index 000000000..a0a82e85b
Binary files /dev/null and b/src/FeaturesPlugin/icons/angle_up_down.png differ
diff --git a/src/FeaturesPlugin/icons/angle_up_down_32x32.png b/src/FeaturesPlugin/icons/angle_up_down_32x32.png
new file mode 100644
index 000000000..25cb0e556
Binary files /dev/null and b/src/FeaturesPlugin/icons/angle_up_down_32x32.png differ
diff --git a/src/FeaturesPlugin/icons/axis.png b/src/FeaturesPlugin/icons/axis.png
new file mode 100644
index 000000000..015d270bf
Binary files /dev/null and b/src/FeaturesPlugin/icons/axis.png differ
diff --git a/src/FeaturesPlugin/icons/bool_common.png b/src/FeaturesPlugin/icons/bool_common.png
new file mode 100644
index 000000000..99812c546
Binary files /dev/null and b/src/FeaturesPlugin/icons/bool_common.png differ
diff --git a/src/FeaturesPlugin/icons/bool_cut.png b/src/FeaturesPlugin/icons/bool_cut.png
new file mode 100644
index 000000000..dd494d7d8
Binary files /dev/null and b/src/FeaturesPlugin/icons/bool_cut.png differ
diff --git a/src/FeaturesPlugin/icons/bool_fuse.png b/src/FeaturesPlugin/icons/bool_fuse.png
new file mode 100644
index 000000000..5369a50a5
Binary files /dev/null and b/src/FeaturesPlugin/icons/bool_fuse.png differ
diff --git a/src/FeaturesPlugin/icons/bool_smash.png b/src/FeaturesPlugin/icons/bool_smash.png
new file mode 100644
index 000000000..bf82ac272
Binary files /dev/null and b/src/FeaturesPlugin/icons/bool_smash.png differ
diff --git a/src/FeaturesPlugin/icons/common.png b/src/FeaturesPlugin/icons/common.png
new file mode 100644
index 000000000..461eb31fc
Binary files /dev/null and b/src/FeaturesPlugin/icons/common.png differ
diff --git a/src/FeaturesPlugin/icons/cut.png b/src/FeaturesPlugin/icons/cut.png
new file mode 100644
index 000000000..67f1b36bc
Binary files /dev/null and b/src/FeaturesPlugin/icons/cut.png differ
diff --git a/src/FeaturesPlugin/icons/cut_shape.png b/src/FeaturesPlugin/icons/cut_shape.png
new file mode 100644
index 000000000..ea5fb26d6
Binary files /dev/null and b/src/FeaturesPlugin/icons/cut_shape.png differ
diff --git a/src/FeaturesPlugin/icons/cut_tool.png b/src/FeaturesPlugin/icons/cut_tool.png
new file mode 100644
index 000000000..4b2ad9c6a
Binary files /dev/null and b/src/FeaturesPlugin/icons/cut_tool.png differ
diff --git a/src/FeaturesPlugin/icons/dimension_down.png b/src/FeaturesPlugin/icons/dimension_down.png
new file mode 100644
index 000000000..de5682c71
Binary files /dev/null and b/src/FeaturesPlugin/icons/dimension_down.png differ
diff --git a/src/FeaturesPlugin/icons/dimension_down_32x32.png b/src/FeaturesPlugin/icons/dimension_down_32x32.png
new file mode 100644
index 000000000..2e56be4d3
Binary files /dev/null and b/src/FeaturesPlugin/icons/dimension_down_32x32.png differ
diff --git a/src/FeaturesPlugin/icons/dimension_up.png b/src/FeaturesPlugin/icons/dimension_up.png
new file mode 100644
index 000000000..bbd7b1456
Binary files /dev/null and b/src/FeaturesPlugin/icons/dimension_up.png differ
diff --git a/src/FeaturesPlugin/icons/dimension_up_32x32.png b/src/FeaturesPlugin/icons/dimension_up_32x32.png
new file mode 100644
index 000000000..8b6ad7ce5
Binary files /dev/null and b/src/FeaturesPlugin/icons/dimension_up_32x32.png differ
diff --git a/src/FeaturesPlugin/icons/dimension_up_down.png b/src/FeaturesPlugin/icons/dimension_up_down.png
new file mode 100644
index 000000000..d640b4903
Binary files /dev/null and b/src/FeaturesPlugin/icons/dimension_up_down.png differ
diff --git a/src/FeaturesPlugin/icons/dimension_up_down_32x32.png b/src/FeaturesPlugin/icons/dimension_up_down_32x32.png
new file mode 100644
index 000000000..adee89f65
Binary files /dev/null and b/src/FeaturesPlugin/icons/dimension_up_down_32x32.png differ
diff --git a/src/FeaturesPlugin/icons/dimension_v.png b/src/FeaturesPlugin/icons/dimension_v.png
new file mode 100644
index 000000000..15e26af43
Binary files /dev/null and b/src/FeaturesPlugin/icons/dimension_v.png differ
diff --git a/src/FeaturesPlugin/icons/dimension_v_32x32.png b/src/FeaturesPlugin/icons/dimension_v_32x32.png
new file mode 100644
index 000000000..a378dd635
Binary files /dev/null and b/src/FeaturesPlugin/icons/dimension_v_32x32.png differ
diff --git a/src/FeaturesPlugin/icons/dimension_vert_32x32.png b/src/FeaturesPlugin/icons/dimension_vert_32x32.png
new file mode 100644
index 000000000..b081893cd
Binary files /dev/null and b/src/FeaturesPlugin/icons/dimension_vert_32x32.png differ
diff --git a/src/FeaturesPlugin/icons/extrusion.png b/src/FeaturesPlugin/icons/extrusion.png
new file mode 100644
index 000000000..290c2e46b
Binary files /dev/null and b/src/FeaturesPlugin/icons/extrusion.png differ
diff --git a/src/FeaturesPlugin/icons/extrusion_cut.png b/src/FeaturesPlugin/icons/extrusion_cut.png
new file mode 100644
index 000000000..77ba5b3a4
Binary files /dev/null and b/src/FeaturesPlugin/icons/extrusion_cut.png differ
diff --git a/src/FeaturesPlugin/icons/extrusion_fuse.png b/src/FeaturesPlugin/icons/extrusion_fuse.png
new file mode 100644
index 000000000..0914eb7dc
Binary files /dev/null and b/src/FeaturesPlugin/icons/extrusion_fuse.png differ
diff --git a/src/FeaturesPlugin/icons/extrusionsketch.png b/src/FeaturesPlugin/icons/extrusionsketch.png
new file mode 100644
index 000000000..d370693dc
Binary files /dev/null and b/src/FeaturesPlugin/icons/extrusionsketch.png differ
diff --git a/src/FeaturesPlugin/icons/feature_wire.png b/src/FeaturesPlugin/icons/feature_wire.png
new file mode 100644
index 000000000..87b855649
Binary files /dev/null and b/src/FeaturesPlugin/icons/feature_wire.png differ
diff --git a/src/FeaturesPlugin/icons/fusion.png b/src/FeaturesPlugin/icons/fusion.png
new file mode 100644
index 000000000..ee8004040
Binary files /dev/null and b/src/FeaturesPlugin/icons/fusion.png differ
diff --git a/src/FeaturesPlugin/icons/intersection.png b/src/FeaturesPlugin/icons/intersection.png
new file mode 100644
index 000000000..bba96f48c
Binary files /dev/null and b/src/FeaturesPlugin/icons/intersection.png differ
diff --git a/src/FeaturesPlugin/icons/movement.png b/src/FeaturesPlugin/icons/movement.png
new file mode 100644
index 000000000..486419118
Binary files /dev/null and b/src/FeaturesPlugin/icons/movement.png differ
diff --git a/src/FeaturesPlugin/icons/partition.png b/src/FeaturesPlugin/icons/partition.png
new file mode 100755
index 000000000..eb34d43e6
Binary files /dev/null and b/src/FeaturesPlugin/icons/partition.png differ
diff --git a/src/FeaturesPlugin/icons/pipe.png b/src/FeaturesPlugin/icons/pipe.png
new file mode 100644
index 000000000..793874472
Binary files /dev/null and b/src/FeaturesPlugin/icons/pipe.png differ
diff --git a/src/FeaturesPlugin/icons/pipe_binormal_32x32.png b/src/FeaturesPlugin/icons/pipe_binormal_32x32.png
new file mode 100644
index 000000000..b262ec90a
Binary files /dev/null and b/src/FeaturesPlugin/icons/pipe_binormal_32x32.png differ
diff --git a/src/FeaturesPlugin/icons/pipe_locations_32x32.png b/src/FeaturesPlugin/icons/pipe_locations_32x32.png
new file mode 100644
index 000000000..5e384ce30
Binary files /dev/null and b/src/FeaturesPlugin/icons/pipe_locations_32x32.png differ
diff --git a/src/FeaturesPlugin/icons/pipe_simple_32x32.png b/src/FeaturesPlugin/icons/pipe_simple_32x32.png
new file mode 100644
index 000000000..793874472
Binary files /dev/null and b/src/FeaturesPlugin/icons/pipe_simple_32x32.png differ
diff --git a/src/FeaturesPlugin/icons/placement.png b/src/FeaturesPlugin/icons/placement.png
new file mode 100644
index 000000000..c100a3153
Binary files /dev/null and b/src/FeaturesPlugin/icons/placement.png differ
diff --git a/src/FeaturesPlugin/icons/placement_from.png b/src/FeaturesPlugin/icons/placement_from.png
new file mode 100755
index 000000000..3ccfd6682
Binary files /dev/null and b/src/FeaturesPlugin/icons/placement_from.png differ
diff --git a/src/FeaturesPlugin/icons/placement_to.png b/src/FeaturesPlugin/icons/placement_to.png
new file mode 100755
index 000000000..0faa8c3f5
Binary files /dev/null and b/src/FeaturesPlugin/icons/placement_to.png differ
diff --git a/src/FeaturesPlugin/icons/plane.png b/src/FeaturesPlugin/icons/plane.png
new file mode 100644
index 000000000..1da328269
Binary files /dev/null and b/src/FeaturesPlugin/icons/plane.png differ
diff --git a/src/FeaturesPlugin/icons/plane_inverted.png b/src/FeaturesPlugin/icons/plane_inverted.png
new file mode 100644
index 000000000..38577cb93
Binary files /dev/null and b/src/FeaturesPlugin/icons/plane_inverted.png differ
diff --git a/src/FeaturesPlugin/icons/plane_inverted_32x32.png b/src/FeaturesPlugin/icons/plane_inverted_32x32.png
new file mode 100644
index 000000000..49f81f8e9
Binary files /dev/null and b/src/FeaturesPlugin/icons/plane_inverted_32x32.png differ
diff --git a/src/FeaturesPlugin/icons/revol_cut.png b/src/FeaturesPlugin/icons/revol_cut.png
new file mode 100644
index 000000000..2a5dfe1e6
Binary files /dev/null and b/src/FeaturesPlugin/icons/revol_cut.png differ
diff --git a/src/FeaturesPlugin/icons/revol_fuse.png b/src/FeaturesPlugin/icons/revol_fuse.png
new file mode 100644
index 000000000..147b045fa
Binary files /dev/null and b/src/FeaturesPlugin/icons/revol_fuse.png differ
diff --git a/src/FeaturesPlugin/icons/revolsketch.png b/src/FeaturesPlugin/icons/revolsketch.png
new file mode 100644
index 000000000..f058a191c
Binary files /dev/null and b/src/FeaturesPlugin/icons/revolsketch.png differ
diff --git a/src/FeaturesPlugin/icons/rotation.png b/src/FeaturesPlugin/icons/rotation.png
new file mode 100644
index 000000000..cfc31b4ab
Binary files /dev/null and b/src/FeaturesPlugin/icons/rotation.png differ
diff --git a/src/FeaturesPlugin/icons/shape_group.png b/src/FeaturesPlugin/icons/shape_group.png
new file mode 100644
index 000000000..a00d1a263
Binary files /dev/null and b/src/FeaturesPlugin/icons/shape_group.png differ
diff --git a/src/FeaturesPlugin/icons/sketch.png b/src/FeaturesPlugin/icons/sketch.png
new file mode 100755
index 000000000..d55e89c1e
Binary files /dev/null and b/src/FeaturesPlugin/icons/sketch.png differ
diff --git a/src/FeaturesPlugin/intersection_widget.xml b/src/FeaturesPlugin/intersection_widget.xml
index 7dac829ae..cc8653d3f 100644
--- a/src/FeaturesPlugin/intersection_widget.xml
+++ b/src/FeaturesPlugin/intersection_widget.xml
@@ -3,7 +3,7 @@
 <source>
   <multi_selector id="main_objects"
     label="Main objects"
-    icon=":icons/cut_shape.png"
+    icon="icons/Features/cut_shape.png"
     tooltip="Select objects(objects, compsoilds, solids, shells, faces or edges)"
     type_choice="Solids Objects"
     use_choice="false"
@@ -13,7 +13,7 @@
   </multi_selector>
   <multi_selector id="tool_objects"
     label="Tool objects"
-    icon=":icons/cut_tool.png"
+    icon="icons/Features/cut_tool.png"
     tooltip="Select tools(objects, compsoilds, solids, shells, faces or edges)"
     type_choice="Solids Objects"
     use_choice="false"
diff --git a/src/FeaturesPlugin/partition_widget.xml b/src/FeaturesPlugin/partition_widget.xml
index d629ebe80..0c770c318 100755
--- a/src/FeaturesPlugin/partition_widget.xml
+++ b/src/FeaturesPlugin/partition_widget.xml
@@ -3,7 +3,7 @@
 <source>
   <multi_selector id="main_objects"
     label="Main objects"
-    icon=":icons/cut_shape.png"
+    icon="icons/Features/cut_shape.png"
     tooltip="Select solid objects"
     type_choice="Solids"
     concealment="true">
@@ -12,7 +12,7 @@
   </multi_selector>
   <multi_selector id="tool_objects"
     label="Tool objects"
-    icon=":icons/cut_tool.png"
+    icon="icons/Features/cut_tool.png"
     tooltip="Select a tool face or solid"
     type_choice="Faces Solids"
     use_choice="false"
diff --git a/src/FeaturesPlugin/pipe_widget.xml b/src/FeaturesPlugin/pipe_widget.xml
index 6d21e3f90..12ea74936 100644
--- a/src/FeaturesPlugin/pipe_widget.xml
+++ b/src/FeaturesPlugin/pipe_widget.xml
@@ -14,8 +14,8 @@
                   shape_types="edge wire">
   </shape_selector>
   <toolbox id="creation_method">
-    <box id="simple" title="Simple pipe by objects and path" icon=":icons/pipe_simple_32x32.png"/>
-    <box id="binormal" title="Pipe by objects, path and Bi-Normal" icon=":icons/pipe_binormal_32x32.png">
+    <box id="simple" title="Simple pipe by objects and path" icon="icons/Features/pipe_simple_32x32.png"/>
+    <box id="binormal" title="Pipe by objects, path and Bi-Normal" icon="icons/Features/pipe_binormal_32x32.png">
       <shape_selector id="binormal"
                       label="Bi-Normal:"
                       tooltip="Select an edge for Bi-Normal"
@@ -23,7 +23,7 @@
         <validator id="GeomValidators_ShapeType" parameters="line"/>
       </shape_selector>
     </box>
-    <box id="locations" title="Pipe by objects, path and locations" icon=":icons/pipe_locations_32x32.png">
+    <box id="locations" title="Pipe by objects, path and locations" icon="icons/Features/pipe_locations_32x32.png">
       <multi_selector id="locations_objects"
                       label="Locations:"
                       tooltip="Select one or more vertices to specify the locations"
diff --git a/src/FeaturesPlugin/placement_widget.xml b/src/FeaturesPlugin/placement_widget.xml
index 2cda323a4..7112ff613 100644
--- a/src/FeaturesPlugin/placement_widget.xml
+++ b/src/FeaturesPlugin/placement_widget.xml
@@ -3,7 +3,7 @@
 <source>
   <multi_selector id="placement_objects_list"
     label="Select objects to move"
-    icon=":icons/cut_shape.png"
+    icon="icons/Features/cut_shape.png"
     tooltip="Select solid objects"
     type_choice=""
     concealment="true" >
@@ -11,13 +11,13 @@
   </multi_selector>
   <shape_selector id="placement_start_shape"
     label="Select an object" 
-    icon=":icons/placement_from.png"
+    icon="icons/Features/placement_from.png"
     tooltip="Select a start face, edge or vertex"
     shape_types="face edge vertex"
   />
   <shape_selector id="placement_end_shape"
     label="Select an object" 
-    icon=":icons/placement_to.png"
+    icon="icons/Features/placement_to.png"
     tooltip="Select an end face, edge or vertex"
     shape_types="face edge vertex">
     <validator id="PartSet_DifferentObjects"/>
diff --git a/src/FeaturesPlugin/plugin-Features.xml b/src/FeaturesPlugin/plugin-Features.xml
index 0ca6daa42..a6e7f8bd1 100644
--- a/src/FeaturesPlugin/plugin-Features.xml
+++ b/src/FeaturesPlugin/plugin-Features.xml
@@ -3,47 +3,47 @@
 <plugin>
   <workbench id="Features" document="Part">
     <group id="Shape">
-      <feature id="Wire" title="Wire" tooltip ="Create a wire from sketch edges and wires objects" icon=":icons/feature_wire.png">
+      <feature id="Wire" title="Wire" tooltip ="Create a wire from sketch edges and wires objects" icon="icons/Features/feature_wire.png">
         <source path="wire_widget.xml"/>
       </feature>
     </group>
     <group id="Extrusion">
-      <feature id="Extrusion" title="Extrusion" tooltip="Create a solid by extrusion of a face" icon=":icons/extrusion.png">
+      <feature id="Extrusion" title="Extrusion" tooltip="Create a solid by extrusion of a face" icon="icons/Features/extrusion.png">
           <source path="extrusion_widget.xml"/>
       </feature>
-      <feature id="ExtrusionCut" title="ExtrusionCut" tooltip="" icon=":icons/extrusion_cut.png">
+      <feature id="ExtrusionCut" title="ExtrusionCut" tooltip="" icon="icons/Features/extrusion_cut.png">
         <source path="extrusioncut_widget.xml"/>
       </feature>
-      <feature id="ExtrusionFuse" title="ExtrusionFuse" tooltip="" icon=":icons/extrusion_fuse.png">
+      <feature id="ExtrusionFuse" title="ExtrusionFuse" tooltip="" icon="icons/Features/extrusion_fuse.png">
         <source path="extrusionfuse_widget.xml"/>
       </feature>
     </group>
     <group id="Revolution">
-      <feature id="Revolution" title="Revolution" tooltip="Create a solid by revolution of a face" icon=":icons/revol.png">
+      <feature id="Revolution" title="Revolution" tooltip="Create a solid by revolution of a face" icon="icons/Features/revol.png">
           <source path="revolution_widget.xml"/>
       </feature>
-      <feature id="RevolutionCut" title="RevolutionCut" tooltip="" icon=":icons/revol_cut.png">
+      <feature id="RevolutionCut" title="RevolutionCut" tooltip="" icon="icons/Features/revol_cut.png">
         <source path="revolutioncut_widget.xml"/>
       </feature>
-      <feature id="RevolutionFuse" title="RevolutionFuse" tooltip="" icon=":icons/revol_fuse.png">
+      <feature id="RevolutionFuse" title="RevolutionFuse" tooltip="" icon="icons/Features/revol_fuse.png">
         <source path="revolutionfuse_widget.xml"/>
       </feature>
     </group>
     <group id="Pipe">
-      <feature id="Pipe" title="Pipe" tooltip="Generates extrusion along a path" icon=":icons/pipe.png">
+      <feature id="Pipe" title="Pipe" tooltip="Generates extrusion along a path" icon="icons/Features/pipe.png">
         <source path="pipe_widget.xml"/>
       </feature>
     </group>
     <group id="Boolean">
-      <feature id="Boolean" title="Boolean" tooltip="Perform boolean operations with solids" icon=":icons/cut.png"
+      <feature id="Boolean" title="Boolean" tooltip="Perform boolean operations with solids" icon="icons/Features/cut.png"
                auto_preview="false">
           <source path="boolean_widget.xml"/>
       </feature>
-      <feature id="Partition" title="Partition" tooltip="Perform partition operations with solids" icon=":icons/partition.png"
+      <feature id="Partition" title="Partition" tooltip="Perform partition operations with solids" icon="icons/Features/partition.png"
                auto_preview="false">
           <source path="partition_widget.xml"/>
       </feature>
-      <feature id="Intersection" title="Intersection" tooltip="Intersect objects with tools" icon=":icons/intersection.png">
+      <feature id="Intersection" title="Intersection" tooltip="Intersect objects with tools" icon="icons/Features/intersection.png">
           <source path="intersection_widget.xml"/>
       </feature>
     </group>
@@ -51,20 +51,20 @@
       <feature id="Group"
         title="Group"
         tooltip="Create named collection of geometry entities"
-        icon=":icons/shape_group.png">
+        icon="icons/Features/shape_group.png">
         <source path="group_widget.xml"/>
       </feature>
     </group>
   </workbench>
   <workbench id="Part">
     <group id="Movement">
-      <feature id="Placement" title="Placement" tooltip="Place an objects relatively to another one" icon=":icons/placement.png">
+      <feature id="Placement" title="Placement" tooltip="Place an objects relatively to another one" icon="icons/Features/placement.png">
         <source path="placement_widget.xml"/>
       </feature>
-      <feature id="Translation" title="Translation" tooltip="Perform translation of an objects along the axis to specified distance" icon=":icons/movement.png">
+      <feature id="Translation" title="Translation" tooltip="Perform translation of an objects along the axis to specified distance" icon="icons/Features/movement.png">
         <source path="translation_widget.xml"/>
       </feature>
-      <feature id="Rotation" title="Rotation" tooltip="Perform rotation of an objects around the axis to specified angle" icon=":icons/rotation.png">
+      <feature id="Rotation" title="Rotation" tooltip="Perform rotation of an objects around the axis to specified angle" icon="icons/Features/rotation.png">
         <source path="rotation_widget.xml"/>
       </feature>
     </group>
diff --git a/src/FeaturesPlugin/revol.png b/src/FeaturesPlugin/revol.png
new file mode 100644
index 000000000..f475b2a6b
Binary files /dev/null and b/src/FeaturesPlugin/revol.png differ
diff --git a/src/FeaturesPlugin/revolution_widget.xml b/src/FeaturesPlugin/revolution_widget.xml
index facc8895d..c0a535da7 100644
--- a/src/FeaturesPlugin/revolution_widget.xml
+++ b/src/FeaturesPlugin/revolution_widget.xml
@@ -17,7 +17,7 @@
     <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell"/>
   </multi_selector>
   <shape_selector id="axis_object"
-                  icon=":icons/axis.png"
+                  icon="icons/Features/axis.png"
                   label="Axis"
                   tooltip="Select an edge for axis"
                   shape_types="edge"
@@ -27,13 +27,13 @@
   <toolbox id="CreationMethod">
     <box id="ByAngles"
          title="By angles"
-         icon=":icons/angle_up_down_32x32.png">
+         icon="icons/Features/angle_up_down_32x32.png">
       <groupbox>
         <doublevalue id="to_angle"
                      label="Angle"
                      step="1.0"
                      default="360"
-                     icon=":icons/angle_up.png"
+                     icon="icons/Features/angle_up.png"
                      tooltip="To angle"/>
       </groupbox>
       <groupbox>
@@ -41,16 +41,16 @@
                      label="Angle"
                      step="1.0"
                      default="0"
-                     icon=":icons/angle_down.png"
+                     icon="icons/Features/angle_down.png"
                      tooltip="From angle"/>
       </groupbox>
     </box>
     <box id="ByPlanesAndOffsets"
          title="By bounding planes and angles"
-         icon=":icons/plane_inverted_32x32.png">
+         icon="icons/Features/plane_inverted_32x32.png">
       <groupbox title="From">
         <shape_selector id="from_object"
-                        icon=":icons/plane.png"
+                        icon="icons/Features/plane.png"
                         label="Plane face"
                         tooltip="Bounding plane (select a planar face)"
                         shape_types="face"
@@ -61,12 +61,12 @@
                      label="Angle"
                      step="1.0"
                      default="0"
-                     icon=":icons/angle_up_down.png"
+                     icon="icons/Features/angle_up_down.png"
                      tooltip="Angle for &quot;from&quot; bounding plane"/>
       </groupbox>
       <groupbox title="To">
         <shape_selector id="to_object"
-                        icon=":icons/plane_inverted.png"
+                        icon="icons/Features/plane_inverted.png"
                         label="Plane face"
                         tooltip="Bounding plane (select a planar face)"
                         shape_types="face"
@@ -77,7 +77,7 @@
                      label="Angle"
                      step="1.0"
                      default="0"
-                     icon=":icons/angle_up_down.png"
+                     icon="icons/Features/angle_up_down.png"
                      tooltip="Angle for &quot;to&quot; bounding plane"/>
       </groupbox>
     </box>
diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index 06730b5e1..25e82fe45 100644
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -13,13 +13,13 @@
     </sketch_launcher>
     <multi_selector id="base"
       label="Select a sketch face"
-      icon=":icons/sketch.png"
+      icon="icons/Features/sketch.png"
       tooltip="Select a sketch face"
       type_choice="Faces Objects">
       <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="face,shell"/>
     </multi_selector>
     <shape_selector id="axis_object"
-                    icon=":icons/axis.png"
+                    icon="icons/Features/axis.png"
                     label="Axis"
                     tooltip="Select an edge for axis"
                     shape_types="edge"
@@ -27,14 +27,14 @@
       <validator id="GeomValidators_ShapeType" parameters="line"/>
     </shape_selector>
     <toolbox id="CreationMethod">
-      <box id="ByAngles" title="By angles" icon=":icons/angle_up_down_32x32.png">
+      <box id="ByAngles" title="By angles" icon="icons/Features/angle_up_down_32x32.png">
         <groupbox>
           <doublevalue
             id="to_angle"
             label="Angle"
             step="1.0"
             default="10"
-            icon=":icons/angle_up.png"
+            icon="icons/Features/angle_up.png"
             tooltip="To angle">
           </doublevalue>
         </groupbox>
@@ -44,15 +44,15 @@
             label="Angle"
             step="1.0"
             default="0"
-            icon=":icons/angle_down.png"
+            icon="icons/Features/angle_down.png"
             tooltip="From angle">
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and angles" icon=":icons/plane_inverted_32x32.png">
+      <box id="ByPlanesAndOffsets" title="By bounding planes and angles" icon="icons/Features/plane_inverted_32x32.png">
         <groupbox title="From">
           <shape_selector id="from_object"
-                          icon=":icons/plane.png"
+                          icon="icons/Features/plane.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
@@ -61,13 +61,13 @@
           </shape_selector>
           <doublevalue id="from_offset" label="Angle"
             step="1.0" default="0"
-            icon=":icons/angle_up_down.png"
+            icon="icons/Features/angle_up_down.png"
             tooltip="Angle for &quot;from&quot; bounding plane">
           </doublevalue>
         </groupbox>
         <groupbox title="To">
           <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+                          icon="icons/Features/plane_inverted.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
@@ -76,7 +76,7 @@
           </shape_selector>
           <doublevalue  id="to_offset" label="Angle"
             step="1.0" default="0"
-            icon=":icons/angle_up_down.png"
+            icon="icons/Features/angle_up_down.png"
             tooltip="Angle for &quot;to&quot; bounding plane">
           </doublevalue>
         </groupbox>
@@ -85,7 +85,7 @@
   </groupbox>
   <multi_selector id="main_objects"
     label="Cut from:"
-    icon=":icons/cut_shape.png"
+    icon="icons/Features/cut_shape.png"
     tooltip="Objects to Cut"
     type_choice="Solids"
     concealment="true">
diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml
index e023b8ed4..633b1ca2a 100644
--- a/src/FeaturesPlugin/revolutionfuse_widget.xml
+++ b/src/FeaturesPlugin/revolutionfuse_widget.xml
@@ -13,13 +13,13 @@
     </sketch_launcher>
     <multi_selector id="base"
       label="Select a sketch face"
-      icon=":icons/sketch.png"
+      icon="icons/Features/sketch.png"
       tooltip="Select a sketch face"
       type_choice="Faces Objects">
       <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell"/>
     </multi_selector>
     <shape_selector id="axis_object"
-                    icon=":icons/axis.png"
+                    icon="icons/Features/axis.png"
                     label="Axis"
                     tooltip="Select an edge for axis"
                     shape_types="edge"
@@ -27,14 +27,14 @@
       <validator id="GeomValidators_ShapeType" parameters="line"/>
     </shape_selector>
     <toolbox id="CreationMethod">
-      <box id="ByAngles" title="By angles" icon=":icons/angle_up_down_32x32.png">
+      <box id="ByAngles" title="By angles" icon="icons/Features/angle_up_down_32x32.png">
         <groupbox>
           <doublevalue
             id="to_angle"
             label="Angle"
             step="1.0"
             default="0"
-            icon=":icons/angle_up.png"
+            icon="icons/Features/angle_up.png"
             tooltip="To angle">
           </doublevalue>
         </groupbox>
@@ -44,15 +44,15 @@
             label="Angle"
             step="1.0"
             default="10"
-            icon=":icons/angle_down.png"
+            icon="icons/Features/angle_down.png"
             tooltip="From angle">
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and angles" icon=":icons/plane_inverted_32x32.png">
+      <box id="ByPlanesAndOffsets" title="By bounding planes and angles" icon="icons/Features/plane_inverted_32x32.png">
         <groupbox title="From">
           <shape_selector id="from_object"
-                          icon=":icons/plane.png"
+                          icon="icons/Features/plane.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
@@ -61,13 +61,13 @@
           </shape_selector>
           <doublevalue id="from_offset" label="Angle"
             step="1.0" default="0"
-            icon=":icons/angle_up_down.png"
+            icon="icons/Features/angle_up_down.png"
             tooltip="Angle for &quot;from&quot; for bounding plane">
           </doublevalue>
         </groupbox>
         <groupbox title="To">
           <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+                          icon="icons/Features/plane_inverted.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
@@ -76,7 +76,7 @@
           </shape_selector>
           <doublevalue  id="to_offset" label="Angle"
             step="1.0" default="0"
-            icon=":icons/angle_up_down.png"
+            icon="icons/Features/angle_up_down.png"
             tooltip="Angle for &quot;to&quot; bounding plane">
           </doublevalue>
         </groupbox>
@@ -85,7 +85,7 @@
   </groupbox>
   <multi_selector id="main_objects"
     label="Fuse with:"
-    icon=":icons/cut_shape.png"
+    icon="icons/Features/cut_shape.png"
     tooltip="Objects to Fuse"
     type_choice="Solids"
     concealment="true">
diff --git a/src/FeaturesPlugin/rotation_widget.xml b/src/FeaturesPlugin/rotation_widget.xml
index 002fbee48..9cb633f12 100755
--- a/src/FeaturesPlugin/rotation_widget.xml
+++ b/src/FeaturesPlugin/rotation_widget.xml
@@ -3,7 +3,7 @@
 <source>
   <multi_selector id="main_objects"
     label="Main objects"
-    icon=":icons/cut_shape.png"
+    icon="icons/Features/cut_shape.png"
     tooltip="Select solid objects"
     type_choice="solid"
     use_choice="false"
@@ -11,7 +11,7 @@
     <validator id="FeaturesPlugin_ValidatorTransform"/>
   </multi_selector>
   <shape_selector id="axis_object"
-                  icon=":icons/axis.png"
+                  icon="icons/Features/axis.png"
                   label="Axis"
                   tooltip="Select an edge for axis"
                   shape_types="edge"
@@ -25,7 +25,7 @@
     max="360"
     step="1.0"
     default="0"
-    icon=":icons/angle.png"
+    icon="icons/Features/angle.png"
     tooltip="Angle">
   </doublevalue>
 </source>
\ No newline at end of file
diff --git a/src/FeaturesPlugin/translation_widget.xml b/src/FeaturesPlugin/translation_widget.xml
index 2a1505aa0..29eb3a45d 100644
--- a/src/FeaturesPlugin/translation_widget.xml
+++ b/src/FeaturesPlugin/translation_widget.xml
@@ -3,14 +3,14 @@
 <source>
   <multi_selector id="main_objects"
     label="Main objects"
-    icon=":icons/cut_shape.png"
+    icon="icons/Features/cut_shape.png"
     tooltip="Select solid objects"
     type_choice="solid"
     concealment="true">
     <validator id="FeaturesPlugin_ValidatorTransform"/>
   </multi_selector>
   <shape_selector id="axis_object"
-                  icon=":icons/axis.png"
+                  icon="icons/Features/axis.png"
                   label="Axis"
                   tooltip="Select an edge for axis"
                   shape_types="edge"
@@ -22,7 +22,7 @@
     label="Distance"
     step="1.0"
     default="0"
-    icon=":icons/dimension_v.png"
+    icon="icons/Features/dimension_v.png"
     tooltip="Distance">
   </doublevalue>
 </source>
\ No newline at end of file
diff --git a/src/ModuleBase/ModuleBase_ActionInfo.cpp b/src/ModuleBase/ModuleBase_ActionInfo.cpp
index cca4e569a..897805b73 100644
--- a/src/ModuleBase/ModuleBase_ActionInfo.cpp
+++ b/src/ModuleBase/ModuleBase_ActionInfo.cpp
@@ -7,6 +7,7 @@
  */
 
 #include <ModuleBase_ActionInfo.h>
+#include <ModuleBase_IconFactory.h>
 
 ModuleBase_ActionInfo::ModuleBase_ActionInfo()
 {
@@ -54,7 +55,7 @@ void ModuleBase_ActionInfo::initFrom(std::shared_ptr<Config_FeatureMessage> theM
   id = QString::fromStdString(theMessage->id());
   iconFile = QString::fromStdString(theMessage->icon());
   if (!iconFile.isEmpty()) {
-    icon = QIcon(iconFile);
+    icon = ModuleBase_IconFactory::loadIcon(iconFile);
   }
   text = QString::fromStdString(theMessage->text());
   toolTip = QString::fromStdString(theMessage->tooltip());
diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc
index 87a2d7dc9..4bf265160 100644
--- a/src/PartSet/PartSet_icons.qrc
+++ b/src/PartSet/PartSet_icons.qrc
@@ -1,105 +1,15 @@
  <!DOCTYPE RCC><RCC version="1.0">
  <qresource>
-     <file>icons/angle.png</file>
+     <file>icons/activate.png</file>
      <file>icons/angle_32x32.png</file>
-     <file>icons/angle_backward.png</file>
-     <file>icons/angle_up.png</file>
-     <file>icons/angle_direct.png</file>
-     <file>icons/angle_down.png</file>
-     <file>icons/angle_complementary.png</file>
-     <file>icons/arc.png</file>
-     <file>icons/arc_base_32x32.png</file>
-     <file>icons/arc_3pt_32x32.png</file>
-     <file>icons/arc_tang_32x32.png</file>
-     <file>icons/circle.png</file>
-     <file>icons/circle_pt_rad_32x32.png</file>
-     <file>icons/circle_3pt_32x32.png</file>
      <file>icons/color.png</file>
-     <file>icons/point.png</file>
-     <file>icons/plane.png</file>
-     <file>icons/plane_inverted.png</file>
-     <file>icons/plane_inverted_32x32.png</file>
-     <file>icons/axis.png</file>
-     <file>icons/duplicate.png</file>
-     <file>icons/remove.png</file>
-     <file>icons/extrusion.png</file>
-     <file>icons/extrusionsketch.png</file>
-     <file>icons/cut.png</file>
-     <file>icons/cut_tool.png</file>
-     <file>icons/cut_shape.png</file>
-     <file>icons/fusion.png</file>
-     <file>icons/revol.png</file>
-     <file>icons/revolsketch.png</file>
-     <file>icons/revol_cut.png</file>
-     <file>icons/revol_fuse.png</file>
-     <file>icons/common.png</file>
-     <file>icons/import.png</file>
-     <file>icons/export.png</file>
-     <file>icons/line.png</file>
-     <file>icons/sketch.png</file>
-     <file>icons/sketch_shape.png</file>
-     <file>icons/hand_point.png</file>
-     <file>icons/dimension_up.png</file>
-     <file>icons/dimension_up_32x32.png</file>
-     <file>icons/dimension_down.png</file>
-     <file>icons/dimension_v.png</file>
-     <file>icons/radius.png</file>
-     <file>icons/perpendicular.png</file>
-     <file>icons/partition.png</file>
-     <file>icons/length.png</file>
-     <file>icons/distance.png</file>
-     <file>icons/radius_constr.png</file>
-     <file>icons/shape_group.png</file>
-     <file>icons/fixed.png</file>
-     <file>icons/placement.png</file>
-     <file>icons/placement_from.png</file>
-     <file>icons/placement_to.png</file>
-     <file>icons/geom_export.png</file>
-     <file>icons/horisontal.png</file>
-     <file>icons/vertical.png</file>
-     <file>icons/equal.png</file>
-     <file>icons/tangent.png</file>
-     <file>icons/fillet.png</file>
-     <file>icons/coincedence.png</file>
-     <file>icons/mirror.png</file>
-     <file>icons/translate.png</file>
-     <file>icons/translate_32x32.png</file>
-     <file>icons/translate_full_32x32.png</file>
-     <file>icons/rotate.png</file>
-     <file>icons/exec_state_failed.png</file>
-     <file>icons/exec_state_invalid_parameters.png</file>
-     <file>icons/activate.png</file>
      <file>icons/deactivate.png</file>
      <file>icons/edit.png</file>
-     <file>icons/rotation.png</file>
-     <file>icons/movement.png</file>
-     <file>icons/extrusion_cut.png</file>
-     <file>icons/extrusion_fuse.png</file>
-     <file>icons/angle_constr.png</file>
-     <file>icons/angle_up_32x32.png</file>
-     <file>icons/angle_up_down.png</file>
-     <file>icons/angle_up_down_32x32.png</file>
-     <file>icons/angle_up_full_32x32.png</file>
-     <file>icons/dimension_up_down.png</file>
-     <file>icons/dimension_up_down_32x32.png</file>
-     <file>icons/by_two_points_32x32.png</file>
-     <file>icons/cylindrical_face_32x32.png</file>
-     <file>icons/dimension_vert_32x32.png</file>
-     <file>icons/bool_cut.png</file>
-     <file>icons/bool_fuse.png</file>
-     <file>icons/bool_common.png</file>
-     <file>icons/bool_smash.png</file>
-     <file>icons/plane_view.png</file>
-     <file>icons/collinear.png</file>
-     <file>icons/middlepoint.png</file>
-     <file>icons/rectangle.png</file>
-     <file>icons/intersection_point.png</file>
-     <file>icons/intersection.png</file>
+     <file>icons/exec_state_failed.png</file>
+     <file>icons/exec_state_invalid_parameters.png</file>
+     <file>icons/hand_point.png</file>
      <file>icons/move_to_end.png</file>
-     <file>icons/pipe.png</file>
-     <file>icons/pipe_simple_32x32.png</file>
-     <file>icons/pipe_binormal_32x32.png</file>
-     <file>icons/pipe_locations_32x32.png</file>
-     <file>icons/feature_wire.png</file>
+     <file>icons/rectangle.png</file>
+     <file>icons/sketch_shape.png</file>
  </qresource>
  </RCC>
diff --git a/src/PartSet/icons/angle.png b/src/PartSet/icons/angle.png
deleted file mode 100644
index e401acd67..000000000
Binary files a/src/PartSet/icons/angle.png and /dev/null differ
diff --git a/src/PartSet/icons/angle_backward.png b/src/PartSet/icons/angle_backward.png
deleted file mode 100755
index 827c193ec..000000000
Binary files a/src/PartSet/icons/angle_backward.png and /dev/null differ
diff --git a/src/PartSet/icons/angle_complementary.png b/src/PartSet/icons/angle_complementary.png
deleted file mode 100755
index 7588fe787..000000000
Binary files a/src/PartSet/icons/angle_complementary.png and /dev/null differ
diff --git a/src/PartSet/icons/angle_constr.png b/src/PartSet/icons/angle_constr.png
deleted file mode 100644
index e0c46dfa3..000000000
Binary files a/src/PartSet/icons/angle_constr.png and /dev/null differ
diff --git a/src/PartSet/icons/angle_direct.png b/src/PartSet/icons/angle_direct.png
deleted file mode 100755
index 286604ef7..000000000
Binary files a/src/PartSet/icons/angle_direct.png and /dev/null differ
diff --git a/src/PartSet/icons/angle_down.png b/src/PartSet/icons/angle_down.png
deleted file mode 100644
index 688699c11..000000000
Binary files a/src/PartSet/icons/angle_down.png and /dev/null differ
diff --git a/src/PartSet/icons/angle_up.png b/src/PartSet/icons/angle_up.png
deleted file mode 100644
index c1d244283..000000000
Binary files a/src/PartSet/icons/angle_up.png and /dev/null differ
diff --git a/src/PartSet/icons/angle_up_32x32.png b/src/PartSet/icons/angle_up_32x32.png
deleted file mode 100755
index b8194b883..000000000
Binary files a/src/PartSet/icons/angle_up_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/angle_up_down.png b/src/PartSet/icons/angle_up_down.png
deleted file mode 100644
index a0a82e85b..000000000
Binary files a/src/PartSet/icons/angle_up_down.png and /dev/null differ
diff --git a/src/PartSet/icons/angle_up_down_32x32.png b/src/PartSet/icons/angle_up_down_32x32.png
deleted file mode 100644
index 25cb0e556..000000000
Binary files a/src/PartSet/icons/angle_up_down_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/angle_up_full_32x32.png b/src/PartSet/icons/angle_up_full_32x32.png
deleted file mode 100755
index 3fc714c59..000000000
Binary files a/src/PartSet/icons/angle_up_full_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/arc.png b/src/PartSet/icons/arc.png
deleted file mode 100644
index fef024583..000000000
Binary files a/src/PartSet/icons/arc.png and /dev/null differ
diff --git a/src/PartSet/icons/arc_3pt_32x32.png b/src/PartSet/icons/arc_3pt_32x32.png
deleted file mode 100644
index 584fa594a..000000000
Binary files a/src/PartSet/icons/arc_3pt_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/arc_base_32x32.png b/src/PartSet/icons/arc_base_32x32.png
deleted file mode 100644
index c36df3056..000000000
Binary files a/src/PartSet/icons/arc_base_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/arc_tang_32x32.png b/src/PartSet/icons/arc_tang_32x32.png
deleted file mode 100644
index cfec981e7..000000000
Binary files a/src/PartSet/icons/arc_tang_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/axis.png b/src/PartSet/icons/axis.png
deleted file mode 100644
index 015d270bf..000000000
Binary files a/src/PartSet/icons/axis.png and /dev/null differ
diff --git a/src/PartSet/icons/bool_common.png b/src/PartSet/icons/bool_common.png
deleted file mode 100644
index 99812c546..000000000
Binary files a/src/PartSet/icons/bool_common.png and /dev/null differ
diff --git a/src/PartSet/icons/bool_cut.png b/src/PartSet/icons/bool_cut.png
deleted file mode 100644
index dd494d7d8..000000000
Binary files a/src/PartSet/icons/bool_cut.png and /dev/null differ
diff --git a/src/PartSet/icons/bool_fuse.png b/src/PartSet/icons/bool_fuse.png
deleted file mode 100644
index 5369a50a5..000000000
Binary files a/src/PartSet/icons/bool_fuse.png and /dev/null differ
diff --git a/src/PartSet/icons/bool_smash.png b/src/PartSet/icons/bool_smash.png
deleted file mode 100644
index bf82ac272..000000000
Binary files a/src/PartSet/icons/bool_smash.png and /dev/null differ
diff --git a/src/PartSet/icons/by_two_points_32x32.png b/src/PartSet/icons/by_two_points_32x32.png
deleted file mode 100644
index 5f20fb8b7..000000000
Binary files a/src/PartSet/icons/by_two_points_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/circle.png b/src/PartSet/icons/circle.png
deleted file mode 100644
index 6f311635d..000000000
Binary files a/src/PartSet/icons/circle.png and /dev/null differ
diff --git a/src/PartSet/icons/circle_3pt_32x32.png b/src/PartSet/icons/circle_3pt_32x32.png
deleted file mode 100644
index d7ed5b227..000000000
Binary files a/src/PartSet/icons/circle_3pt_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/circle_pt_rad_32x32.png b/src/PartSet/icons/circle_pt_rad_32x32.png
deleted file mode 100644
index 6a8b7e7fa..000000000
Binary files a/src/PartSet/icons/circle_pt_rad_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/coincedence.png b/src/PartSet/icons/coincedence.png
deleted file mode 100644
index ee775389b..000000000
Binary files a/src/PartSet/icons/coincedence.png and /dev/null differ
diff --git a/src/PartSet/icons/collinear.png b/src/PartSet/icons/collinear.png
deleted file mode 100644
index d96834f31..000000000
Binary files a/src/PartSet/icons/collinear.png and /dev/null differ
diff --git a/src/PartSet/icons/common.png b/src/PartSet/icons/common.png
deleted file mode 100644
index 461eb31fc..000000000
Binary files a/src/PartSet/icons/common.png and /dev/null differ
diff --git a/src/PartSet/icons/cut.png b/src/PartSet/icons/cut.png
deleted file mode 100644
index 67f1b36bc..000000000
Binary files a/src/PartSet/icons/cut.png and /dev/null differ
diff --git a/src/PartSet/icons/cut_shape.png b/src/PartSet/icons/cut_shape.png
deleted file mode 100644
index ea5fb26d6..000000000
Binary files a/src/PartSet/icons/cut_shape.png and /dev/null differ
diff --git a/src/PartSet/icons/cut_tool.png b/src/PartSet/icons/cut_tool.png
deleted file mode 100644
index 4b2ad9c6a..000000000
Binary files a/src/PartSet/icons/cut_tool.png and /dev/null differ
diff --git a/src/PartSet/icons/cylindrical_face_32x32.png b/src/PartSet/icons/cylindrical_face_32x32.png
deleted file mode 100644
index e82010154..000000000
Binary files a/src/PartSet/icons/cylindrical_face_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/dimension_down.png b/src/PartSet/icons/dimension_down.png
deleted file mode 100644
index de5682c71..000000000
Binary files a/src/PartSet/icons/dimension_down.png and /dev/null differ
diff --git a/src/PartSet/icons/dimension_down_32x32.png b/src/PartSet/icons/dimension_down_32x32.png
deleted file mode 100644
index 2e56be4d3..000000000
Binary files a/src/PartSet/icons/dimension_down_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/dimension_up.png b/src/PartSet/icons/dimension_up.png
deleted file mode 100644
index bbd7b1456..000000000
Binary files a/src/PartSet/icons/dimension_up.png and /dev/null differ
diff --git a/src/PartSet/icons/dimension_up_32x32.png b/src/PartSet/icons/dimension_up_32x32.png
deleted file mode 100644
index 8b6ad7ce5..000000000
Binary files a/src/PartSet/icons/dimension_up_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/dimension_up_down.png b/src/PartSet/icons/dimension_up_down.png
deleted file mode 100644
index d640b4903..000000000
Binary files a/src/PartSet/icons/dimension_up_down.png and /dev/null differ
diff --git a/src/PartSet/icons/dimension_up_down_32x32.png b/src/PartSet/icons/dimension_up_down_32x32.png
deleted file mode 100644
index adee89f65..000000000
Binary files a/src/PartSet/icons/dimension_up_down_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/dimension_v.png b/src/PartSet/icons/dimension_v.png
deleted file mode 100644
index 15e26af43..000000000
Binary files a/src/PartSet/icons/dimension_v.png and /dev/null differ
diff --git a/src/PartSet/icons/dimension_v_32x32.png b/src/PartSet/icons/dimension_v_32x32.png
deleted file mode 100644
index a378dd635..000000000
Binary files a/src/PartSet/icons/dimension_v_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/dimension_vert_32x32.png b/src/PartSet/icons/dimension_vert_32x32.png
deleted file mode 100644
index b081893cd..000000000
Binary files a/src/PartSet/icons/dimension_vert_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/distance.png b/src/PartSet/icons/distance.png
deleted file mode 100644
index 7676548da..000000000
Binary files a/src/PartSet/icons/distance.png and /dev/null differ
diff --git a/src/PartSet/icons/duplicate.png b/src/PartSet/icons/duplicate.png
deleted file mode 100644
index 228db95bc..000000000
Binary files a/src/PartSet/icons/duplicate.png and /dev/null differ
diff --git a/src/PartSet/icons/equal.png b/src/PartSet/icons/equal.png
deleted file mode 100644
index e8873c0a4..000000000
Binary files a/src/PartSet/icons/equal.png and /dev/null differ
diff --git a/src/PartSet/icons/export.png b/src/PartSet/icons/export.png
deleted file mode 100644
index 55ebd4526..000000000
Binary files a/src/PartSet/icons/export.png and /dev/null differ
diff --git a/src/PartSet/icons/extrusion.png b/src/PartSet/icons/extrusion.png
deleted file mode 100644
index 290c2e46b..000000000
Binary files a/src/PartSet/icons/extrusion.png and /dev/null differ
diff --git a/src/PartSet/icons/extrusion_cut.png b/src/PartSet/icons/extrusion_cut.png
deleted file mode 100644
index 77ba5b3a4..000000000
Binary files a/src/PartSet/icons/extrusion_cut.png and /dev/null differ
diff --git a/src/PartSet/icons/extrusion_fuse.png b/src/PartSet/icons/extrusion_fuse.png
deleted file mode 100644
index 0914eb7dc..000000000
Binary files a/src/PartSet/icons/extrusion_fuse.png and /dev/null differ
diff --git a/src/PartSet/icons/extrusionsketch.png b/src/PartSet/icons/extrusionsketch.png
deleted file mode 100644
index d370693dc..000000000
Binary files a/src/PartSet/icons/extrusionsketch.png and /dev/null differ
diff --git a/src/PartSet/icons/feature_wire.png b/src/PartSet/icons/feature_wire.png
deleted file mode 100644
index 87b855649..000000000
Binary files a/src/PartSet/icons/feature_wire.png and /dev/null differ
diff --git a/src/PartSet/icons/fillet.png b/src/PartSet/icons/fillet.png
deleted file mode 100644
index 05e9b2abd..000000000
Binary files a/src/PartSet/icons/fillet.png and /dev/null differ
diff --git a/src/PartSet/icons/fixed.png b/src/PartSet/icons/fixed.png
deleted file mode 100644
index d5085325d..000000000
Binary files a/src/PartSet/icons/fixed.png and /dev/null differ
diff --git a/src/PartSet/icons/fusion.png b/src/PartSet/icons/fusion.png
deleted file mode 100644
index ee8004040..000000000
Binary files a/src/PartSet/icons/fusion.png and /dev/null differ
diff --git a/src/PartSet/icons/geom_export.png b/src/PartSet/icons/geom_export.png
deleted file mode 100644
index cb8bc6bd9..000000000
Binary files a/src/PartSet/icons/geom_export.png and /dev/null differ
diff --git a/src/PartSet/icons/horisontal.png b/src/PartSet/icons/horisontal.png
deleted file mode 100644
index 63ea87d02..000000000
Binary files a/src/PartSet/icons/horisontal.png and /dev/null differ
diff --git a/src/PartSet/icons/import.png b/src/PartSet/icons/import.png
deleted file mode 100644
index c1d417542..000000000
Binary files a/src/PartSet/icons/import.png and /dev/null differ
diff --git a/src/PartSet/icons/intersection.png b/src/PartSet/icons/intersection.png
deleted file mode 100644
index bba96f48c..000000000
Binary files a/src/PartSet/icons/intersection.png and /dev/null differ
diff --git a/src/PartSet/icons/intersection_point.png b/src/PartSet/icons/intersection_point.png
deleted file mode 100644
index ffb88f8a7..000000000
Binary files a/src/PartSet/icons/intersection_point.png and /dev/null differ
diff --git a/src/PartSet/icons/length.png b/src/PartSet/icons/length.png
deleted file mode 100644
index 8bdb113d5..000000000
Binary files a/src/PartSet/icons/length.png and /dev/null differ
diff --git a/src/PartSet/icons/line.png b/src/PartSet/icons/line.png
deleted file mode 100644
index 53dbb0820..000000000
Binary files a/src/PartSet/icons/line.png and /dev/null differ
diff --git a/src/PartSet/icons/middlepoint.png b/src/PartSet/icons/middlepoint.png
deleted file mode 100644
index af1252161..000000000
Binary files a/src/PartSet/icons/middlepoint.png and /dev/null differ
diff --git a/src/PartSet/icons/mirror.png b/src/PartSet/icons/mirror.png
deleted file mode 100644
index 01c7ef4f6..000000000
Binary files a/src/PartSet/icons/mirror.png and /dev/null differ
diff --git a/src/PartSet/icons/movement.png b/src/PartSet/icons/movement.png
deleted file mode 100644
index 486419118..000000000
Binary files a/src/PartSet/icons/movement.png and /dev/null differ
diff --git a/src/PartSet/icons/partition.png b/src/PartSet/icons/partition.png
deleted file mode 100755
index eb34d43e6..000000000
Binary files a/src/PartSet/icons/partition.png and /dev/null differ
diff --git a/src/PartSet/icons/perpendicular.png b/src/PartSet/icons/perpendicular.png
deleted file mode 100644
index 1fb695c6a..000000000
Binary files a/src/PartSet/icons/perpendicular.png and /dev/null differ
diff --git a/src/PartSet/icons/pipe.png b/src/PartSet/icons/pipe.png
deleted file mode 100644
index 793874472..000000000
Binary files a/src/PartSet/icons/pipe.png and /dev/null differ
diff --git a/src/PartSet/icons/pipe_binormal_32x32.png b/src/PartSet/icons/pipe_binormal_32x32.png
deleted file mode 100644
index b262ec90a..000000000
Binary files a/src/PartSet/icons/pipe_binormal_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/pipe_locations_32x32.png b/src/PartSet/icons/pipe_locations_32x32.png
deleted file mode 100644
index 5e384ce30..000000000
Binary files a/src/PartSet/icons/pipe_locations_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/pipe_simple_32x32.png b/src/PartSet/icons/pipe_simple_32x32.png
deleted file mode 100644
index 793874472..000000000
Binary files a/src/PartSet/icons/pipe_simple_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/placement.png b/src/PartSet/icons/placement.png
deleted file mode 100644
index c100a3153..000000000
Binary files a/src/PartSet/icons/placement.png and /dev/null differ
diff --git a/src/PartSet/icons/placement_from.png b/src/PartSet/icons/placement_from.png
deleted file mode 100755
index 3ccfd6682..000000000
Binary files a/src/PartSet/icons/placement_from.png and /dev/null differ
diff --git a/src/PartSet/icons/placement_to.png b/src/PartSet/icons/placement_to.png
deleted file mode 100755
index 0faa8c3f5..000000000
Binary files a/src/PartSet/icons/placement_to.png and /dev/null differ
diff --git a/src/PartSet/icons/plane.png b/src/PartSet/icons/plane.png
deleted file mode 100644
index 1da328269..000000000
Binary files a/src/PartSet/icons/plane.png and /dev/null differ
diff --git a/src/PartSet/icons/plane_32x32.png b/src/PartSet/icons/plane_32x32.png
deleted file mode 100644
index 8487d8282..000000000
Binary files a/src/PartSet/icons/plane_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/plane_inverted.png b/src/PartSet/icons/plane_inverted.png
deleted file mode 100644
index 38577cb93..000000000
Binary files a/src/PartSet/icons/plane_inverted.png and /dev/null differ
diff --git a/src/PartSet/icons/plane_inverted_32x32.png b/src/PartSet/icons/plane_inverted_32x32.png
deleted file mode 100644
index 49f81f8e9..000000000
Binary files a/src/PartSet/icons/plane_inverted_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/plane_view.png b/src/PartSet/icons/plane_view.png
deleted file mode 100644
index 431f71a37..000000000
Binary files a/src/PartSet/icons/plane_view.png and /dev/null differ
diff --git a/src/PartSet/icons/point.png b/src/PartSet/icons/point.png
deleted file mode 100644
index 96149ebf3..000000000
Binary files a/src/PartSet/icons/point.png and /dev/null differ
diff --git a/src/PartSet/icons/radius.png b/src/PartSet/icons/radius.png
deleted file mode 100644
index 7ff3b4d2b..000000000
Binary files a/src/PartSet/icons/radius.png and /dev/null differ
diff --git a/src/PartSet/icons/radius_constr.png b/src/PartSet/icons/radius_constr.png
deleted file mode 100644
index 83fabad43..000000000
Binary files a/src/PartSet/icons/radius_constr.png and /dev/null differ
diff --git a/src/PartSet/icons/remove.png b/src/PartSet/icons/remove.png
deleted file mode 100644
index f5359d7bc..000000000
Binary files a/src/PartSet/icons/remove.png and /dev/null differ
diff --git a/src/PartSet/icons/revol.png b/src/PartSet/icons/revol.png
deleted file mode 100644
index f475b2a6b..000000000
Binary files a/src/PartSet/icons/revol.png and /dev/null differ
diff --git a/src/PartSet/icons/revol_cut.png b/src/PartSet/icons/revol_cut.png
deleted file mode 100644
index 2a5dfe1e6..000000000
Binary files a/src/PartSet/icons/revol_cut.png and /dev/null differ
diff --git a/src/PartSet/icons/revol_fuse.png b/src/PartSet/icons/revol_fuse.png
deleted file mode 100644
index 147b045fa..000000000
Binary files a/src/PartSet/icons/revol_fuse.png and /dev/null differ
diff --git a/src/PartSet/icons/revolsketch.png b/src/PartSet/icons/revolsketch.png
deleted file mode 100644
index f058a191c..000000000
Binary files a/src/PartSet/icons/revolsketch.png and /dev/null differ
diff --git a/src/PartSet/icons/rotate.png b/src/PartSet/icons/rotate.png
deleted file mode 100644
index fd51d76f1..000000000
Binary files a/src/PartSet/icons/rotate.png and /dev/null differ
diff --git a/src/PartSet/icons/rotation.png b/src/PartSet/icons/rotation.png
deleted file mode 100644
index cfc31b4ab..000000000
Binary files a/src/PartSet/icons/rotation.png and /dev/null differ
diff --git a/src/PartSet/icons/shape_group.png b/src/PartSet/icons/shape_group.png
deleted file mode 100644
index a00d1a263..000000000
Binary files a/src/PartSet/icons/shape_group.png and /dev/null differ
diff --git a/src/PartSet/icons/sketch.png b/src/PartSet/icons/sketch.png
deleted file mode 100644
index d55e89c1e..000000000
Binary files a/src/PartSet/icons/sketch.png and /dev/null differ
diff --git a/src/PartSet/icons/tangent.png b/src/PartSet/icons/tangent.png
deleted file mode 100644
index ec54eae31..000000000
Binary files a/src/PartSet/icons/tangent.png and /dev/null differ
diff --git a/src/PartSet/icons/translate.png b/src/PartSet/icons/translate.png
deleted file mode 100644
index 5ecdb5192..000000000
Binary files a/src/PartSet/icons/translate.png and /dev/null differ
diff --git a/src/PartSet/icons/translate_32x32.png b/src/PartSet/icons/translate_32x32.png
deleted file mode 100755
index 20391da43..000000000
Binary files a/src/PartSet/icons/translate_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/translate_full_32x32.png b/src/PartSet/icons/translate_full_32x32.png
deleted file mode 100755
index 1fd53d9d7..000000000
Binary files a/src/PartSet/icons/translate_full_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/vertical.png b/src/PartSet/icons/vertical.png
deleted file mode 100644
index 430386c98..000000000
Binary files a/src/PartSet/icons/vertical.png and /dev/null differ
diff --git a/src/PartSetPlugin/CMakeLists.txt b/src/PartSetPlugin/CMakeLists.txt
index c644b807b..5204a076c 100644
--- a/src/PartSetPlugin/CMakeLists.txt
+++ b/src/PartSetPlugin/CMakeLists.txt
@@ -31,5 +31,11 @@ INCLUDE_DIRECTORIES(
   ../GeomAPI
 )
 
+SET(ICON_RESOURCES
+  icons/duplicate.png
+  icons/remove.png
+)
+
 INSTALL(TARGETS PartSetPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
 INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
+INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/PartSet)
diff --git a/src/PartSetPlugin/icons/duplicate.png b/src/PartSetPlugin/icons/duplicate.png
new file mode 100644
index 000000000..228db95bc
Binary files /dev/null and b/src/PartSetPlugin/icons/duplicate.png differ
diff --git a/src/PartSetPlugin/icons/remove.png b/src/PartSetPlugin/icons/remove.png
new file mode 100644
index 000000000..f5359d7bc
Binary files /dev/null and b/src/PartSetPlugin/icons/remove.png differ
diff --git a/src/PartSetPlugin/plugin-PartSet.xml b/src/PartSetPlugin/plugin-PartSet.xml
index 47055abfa..3ec3f874c 100644
--- a/src/PartSetPlugin/plugin-PartSet.xml
+++ b/src/PartSetPlugin/plugin-PartSet.xml
@@ -8,12 +8,12 @@
                icon=":pictures/part_ico.png"/>
       <feature id="Duplicate" title="Duplicate part"
                tooltip="Duplicate active part"
-               icon=":icons/duplicate.png"
+               icon="icons/PartSet/duplicate.png"
                document="Part"/>
       <feature id="Remove"
                title="Remove part"
                tooltip="Remove active part"
-               icon=":icons/remove.png"
+               icon="icons/PartSet/remove.png"
                document="Part"/>
     </group>
   </workbench>
diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt
index 165ad0f42..8740502f4 100644
--- a/src/SketchPlugin/CMakeLists.txt
+++ b/src/SketchPlugin/CMakeLists.txt
@@ -102,12 +102,49 @@ INCLUDE_DIRECTORIES(
 )
 
 SET(ICON_RESOURCES
+  icons/angle.png
+  icons/angle_backward.png
+  icons/angle_complementary.png
+  icons/angle_constr.png
+  icons/angle_direct.png
+  icons/angle_up_32x32.png
+  icons/angle_up_full_32x32.png
+  icons/arc.png
+  icons/arc_3pt_32x32.png
+  icons/arc_base_32x32.png
+  icons/arc_tang_32x32.png
+  icons/circle.png
+  icons/circle_3pt_32x32.png
+  icons/circle_pt_rad_32x32.png
+  icons/coincedence.png
+  icons/collinear.png
+  icons/distance.png
+  icons/equal.png
+  icons/fillet.png
+  icons/fixed.png
+  icons/horisontal.png
+  icons/intersection_point.png
+  icons/length.png
+  icons/line.png
+  icons/middlepoint.png
+  icons/mirror.png
   icons/parallel.png
+  icons/perpendicular.png
+  icons/point.png
+  icons/radius.png
+  icons/radius_constr.png
+  icons/rotate.png
+  icons/sketch.png
+  icons/tangent.png
+  icons/translate.png
+  icons/translate_32x32.png
+  icons/translate_full_32x32.png
+  icons/vertical.png
 )
 
 INSTALL(TARGETS SketchPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
 INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
-INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
+INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Sketch)
 
 ADD_UNIT_TESTS(TestSketchPointLine.py
                TestSketchArcCircle.py
diff --git a/src/SketchPlugin/icons/angle.png b/src/SketchPlugin/icons/angle.png
new file mode 100644
index 000000000..e401acd67
Binary files /dev/null and b/src/SketchPlugin/icons/angle.png differ
diff --git a/src/SketchPlugin/icons/angle_backward.png b/src/SketchPlugin/icons/angle_backward.png
new file mode 100755
index 000000000..827c193ec
Binary files /dev/null and b/src/SketchPlugin/icons/angle_backward.png differ
diff --git a/src/SketchPlugin/icons/angle_complementary.png b/src/SketchPlugin/icons/angle_complementary.png
new file mode 100755
index 000000000..7588fe787
Binary files /dev/null and b/src/SketchPlugin/icons/angle_complementary.png differ
diff --git a/src/SketchPlugin/icons/angle_constr.png b/src/SketchPlugin/icons/angle_constr.png
new file mode 100644
index 000000000..e0c46dfa3
Binary files /dev/null and b/src/SketchPlugin/icons/angle_constr.png differ
diff --git a/src/SketchPlugin/icons/angle_direct.png b/src/SketchPlugin/icons/angle_direct.png
new file mode 100755
index 000000000..286604ef7
Binary files /dev/null and b/src/SketchPlugin/icons/angle_direct.png differ
diff --git a/src/SketchPlugin/icons/angle_up_32x32.png b/src/SketchPlugin/icons/angle_up_32x32.png
new file mode 100755
index 000000000..b8194b883
Binary files /dev/null and b/src/SketchPlugin/icons/angle_up_32x32.png differ
diff --git a/src/SketchPlugin/icons/angle_up_full_32x32.png b/src/SketchPlugin/icons/angle_up_full_32x32.png
new file mode 100755
index 000000000..3fc714c59
Binary files /dev/null and b/src/SketchPlugin/icons/angle_up_full_32x32.png differ
diff --git a/src/SketchPlugin/icons/arc.png b/src/SketchPlugin/icons/arc.png
new file mode 100644
index 000000000..fef024583
Binary files /dev/null and b/src/SketchPlugin/icons/arc.png differ
diff --git a/src/SketchPlugin/icons/arc_3pt_32x32.png b/src/SketchPlugin/icons/arc_3pt_32x32.png
new file mode 100644
index 000000000..584fa594a
Binary files /dev/null and b/src/SketchPlugin/icons/arc_3pt_32x32.png differ
diff --git a/src/SketchPlugin/icons/arc_base_32x32.png b/src/SketchPlugin/icons/arc_base_32x32.png
new file mode 100644
index 000000000..c36df3056
Binary files /dev/null and b/src/SketchPlugin/icons/arc_base_32x32.png differ
diff --git a/src/SketchPlugin/icons/arc_tang_32x32.png b/src/SketchPlugin/icons/arc_tang_32x32.png
new file mode 100644
index 000000000..cfec981e7
Binary files /dev/null and b/src/SketchPlugin/icons/arc_tang_32x32.png differ
diff --git a/src/SketchPlugin/icons/circle.png b/src/SketchPlugin/icons/circle.png
new file mode 100644
index 000000000..6f311635d
Binary files /dev/null and b/src/SketchPlugin/icons/circle.png differ
diff --git a/src/SketchPlugin/icons/circle_3pt_32x32.png b/src/SketchPlugin/icons/circle_3pt_32x32.png
new file mode 100644
index 000000000..d7ed5b227
Binary files /dev/null and b/src/SketchPlugin/icons/circle_3pt_32x32.png differ
diff --git a/src/SketchPlugin/icons/circle_pt_rad_32x32.png b/src/SketchPlugin/icons/circle_pt_rad_32x32.png
new file mode 100644
index 000000000..6a8b7e7fa
Binary files /dev/null and b/src/SketchPlugin/icons/circle_pt_rad_32x32.png differ
diff --git a/src/SketchPlugin/icons/coincedence.png b/src/SketchPlugin/icons/coincedence.png
new file mode 100644
index 000000000..ee775389b
Binary files /dev/null and b/src/SketchPlugin/icons/coincedence.png differ
diff --git a/src/SketchPlugin/icons/collinear.png b/src/SketchPlugin/icons/collinear.png
new file mode 100644
index 000000000..d96834f31
Binary files /dev/null and b/src/SketchPlugin/icons/collinear.png differ
diff --git a/src/SketchPlugin/icons/distance.png b/src/SketchPlugin/icons/distance.png
new file mode 100644
index 000000000..7676548da
Binary files /dev/null and b/src/SketchPlugin/icons/distance.png differ
diff --git a/src/SketchPlugin/icons/equal.png b/src/SketchPlugin/icons/equal.png
new file mode 100644
index 000000000..e8873c0a4
Binary files /dev/null and b/src/SketchPlugin/icons/equal.png differ
diff --git a/src/SketchPlugin/icons/fillet.png b/src/SketchPlugin/icons/fillet.png
new file mode 100644
index 000000000..05e9b2abd
Binary files /dev/null and b/src/SketchPlugin/icons/fillet.png differ
diff --git a/src/SketchPlugin/icons/fixed.png b/src/SketchPlugin/icons/fixed.png
new file mode 100644
index 000000000..d5085325d
Binary files /dev/null and b/src/SketchPlugin/icons/fixed.png differ
diff --git a/src/SketchPlugin/icons/horisontal.png b/src/SketchPlugin/icons/horisontal.png
new file mode 100644
index 000000000..63ea87d02
Binary files /dev/null and b/src/SketchPlugin/icons/horisontal.png differ
diff --git a/src/SketchPlugin/icons/intersection_point.png b/src/SketchPlugin/icons/intersection_point.png
new file mode 100644
index 000000000..ffb88f8a7
Binary files /dev/null and b/src/SketchPlugin/icons/intersection_point.png differ
diff --git a/src/SketchPlugin/icons/length.png b/src/SketchPlugin/icons/length.png
new file mode 100644
index 000000000..8bdb113d5
Binary files /dev/null and b/src/SketchPlugin/icons/length.png differ
diff --git a/src/SketchPlugin/icons/line.png b/src/SketchPlugin/icons/line.png
new file mode 100644
index 000000000..53dbb0820
Binary files /dev/null and b/src/SketchPlugin/icons/line.png differ
diff --git a/src/SketchPlugin/icons/middlepoint.png b/src/SketchPlugin/icons/middlepoint.png
new file mode 100644
index 000000000..af1252161
Binary files /dev/null and b/src/SketchPlugin/icons/middlepoint.png differ
diff --git a/src/SketchPlugin/icons/mirror.png b/src/SketchPlugin/icons/mirror.png
new file mode 100644
index 000000000..01c7ef4f6
Binary files /dev/null and b/src/SketchPlugin/icons/mirror.png differ
diff --git a/src/SketchPlugin/icons/parallel.png b/src/SketchPlugin/icons/parallel.png
old mode 100644
new mode 100755
diff --git a/src/SketchPlugin/icons/perpendicular.png b/src/SketchPlugin/icons/perpendicular.png
new file mode 100644
index 000000000..1fb695c6a
Binary files /dev/null and b/src/SketchPlugin/icons/perpendicular.png differ
diff --git a/src/SketchPlugin/icons/plane_view.png b/src/SketchPlugin/icons/plane_view.png
new file mode 100644
index 000000000..431f71a37
Binary files /dev/null and b/src/SketchPlugin/icons/plane_view.png differ
diff --git a/src/SketchPlugin/icons/point.png b/src/SketchPlugin/icons/point.png
new file mode 100755
index 000000000..96149ebf3
Binary files /dev/null and b/src/SketchPlugin/icons/point.png differ
diff --git a/src/SketchPlugin/icons/radius.png b/src/SketchPlugin/icons/radius.png
new file mode 100644
index 000000000..7ff3b4d2b
Binary files /dev/null and b/src/SketchPlugin/icons/radius.png differ
diff --git a/src/SketchPlugin/icons/radius_constr.png b/src/SketchPlugin/icons/radius_constr.png
new file mode 100644
index 000000000..83fabad43
Binary files /dev/null and b/src/SketchPlugin/icons/radius_constr.png differ
diff --git a/src/SketchPlugin/icons/rotate.png b/src/SketchPlugin/icons/rotate.png
new file mode 100644
index 000000000..fd51d76f1
Binary files /dev/null and b/src/SketchPlugin/icons/rotate.png differ
diff --git a/src/SketchPlugin/icons/sketch.png b/src/SketchPlugin/icons/sketch.png
new file mode 100644
index 000000000..d55e89c1e
Binary files /dev/null and b/src/SketchPlugin/icons/sketch.png differ
diff --git a/src/SketchPlugin/icons/tangent.png b/src/SketchPlugin/icons/tangent.png
new file mode 100644
index 000000000..ec54eae31
Binary files /dev/null and b/src/SketchPlugin/icons/tangent.png differ
diff --git a/src/SketchPlugin/icons/translate.png b/src/SketchPlugin/icons/translate.png
new file mode 100644
index 000000000..5ecdb5192
Binary files /dev/null and b/src/SketchPlugin/icons/translate.png differ
diff --git a/src/SketchPlugin/icons/translate_32x32.png b/src/SketchPlugin/icons/translate_32x32.png
new file mode 100755
index 000000000..20391da43
Binary files /dev/null and b/src/SketchPlugin/icons/translate_32x32.png differ
diff --git a/src/SketchPlugin/icons/translate_full_32x32.png b/src/SketchPlugin/icons/translate_full_32x32.png
new file mode 100755
index 000000000..1fd53d9d7
Binary files /dev/null and b/src/SketchPlugin/icons/translate_full_32x32.png differ
diff --git a/src/SketchPlugin/icons/vertical.png b/src/SketchPlugin/icons/vertical.png
new file mode 100644
index 000000000..430386c98
Binary files /dev/null and b/src/SketchPlugin/icons/vertical.png differ
diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 38b0854d0..20c68b4d3 100644
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -9,23 +9,22 @@
         when_nested="accept abort"
         title="Sketch"
         tooltip="Create sketch"
-        icon=":icons/sketch.png">
+        icon="icons/Sketch/sketch.png">
         <sketch-start-label id="External" title="Select a plane on which to create a sketch" tooltip="Select a plane on which to create a sketch">
           <validator id="GeomValidators_Face" parameters="plane"/>
         </sketch-start-label>
         <error_label id="SolverError"/>
         <validator id="SketchPlugin_SolverErrorValidator"/>
-      <!--icon=":pictures/x_point.png"-->
       </feature>
 
       <!-- SketchPoint -->
-      <feature id="SketchPoint" title="Point" tooltip="Create point" icon=":icons/point.png">
+      <feature id="SketchPoint" title="Point" tooltip="Create point" icon="icons/Sketch/point.png">
         <sketch-2dpoint_selector id="PointCoordindates" accept_expressions="0" title="Point" tooltip="Point coordinates"/>
         <boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
       </feature>
       
       <!-- SketchLine -->
-      <feature id="SketchLine" title="Line" tooltip="Create line" icon=":icons/line.png">
+      <feature id="SketchLine" title="Line" tooltip="Create line" icon="icons/Sketch/line.png">
         <sketch-2dpoint_selector id="StartPoint" accept_expressions="0" title="Start point" tooltip="Start point coordinates" previous_feature_param="EndPoint"/>
         <sketch-2dpoint_selector id="EndPoint" accept_expressions="0" title="End point" tooltip="End point coordinates"/>
         <boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
@@ -37,15 +36,15 @@
         id="SketchCircle"
         title="Circle"
         tooltip="Create circle"
-        icon=":icons/circle.png">
+        icon="icons/Sketch/circle.png">
         <toolbox id="CircleType">
-          <box id="CenterRadius" title="Center and radius" icon=":icons/circle_pt_rad_32x32.png">
+          <box id="CenterRadius" title="Center and radius" icon="icons/Sketch/circle_pt_rad_32x32.png">
             <sketch-2dpoint_selector id="CircleCenter" accept_expressions="0" title="Center" tooltip="Center coordinates"/>
-            <point2ddistance id="CircleRadius" accept_expressions="0" first_point="CircleCenter" label="Radius:" min="0" step="1.0" default="0" icon=":icons/radius.png" tooltip="Set radius">
+            <point2ddistance id="CircleRadius" accept_expressions="0" first_point="CircleCenter" label="Radius:" min="0" step="1.0" default="0" icon="icons/Sketch/radius.png" tooltip="Set radius">
               <validator id="GeomValidators_Positive"/>
             </point2ddistance>
           </box>
-          <box id="ThreePoints" title="Three points" icon=":icons/circle_3pt_32x32.png">
+          <box id="ThreePoints" title="Three points" icon="icons/Sketch/circle_3pt_32x32.png">
             <sketch-2dpoint_selector id="FirstPoint" accept_expressions="0" title="First point" tooltip="First point"/>
             <sketch-2dpoint_selector id="SecondPoint" accept_expressions="0" title="Second point" tooltip="Second point"/>
             <sketch-2dpoint_selector id="ThirdPoint" accept_expressions="0" title="Third point" tooltip="Third point"/>
@@ -59,36 +58,36 @@
         id="SketchArc"
         title="Arc"
         tooltip="Create arc"
-        icon=":icons/arc.png">
+        icon="icons/Sketch/arc.png">
         <toolbox id="ArcType">
-          <box id="CenterStartEnd" title="Center and two points" icon=":icons/arc_base_32x32.png">
+          <box id="CenterStartEnd" title="Center and two points" icon="icons/Sketch/arc_base_32x32.png">
             <sketch-2dpoint_selector id="ArcCenter" accept_expressions="0" title="Center" tooltip="Center of a circle"/>
             <sketch-2dpoint_selector id="ArcStartPoint" accept_expressions="0" title="Start point" tooltip="Start point"/>
             <sketch-2dpoint_selector id="ArcEndPoint" accept_expressions="0" title="End point" tooltip="End point"/>
             <validator id="GeomValidators_Different" parameters="ArcCenter,ArcStartPoint,ArcEndPoint"/>
           </box>
-          <box id="ThreePoints" title="Three points on arc" icon=":icons/arc_3pt_32x32.png">
+          <box id="ThreePoints" title="Three points on arc" icon="icons/Sketch/arc_3pt_32x32.png">
             <sketch-2dpoint_selector id="ArcStartPoint" accept_expressions="0" title="Start point" tooltip="Start point"/>
             <sketch-2dpoint_selector id="ArcEndPoint" accept_expressions="0" title="End point" tooltip="End point"/>
             <sketch-2dpoint_selector id="ArcPassedPoint" accept_expressions="0" title="Passed point" tooltip="Passed point"/>
             <validator id="GeomValidators_Different" parameters="ArcStartPoint,ArcEndPoint,ArcPassedPoint"/>
           </box>
-          <box id="Tangent" title="Tangent with edge" icon=":icons/arc_tang_32x32.png">
+          <box id="Tangent" title="Tangent with edge" icon="icons/Sketch/arc_tang_32x32.png">
             <sketch_shape_selector id="ArcTangentPoint" label="Start point" tooltip="Select point on line" shape_types="vertex">
               <validator id="SketchPlugin_ArcTangentPoint" parameters="" />
             </sketch_shape_selector>
             <sketch-2dpoint_selector id="ArcEndPoint" accept_expressions="0" title="End point" tooltip="End point"/>
           </box>
         </toolbox>
-        <doublevalue id="ArcRadius" accept_expressions="0" label="Radius:" default="computed" icon=":icons/radius.png" tooltip="Set radius" obligatory="0">
+        <doublevalue id="ArcRadius" accept_expressions="0" label="Radius:" default="computed" icon="icons/Sketch/radius.png" tooltip="Set radius" obligatory="0">
           <validator id="GeomValidators_Positive"/>
         </doublevalue>
-        <doublevalue id="ArcAngle" label="Angle:" icon=":icons/angle.png" tooltip="Set angle" default="90" use_reset="false" obligatory="0"/>
+        <doublevalue id="ArcAngle" label="Angle:" icon="icons/Sketch/angle.png" tooltip="Set angle" default="90" use_reset="false" obligatory="0"/>
         <boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
       </feature>
 
       <!--  SketchConstraintFillet  -->
-      <feature id="SketchConstraintFillet" title="Fillet" tooltip="Create constraint defining fillet between two objects" icon=":icons/fillet.png">
+      <feature id="SketchConstraintFillet" title="Fillet" tooltip="Create constraint defining fillet between two objects" icon="icons/Sketch/fillet.png">
         <!--<sketch_shape_selector id="ConstraintEntityA"
             label="Point" tooltip="Select point for fillet (should be shared by two entities only)" shape_types="vertex">
           <validator id="SketchPlugin_FilletVertexValidator"/>
@@ -113,7 +112,7 @@
         id="SketchIntersectionPoint"
         title="Intersection Point"
         tooltip="Create intersection point"
-        icon=":icons/intersection_point.png">
+        icon="icons/Sketch/intersection_point.png">
         <sketch_shape_selector
               id="ExternalLine"
               label="Edge"
@@ -132,7 +131,7 @@
       <!--  SketchConstraintMirror  -->
       <feature
         id="SketchConstraintMirror"
-        title="Mirror" icon=":icons/mirror.png"
+        title="Mirror" icon="icons/Sketch/mirror.png"
         tooltip="Create constraint, mirroring group of objects">
         <sketch_shape_selector id="ConstraintEntityA"
             label="Mirror line" tooltip="Select mirror line" shape_types="edge">
@@ -151,7 +150,7 @@
       <!--  SketchMultiTranslation  -->
       <feature
         id="SketchMultiTranslation"
-        title="Translation" icon=":icons/translate.png"
+        title="Translation" icon="icons/Sketch/translate.png"
         tooltip="Multiple translation">
         <sketch_multi_selector id="MultiTranslationList"
             label="Segments:"
@@ -162,7 +161,7 @@
           <validator id="SketchPlugin_CopyValidator" />
         </sketch_multi_selector>
         <toolbox id="ValueType">
-          <box id="SingleValue" title="Single value" icon=":icons/translate_32x32.png">
+          <box id="SingleValue" title="Single value" icon="icons/Sketch/translate_32x32.png">
             <groupbox title="Direction">
               <sketch_shape_selector
                     id="MultiTranslationStartPoint"
@@ -182,7 +181,7 @@
               </sketch_shape_selector>
             </groupbox>
           </box>
-          <box id="FullValue" title="Full value" icon=":icons/translate_full_32x32.png">
+          <box id="FullValue" title="Full value" icon="icons/Sketch/translate_full_32x32.png">
             <groupbox title="Direction">
               <sketch_shape_selector
                     id="MultiTranslationStartPoint"
@@ -214,7 +213,7 @@
       <!--  SketchMultiRotation  -->
       <feature
         id="SketchMultiRotation"
-        title="Rotation" icon=":icons/rotate.png"
+        title="Rotation" icon="icons/Sketch/rotate.png"
         tooltip="Multiple rotation">
         <sketch_multi_selector id="MultiRotationList"
             label="Segments:"
@@ -232,17 +231,17 @@
           <validator id="GeomValidators_ShapeType" parameters="vertex"/>
         </sketch_shape_selector>
         <toolbox id="AngleType">
-          <box id="SingleAngle" title="Single angle" icon=":icons/angle_up_32x32.png">
+          <box id="SingleAngle" title="Single angle" icon="icons/Sketch/angle_up_32x32.png">
             <doublevalue id="MultiRotationAngle"
                          label="Angle"
-                         icon=":icons/angle.png"
+                         icon="icons/Sketch/angle.png"
                          tooltip="Rotation angle"
                          default="90" use_reset="false"/>
           </box>
-          <box id="FullAngle" title="Full angle" icon=":icons/angle_up_full_32x32.png">
+          <box id="FullAngle" title="Full angle" icon="icons/Sketch/angle_up_full_32x32.png">
             <doublevalue id="MultiRotationAngle"
                          label="Angle"
-                         icon=":icons/angle.png"
+                         icon="icons/Sketch/angle.png"
                          tooltip="Rotation angle"
                          default="90" use_reset="false"/>
           </box>
@@ -262,7 +261,7 @@
         id="SketchConstraintDistance"
         title="Distance"
         tooltip="Set fixed distance from a point to an object"
-        icon=":icons/distance.png">
+        icon="icons/Sketch/distance.png">
         <label title="Select objects for distance definition. Following objects can be accepted: point, line or arc end point, center of circle or arc."/>
         <sketch_shape_selector
               id="ConstraintEntityA"
@@ -293,7 +292,7 @@
       </feature>
       
     <!--  SketchConstraintLength  -->      
-      <feature id="SketchConstraintLength" title="Length" tooltip="Set fixed length of a line segment" icon=":icons/length.png">
+      <feature id="SketchConstraintLength" title="Length" tooltip="Set fixed length of a line segment" icon="icons/Sketch/length.png">
         <label title="Select a line on which to calculate length" tooltip="Select a line on which to calculate length"/>
         <shape_selector id="ConstraintEntityA" label="Line" tooltip="Select an line" shape_types="edge" >
           <validator id="GeomValidators_ShapeType" parameters="line"/>
@@ -306,7 +305,7 @@
       </feature>
 
       <!--  SketchConstraintAngle  -->
-      <feature id="SketchConstraintAngle" title="Angle" tooltip="Set fixed angle between two line segments" icon=":icons/angle_constr.png">
+      <feature id="SketchConstraintAngle" title="Angle" tooltip="Set fixed angle between two line segments" icon="icons/Sketch/angle_constr.png">
         <sketch_shape_selector id="ConstraintEntityA" label="Line 1" tooltip="Select an line" shape_types="edge" >
           <validator id="GeomValidators_ShapeType" parameters="line"/>
           <validator id="PartSet_DifferentObjects"/>
@@ -326,13 +325,13 @@
           label="Angle type"
           tooltip="Type of angle"
           string_list="Direct Complementary Additional"
-          icons_list=":icons/angle_direct.png :icons/angle_complementary.png :icons/angle_backward.png"
+          icons_list="icons/Sketch/angle_direct.png icons/angle_complementary.png icons/angle_backward.png"
           default="0"
           />
       </feature>
 
       <!--  SketchConstraintRadius  -->
-      <feature id="SketchConstraintRadius" title="Radius" tooltip="Set fixed radius of a circle or an arc" icon=":icons/radius_constr.png">
+      <feature id="SketchConstraintRadius" title="Radius" tooltip="Set fixed radius of a circle or an arc" icon="icons/Sketch/radius_constr.png">
         <label title="Select a circle or an arc on which to calculate radius" tooltip="Select a circle or an arc on which to calculate radius"/>
         <shape_selector id="ConstraintEntityA" label="Circle or Arc" tooltip="Select a circle or an arc"
             shape_types="edge">
@@ -350,7 +349,7 @@
     <group id="Geometrical constraints">
 
       <!--  SketchConstraintHorizontal  -->
-      <feature id="SketchConstraintHorizontal" title="Horizontal" tooltip="Create constraint defining horizontal line" icon=":icons/horisontal.png">
+      <feature id="SketchConstraintHorizontal" title="Horizontal" tooltip="Create constraint defining horizontal line" icon="icons/Sketch/horisontal.png">
         <sketch_shape_selector id="ConstraintEntityA"
             label="Line" tooltip="Select a line" shape_types="edge" use_external="false">
           <validator id="GeomValidators_ShapeType" parameters="line"/>
@@ -359,7 +358,7 @@
       </feature>
 
       <!--  SketchConstraintVertical  -->
-      <feature id="SketchConstraintVertical" title="Vertical" tooltip="Create constraint defining vertical line" icon=":icons/vertical.png">
+      <feature id="SketchConstraintVertical" title="Vertical" tooltip="Create constraint defining vertical line" icon="icons/Sketch/vertical.png">
         <sketch_shape_selector id="ConstraintEntityA"
             label="Line" tooltip="Select a line" shape_types="edge" use_external="false">
           <validator id="GeomValidators_ShapeType" parameters="line"/>
@@ -368,7 +367,7 @@
       </feature>
 
       <!--  SketchConstraintRigid  -->
-      <feature id="SketchConstraintRigid" title="Fixed" tooltip="Fix an object" icon=":icons/fixed.png">
+      <feature id="SketchConstraintRigid" title="Fixed" tooltip="Fix an object" icon="icons/Sketch/fixed.png">
         <sketch_shape_selector id="ConstraintEntityA" label="Object"
                         tooltip="Select point, line end point, line, center of circle or arc."
                         shape_types="edge vertex">
@@ -380,7 +379,7 @@
 
       <!--  SketchConstraintParallel  -->
       <feature id="SketchConstraintParallel" title="Parallel" tooltip="Create constraint defining two parallel lines"
-               icon="parallel.png">
+               icon="icons/Sketch/parallel.png">
         <sketch_shape_selector id="ConstraintEntityA" 
             label="First line" tooltip="Select a line" shape_types="edge">
           <validator id="GeomValidators_ShapeType" parameters="line"/>
@@ -400,7 +399,7 @@
     <!--  SketchConstraintPerpendicular  -->
       <feature id="SketchConstraintPerpendicular" title="Perpendicular" 
         tooltip="Create constraint defining two perpendicular lines" 
-        icon=":icons/perpendicular.png">
+        icon="icons/Sketch/perpendicular.png">
         <sketch_shape_selector id="ConstraintEntityA" 
             label="First line" tooltip="Select an line" 
             shape_types="edge">
@@ -420,7 +419,7 @@
       </feature>
 
       <!--  SketchConstraintTangent  -->
-      <feature id="SketchConstraintTangent" title="Tangent" tooltip="Create constraint defining tangency of two objects with common coincident point" icon=":icons/tangent.png">
+      <feature id="SketchConstraintTangent" title="Tangent" tooltip="Create constraint defining tangency of two objects with common coincident point" icon="icons/Sketch/tangent.png">
         <sketch_shape_selector id="ConstraintEntityA"
             label="First object" tooltip="Select line or arc" shape_types="edge">
           <validator id="SketchPlugin_TangentAttr" parameters="ConstraintEntityB"/>
@@ -436,7 +435,7 @@
       </feature>
 
       <!--  SketchConstraintCoincidence  -->
-      <feature id="SketchConstraintCoincidence" title="Coincident" tooltip="Create constraint for the coincidence of two points or point on line or circle" icon=":icons/coincedence.png">
+      <feature id="SketchConstraintCoincidence" title="Coincident" tooltip="Create constraint for the coincidence of two points or point on line or circle" icon="icons/Sketch/coincedence.png">
         <sketch_shape_selector id="ConstraintEntityA" label="First object" tooltip="Select a first object" shape_types="vertex edge">
           <validator id="PartSet_DifferentObjects"/>
           <validator id="SketchPlugin_ExternalValidator" parameters="ConstraintEntityB"/>
@@ -450,7 +449,7 @@
       </feature>
 
       <!--  SketchConstraintMiddle  -->
-      <feature id="SketchConstraintMiddle" title="Middle point" tooltip="Create constraint for setting middle point on a line" icon=":icons/middlepoint.png">
+      <feature id="SketchConstraintMiddle" title="Middle point" tooltip="Create constraint for setting middle point on a line" icon="icons/Sketch/middlepoint.png">
         <sketch_shape_selector id="ConstraintEntityA" label="First object" tooltip="Select a first object" shape_types="vertex edge">
           <validator id="PartSet_DifferentObjects"/>
           <validator id="SketchPlugin_ExternalValidator" parameters="ConstraintEntityB"/>
@@ -467,7 +466,7 @@
       <!--  SketchConstraintEqual  -->
       <feature id="SketchConstraintEqual" title="Equal"
         tooltip="Create constraint defining equal lengths of two lines or line and arc or equal radii of two arcs or two circles or arc and circle"
-        icon=":icons/equal.png">
+        icon="icons/Sketch/equal.png">
         <sketch_shape_selector id="ConstraintEntityA" 
             label="First object" tooltip="Select line, circle or arc" shape_types="edge">
           <validator id="PartSet_DifferentObjects"/>
@@ -485,7 +484,7 @@
       
     <!--  SketchConstraintCollinear  -->
       <!--
-      <feature id="SketchConstraintCollinear" title="Collinear" tooltip="Create constraint defining collinearity of two lines" icon=":icons/collinear.png">
+      <feature id="SketchConstraintCollinear" title="Collinear" tooltip="Create constraint defining collinearity of two lines" icon="icons/Sketch/collinear.png">
         <sketch_shape_selector id="ConstraintEntityA" 
             label="First line" tooltip="Select a line" shape_types="edge">
           <validator id="GeomValidators_ShapeType" parameters="line"/>