diff --git a/apps/opencs/view/world/scenetool.cpp b/apps/opencs/view/world/scenetool.cpp
index 320deb1ba..612b4c6d3 100644
--- a/apps/opencs/view/world/scenetool.cpp
+++ b/apps/opencs/view/world/scenetool.cpp
@@ -6,6 +6,7 @@
 CSVWorld::SceneTool::SceneTool (SceneToolbar *parent) : QPushButton (parent)
 {
     setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
+    setIconSize (QSize (parent->getIconSize(), parent->getIconSize()));
     setFixedSize (parent->getButtonSize(), parent->getButtonSize());
 
     connect (this, SIGNAL (clicked()), this, SLOT (openRequest()));
diff --git a/apps/opencs/view/world/scenetoolbar.cpp b/apps/opencs/view/world/scenetoolbar.cpp
index 2972c5391..9eb02ce2f 100644
--- a/apps/opencs/view/world/scenetoolbar.cpp
+++ b/apps/opencs/view/world/scenetoolbar.cpp
@@ -6,7 +6,7 @@
 #include "scenetool.hpp"
 
 CSVWorld::SceneToolbar::SceneToolbar (int buttonSize, QWidget *parent)
-: QWidget (parent), mButtonSize (buttonSize)
+: QWidget (parent), mButtonSize (buttonSize), mIconSize (buttonSize-8)
 {
     setFixedWidth (mButtonSize);
 
@@ -26,4 +26,9 @@ void CSVWorld::SceneToolbar::addTool (SceneTool *tool)
 int CSVWorld::SceneToolbar::getButtonSize() const
 {
     return mButtonSize;
+}
+
+int CSVWorld::SceneToolbar::getIconSize() const
+{
+    return mIconSize;
 }
\ No newline at end of file
diff --git a/apps/opencs/view/world/scenetoolbar.hpp b/apps/opencs/view/world/scenetoolbar.hpp
index f713ca3df..731806cc5 100644
--- a/apps/opencs/view/world/scenetoolbar.hpp
+++ b/apps/opencs/view/world/scenetoolbar.hpp
@@ -15,6 +15,7 @@ namespace CSVWorld
 
             QVBoxLayout *mLayout;
             int mButtonSize;
+            int mIconSize;
 
         public:
 
@@ -23,6 +24,8 @@ namespace CSVWorld
             void addTool (SceneTool *tool);
 
             int getButtonSize() const;
+
+            int getIconSize() const;
     };
 }
 
diff --git a/apps/opencs/view/world/scenetoolmode.cpp b/apps/opencs/view/world/scenetoolmode.cpp
index 281d703b6..73b01ae3a 100644
--- a/apps/opencs/view/world/scenetoolmode.cpp
+++ b/apps/opencs/view/world/scenetoolmode.cpp
@@ -8,7 +8,7 @@
 #include "scenetoolbar.hpp"
 
 CSVWorld::SceneToolMode::SceneToolMode (SceneToolbar *parent)
-: SceneTool (parent), mButtonSize (parent->getButtonSize())
+: SceneTool (parent), mButtonSize (parent->getButtonSize()), mIconSize (parent->getIconSize())
 {
     mPanel = new QFrame (this, Qt::Popup);
 
@@ -29,6 +29,7 @@ void CSVWorld::SceneToolMode::addButton (const std::string& icon, const std::str
 {
     QPushButton *button = new QPushButton (QIcon (QPixmap (icon.c_str())), "", mPanel);
     button->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
+    button->setIconSize (QSize (mIconSize, mIconSize));
     button->setFixedSize (mButtonSize, mButtonSize);
 
     mLayout->addWidget (button);
diff --git a/apps/opencs/view/world/scenetoolmode.hpp b/apps/opencs/view/world/scenetoolmode.hpp
index a8fe2b5a6..a156c0c95 100644
--- a/apps/opencs/view/world/scenetoolmode.hpp
+++ b/apps/opencs/view/world/scenetoolmode.hpp
@@ -20,6 +20,7 @@ namespace CSVWorld
             QHBoxLayout *mLayout;
             std::map<QPushButton *, std::string> mButtons; // widget, id
             int mButtonSize;
+            int mIconSize;
 
         public: