diff --git a/apps/opencs/model/world/universalid.cpp b/apps/opencs/model/world/universalid.cpp
index f2ed87d61..190ea87d8 100644
--- a/apps/opencs/model/world/universalid.cpp
+++ b/apps/opencs/model/world/universalid.cpp
@@ -328,7 +328,7 @@ std::string CSMWorld::UniversalId::getIcon() const
 
     for (int i=0; typeData[i].mName; ++i)
         if (typeData[i].mType==mType)
-            return typeData[i].mIcon ? typeData[i].mIcon : "";
+            return typeData[i].mIcon ? typeData[i].mIcon : ":placeholder";
 
     throw std::logic_error ("failed to retrieve UniversalId type icon");
 }
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 66ea26f11..e5d542858 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -219,16 +219,16 @@ void CSVRender::PagedWorldspaceWidget::addEditModeSelectorButtons (
 
     /// \todo replace EditMode with suitable subclasses
     tool->addButton (
-        new EditMode (this, QIcon (":armor.png"), Element_Reference, "Terrain shape editing"),
+        new EditMode (this, QIcon (":placeholder"), Element_Reference, "Terrain shape editing"),
         "terrain-shape");
     tool->addButton (
-        new EditMode (this, QIcon (":armor.png"), Element_Reference, "Terrain texture editing"),
+        new EditMode (this, QIcon (":placeholder"), Element_Reference, "Terrain texture editing"),
         "terrain-texture");
     tool->addButton (
-        new EditMode (this, QIcon (":armor.png"), Element_Reference, "Terrain vertex paint editing"),
+        new EditMode (this, QIcon (":placeholder"), Element_Reference, "Terrain vertex paint editing"),
         "terrain-vertex");
     tool->addButton (
-        new EditMode (this, QIcon (":armor.png"), Element_Reference, "Terrain movement"),
+        new EditMode (this, QIcon (":placeholder"), Element_Reference, "Terrain movement"),
         "terrain-move");
 }
 
@@ -476,12 +476,12 @@ CSVWidget::SceneToolToggle *CSVRender::PagedWorldspaceWidget::makeControlVisibil
     CSVWidget::SceneToolbar *parent)
 {
     mControlElements = new CSVWidget::SceneToolToggle (parent,
-        "Controls & Guides Visibility", ":door.png");
+        "Controls & Guides Visibility", ":placeholder");
 
-    mControlElements->addButton (":activator.png", Element_CellMarker, ":activator.png",
+    mControlElements->addButton (":placeholder", Element_CellMarker, ":placeholder",
         "Cell marker");
-    mControlElements->addButton (":armor.png", Element_CellArrow, ":armor.png", "Cell arrows");
-    mControlElements->addButton (":armor.png", Element_CellBorder, ":armor.png", "Cell border");
+    mControlElements->addButton (":placeholder", Element_CellArrow, ":placeholder", "Cell arrows");
+    mControlElements->addButton (":placeholder", Element_CellBorder, ":placeholder", "Cell border");
 
     mControlElements->setSelection (0xffffffff);
 
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 534325e84..6c6acd22d 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -130,7 +130,7 @@ CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeNavigationSelector (
 CSVWidget::SceneToolToggle *CSVRender::WorldspaceWidget::makeSceneVisibilitySelector (CSVWidget::SceneToolbar *parent)
 {
     mSceneElements= new CSVWidget::SceneToolToggle (parent,
-        "Scene Element Visibility", ":door.png");
+        "Scene Element Visibility", ":placeholder");
 
     addVisibilitySelectorButtons (mSceneElements);
 
@@ -172,7 +172,7 @@ CSVWidget::SceneToolRun *CSVRender::WorldspaceWidget::makeRunTool (
     std::sort (profiles.begin(), profiles.end());
 
     mRun = new CSVWidget::SceneToolRun (parent, "Run OpenMW from the current camera position",
-        ":door.png", ":faction.png", profiles);
+        ":placeholder", ":placeholder", profiles);
 
     connect (mRun, SIGNAL (runRequest (const std::string&)),
         this, SLOT (runRequest (const std::string&)));
@@ -262,20 +262,20 @@ unsigned int CSVRender::WorldspaceWidget::getInteractionMask() const
 void CSVRender::WorldspaceWidget::addVisibilitySelectorButtons (
     CSVWidget::SceneToolToggle *tool)
 {
-    tool->addButton (":activator.png", Element_Reference, ":activator.png", "References");
-    tool->addButton (":armor.png", Element_Terrain, ":armor.png", "Terrain");
-    tool->addButton (":armor.png", Element_Water, ":armor.png", "Water");
-    tool->addButton (":armor.png", Element_Pathgrid, ":armor.png", "Pathgrid");
+    tool->addButton (":placeholder", Element_Reference, ":placeholder", "References");
+    tool->addButton (":placeholder", Element_Terrain, ":placeholder", "Terrain");
+    tool->addButton (":placeholder", Element_Water, ":placeholder", "Water");
+    tool->addButton (":placeholder", Element_Pathgrid, ":placeholder", "Pathgrid");
 }
 
 void CSVRender::WorldspaceWidget::addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool)
 {
     /// \todo replace EditMode with suitable subclasses
     tool->addButton (
-        new EditMode (this, QIcon (":armor.png"), Element_Reference, "Reference editing"),
+        new EditMode (this, QIcon (":placeholder"), Element_Reference, "Reference editing"),
         "object");
     tool->addButton (
-        new EditMode (this, QIcon (":armor.png"), Element_Pathgrid, "Pathgrid editing"),
+        new EditMode (this, QIcon (":placeholder"), Element_Pathgrid, "Pathgrid editing"),
         "pathgrid");
 }
 
diff --git a/credits.txt b/credits.txt
index d7fe230c7..c6a5c7169 100644
--- a/credits.txt
+++ b/credits.txt
@@ -140,7 +140,7 @@ Sadler
 Artwork:
 Necrod - OpenMW Logo
 Mickey Lyle (raevol) - Wordpress Theme
-Tom Koenderink (Okulo), SirHerrbatka, crysthala - OpenMW Editor Icons
+Tom Koenderink (Okulo), SirHerrbatka, crysthala, Shnatsel - OpenMW Editor Icons
 
 Inactive Contributors:
 Ardekantur
diff --git a/files/opencs/placeholder.png b/files/opencs/placeholder.png
new file mode 100644
index 000000000..1d3df3c47
Binary files /dev/null and b/files/opencs/placeholder.png differ
diff --git a/files/opencs/resources.qrc b/files/opencs/resources.qrc
index 4b2f7de0d..751ae6484 100644
--- a/files/opencs/resources.qrc
+++ b/files/opencs/resources.qrc
@@ -64,6 +64,7 @@
         <file>edit-preview.png</file>
         <file>edit-clone.png</file>
         <file>add.png</file>
+        <file alias="placeholder">placeholder.png</file>
     </qresource>
     <qresource prefix="/startup">
         <file alias="create-addon">raster/startup/big/create-addon.png</file>