diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 2bb31be9f..f918cfebf 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -60,6 +60,7 @@ opencs_hdrs_noqt (view/doc
 opencs_units (view/world
     table tablesubview scriptsubview util regionmapsubview tablebottombox creator genericcreator
     cellcreator referenceablecreator referencecreator scenesubview scenetoolbar scenetool
+    scenetoolmode
     )
 
 opencs_units_noqt (view/world
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index 3b15326ab..8f3ecab21 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -12,7 +12,7 @@
 #include "tablebottombox.hpp"
 #include "creator.hpp"
 #include "scenetoolbar.hpp"
-#include "scenetool.hpp"
+#include "scenetoolmode.hpp"
 
 CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
 : SubView (id)
@@ -30,10 +30,10 @@ CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::D
     layout2->setContentsMargins (QMargins (0, 0, 0, 0));
 
     SceneToolbar *toolbar = new SceneToolbar (this);
-toolbar->addTool (new SceneTool (this)); // test
-toolbar->addTool (new SceneTool (this));
-toolbar->addTool (new SceneTool (this));
-toolbar->addTool (new SceneTool (this));
+toolbar->addTool (new SceneToolMode (this)); // test
+toolbar->addTool (new SceneToolMode (this));
+toolbar->addTool (new SceneToolMode (this));
+toolbar->addTool (new SceneToolMode (this));
     layout2->addWidget (toolbar, 0);
 
     /// \todo replace with rendering widget
diff --git a/apps/opencs/view/world/scenetool.cpp b/apps/opencs/view/world/scenetool.cpp
index 12743c52c..f67e4fa45 100644
--- a/apps/opencs/view/world/scenetool.cpp
+++ b/apps/opencs/view/world/scenetool.cpp
@@ -5,5 +5,4 @@ CSVWorld::SceneTool::SceneTool (QWidget *parent) : QPushButton (parent)
 {
     setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
     setFixedSize (48, 48);
-
 }
\ No newline at end of file
diff --git a/apps/opencs/view/world/scenetool.hpp b/apps/opencs/view/world/scenetool.hpp
index ae440b579..c3e9e3b4b 100644
--- a/apps/opencs/view/world/scenetool.hpp
+++ b/apps/opencs/view/world/scenetool.hpp
@@ -5,6 +5,7 @@
 
 namespace CSVWorld
 {
+    ///< \brief Tool base class
     class SceneTool : public QPushButton
     {
             Q_OBJECT
diff --git a/apps/opencs/view/world/scenetoolmode.cpp b/apps/opencs/view/world/scenetoolmode.cpp
new file mode 100644
index 000000000..a6b9b5a28
--- /dev/null
+++ b/apps/opencs/view/world/scenetoolmode.cpp
@@ -0,0 +1,6 @@
+
+#include "scenetoolmode.hpp"
+
+CSVWorld::SceneToolMode::SceneToolMode (QWidget *parent)
+: SceneTool (parent)
+{}
\ No newline at end of file
diff --git a/apps/opencs/view/world/scenetoolmode.hpp b/apps/opencs/view/world/scenetoolmode.hpp
new file mode 100644
index 000000000..d54ec76b2
--- /dev/null
+++ b/apps/opencs/view/world/scenetoolmode.hpp
@@ -0,0 +1,19 @@
+#ifndef CSV_WORLD_SCENETOOL_MODE_H
+#define CSV_WORLD_SCENETOOL_MODE_H
+
+#include "scenetool.hpp"
+
+namespace CSVWorld
+{
+    ///< \brief Mode selector tool
+    class SceneToolMode : public SceneTool
+    {
+            Q_OBJECT
+
+        public:
+
+            SceneToolMode (QWidget *parent = 0);
+    };
+}
+
+#endif