diff --git a/object_color_rules.py b/object_color_rules.py
index 8d3d02febc9e6564f686da1f045fa8f52d04233a..fea8c1c30da8e9bbbb4b94abfe944a9e6ccb31a5 100644
--- a/object_color_rules.py
+++ b/object_color_rules.py
@@ -260,8 +260,8 @@ class OBJECT_PT_color_rules(Panel):
 
         col = row.column()
         colsub = col.column(align=True)
-        colsub.operator("object.color_rules_add", icon='ZOOMIN', text="")
-        colsub.operator("object.color_rules_remove", icon='ZOOMOUT', text="")
+        colsub.operator("object.color_rules_add", icon='ADD', text="")
+        colsub.operator("object.color_rules_remove", icon='REMOVE', text="")
 
         colsub = col.column(align=True)
         colsub.operator("object.color_rules_move", text="", icon='TRIA_UP').direction = -1
diff --git a/oscurart_mesh_cache_tools.py b/oscurart_mesh_cache_tools.py
index ee8ecf30b91e4bce5088ba8d7c1ae0852338d40a..a28fe650722b736cf5f8bcee9ffc864b25198346 100644
--- a/oscurart_mesh_cache_tools.py
+++ b/oscurart_mesh_cache_tools.py
@@ -125,7 +125,7 @@ class OscEPc2ExporterPanel(View3DMCPanel, Panel):
 
         row = layout.column(align=1)
         row.prop(scene, "pc_pc2_folder", text="Folder")
-        row.operator("buttons.set_meshcache_folder", icon='FILESEL', text="Select Folder Path")
+        row.operator("buttons.set_meshcache_folder", icon='FILEBROWSER', text="Select Folder Path")
         row = layout.box().column(align=1)
         row.label("EXPORTER:")
         row.operator("group.linked_group_to_local", text="Linked To Local", icon="LINKED")
diff --git a/space_view3d_enhanced_3d_cursor.py b/space_view3d_enhanced_3d_cursor.py
index 25019e766a999125b838eb5b2276a276f594e332..b23ab35bbd61de451343dce4ffa113449067c7ea 100644
--- a/space_view3d_enhanced_3d_cursor.py
+++ b/space_view3d_enhanced_3d_cursor.py
@@ -3408,7 +3408,7 @@ class PseudoIDBlockBase(bpy.types.PropertyGroup):
         row.prop_menu_enum(self, "enum", text="", icon=self.icon)
         row.prop(self, "active", text="")
         if self.op_new:
-            row.operator(self.op_new, text="", icon='ZOOMIN')
+            row.operator(self.op_new, text="", icon='ADD')
         if self.op_delete:
             row.operator(self.op_delete, text="", icon='X')
 # end class
diff --git a/space_view3d_paint_bprojection.py b/space_view3d_paint_bprojection.py
index 632b5d636ad94a211988c766463f1ff9ea1c1dda..751f9bc822035ac6027f5cda82b09b73465385a8 100644
--- a/space_view3d_paint_bprojection.py
+++ b/space_view3d_paint_bprojection.py
@@ -797,7 +797,7 @@ class BProjection(Panel):
                     col.template_ID(tex, "image", open="image.open")
                     row = box.row(align=True)
                     row.operator('object.applyimage', text="Apply image", icon='FILE_TICK')
-                    row.prop(em, "custom_c3d", text="", icon='CURSOR')
+                    row.prop(em, "custom_c3d", text="", icon='PIVOT_CURSOR')
                     row = box.row(align=True)
                     row.label(text="Location:")
                     row = box.row(align=True)
diff --git a/space_view3d_panel_measure.py b/space_view3d_panel_measure.py
index e5d2760b10fa3e2d1f1b70265ee9257b84643631..c5fa71db7f796b3a89681a1561d36b68e18df3df 100644
--- a/space_view3d_panel_measure.py
+++ b/space_view3d_panel_measure.py
@@ -1088,7 +1088,7 @@ class VIEW3D_PT_measure(bpy.types.Panel):
                     row.prop(sce, "measure_panel_dist")
 
                     row = box.row()
-                    row.label(text="", icon='CURSOR')
+                    row.label(text="", icon='PIVOT_CURSOR')
                     row.label(text="", icon='ARROW_LEFTRIGHT')
                     if measureLocal(sce):
                         row.label(text="Obj. Center")
@@ -1108,7 +1108,7 @@ class VIEW3D_PT_measure(bpy.types.Panel):
                     row.prop(sce, "measure_panel_dist")
 
                     row = box.row()
-                    row.label(text="", icon='CURSOR')
+                    row.label(text="", icon='PIVOT_CURSOR')
                     row.label(text="", icon='ARROW_LEFTRIGHT')
                     row.label(text="", icon='VERTEXSEL')
 
@@ -1368,7 +1368,7 @@ class VIEW3D_PT_measure(bpy.types.Panel):
                 row.prop(sce, "measure_panel_dist")
 
                 row = box.row()
-                row.label(text="", icon='CURSOR')
+                row.label(text="", icon='PIVOT_CURSOR')
 
                 row.label(text="", icon='ARROW_LEFTRIGHT')
 
@@ -1449,7 +1449,7 @@ class VIEW3D_PT_measure(bpy.types.Panel):
                 row.prop(sce, "measure_panel_dist")
 
                 row = box.row()
-                row.label(text="", icon='CURSOR')
+                row.label(text="", icon='PIVOT_CURSOR')
                 row.label(text="", icon='ARROW_LEFTRIGHT')
                 row.label(text="Origin [0,0,0]")
 
diff --git a/space_view3d_quickPrefs.py b/space_view3d_quickPrefs.py
index 3ccf3dbc10e5004281d58c9d537fa4379cc280a2..f084cf1c24c90920a53a1b1349159d923e11b490 100644
--- a/space_view3d_quickPrefs.py
+++ b/space_view3d_quickPrefs.py
@@ -783,8 +783,8 @@ class PANEL(bpy.types.Panel):
 #Draw the buttons
             split = split.split()
             col = split.column()
-            col.operator("gllightpreset.action", icon="ZOOMIN", text="Add").button="add"
-            col.operator("gllightpreset.action", icon="ZOOMOUT", text="Delete").button="delete"
+            col.operator("gllightpreset.action", icon='ADD', text="Add").button="add"
+            col.operator("gllightpreset.action", icon='REMOVE', text="Delete").button="delete"
             col.operator("gllightpreset.action", icon="FILE_TICK", text="Save to Blend").button="save"
             col.operator("gllightpreset.action", icon="SORTALPHA", text="Sort").button="sort"
             col.operator("gllightpreset.action", icon="SHORTDISPLAY", text="Add Defaults").button="defaults"
diff --git a/space_view3d_render_settings.py b/space_view3d_render_settings.py
index 3ee74d5d38b57e47e8532f332cdec9175ff64179..fc270b71ddcdfd0ae8839dccdeaa25cf994f48b2 100644
--- a/space_view3d_render_settings.py
+++ b/space_view3d_render_settings.py
@@ -278,7 +278,7 @@ class RenderToolsMenu(bpy.types.Operator):
             self.layout.prop(cscene, "samples", text="Render")
             self.layout.prop(cscene, "preview_samples", text="Preview")
             self.layout.separator()
-            self.layout.prop(context.scene.render, 'use_freestyle', text="Use FreeStyle", icon="WIRE")
+            self.layout.prop(context.scene.render, 'use_freestyle', text="Use FreeStyle", icon='SHADING_WIRE')
             self.layout.separator()
             self.layout.menu(SimplifyRenderMenu.bl_idname, icon="RENDER_RESULT")
             self.layout.menu(SubsurfMenu.bl_idname, icon="MOD_SUBSURF")
@@ -306,7 +306,7 @@ class RenderToolsMenu(bpy.types.Operator):
             self.layout.prop(context.scene.render, 'use_antialiasing', text="Use Anti-aliasing", icon="ALIASED")
             self.layout.prop_menu_enum(context.scene.render, 'antialiasing_samples', text="Set Anti-Aliasing", icon="ANTIALIASED")
             self.layout.prop(context.scene.world.light_settings, 'samples', text="Ray Samples", icon="WORLD")
-            self.layout.prop(context.scene.render, 'use_freestyle', text="Use FreeStyle", icon="WIRE")
+            self.layout.prop(context.scene.render, 'use_freestyle', text="Use FreeStyle", icon='SHADING_WIRE')
             self.layout.menu(ShadeingMenu.bl_idname, icon="TEXTURE_SHADED")
             self.layout.separator()
             self.layout.menu(SimplifyRenderMenu.bl_idname, icon="RENDER_RESULT")
@@ -338,7 +338,7 @@ class AnimateRenderMenu(bpy.types.Menu):
         self.layout.separator()
         self.layout.prop(context.scene, 'frame_start', text="Start Frame", icon="COLOR_GREEN")
         self.layout.prop(context.scene, 'frame_end', text="End Frame", icon="COLOR_RED")
-        self.layout.prop(context.scene, 'frame_step', text="Frame Step", icon="ALIGN")
+        self.layout.prop(context.scene, 'frame_step', text="Frame Step", icon='CENTER_ONLY')
         self.layout.prop(context.scene.render, 'fps', text="FPS", icon="AUTO")
 
 
@@ -377,7 +377,7 @@ class RenderSettingsPanel(bpy.types.Panel):
             self.layout.prop(cscene, "samples", text="Render")
             self.layout.prop(cscene, "preview_samples", text="Preview")
             self.layout.separator()
-            self.layout.prop(context.scene.render, 'use_freestyle', text="Use FreeStyle", icon="WIRE")
+            self.layout.prop(context.scene.render, 'use_freestyle', text="Use FreeStyle", icon='SHADING_WIRE')
             self.layout.separator()
             self.layout.menu(SimplifyRenderMenu.bl_idname, icon="RENDER_RESULT")
             self.layout.menu(SubsurfMenu.bl_idname, icon="MOD_SUBSURF")
@@ -405,7 +405,7 @@ class RenderSettingsPanel(bpy.types.Panel):
             self.layout.prop(context.scene.render, 'use_antialiasing', text="Use Anti-aliasing", icon="ALIASED")
             self.layout.prop_menu_enum(context.scene.render, 'antialiasing_samples', text="Set Anti-Aliasing", icon="ANTIALIASED")
             self.layout.prop(context.scene.world.light_settings, 'samples', text="Ray Samples", icon="WORLD")
-            self.layout.prop(context.scene.render, 'use_freestyle', text="Use FreeStyle", icon="WIRE")
+            self.layout.prop(context.scene.render, 'use_freestyle', text="Use FreeStyle", icon='SHADING_WIRE')
             self.layout.menu(ShadeingMenu.bl_idname, icon="TEXTURE_SHADED")
             self.layout.separator()
             self.layout.menu(SimplifyRenderMenu.bl_idname, icon="RENDER_RESULT")
diff --git a/space_view3d_toolshelf_menu.py b/space_view3d_toolshelf_menu.py
index d1aa02e10ca76d59da781e7ad5b0c44e4cb56e29..e893e542b4dea0635ce802a0bdf5f224f8048b4d 100644
--- a/space_view3d_toolshelf_menu.py
+++ b/space_view3d_toolshelf_menu.py
@@ -64,8 +64,8 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
             layout.menu("VIEW3D_MT_AddMenu2", icon='OBJECT_DATAMODE')
             layout.menu("VIEW3D_MT_View_Directions2", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_View_Navigation2", icon='ROTATE')
-            layout.menu("VIEW3D_MT_View_Toggle2", icon='SPLITSCREEN')
+            layout.menu("VIEW3D_MT_View_Navigation2", icon='PIVOT_BOUNDBOX')
+            layout.menu("VIEW3D_MT_View_Toggle2", icon='WORKSPACE')
             layout.operator("view3d.snap_cursor_to_center",
                             text="Cursor to Center")
             layout.operator("view3d.snap_cursor_to_grid",
@@ -91,9 +91,9 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenu2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu2", icon='ROTACTIVE')
+            layout.menu("VIEW3D_MT_ParentMenu2", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu2", icon='GROUP')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
@@ -125,11 +125,11 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenuEdit2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_EditCursorMenu2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_EditCursorMenu2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_UV_Map2", icon='MOD_UVPROJECT')
             layout.menu("VIEW3D_MT_edit_mesh_specials", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_edit_mesh_extrude", icon='ORTHO')
+            layout.menu("VIEW3D_MT_edit_mesh_extrude", icon='XRAY')
             UseSeparator(self, context)
             layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
             layout.operator_menu_enum("object.constraint_add", "type", text="Add Constraint", icon='CONSTRAINT')
@@ -158,7 +158,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenu2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_UndoS2", icon='ARROW_LEFTRIGHT')
             layout.menu("VIEW3D_MT_Object_Interactive_Mode2", icon='EDIT')
@@ -229,9 +229,9 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenu2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu2", icon='ROTACTIVE')
+            layout.menu("VIEW3D_MT_ParentMenu2", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu2", icon='GROUP')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
@@ -263,7 +263,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenu2", icon='PIVOT_CURSOR')
             layout.menu("VIEW3D_MT_EditCurveCtrlpoints2",
                         icon='CURVE_BEZCURVE')
             layout.menu("VIEW3D_MT_EditCurveSpecials2",
@@ -292,9 +292,9 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenu2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu2", icon='ROTACTIVE')
+            layout.menu("VIEW3D_MT_ParentMenu2", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu2", icon='GROUP')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
@@ -322,7 +322,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
                         icon='OUTLINER_OB_SURFACE')
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenu2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
             layout.prop_menu_enum(settings, "proportional_edit",
                                   icon="PROP_CON")
@@ -354,9 +354,9 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenu2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu2", icon='ROTACTIVE')
+            layout.menu("VIEW3D_MT_ParentMenu2", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu2", icon='GROUP')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
@@ -384,7 +384,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
                                       icon='OUTLINER_OB_META')
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenu2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
             layout.prop_menu_enum(settings, "proportional_edit",
                                   icon="PROP_CON")
@@ -414,9 +414,9 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenu2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu2", icon='ROTACTIVE')
+            layout.menu("VIEW3D_MT_ParentMenu2", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu2", icon='GROUP')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
@@ -465,9 +465,9 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             layout.menu("VIEW3D_MT_Object2", icon='VIEW3D')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
-            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu2", icon='ROTACTIVE')
+            layout.menu("VIEW3D_MT_ParentMenu2", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu2", icon='GROUP')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
@@ -495,9 +495,9 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             layout.menu("VIEW3D_MT_Object2", icon='VIEW3D')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenuLite2", icon='MANIPUL')
-            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu2", icon='ROTACTIVE')
+            layout.menu("VIEW3D_MT_ParentMenu2", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu2", icon='GROUP')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
@@ -526,9 +526,9 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenuArmature2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu2", icon='ROTACTIVE')
+            layout.menu("VIEW3D_MT_ParentMenu2", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu2", icon='GROUP')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
@@ -562,8 +562,8 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenuArmatureEdit2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='CURSOR')
-            layout.menu("VIEW3D_MT_ParentMenu2", icon='ROTACTIVE')
+            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='PIVOT_CURSOR')
+            layout.menu("VIEW3D_MT_ParentMenu2", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_armature_specials", icon='SOLO_OFF')
             layout.menu("VIEW3D_MT_edit_armature_roll",
                         icon='BONE_DATA')
@@ -591,7 +591,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             layout.menu("VIEW3D_MT_TransformMenuArmaturePose2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_pose_transform", icon='EMPTY_DATA')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='PIVOT_CURSOR')
             layout.menu("VIEW3D_MT_PoseCopy2", icon='FILE')
 
             if arm.display_type in {'BBONE', 'ENVELOPE'}:
@@ -626,9 +626,9 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenu2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu2", icon='ROTACTIVE')
+            layout.menu("VIEW3D_MT_ParentMenu2", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu2", icon='GROUP')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
@@ -656,7 +656,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenu2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
             layout.prop_menu_enum(settings, "proportional_edit",
                                   icon="PROP_CON")
@@ -685,9 +685,9 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenuLite2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu2", icon='ROTACTIVE')
+            layout.menu("VIEW3D_MT_ParentMenu2", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu2", icon='GROUP')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_object_specials", text="Specials", icon='SOLO_OFF')
@@ -715,9 +715,9 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             layout.menu("VIEW3D_MT_Object2", icon='VIEW3D')
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenuLite2", icon='MANIPUL')
-            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu2", icon='ROTACTIVE')
+            layout.menu("VIEW3D_MT_ParentMenu2", icon='PIVOT_ACTIVE')
             layout.menu("VIEW3D_MT_GroupMenu2", icon='GROUP')
             UseSeparator(self, context)
             layout.operator_menu_enum("object.constraint_add", "type", text="Add Constraint", icon='CONSTRAINT')
@@ -742,7 +742,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
             UseSeparator(self, context)
             layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
             layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='CURSOR')
+            layout.menu("VIEW3D_MT_CursorMenuLite2", icon='PIVOT_CURSOR')
             UseSeparator(self, context)
             layout.prop_menu_enum(settings, "proportional_edit",
                                   icon="PROP_CON")
@@ -1334,7 +1334,7 @@ class VIEW3D_MT_Edit_Multi2(Menu):
 
         prop = layout.operator("wm.context_set_value",
                                text="Vertex & Face Select",
-                               icon='ORTHO')
+                               icon='XRAY')
         prop.value = "(True, False, True)"
         prop.data_path = "tool_settings.mesh_select_mode"
 
@@ -2188,7 +2188,7 @@ class VIEW3D_MT_Shade2(Menu):
                 layout.operator("OBJECT_OT_shade_flat")
 
         UseSeparator(self, context)
-        layout.operator("view3d.display_wire_all2", text="Wire all", icon='WIRE')
+        layout.operator("view3d.display_wire_all2", text="Wire all", icon='SHADING_WIRE')
         layout.prop(context.object, "show_in_front", text="X-Ray", icon="META_CUBE")
 
         UseSeparator(self, context)
diff --git a/system_project_folder.py b/system_project_folder.py
index 4c915e75eab076aae7009d34e2f762378ce34391..c33ccda7b4604fe54359227a996da3fa357198c7 100644
--- a/system_project_folder.py
+++ b/system_project_folder.py
@@ -68,7 +68,7 @@ def menu_func(self, context):
     self.layout.operator(
         ProjectFolder.bl_idname,
         text="Project Folder",
-        icon="FILESEL")
+        icon='FILEBROWSER')
 
 def register():
     bpy.utils.register_class(ProjectFolder)