diff --git a/apps/opencs/model/world/universalid.cpp b/apps/opencs/model/world/universalid.cpp
index 38386f6da..8d7a7761e 100644
--- a/apps/opencs/model/world/universalid.cpp
+++ b/apps/opencs/model/world/universalid.cpp
@@ -64,21 +64,21 @@ namespace
 
     static const TypeData sIdArg[] =
     {
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Global, "Global Variable", ":./globvar.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Gmst, "Game Setting", ":./GMST.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Global, "Global Variable", ":./global-variable.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Gmst, "Game Setting", ":./gmst.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Skill, "Skill", ":./skill.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Class, "Class", ":./class.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Faction, "Faction", ":./faction.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Race, "Race", ":./race.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Sound, "Sound", ":./sound.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Script, "Script", ":./script.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Region, "Region", ":./land.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Region, "Region", ":./region.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Birthsign, "Birthsign", ":./birthsign.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Spell, "Spell", ":./spell.png" },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Topic, "Topic", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Journal, "Journal", 0 },
-        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_TopicInfo, "TopicInfo", 0 },
-        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_JournalInfo, "JournalInfo", 0 },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Topic, "Topic", ":./dialogue-topics.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Journal, "Journal", ":./journal-topics.png" },
+        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_TopicInfo, "TopicInfo", ":./dialogue-topic-infos.png" },
+        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_JournalInfo, "JournalInfo", ":./journal-topic-infos.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Cell, "Cell", ":./cell.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Cell_Missing, "Cell", ":./cell.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Referenceable, "Object", 0 },
@@ -93,7 +93,7 @@ namespace
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Door, "Door", ":./door.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Ingredient, "Ingredient", ":./ingredient.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_CreatureLevelledList,
-            "Creature Levelled List", ":./creature.png" },
+            "Creature Levelled List", ":./leveled-creature.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_ItemLevelledList,
             "Item Levelled List", ":./leveled-item.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Light, "Light", ":./light.png" },
@@ -109,20 +109,20 @@ namespace
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Filter, "Filter", ":./filter.png" },
         { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Scene, "Scene", 0 },
         { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Preview, "Preview", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Enchantment, "Enchantment", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_BodyPart, "Body Part", 0 },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Mesh, "Mesh", 0 },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Icon, "Icon", 0 },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Music, "Music", 0 },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_SoundRes, "Sound File", 0 },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Texture, "Texture", 0 },
-        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Video, "Video", 0 },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Enchantment, "Enchantment", ":./enchantment.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_BodyPart, "Body Part", ":./body-part.png" },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Mesh, "Mesh", ":resources-mesh"},
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Icon, "Icon", ":resources-icon"},
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Music, "Music", ":resources-music" },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_SoundRes, "Sound File", ":resources-sound" },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Texture, "Texture", ":resources-texture"},
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Video, "Video", ":resources-video"},
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_DebugProfile, "Debug Profile", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_SoundGen, "Sound Generator", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MagicEffect, "Magic Effect", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Land, "Land", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_LandTexture, "LandTexture", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Pathgrid, "Pathgrid", 0 },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_SoundGen, "Sound Generator", ":./sound-generator.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MagicEffect, "Magic Effect", ":./magic-effect.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Land, "Land", ":./land-heightmap.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_LandTexture, "LandTexture", ":./land-texture.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Pathgrid, "Pathgrid", ":./pathgrid.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_StartScript, "Start Script", 0 },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MetaData, "Meta Data", 0 },
 
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index fae609af5..ee3e18d71 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -92,7 +92,7 @@ osg::Vec3f CSVRender::InstanceMode::getScreenCoords(const osg::Vec3f& pos)
 }
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
-: EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference | Mask_Terrain, "Instance editing",
+: EditMode (worldspaceWidget, QIcon (":scenetoolbar/editing-instance"), Mask_Reference | Mask_Terrain, "Instance editing",
   parent), mSubMode (0), mSubModeId ("move"), mSelectionMode (0), mDragMode (DragMode_None),
   mDragAxis (-1), mLocked (false), mUnitScaleDist(1)
 {
@@ -104,14 +104,14 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
     {
         mSubMode = new CSVWidget::SceneToolMode (toolbar, "Edit Sub-Mode");
         mSubMode->addButton (new InstanceMoveMode (this), "move");
-        mSubMode->addButton (":placeholder", "rotate",
+        mSubMode->addButton (":scenetoolbar/transform-rotate", "rotate",
             "Rotate selected instances"
             "<ul><li>Use {scene-edit-primary} to rotate instances freely</li>"
             "<li>Use {scene-edit-secondary} to rotate instances within the grid</li>"
             "<li>The center of the view acts as the axis of rotation</li>"
             "</ul>"
             "<font color=Red>Grid rotate not implemented yet</font color>");
-        mSubMode->addButton (":placeholder", "scale",
+        mSubMode->addButton (":scenetoolbar/transform-scale", "scale",
             "Scale selected instances"
             "<ul><li>Use {scene-edit-primary} to scale instances freely</li>"
             "<li>Use {scene-edit-secondary} to scale instances along the grid</li>"
diff --git a/apps/opencs/view/render/instancemovemode.cpp b/apps/opencs/view/render/instancemovemode.cpp
index fe58b581b..723af811d 100644
--- a/apps/opencs/view/render/instancemovemode.cpp
+++ b/apps/opencs/view/render/instancemovemode.cpp
@@ -2,7 +2,7 @@
 #include "instancemovemode.hpp"
 
 CSVRender::InstanceMoveMode::InstanceMoveMode (QWidget *parent)
-: ModeButton (QIcon (QPixmap (":placeholder")),
+: ModeButton (QIcon (QPixmap (":scenetoolbar/transform-move")),
   "Move selected instances"
   "<ul><li>Use {scene-edit-primary} to move instances around freely</li>"
   "<li>Use {scene-edit-secondary} to move instances around within the grid</li>"
diff --git a/apps/opencs/view/render/selectionmode.cpp b/apps/opencs/view/render/selectionmode.cpp
index cf0967e47..b5ccda5ad 100644
--- a/apps/opencs/view/render/selectionmode.cpp
+++ b/apps/opencs/view/render/selectionmode.cpp
@@ -13,7 +13,7 @@ namespace CSVRender
         , mWorldspaceWidget(worldspaceWidget)
         , mInteractionMask(interactionMask)
     {
-        addButton(":placeholder", "cube-centre",
+        addButton(":scenetoolbar/selection-mode-cube", "cube-centre",
             "Centred cube"
             "<ul><li>Drag with {scene-select-primary} (make instances the selection) or {scene-select-secondary} "
                 "(invert selection state) from the centre of the selection cube outwards</li>"
@@ -22,7 +22,7 @@ namespace CSVRender
                 "starting on an instance will have the same effect</li>"
             "</ul>"
             "<font color=Red>Not implemented yet</font color>");
-        addButton(":placeholder", "cube-corner",
+        addButton(":scenetoolbar/selection-mode-cube-corner", "cube-corner",
             "Cube corner to corner"
             "<ul><li>Drag with {scene-select-primary} (make instances the selection) or {scene-select-secondary} "
                 "(invert selection state) from one corner of the selection cube to the opposite corner</li>"
@@ -31,7 +31,7 @@ namespace CSVRender
                 "starting on an instance will have the same effect</li>"
             "</ul>"
             "<font color=Red>Not implemented yet</font color>");
-        addButton(":placeholder", "sphere",
+        addButton(":scenetoolbar/selection-mode-cube-sphere", "sphere",
             "Centred sphere"
             "<ul><li>Drag with {scene-select-primary} (make instances the selection) or {scene-select-secondary} "
                 "(invert selection state) from the centre of the selection sphere outwards</li>"
diff --git a/apps/opencs/view/world/recordbuttonbar.cpp b/apps/opencs/view/world/recordbuttonbar.cpp
index 40a24bf65..9fea7b303 100644
--- a/apps/opencs/view/world/recordbuttonbar.cpp
+++ b/apps/opencs/view/world/recordbuttonbar.cpp
@@ -57,12 +57,12 @@ CSVWorld::RecordButtonBar::RecordButtonBar (const CSMWorld::UniversalId& id,
 
     // left section
     mPrevButton = new QToolButton (this);
-    mPrevButton->setIcon(QIcon(":/go-previous.png"));
+    mPrevButton->setIcon(QIcon(":record-previous"));
     mPrevButton->setToolTip ("Switch to previous record");
     buttonsLayout->addWidget (mPrevButton, 0);
 
     mNextButton = new QToolButton (this);
-    mNextButton->setIcon(QIcon(":/go-next.png"));
+    mNextButton->setIcon(QIcon(":/record-next"));
     mNextButton->setToolTip ("Switch to next record");
     buttonsLayout->addWidget (mNextButton, 1);
 
@@ -72,7 +72,7 @@ CSVWorld::RecordButtonBar::RecordButtonBar (const CSMWorld::UniversalId& id,
     if (mTable.getFeatures() & CSMWorld::IdTable::Feature_Preview)
     {
         QToolButton* previewButton = new QToolButton (this);
-        previewButton->setIcon(QIcon(":/edit-preview.png"));
+        previewButton->setIcon(QIcon(":edit-preview"));
         previewButton->setToolTip ("Open a preview of this record");
         buttonsLayout->addWidget(previewButton);
         connect (previewButton, SIGNAL(clicked()), this, SIGNAL (showPreview()));
@@ -89,22 +89,22 @@ CSVWorld::RecordButtonBar::RecordButtonBar (const CSMWorld::UniversalId& id,
 
     // right section
     mCloneButton = new QToolButton (this);
-    mCloneButton->setIcon(QIcon(":/edit-clone.png"));
+    mCloneButton->setIcon(QIcon(":edit-clone"));
     mCloneButton->setToolTip ("Clone record");
     buttonsLayout->addWidget(mCloneButton);
 
     mAddButton = new QToolButton (this);
-    mAddButton->setIcon(QIcon(":/add.png"));
+    mAddButton->setIcon(QIcon(":edit-add"));
     mAddButton->setToolTip ("Add new record");
     buttonsLayout->addWidget(mAddButton);
 
     mDeleteButton = new QToolButton (this);
-    mDeleteButton->setIcon(QIcon(":/edit-delete.png"));
+    mDeleteButton->setIcon(QIcon(":edit-delete"));
     mDeleteButton->setToolTip ("Delete record");
     buttonsLayout->addWidget(mDeleteButton);
 
     mRevertButton = new QToolButton (this);
-    mRevertButton->setIcon(QIcon(":/edit-undo.png"));
+    mRevertButton->setIcon(QIcon(":edit-undo"));
     mRevertButton->setToolTip ("Revert record");
     buttonsLayout->addWidget(mRevertButton);
 
diff --git a/apps/opencs/view/world/recordstatusdelegate.cpp b/apps/opencs/view/world/recordstatusdelegate.cpp
index 12d545339..4a229657d 100644
--- a/apps/opencs/view/world/recordstatusdelegate.cpp
+++ b/apps/opencs/view/world/recordstatusdelegate.cpp
@@ -27,7 +27,7 @@ CSVWorld::RecordStatusDelegateFactory::RecordStatusDelegateFactory()
 
     static const char *sIcons[] =
     {
-        ":./base.png", ":./modified.png", ":./added.png", ":./removed.png", ":./removed.png", 0
+        ":list-base", ":list-modified", ":list-added", ":list-removed", ":list-removed", 0
     };
 
     for (int i=0; sIcons[i]; ++i)
diff --git a/files/opencs/GMST.png b/files/opencs/GMST.png
deleted file mode 100644
index f24620288..000000000
Binary files a/files/opencs/GMST.png and /dev/null differ
diff --git a/files/opencs/LandTexture.png b/files/opencs/LandTexture.png
deleted file mode 100644
index 84f729098..000000000
Binary files a/files/opencs/LandTexture.png and /dev/null differ
diff --git a/files/opencs/Lightbulb-48.png b/files/opencs/Lightbulb-48.png
deleted file mode 100644
index c7a45528e..000000000
Binary files a/files/opencs/Lightbulb-48.png and /dev/null differ
diff --git a/files/opencs/Moon-48.png b/files/opencs/Moon-48.png
deleted file mode 100644
index 016b030f2..000000000
Binary files a/files/opencs/Moon-48.png and /dev/null differ
diff --git a/files/opencs/PathGrid.png b/files/opencs/PathGrid.png
deleted file mode 100644
index 23b6b84d7..000000000
Binary files a/files/opencs/PathGrid.png and /dev/null differ
diff --git a/files/opencs/Sun-48.png b/files/opencs/Sun-48.png
deleted file mode 100644
index dbdede349..000000000
Binary files a/files/opencs/Sun-48.png and /dev/null differ
diff --git a/files/opencs/activator.png b/files/opencs/activator.png
index 32cc6f8a3..ded6ab835 100644
Binary files a/files/opencs/activator.png and b/files/opencs/activator.png differ
diff --git a/files/opencs/add.png b/files/opencs/add.png
deleted file mode 100644
index 3f1347e24..000000000
Binary files a/files/opencs/add.png and /dev/null differ
diff --git a/files/opencs/added.png b/files/opencs/added.png
deleted file mode 100644
index ddd9c2108..000000000
Binary files a/files/opencs/added.png and /dev/null differ
diff --git a/files/opencs/apparatus.png b/files/opencs/apparatus.png
index 3cef537e1..4e95397df 100644
Binary files a/files/opencs/apparatus.png and b/files/opencs/apparatus.png differ
diff --git a/files/opencs/armor.png b/files/opencs/armor.png
index fc534c7d1..6f5cc83c5 100644
Binary files a/files/opencs/armor.png and b/files/opencs/armor.png differ
diff --git a/files/opencs/attribute.png b/files/opencs/attribute.png
index 4aa5dc02e..c12456717 100644
Binary files a/files/opencs/attribute.png and b/files/opencs/attribute.png differ
diff --git a/files/opencs/base.png b/files/opencs/base.png
deleted file mode 100644
index 4398e2d68..000000000
Binary files a/files/opencs/base.png and /dev/null differ
diff --git a/files/opencs/birthsign.png b/files/opencs/birthsign.png
index 8192d2ebf..861dbd4d1 100644
Binary files a/files/opencs/birthsign.png and b/files/opencs/birthsign.png differ
diff --git a/files/opencs/body-part.png b/files/opencs/body-part.png
index 823e43712..8baec7202 100644
Binary files a/files/opencs/body-part.png and b/files/opencs/body-part.png differ
diff --git a/files/opencs/book.png b/files/opencs/book.png
index 9d7669bd7..fdecb1585 100644
Binary files a/files/opencs/book.png and b/files/opencs/book.png differ
diff --git a/files/opencs/brush-circle.png b/files/opencs/brush-circle.png
new file mode 100644
index 000000000..22e92c1c7
Binary files /dev/null and b/files/opencs/brush-circle.png differ
diff --git a/files/opencs/brush-custom.png b/files/opencs/brush-custom.png
new file mode 100644
index 000000000..58c048550
Binary files /dev/null and b/files/opencs/brush-custom.png differ
diff --git a/files/opencs/brush-point.png b/files/opencs/brush-point.png
new file mode 100644
index 000000000..19b2354f8
Binary files /dev/null and b/files/opencs/brush-point.png differ
diff --git a/files/opencs/brush-square.png b/files/opencs/brush-square.png
new file mode 100644
index 000000000..08628772e
Binary files /dev/null and b/files/opencs/brush-square.png differ
diff --git a/files/opencs/camera-first-person.png b/files/opencs/camera-first-person.png
new file mode 100644
index 000000000..b497198df
Binary files /dev/null and b/files/opencs/camera-first-person.png differ
diff --git a/files/opencs/camera-free.png b/files/opencs/camera-free.png
new file mode 100644
index 000000000..d8e7ccae5
Binary files /dev/null and b/files/opencs/camera-free.png differ
diff --git a/files/opencs/camera-orbit.png b/files/opencs/camera-orbit.png
new file mode 100644
index 000000000..1aedf2847
Binary files /dev/null and b/files/opencs/camera-orbit.png differ
diff --git a/files/opencs/cell.png b/files/opencs/cell.png
index c4f00c1f0..9127dd5e5 100644
Binary files a/files/opencs/cell.png and b/files/opencs/cell.png differ
diff --git a/files/opencs/class.png b/files/opencs/class.png
index 316380363..272f2630c 100644
Binary files a/files/opencs/class.png and b/files/opencs/class.png differ
diff --git a/files/opencs/clothing.png b/files/opencs/clothing.png
index 88c9b6ab8..e42988e74 100644
Binary files a/files/opencs/clothing.png and b/files/opencs/clothing.png differ
diff --git a/files/opencs/container.png b/files/opencs/container.png
index 2a6ed01eb..336a05dbf 100644
Binary files a/files/opencs/container.png and b/files/opencs/container.png differ
diff --git a/files/opencs/creature.png b/files/opencs/creature.png
index 99cf9c87c..003684dca 100644
Binary files a/files/opencs/creature.png and b/files/opencs/creature.png differ
diff --git a/files/opencs/dialogoue-info.png b/files/opencs/dialogoue-info.png
deleted file mode 100644
index f6743d43c..000000000
Binary files a/files/opencs/dialogoue-info.png and /dev/null differ
diff --git a/files/opencs/dialogoue-journal.png b/files/opencs/dialogoue-journal.png
deleted file mode 100644
index b6a95c538..000000000
Binary files a/files/opencs/dialogoue-journal.png and /dev/null differ
diff --git a/files/opencs/dialogoue-regular.png b/files/opencs/dialogoue-regular.png
deleted file mode 100644
index f9b8d252d..000000000
Binary files a/files/opencs/dialogoue-regular.png and /dev/null differ
diff --git a/files/opencs/dialogue-greeting.png b/files/opencs/dialogue-greeting.png
index a35e1fe6d..de6b22b42 100644
Binary files a/files/opencs/dialogue-greeting.png and b/files/opencs/dialogue-greeting.png differ
diff --git a/files/opencs/dialogue-info.png b/files/opencs/dialogue-info.png
new file mode 100644
index 000000000..6242eddf4
Binary files /dev/null and b/files/opencs/dialogue-info.png differ
diff --git a/files/opencs/dialogue-journal.png b/files/opencs/dialogue-journal.png
new file mode 100644
index 000000000..086cb8a42
Binary files /dev/null and b/files/opencs/dialogue-journal.png differ
diff --git a/files/opencs/dialogue-persuasion.png b/files/opencs/dialogue-persuasion.png
index 5bc5d6113..3138862c8 100644
Binary files a/files/opencs/dialogue-persuasion.png and b/files/opencs/dialogue-persuasion.png differ
diff --git a/files/opencs/dialogue-regular.png b/files/opencs/dialogue-regular.png
new file mode 100644
index 000000000..933afc595
Binary files /dev/null and b/files/opencs/dialogue-regular.png differ
diff --git a/files/opencs/dialogue-speech.png b/files/opencs/dialogue-speech.png
deleted file mode 100644
index 11eb9f1ca..000000000
Binary files a/files/opencs/dialogue-speech.png and /dev/null differ
diff --git a/files/opencs/dialogue-topic-infos.png b/files/opencs/dialogue-topic-infos.png
new file mode 100644
index 000000000..6242eddf4
Binary files /dev/null and b/files/opencs/dialogue-topic-infos.png differ
diff --git a/files/opencs/dialogue-topics.png b/files/opencs/dialogue-topics.png
new file mode 100644
index 000000000..caa6d7e7c
Binary files /dev/null and b/files/opencs/dialogue-topics.png differ
diff --git a/files/opencs/dialogue-voice.png b/files/opencs/dialogue-voice.png
new file mode 100644
index 000000000..1d67745e5
Binary files /dev/null and b/files/opencs/dialogue-voice.png differ
diff --git a/files/opencs/door.png b/files/opencs/door.png
index aa48858ef..a1a823ecd 100644
Binary files a/files/opencs/door.png and b/files/opencs/door.png differ
diff --git a/files/opencs/editing-instance.png b/files/opencs/editing-instance.png
new file mode 100644
index 000000000..7349e8f66
Binary files /dev/null and b/files/opencs/editing-instance.png differ
diff --git a/files/opencs/editing-pathgrid.png b/files/opencs/editing-pathgrid.png
new file mode 100644
index 000000000..0ec024cad
Binary files /dev/null and b/files/opencs/editing-pathgrid.png differ
diff --git a/files/opencs/editing-terrain-movement.png b/files/opencs/editing-terrain-movement.png
new file mode 100644
index 000000000..40777334b
Binary files /dev/null and b/files/opencs/editing-terrain-movement.png differ
diff --git a/files/opencs/editing-terrain-shape.png b/files/opencs/editing-terrain-shape.png
new file mode 100644
index 000000000..a11bd95d5
Binary files /dev/null and b/files/opencs/editing-terrain-shape.png differ
diff --git a/files/opencs/editing-terrain-texture.png b/files/opencs/editing-terrain-texture.png
new file mode 100644
index 000000000..4a88353ee
Binary files /dev/null and b/files/opencs/editing-terrain-texture.png differ
diff --git a/files/opencs/editing-terrain-vertex-paint.png b/files/opencs/editing-terrain-vertex-paint.png
new file mode 100644
index 000000000..2b3f0beac
Binary files /dev/null and b/files/opencs/editing-terrain-vertex-paint.png differ
diff --git a/files/opencs/enchantment.png b/files/opencs/enchantment.png
index c90fb27ce..9bd54b8f0 100644
Binary files a/files/opencs/enchantment.png and b/files/opencs/enchantment.png differ
diff --git a/files/opencs/eyeballdude.png b/files/opencs/eyeballdude.png
deleted file mode 100644
index c782880f3..000000000
Binary files a/files/opencs/eyeballdude.png and /dev/null differ
diff --git a/files/opencs/faction.png b/files/opencs/faction.png
index 8ac1f5200..b58756bdc 100644
Binary files a/files/opencs/faction.png and b/files/opencs/faction.png differ
diff --git a/files/opencs/filter.png b/files/opencs/filter.png
index 94a57ecd9..55f442377 100644
Binary files a/files/opencs/filter.png and b/files/opencs/filter.png differ
diff --git a/files/opencs/flying-eye.png b/files/opencs/flying-eye.png
deleted file mode 100644
index e379d7fad..000000000
Binary files a/files/opencs/flying-eye.png and /dev/null differ
diff --git a/files/opencs/global-variable.png b/files/opencs/global-variable.png
new file mode 100644
index 000000000..e1642ac35
Binary files /dev/null and b/files/opencs/global-variable.png differ
diff --git a/files/opencs/globvar.png b/files/opencs/globvar.png
deleted file mode 100644
index 646145f0f..000000000
Binary files a/files/opencs/globvar.png and /dev/null differ
diff --git a/files/opencs/gmst.png b/files/opencs/gmst.png
new file mode 100644
index 000000000..2605fb4b9
Binary files /dev/null and b/files/opencs/gmst.png differ
diff --git a/files/opencs/go-next.png b/files/opencs/go-next.png
deleted file mode 100644
index 6ef8de76e..000000000
Binary files a/files/opencs/go-next.png and /dev/null differ
diff --git a/files/opencs/go-previous.png b/files/opencs/go-previous.png
deleted file mode 100644
index 659cd90d7..000000000
Binary files a/files/opencs/go-previous.png and /dev/null differ
diff --git a/files/opencs/ingredient.png b/files/opencs/ingredient.png
index 564a93047..f31e6f581 100644
Binary files a/files/opencs/ingredient.png and b/files/opencs/ingredient.png differ
diff --git a/files/opencs/journal-topic-infos.png b/files/opencs/journal-topic-infos.png
new file mode 100644
index 000000000..4cc446489
Binary files /dev/null and b/files/opencs/journal-topic-infos.png differ
diff --git a/files/opencs/journal-topics.png b/files/opencs/journal-topics.png
new file mode 100644
index 000000000..d4e58a288
Binary files /dev/null and b/files/opencs/journal-topics.png differ
diff --git a/files/opencs/land-heightmap.png b/files/opencs/land-heightmap.png
new file mode 100644
index 000000000..5b460a002
Binary files /dev/null and b/files/opencs/land-heightmap.png differ
diff --git a/files/opencs/land-texture.png b/files/opencs/land-texture.png
new file mode 100644
index 000000000..a96c4bf8c
Binary files /dev/null and b/files/opencs/land-texture.png differ
diff --git a/files/opencs/land.png b/files/opencs/land.png
deleted file mode 100644
index 20dd321dd..000000000
Binary files a/files/opencs/land.png and /dev/null differ
diff --git a/files/opencs/landpaint.png b/files/opencs/landpaint.png
deleted file mode 100644
index 711c0d8f5..000000000
Binary files a/files/opencs/landpaint.png and /dev/null differ
diff --git a/files/opencs/leveled-creature.png b/files/opencs/leveled-creature.png
index ad4a7c6f8..e6cb1f54c 100644
Binary files a/files/opencs/leveled-creature.png and b/files/opencs/leveled-creature.png differ
diff --git a/files/opencs/leveled-item.png b/files/opencs/leveled-item.png
old mode 100755
new mode 100644
index 7b8e68e60..3c819c56d
Binary files a/files/opencs/leveled-item.png and b/files/opencs/leveled-item.png differ
diff --git a/files/opencs/light.png b/files/opencs/light.png
index 2765ef1d3..55d03bcd1 100644
Binary files a/files/opencs/light.png and b/files/opencs/light.png differ
diff --git a/files/opencs/lighting-lamp.png b/files/opencs/lighting-lamp.png
new file mode 100644
index 000000000..c86517aa5
Binary files /dev/null and b/files/opencs/lighting-lamp.png differ
diff --git a/files/opencs/lighting-moon.png b/files/opencs/lighting-moon.png
new file mode 100644
index 000000000..36a6e9b5b
Binary files /dev/null and b/files/opencs/lighting-moon.png differ
diff --git a/files/opencs/lighting-sun.png b/files/opencs/lighting-sun.png
new file mode 100644
index 000000000..a54d0ab12
Binary files /dev/null and b/files/opencs/lighting-sun.png differ
diff --git a/files/opencs/list-added.png b/files/opencs/list-added.png
new file mode 100644
index 000000000..4da265983
Binary files /dev/null and b/files/opencs/list-added.png differ
diff --git a/files/opencs/list-base.png b/files/opencs/list-base.png
new file mode 100644
index 000000000..336d4c59c
Binary files /dev/null and b/files/opencs/list-base.png differ
diff --git a/files/opencs/list-modified.png b/files/opencs/list-modified.png
new file mode 100644
index 000000000..8b269a31d
Binary files /dev/null and b/files/opencs/list-modified.png differ
diff --git a/files/opencs/list-removed.png b/files/opencs/list-removed.png
new file mode 100644
index 000000000..618a202bb
Binary files /dev/null and b/files/opencs/list-removed.png differ
diff --git a/files/opencs/lockpick.png b/files/opencs/lockpick.png
index d9bd27f5e..7b1865f50 100644
Binary files a/files/opencs/lockpick.png and b/files/opencs/lockpick.png differ
diff --git a/files/opencs/magic-effect.png b/files/opencs/magic-effect.png
index e672ffccb..4901724c5 100644
Binary files a/files/opencs/magic-effect.png and b/files/opencs/magic-effect.png differ
diff --git a/files/opencs/miscellaneous.png b/files/opencs/miscellaneous.png
index 744bcd9db..b21f6e214 100644
Binary files a/files/opencs/miscellaneous.png and b/files/opencs/miscellaneous.png differ
diff --git a/files/opencs/modified.png b/files/opencs/modified.png
deleted file mode 100644
index 39bd182ac..000000000
Binary files a/files/opencs/modified.png and /dev/null differ
diff --git a/files/opencs/npc.png b/files/opencs/npc.png
index 7a07f26df..5b5b199be 100644
Binary files a/files/opencs/npc.png and b/files/opencs/npc.png differ
diff --git a/files/opencs/orbit2.png b/files/opencs/orbit2.png
deleted file mode 100644
index aa5c541d3..000000000
Binary files a/files/opencs/orbit2.png and /dev/null differ
diff --git a/files/opencs/pathgrid.png b/files/opencs/pathgrid.png
new file mode 100644
index 000000000..710ff1357
Binary files /dev/null and b/files/opencs/pathgrid.png differ
diff --git a/files/opencs/potion.png b/files/opencs/potion.png
index 678f61fbf..cb173bb9e 100644
Binary files a/files/opencs/potion.png and b/files/opencs/potion.png differ
diff --git a/files/opencs/probe.png b/files/opencs/probe.png
index 01536186d..2e405d365 100644
Binary files a/files/opencs/probe.png and b/files/opencs/probe.png differ
diff --git a/files/opencs/race.png b/files/opencs/race.png
index 94a2de696..aeed2fdf3 100644
Binary files a/files/opencs/race.png and b/files/opencs/race.png differ
diff --git a/files/opencs/record-add.png b/files/opencs/record-add.png
new file mode 100644
index 000000000..d477f1946
Binary files /dev/null and b/files/opencs/record-add.png differ
diff --git a/files/opencs/record-clone.png b/files/opencs/record-clone.png
new file mode 100644
index 000000000..262a67a42
Binary files /dev/null and b/files/opencs/record-clone.png differ
diff --git a/files/opencs/record-delete.png b/files/opencs/record-delete.png
new file mode 100644
index 000000000..817988a5d
Binary files /dev/null and b/files/opencs/record-delete.png differ
diff --git a/files/opencs/record-next.png b/files/opencs/record-next.png
new file mode 100644
index 000000000..76866e473
Binary files /dev/null and b/files/opencs/record-next.png differ
diff --git a/files/opencs/record-preview.png b/files/opencs/record-preview.png
new file mode 100644
index 000000000..e3adb6ede
Binary files /dev/null and b/files/opencs/record-preview.png differ
diff --git a/files/opencs/record-previous.png b/files/opencs/record-previous.png
new file mode 100644
index 000000000..2009d84e0
Binary files /dev/null and b/files/opencs/record-previous.png differ
diff --git a/files/opencs/record-revert.png b/files/opencs/record-revert.png
new file mode 100644
index 000000000..bd177ce65
Binary files /dev/null and b/files/opencs/record-revert.png differ
diff --git a/files/opencs/region.png b/files/opencs/region.png
new file mode 100644
index 000000000..a10089243
Binary files /dev/null and b/files/opencs/region.png differ
diff --git a/files/opencs/removed.png b/files/opencs/removed.png
deleted file mode 100644
index 2354bc743..000000000
Binary files a/files/opencs/removed.png and /dev/null differ
diff --git a/files/opencs/repair.png b/files/opencs/repair.png
index 6cf1c0aac..1b5a9ccc1 100644
Binary files a/files/opencs/repair.png and b/files/opencs/repair.png differ
diff --git a/files/opencs/resources-icon.png b/files/opencs/resources-icon.png
new file mode 100644
index 000000000..d84c90d5d
Binary files /dev/null and b/files/opencs/resources-icon.png differ
diff --git a/files/opencs/resources-mesh.png b/files/opencs/resources-mesh.png
new file mode 100644
index 000000000..fdfa3528b
Binary files /dev/null and b/files/opencs/resources-mesh.png differ
diff --git a/files/opencs/resources-music.png b/files/opencs/resources-music.png
new file mode 100644
index 000000000..53775109c
Binary files /dev/null and b/files/opencs/resources-music.png differ
diff --git a/files/opencs/resources-sound.png b/files/opencs/resources-sound.png
new file mode 100644
index 000000000..86871611f
Binary files /dev/null and b/files/opencs/resources-sound.png differ
diff --git a/files/opencs/resources-texture.png b/files/opencs/resources-texture.png
new file mode 100644
index 000000000..a96c4bf8c
Binary files /dev/null and b/files/opencs/resources-texture.png differ
diff --git a/files/opencs/resources-video.png b/files/opencs/resources-video.png
new file mode 100644
index 000000000..d86bc6025
Binary files /dev/null and b/files/opencs/resources-video.png differ
diff --git a/files/opencs/resources.qrc b/files/opencs/resources.qrc
index 7e798527c..bfa256faf 100644
--- a/files/opencs/resources.qrc
+++ b/files/opencs/resources.qrc
@@ -2,11 +2,11 @@
     <qresource prefix="/">
         <file>openmw-cs.png</file>
         <file>activator.png</file>
-        <file>added.png</file>
+        <file alias="list-added">list-added.png</file>
         <file>apparatus.png</file>
         <file>armor.png</file>
         <file>attribute.png</file>
-        <file>base.png</file>
+        <file>list-base.png</file>
         <file>birthsign.png</file>
         <file>body-part.png</file>
         <file>book.png</file>
@@ -15,55 +15,65 @@
         <file>clothing.png</file>
         <file>container.png</file>
         <file>creature.png</file>
-        <file>dialogoue-info.png</file>
-        <file>dialogoue-journal.png</file>
-        <file>dialogoue-regular.png</file>
+        <file>dialogue-info.png</file>
+        <file>dialogue-journal.png</file>
+        <file>dialogue-regular.png</file>
         <file>dialogue-greeting.png</file>
         <file>dialogue-persuasion.png</file>
-        <file>dialogue-speech.png</file>
+        <file>dialogue-voice.png</file>
+        <file>dialogue-topics.png</file>
+        <file>dialogue-topic-infos.png</file>
+        <file>journal-topic-infos.png</file>
+        <file>journal-topics.png</file>
         <file>door.png</file>
         <file>enchantment.png</file>
         <file>faction.png</file>
         <file>filter.png</file>
-        <file>globvar.png</file>
-        <file>GMST.png</file>
+        <file>global-variable.png</file>
+        <file>gmst.png</file>
         <file>Info.png</file>
         <file>ingredient.png</file>
-        <file>landpaint.png</file>
-        <file>land.png</file>
-        <file>LandTexture.png</file>
+        <file>land-heightmap.png</file>
+        <file>land-texture.png</file>
         <file>leveled-creature.png</file>
+        <file>leveled-item.png</file>
         <file>light.png</file>
         <file>lockpick.png</file>
         <file>magic-effect.png</file>
         <file>magicrabbit.png</file>
         <file>map.png</file>
         <file>miscellaneous.png</file>
-        <file>modified.png</file>
+        <file alias="list-modified">list-modified.png</file>
         <file>npc.png</file>
-        <file>PathGrid.png</file>
+        <file>pathgrid.png</file>
         <file>potion.png</file>
         <file>probe.png</file>
         <file>race.png</file>
         <file>random-item.png</file>
         <file>random.png</file>
-        <file>removed.png</file>
+        <file alias="list-removed">list-removed.png</file>
         <file>repair.png</file>
         <file>script.png</file>
         <file>skill.png</file>
-        <file>soundgen.png</file>
+        <file>sound-generator.png</file>
         <file>sound.png</file>
         <file>spell.png</file>
         <file>static.png</file>
         <file>weapon.png</file>
         <file>multitype.png</file>
-        <file>go-next.png</file>
-        <file>go-previous.png</file>
-        <file>edit-delete.png</file>
-        <file>edit-undo.png</file>
-        <file>edit-preview.png</file>
-        <file>edit-clone.png</file>
-        <file>add.png</file>
+        <file alias="record-next">record-next.png</file>
+        <file alias="record-previous">record-previous.png</file>
+        <file alias="edit-delete">record-delete.png</file>
+        <file alias="edit-undo">record-revert.png</file>
+        <file alias="edit-preview">record-preview.png</file>
+        <file alias="edit-clone">record-clone.png</file>
+        <file alias="edit-add">record-add.png</file>
+        <file alias="resources-icon">resources-icon.png</file>        
+        <file alias="resources-mesh">resources-mesh.png</file>
+        <file alias="resources-music">resources-music.png</file>
+        <file alias="resources-sound">resources-sound.png</file>
+        <file alias="resources-texture">resources-texture.png</file>
+        <file alias="resources-video">resources-video.png</file>
         <file alias="placeholder">placeholder.png</file>
     </qresource>
     <qresource prefix="/startup">
@@ -73,14 +83,14 @@
         <file alias="configure">raster/startup/small/configure.png</file>
     </qresource>
     <qresource prefix="/scenetoolbar">
-        <file alias="night">Moon-48.png</file>
-        <file alias="day">Sun-48.png</file>
-        <file alias="bright">Lightbulb-48.png</file>
-        <file alias="1st-person">eyeballdude.png</file>
-        <file alias="free-camera">flying-eye.png</file>
-        <file alias="orbiting-camera">orbit2.png</file>
-        <file alias="play">scene-play.png</file>
-        <file alias="scene-view-1">scene-view-references.png</file>
+        <file alias="night">lighting-moon.png</file>
+        <file alias="day">lighting-sun.png</file>
+        <file alias="bright">lighting-lamp.png</file>
+        <file alias="1st-person">camera-first-person.png</file>
+        <file alias="free-camera">camera-free.png</file>
+        <file alias="orbiting-camera">camera-orbit.png</file>
+        <file alias="play">run-game.png</file>
+        <file alias="scene-view-1">scene-view-instance.png</file>
         <file alias="scene-view-16">scene-view-terrain.png</file>
         <file alias="scene-view-4">scene-view-water.png</file>
         <file alias="scene-view-2">scene-view-pathgrid.png</file>
@@ -119,7 +129,7 @@
         <file alias="scene-view-c31">scene-view-status-31.png</file>
         <file alias="scene-view-marker-2">scene-exterior-arrows.png</file>
         <file alias="scene-view-marker-4">scene-exterior-borders.png</file>
-        <file alias="scene-view-marker-1">scene-exterior-marker.png</file>
+        <file alias="scene-view-marker-1">scene-exterior-markers.png</file>
         <file alias="scene-view-marker-c0">scene-exterior-status-0.png</file>
         <file alias="scene-view-marker-c1">scene-exterior-status-1.png</file>
         <file alias="scene-view-marker-c2">scene-exterior-status-2.png</file>
@@ -128,5 +138,17 @@
         <file alias="scene-view-marker-c5">scene-exterior-status-5.png</file>
         <file alias="scene-view-marker-c6">scene-exterior-status-6.png</file>
         <file alias="scene-view-marker-c7">scene-exterior-status-7.png</file>
+        <file alias="editing-instance">editing-instance.png</file>
+        <file alias="editing-pathgrid">editing-pathgrid.png</file>
+        <file alias="editing-terrain-movement">editing-terrain-movement.png</file>
+        <file alias="editing-terrain-shape">editing-terrain-shape.png</file>
+        <file alias="editing-terrain-texture">editing-terrain-texture.png</file>
+        <file alias="editing-terrain-vertex-paint">editing-terrain-vertex-paint.png</file>
+        <file alias="transform-move">transform-move.png</file>
+        <file alias="transform-rotate">transform-rotate.png</file>
+        <file alias="transform-scale">transform-scale.png</file>
+        <file alias="selection-mode-cube">selection-mode-cube.png</file>
+        <file alias="selection-mode-cube-corner">selection-mode-cube-corner.png</file>
+        <file alias="selection-mode-cube-sphere">selection-mode-cube-sphere.png</file>        
     </qresource>
 </RCC>
diff --git a/files/opencs/run-game.png b/files/opencs/run-game.png
new file mode 100644
index 000000000..f5038654f
Binary files /dev/null and b/files/opencs/run-game.png differ
diff --git a/files/opencs/scene-exterior-arrows.png b/files/opencs/scene-exterior-arrows.png
index f388255ad..661bb81ae 100644
Binary files a/files/opencs/scene-exterior-arrows.png and b/files/opencs/scene-exterior-arrows.png differ
diff --git a/files/opencs/scene-exterior-borders.png b/files/opencs/scene-exterior-borders.png
index 9711df62c..ec5040dc8 100644
Binary files a/files/opencs/scene-exterior-borders.png and b/files/opencs/scene-exterior-borders.png differ
diff --git a/files/opencs/scene-exterior-marker.png b/files/opencs/scene-exterior-marker.png
deleted file mode 100644
index a2de374b7..000000000
Binary files a/files/opencs/scene-exterior-marker.png and /dev/null differ
diff --git a/files/opencs/scene-exterior-markers.png b/files/opencs/scene-exterior-markers.png
index a2de374b7..6fffcbbcc 100644
Binary files a/files/opencs/scene-exterior-markers.png and b/files/opencs/scene-exterior-markers.png differ
diff --git a/files/opencs/scene-exterior-status-0.png b/files/opencs/scene-exterior-status-0.png
index f95de53e3..6fa47b439 100644
Binary files a/files/opencs/scene-exterior-status-0.png and b/files/opencs/scene-exterior-status-0.png differ
diff --git a/files/opencs/scene-exterior-status-1.png b/files/opencs/scene-exterior-status-1.png
index 09427b0c2..2e1ed0f65 100644
Binary files a/files/opencs/scene-exterior-status-1.png and b/files/opencs/scene-exterior-status-1.png differ
diff --git a/files/opencs/scene-exterior-status-2.png b/files/opencs/scene-exterior-status-2.png
index 086fe7b0a..8ccd356aa 100644
Binary files a/files/opencs/scene-exterior-status-2.png and b/files/opencs/scene-exterior-status-2.png differ
diff --git a/files/opencs/scene-exterior-status-3.png b/files/opencs/scene-exterior-status-3.png
index 68cdb07d2..70fdc4111 100644
Binary files a/files/opencs/scene-exterior-status-3.png and b/files/opencs/scene-exterior-status-3.png differ
diff --git a/files/opencs/scene-exterior-status-4.png b/files/opencs/scene-exterior-status-4.png
index c984989b5..2f2b907fc 100644
Binary files a/files/opencs/scene-exterior-status-4.png and b/files/opencs/scene-exterior-status-4.png differ
diff --git a/files/opencs/scene-exterior-status-5.png b/files/opencs/scene-exterior-status-5.png
index dee32f443..b294c1b15 100644
Binary files a/files/opencs/scene-exterior-status-5.png and b/files/opencs/scene-exterior-status-5.png differ
diff --git a/files/opencs/scene-exterior-status-6.png b/files/opencs/scene-exterior-status-6.png
index 877b005e4..872568b26 100644
Binary files a/files/opencs/scene-exterior-status-6.png and b/files/opencs/scene-exterior-status-6.png differ
diff --git a/files/opencs/scene-exterior-status-7.png b/files/opencs/scene-exterior-status-7.png
index 6a8afeff7..c19431025 100644
Binary files a/files/opencs/scene-exterior-status-7.png and b/files/opencs/scene-exterior-status-7.png differ
diff --git a/files/opencs/scene-play.png b/files/opencs/scene-play.png
deleted file mode 100644
index e2fabea7d..000000000
Binary files a/files/opencs/scene-play.png and /dev/null differ
diff --git a/files/opencs/scene-view-fog.png b/files/opencs/scene-view-fog.png
index 0ba2e69cf..65ea108ac 100644
Binary files a/files/opencs/scene-view-fog.png and b/files/opencs/scene-view-fog.png differ
diff --git a/files/opencs/scene-view-instance.png b/files/opencs/scene-view-instance.png
new file mode 100644
index 000000000..6f5e7cb2a
Binary files /dev/null and b/files/opencs/scene-view-instance.png differ
diff --git a/files/opencs/scene-view-pathgrid.png b/files/opencs/scene-view-pathgrid.png
index 6586b882e..edb350b8b 100644
Binary files a/files/opencs/scene-view-pathgrid.png and b/files/opencs/scene-view-pathgrid.png differ
diff --git a/files/opencs/scene-view-references.png b/files/opencs/scene-view-references.png
deleted file mode 100644
index aa3bc73b2..000000000
Binary files a/files/opencs/scene-view-references.png and /dev/null differ
diff --git a/files/opencs/scene-view-status-0.png b/files/opencs/scene-view-status-0.png
index 2b2bb4d29..1906fd89c 100644
Binary files a/files/opencs/scene-view-status-0.png and b/files/opencs/scene-view-status-0.png differ
diff --git a/files/opencs/scene-view-status-1.png b/files/opencs/scene-view-status-1.png
index ba18877b9..6f5e7cb2a 100644
Binary files a/files/opencs/scene-view-status-1.png and b/files/opencs/scene-view-status-1.png differ
diff --git a/files/opencs/scene-view-status-10.png b/files/opencs/scene-view-status-10.png
index d6e23431e..1216c180f 100644
Binary files a/files/opencs/scene-view-status-10.png and b/files/opencs/scene-view-status-10.png differ
diff --git a/files/opencs/scene-view-status-11.png b/files/opencs/scene-view-status-11.png
index 21a77c533..dbe8276f0 100644
Binary files a/files/opencs/scene-view-status-11.png and b/files/opencs/scene-view-status-11.png differ
diff --git a/files/opencs/scene-view-status-12.png b/files/opencs/scene-view-status-12.png
index efe608d2e..ba6d1f323 100644
Binary files a/files/opencs/scene-view-status-12.png and b/files/opencs/scene-view-status-12.png differ
diff --git a/files/opencs/scene-view-status-13.png b/files/opencs/scene-view-status-13.png
index 2fe7d4025..3651cd609 100644
Binary files a/files/opencs/scene-view-status-13.png and b/files/opencs/scene-view-status-13.png differ
diff --git a/files/opencs/scene-view-status-14.png b/files/opencs/scene-view-status-14.png
index 56f77199f..4bddb7ebc 100644
Binary files a/files/opencs/scene-view-status-14.png and b/files/opencs/scene-view-status-14.png differ
diff --git a/files/opencs/scene-view-status-15.png b/files/opencs/scene-view-status-15.png
index 5dab523c6..bdd43407c 100644
Binary files a/files/opencs/scene-view-status-15.png and b/files/opencs/scene-view-status-15.png differ
diff --git a/files/opencs/scene-view-status-16.png b/files/opencs/scene-view-status-16.png
index 2ff5aba75..b0051eb12 100644
Binary files a/files/opencs/scene-view-status-16.png and b/files/opencs/scene-view-status-16.png differ
diff --git a/files/opencs/scene-view-status-17.png b/files/opencs/scene-view-status-17.png
index 1b30b6be1..def156032 100644
Binary files a/files/opencs/scene-view-status-17.png and b/files/opencs/scene-view-status-17.png differ
diff --git a/files/opencs/scene-view-status-18.png b/files/opencs/scene-view-status-18.png
index 363d396cb..7d9272687 100644
Binary files a/files/opencs/scene-view-status-18.png and b/files/opencs/scene-view-status-18.png differ
diff --git a/files/opencs/scene-view-status-19.png b/files/opencs/scene-view-status-19.png
index 31f90a5d3..17b75ce0e 100644
Binary files a/files/opencs/scene-view-status-19.png and b/files/opencs/scene-view-status-19.png differ
diff --git a/files/opencs/scene-view-status-2.png b/files/opencs/scene-view-status-2.png
index 06e4cd393..edb350b8b 100644
Binary files a/files/opencs/scene-view-status-2.png and b/files/opencs/scene-view-status-2.png differ
diff --git a/files/opencs/scene-view-status-20.png b/files/opencs/scene-view-status-20.png
index 5420953ed..bb950d94e 100644
Binary files a/files/opencs/scene-view-status-20.png and b/files/opencs/scene-view-status-20.png differ
diff --git a/files/opencs/scene-view-status-21.png b/files/opencs/scene-view-status-21.png
index 7344f3195..76ad0022c 100644
Binary files a/files/opencs/scene-view-status-21.png and b/files/opencs/scene-view-status-21.png differ
diff --git a/files/opencs/scene-view-status-22.png b/files/opencs/scene-view-status-22.png
index 99977a1cc..e33820a16 100644
Binary files a/files/opencs/scene-view-status-22.png and b/files/opencs/scene-view-status-22.png differ
diff --git a/files/opencs/scene-view-status-23.png b/files/opencs/scene-view-status-23.png
index 6c428e5a8..6c1fcc54f 100644
Binary files a/files/opencs/scene-view-status-23.png and b/files/opencs/scene-view-status-23.png differ
diff --git a/files/opencs/scene-view-status-24.png b/files/opencs/scene-view-status-24.png
index 903a4d5a4..057532b77 100644
Binary files a/files/opencs/scene-view-status-24.png and b/files/opencs/scene-view-status-24.png differ
diff --git a/files/opencs/scene-view-status-25.png b/files/opencs/scene-view-status-25.png
index dd7ad5458..061336c99 100644
Binary files a/files/opencs/scene-view-status-25.png and b/files/opencs/scene-view-status-25.png differ
diff --git a/files/opencs/scene-view-status-26.png b/files/opencs/scene-view-status-26.png
index fca0ed8e9..8fbcf68c6 100644
Binary files a/files/opencs/scene-view-status-26.png and b/files/opencs/scene-view-status-26.png differ
diff --git a/files/opencs/scene-view-status-27.png b/files/opencs/scene-view-status-27.png
index 1a888bff9..30eb053b9 100644
Binary files a/files/opencs/scene-view-status-27.png and b/files/opencs/scene-view-status-27.png differ
diff --git a/files/opencs/scene-view-status-28.png b/files/opencs/scene-view-status-28.png
index 5b11fda91..3a8f77457 100644
Binary files a/files/opencs/scene-view-status-28.png and b/files/opencs/scene-view-status-28.png differ
diff --git a/files/opencs/scene-view-status-29.png b/files/opencs/scene-view-status-29.png
index 211890638..eff610666 100644
Binary files a/files/opencs/scene-view-status-29.png and b/files/opencs/scene-view-status-29.png differ
diff --git a/files/opencs/scene-view-status-3.png b/files/opencs/scene-view-status-3.png
index 7d23409f7..ddf27c2db 100644
Binary files a/files/opencs/scene-view-status-3.png and b/files/opencs/scene-view-status-3.png differ
diff --git a/files/opencs/scene-view-status-30.png b/files/opencs/scene-view-status-30.png
index 825bc772c..63ce7d0d2 100644
Binary files a/files/opencs/scene-view-status-30.png and b/files/opencs/scene-view-status-30.png differ
diff --git a/files/opencs/scene-view-status-31.png b/files/opencs/scene-view-status-31.png
index 16d80af04..1906fd89c 100644
Binary files a/files/opencs/scene-view-status-31.png and b/files/opencs/scene-view-status-31.png differ
diff --git a/files/opencs/scene-view-status-4.png b/files/opencs/scene-view-status-4.png
index 82057190d..246c5aae9 100644
Binary files a/files/opencs/scene-view-status-4.png and b/files/opencs/scene-view-status-4.png differ
diff --git a/files/opencs/scene-view-status-5.png b/files/opencs/scene-view-status-5.png
index 79532bf0f..63d37f8be 100644
Binary files a/files/opencs/scene-view-status-5.png and b/files/opencs/scene-view-status-5.png differ
diff --git a/files/opencs/scene-view-status-6.png b/files/opencs/scene-view-status-6.png
index 2b1d38526..051aa64ae 100644
Binary files a/files/opencs/scene-view-status-6.png and b/files/opencs/scene-view-status-6.png differ
diff --git a/files/opencs/scene-view-status-7.png b/files/opencs/scene-view-status-7.png
index 991668330..6b2e5fdc1 100644
Binary files a/files/opencs/scene-view-status-7.png and b/files/opencs/scene-view-status-7.png differ
diff --git a/files/opencs/scene-view-status-8.png b/files/opencs/scene-view-status-8.png
index 406649aac..65ea108ac 100644
Binary files a/files/opencs/scene-view-status-8.png and b/files/opencs/scene-view-status-8.png differ
diff --git a/files/opencs/scene-view-status-9.png b/files/opencs/scene-view-status-9.png
index cf83a9f7c..72d0d9fb7 100644
Binary files a/files/opencs/scene-view-status-9.png and b/files/opencs/scene-view-status-9.png differ
diff --git a/files/opencs/scene-view-terrain.png b/files/opencs/scene-view-terrain.png
index 7ebbd7a9a..b0051eb12 100644
Binary files a/files/opencs/scene-view-terrain.png and b/files/opencs/scene-view-terrain.png differ
diff --git a/files/opencs/scene-view-water.png b/files/opencs/scene-view-water.png
index 0289b3c2c..246c5aae9 100644
Binary files a/files/opencs/scene-view-water.png and b/files/opencs/scene-view-water.png differ
diff --git a/files/opencs/script.png b/files/opencs/script.png
index 297da4021..29d622e19 100644
Binary files a/files/opencs/script.png and b/files/opencs/script.png differ
diff --git a/files/opencs/selection-mode-cube-corner.png b/files/opencs/selection-mode-cube-corner.png
new file mode 100644
index 000000000..b69ef1782
Binary files /dev/null and b/files/opencs/selection-mode-cube-corner.png differ
diff --git a/files/opencs/selection-mode-cube-sphere.png b/files/opencs/selection-mode-cube-sphere.png
new file mode 100644
index 000000000..cb5432eea
Binary files /dev/null and b/files/opencs/selection-mode-cube-sphere.png differ
diff --git a/files/opencs/selection-mode-cube.png b/files/opencs/selection-mode-cube.png
new file mode 100644
index 000000000..1344a3fb1
Binary files /dev/null and b/files/opencs/selection-mode-cube.png differ
diff --git a/files/opencs/skill.png b/files/opencs/skill.png
index 418f4f35c..0ef7cb1cb 100644
Binary files a/files/opencs/skill.png and b/files/opencs/skill.png differ
diff --git a/files/opencs/sound-generator.png b/files/opencs/sound-generator.png
new file mode 100644
index 000000000..79833df9c
Binary files /dev/null and b/files/opencs/sound-generator.png differ
diff --git a/files/opencs/sound.png b/files/opencs/sound.png
index b072acf76..86871611f 100644
Binary files a/files/opencs/sound.png and b/files/opencs/sound.png differ
diff --git a/files/opencs/soundgen.png b/files/opencs/soundgen.png
deleted file mode 100644
index 222fc4c7f..000000000
Binary files a/files/opencs/soundgen.png and /dev/null differ
diff --git a/files/opencs/spell.png b/files/opencs/spell.png
index 69c897180..5890ea751 100644
Binary files a/files/opencs/spell.png and b/files/opencs/spell.png differ
diff --git a/files/opencs/static.png b/files/opencs/static.png
index aedf2d30e..9f458e5d0 100644
Binary files a/files/opencs/static.png and b/files/opencs/static.png differ
diff --git a/files/opencs/transform-move.png b/files/opencs/transform-move.png
new file mode 100644
index 000000000..1e5bd573d
Binary files /dev/null and b/files/opencs/transform-move.png differ
diff --git a/files/opencs/transform-rotate.png b/files/opencs/transform-rotate.png
new file mode 100644
index 000000000..b6c6bc58a
Binary files /dev/null and b/files/opencs/transform-rotate.png differ
diff --git a/files/opencs/transform-scale.png b/files/opencs/transform-scale.png
new file mode 100644
index 000000000..c641259bd
Binary files /dev/null and b/files/opencs/transform-scale.png differ
diff --git a/files/opencs/weapon.png b/files/opencs/weapon.png
index 3d4b53466..e2c1d3dc1 100644
Binary files a/files/opencs/weapon.png and b/files/opencs/weapon.png differ