diff --git a/static/css/style.css b/static/css/style.css
index b2ffa36..5af79f8 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -68,7 +68,7 @@ h1 {
 }
 
 #toolbar .button_background {
-  background: transparent url(/static/images/toolbar/themes/default/buttons.png);
+  background: transparent url(/static/themes/default/images/toolbar/buttons.png);
   background-position: 40px 0;
   height: 40px;
   width: 40px;
@@ -130,7 +130,7 @@ h1 {
 #theme_default_buttons_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/toolbar/themes/default/buttons.png);
+  background-image: url(/static/themes/default/images/toolbar/buttons.png);
 }
 
 #tree_arrow_hover_preload {
diff --git a/static/images/toolbar/themes/default/button.xcf b/static/themes/default/images/toolbar/button.xcf
similarity index 100%
rename from static/images/toolbar/themes/default/button.xcf
rename to static/themes/default/images/toolbar/button.xcf
diff --git a/static/images/toolbar/themes/default/button_down.xcf b/static/themes/default/images/toolbar/button_down.xcf
similarity index 100%
rename from static/images/toolbar/themes/default/button_down.xcf
rename to static/themes/default/images/toolbar/button_down.xcf
diff --git a/static/images/toolbar/themes/default/button_down_hover.xcf b/static/themes/default/images/toolbar/button_down_hover.xcf
similarity index 100%
rename from static/images/toolbar/themes/default/button_down_hover.xcf
rename to static/themes/default/images/toolbar/button_down_hover.xcf
diff --git a/static/images/toolbar/themes/default/button_hover.xcf b/static/themes/default/images/toolbar/button_hover.xcf
similarity index 100%
rename from static/images/toolbar/themes/default/button_hover.xcf
rename to static/themes/default/images/toolbar/button_hover.xcf
diff --git a/static/images/toolbar/themes/default/buttons.png b/static/themes/default/images/toolbar/buttons.png
similarity index 100%
rename from static/images/toolbar/themes/default/buttons.png
rename to static/themes/default/images/toolbar/buttons.png
diff --git a/static/images/toolbar/themes/default/small/button.xcf b/static/themes/default/images/toolbar/small/button.xcf
similarity index 100%
rename from static/images/toolbar/themes/default/small/button.xcf
rename to static/themes/default/images/toolbar/small/button.xcf
diff --git a/static/images/toolbar/themes/default/small/button_down.xcf b/static/themes/default/images/toolbar/small/button_down.xcf
similarity index 100%
rename from static/images/toolbar/themes/default/small/button_down.xcf
rename to static/themes/default/images/toolbar/small/button_down.xcf
diff --git a/static/images/toolbar/themes/default/small/button_down_hover.xcf b/static/themes/default/images/toolbar/small/button_down_hover.xcf
similarity index 100%
rename from static/images/toolbar/themes/default/small/button_down_hover.xcf
rename to static/themes/default/images/toolbar/small/button_down_hover.xcf
diff --git a/static/images/toolbar/themes/default/small/button_hover.xcf b/static/themes/default/images/toolbar/small/button_hover.xcf
similarity index 100%
rename from static/images/toolbar/themes/default/small/button_hover.xcf
rename to static/themes/default/images/toolbar/small/button_hover.xcf
diff --git a/static/images/toolbar/themes/default/small/buttons.png b/static/themes/default/images/toolbar/small/buttons.png
similarity index 100%
rename from static/images/toolbar/themes/default/small/buttons.png
rename to static/themes/default/images/toolbar/small/buttons.png