diff --git a/setup.py b/setup.py
index 2e9122a..f1210a3 100644
--- a/setup.py
+++ b/setup.py
@@ -258,6 +258,8 @@ data_files = [
   ] ) ),
   ( "static/images/toolbar", files( "static/images/toolbar/*.*", excludes = [ "static/images/toolbar/*.xcf" ] ) ),
   ( "static/images/toolbar/small", files( "static/images/toolbar/small/*.*", excludes = [ "static/images/toolbar/small/*.xcf" ]  ) ),
+  ( "static/images/toolbar/themes/*", files( "static/images/toolbar/themes/*/*.*", excludes = [ "static/images/toolbar//themes/*/*.xcf" ] ) ),
+  ( "static/images/toolbar/themes/*/small", files( "static/images/toolbar/themes/*/small/*.*", excludes = [ "static/images/toolbar/themes/*/small/*.xcf" ]  ) ),
   ( "static/js", files( "static/js/*.*" ) ),
   ( "static/js", files( "static/js/*_LICENSE" ) ),
   ( "model/delta", files( "model/delta/*.sqlite" ) ),
diff --git a/static/css/style.css b/static/css/style.css
index 0199edb..2f3003b 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -58,203 +58,79 @@ h1 {
 }
 
 #toolbar .image_button {
+  background: transparent url(/static/images/toolbar/buttons.png);
+  height: 40px;
+  width: 40px;
+  padding: 0px;
+  border-style: none;
   outline: none;
+  position: relative;
 }
 
-#toolbar div {
-  margin-bottom: 0.1em;
+#toolbar .button_background {
+  background: transparent url(/static/images/toolbar/themes/default/buttons.png);
+  background-position: 40px 0;
+  height: 40px;
+  width: 40px;
+  padding: 0px;
+  border-style: none;
+  margin-bottom: 0.25em;
 }
 
-#new_note_button_hover_preload {
+#toolbar #newNote {
+  background-position: 200px 0;
+}
+
+#toolbar #createLink {
+  background-position: 240px 0;
+}
+
+#toolbar #attachFile {
+  background-position: 0 0;
+}
+
+#toolbar #bold {
+  background-position: 440px 0;
+}
+
+#toolbar #italic {
+  background-position: 280px 0;
+}
+
+#toolbar #underline {
+  background-position: 40px 0;
+}
+
+#toolbar #strikethrough {
+  background-position: 120px 0;
+}
+
+#toolbar #font {
+  background-position: 360px 0;
+}
+
+#toolbar #title {
+  background-position: 80px 0;
+}
+
+#toolbar #insertUnorderedList {
+  background-position: 400px 0;
+}
+
+#toolbar #insertOrderedList {
+  background-position: 160px 0;
+}
+
+#buttons_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/toolbar/new_note_button_hover.png);
+  background-image: url(/static/images/toolbar/buttons.png);
 }
 
-#link_button_hover_preload {
+#theme_default_buttons_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/toolbar/link_button_hover.png);
-}
-
-#attach_button_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/attach_button_hover.png);
-}
-
-#bold_button_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/bold_button_hover.png);
-}
-
-#italic_button_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/italic_button_hover.png);
-}
-
-#underline_button_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/underline_button_hover.png);
-}
-
-#strikethrough_button_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/strikethrough_button_hover.png);
-}
-
-#font_button_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/font_button_hover.png);
-}
-
-#bullet_list_button_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/bullet_list_button_hover.png);
-}
-
-#numbered_list_button_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/numbered_list_button_hover.png);
-}
-
-#new_note_button_down_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/new_note_button_down_hover.png);
-}
-
-#link_button_down_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/link_button_down_hover.png);
-}
-
-#attach_button_down_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/attach_button_down_hover.png);
-}
-
-#bold_button_down_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/bold_button_down_hover.png);
-}
-
-#italic_button_down_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/italic_button_down_hover.png);
-}
-
-#underline_button_down_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/underline_button_down_hover.png);
-}
-
-#strikethrough_button_down_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/strikethrough_button_down_hover.png);
-}
-
-#font_button_down_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/font_button_down_hover.png);
-}
-
-#bullet_list_button_down_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/bullet_list_button_down_hover.png);
-}
-
-#numbered_list_button_down_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/numbered_list_button_down_hover.png);
-}
-
-#new_note_button_down_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/new_note_button_down.png);
-}
-
-#link_button_down_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/link_button_down.png);
-}
-
-#attach_button_down_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/attach_button_down.png);
-}
-
-#bold_button_down_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/bold_button_down.png);
-}
-
-#italic_button_down_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/italic_button_down.png);
-}
-
-#underline_button_down_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/underline_button_down.png);
-}
-
-#strikethrough_button_down_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/strikethrough_button_down.png);
-}
-
-#font_button_down_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/font_button_down.png);
-}
-
-#bullet_list_button_down_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/bullet_list_button_down.png);
-}
-
-#numbered_list_button_down_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/toolbar/numbered_list_button_down.png);
-}
-
-#current_notebook_up_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/up_arrow_hover.png);
-}
-
-#current_notebook_down_hover_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/down_arrow_hover.png);
+  background-image: url(/static/images/toolbar/themes/default/buttons.png);
 }
 
 #tree_arrow_hover_preload {
diff --git a/static/images/images.txt b/static/images/images.txt
index 2f05d53..79c2e16 100644
--- a/static/images/images.txt
+++ b/static/images/images.txt
@@ -10,6 +10,9 @@ buttons are at 14 pt. The link button is at 8 pt. The list buttons are at 6
 pt with a -3 pixel line spacing. Down (pressed) buttons have their text offset
 by one pixel down and one pixel right.
 
+The combined toolbar buttons image is created with the "montage" ImageMagick
+command. Use tools/tile_images.sh to do this.
+
 To make the white glowing effect (which isn't present on any buttons
 currently), start with black text on a transparent background in the Gimp.
 Duplicate the layer, and move that duplicate underneath the original layer.
diff --git a/static/images/toolbar/attach_button.png b/static/images/toolbar/attach_button.png
deleted file mode 100644
index 8e7b2dc..0000000
Binary files a/static/images/toolbar/attach_button.png and /dev/null differ
diff --git a/static/images/toolbar/attach_button.xcf b/static/images/toolbar/attach_button.xcf
index 63a0e88..0c9f7cd 100644
Binary files a/static/images/toolbar/attach_button.xcf and b/static/images/toolbar/attach_button.xcf differ
diff --git a/static/images/toolbar/attach_button_down.png b/static/images/toolbar/attach_button_down.png
deleted file mode 100644
index bcb5a18..0000000
Binary files a/static/images/toolbar/attach_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/attach_button_down.xcf b/static/images/toolbar/attach_button_down.xcf
deleted file mode 100644
index 1e53ef2..0000000
Binary files a/static/images/toolbar/attach_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/attach_button_down_hover.png b/static/images/toolbar/attach_button_down_hover.png
deleted file mode 100644
index 8950330..0000000
Binary files a/static/images/toolbar/attach_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/attach_button_down_hover.xcf b/static/images/toolbar/attach_button_down_hover.xcf
deleted file mode 100644
index 9c64d16..0000000
Binary files a/static/images/toolbar/attach_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/attach_button_hover.png b/static/images/toolbar/attach_button_hover.png
deleted file mode 100644
index fe3aeed..0000000
Binary files a/static/images/toolbar/attach_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/attach_button_hover.xcf b/static/images/toolbar/attach_button_hover.xcf
deleted file mode 100644
index 154c444..0000000
Binary files a/static/images/toolbar/attach_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/bold_button.png b/static/images/toolbar/bold_button.png
deleted file mode 100644
index bc70481..0000000
Binary files a/static/images/toolbar/bold_button.png and /dev/null differ
diff --git a/static/images/toolbar/bold_button.xcf b/static/images/toolbar/bold_button.xcf
index 63ec400..462564a 100644
Binary files a/static/images/toolbar/bold_button.xcf and b/static/images/toolbar/bold_button.xcf differ
diff --git a/static/images/toolbar/bold_button_down.png b/static/images/toolbar/bold_button_down.png
deleted file mode 100644
index cd4569b..0000000
Binary files a/static/images/toolbar/bold_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/bold_button_down.xcf b/static/images/toolbar/bold_button_down.xcf
deleted file mode 100644
index a449009..0000000
Binary files a/static/images/toolbar/bold_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/bold_button_down_hover.png b/static/images/toolbar/bold_button_down_hover.png
deleted file mode 100644
index c3b612b..0000000
Binary files a/static/images/toolbar/bold_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/bold_button_down_hover.xcf b/static/images/toolbar/bold_button_down_hover.xcf
deleted file mode 100644
index 86c4bb5..0000000
Binary files a/static/images/toolbar/bold_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/bold_button_hover.png b/static/images/toolbar/bold_button_hover.png
deleted file mode 100644
index a18e460..0000000
Binary files a/static/images/toolbar/bold_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/bold_button_hover.xcf b/static/images/toolbar/bold_button_hover.xcf
deleted file mode 100644
index c6e79f1..0000000
Binary files a/static/images/toolbar/bold_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/bullet_list_button.png b/static/images/toolbar/bullet_list_button.png
deleted file mode 100644
index 9d7157c..0000000
Binary files a/static/images/toolbar/bullet_list_button.png and /dev/null differ
diff --git a/static/images/toolbar/bullet_list_button.xcf b/static/images/toolbar/bullet_list_button.xcf
index 7e20f3a..01bf37b 100644
Binary files a/static/images/toolbar/bullet_list_button.xcf and b/static/images/toolbar/bullet_list_button.xcf differ
diff --git a/static/images/toolbar/bullet_list_button_down.png b/static/images/toolbar/bullet_list_button_down.png
deleted file mode 100644
index 86fa1a1..0000000
Binary files a/static/images/toolbar/bullet_list_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/bullet_list_button_down.xcf b/static/images/toolbar/bullet_list_button_down.xcf
deleted file mode 100644
index 0e942db..0000000
Binary files a/static/images/toolbar/bullet_list_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/bullet_list_button_down_hover.png b/static/images/toolbar/bullet_list_button_down_hover.png
deleted file mode 100644
index 17af44a..0000000
Binary files a/static/images/toolbar/bullet_list_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/bullet_list_button_down_hover.xcf b/static/images/toolbar/bullet_list_button_down_hover.xcf
deleted file mode 100644
index 016371d..0000000
Binary files a/static/images/toolbar/bullet_list_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/bullet_list_button_hover.png b/static/images/toolbar/bullet_list_button_hover.png
deleted file mode 100644
index f829f96..0000000
Binary files a/static/images/toolbar/bullet_list_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/bullet_list_button_hover.xcf b/static/images/toolbar/bullet_list_button_hover.xcf
deleted file mode 100644
index d4f60ee..0000000
Binary files a/static/images/toolbar/bullet_list_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/buttons.png b/static/images/toolbar/buttons.png
new file mode 100644
index 0000000..fc43bc1
Binary files /dev/null and b/static/images/toolbar/buttons.png differ
diff --git a/static/images/toolbar/font_button.png b/static/images/toolbar/font_button.png
deleted file mode 100644
index 9372ee9..0000000
Binary files a/static/images/toolbar/font_button.png and /dev/null differ
diff --git a/static/images/toolbar/font_button.xcf b/static/images/toolbar/font_button.xcf
index 4331ad9..5e43a56 100644
Binary files a/static/images/toolbar/font_button.xcf and b/static/images/toolbar/font_button.xcf differ
diff --git a/static/images/toolbar/font_button_down.png b/static/images/toolbar/font_button_down.png
deleted file mode 100644
index 7c0de1e..0000000
Binary files a/static/images/toolbar/font_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/font_button_down.xcf b/static/images/toolbar/font_button_down.xcf
deleted file mode 100644
index d9b9dea..0000000
Binary files a/static/images/toolbar/font_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/font_button_down_hover.png b/static/images/toolbar/font_button_down_hover.png
deleted file mode 100644
index 1294bcd..0000000
Binary files a/static/images/toolbar/font_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/font_button_down_hover.xcf b/static/images/toolbar/font_button_down_hover.xcf
deleted file mode 100644
index e616221..0000000
Binary files a/static/images/toolbar/font_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/font_button_hover.png b/static/images/toolbar/font_button_hover.png
deleted file mode 100644
index 927c7bf..0000000
Binary files a/static/images/toolbar/font_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/font_button_hover.xcf b/static/images/toolbar/font_button_hover.xcf
deleted file mode 100644
index ce96066..0000000
Binary files a/static/images/toolbar/font_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/insert_button.png b/static/images/toolbar/insert_button.png
deleted file mode 100644
index 88823cc..0000000
Binary files a/static/images/toolbar/insert_button.png and /dev/null differ
diff --git a/static/images/toolbar/insert_button.xcf b/static/images/toolbar/insert_button.xcf
index 2bde938..57fde26 100644
Binary files a/static/images/toolbar/insert_button.xcf and b/static/images/toolbar/insert_button.xcf differ
diff --git a/static/images/toolbar/insert_button_down.png b/static/images/toolbar/insert_button_down.png
deleted file mode 100644
index 851260c..0000000
Binary files a/static/images/toolbar/insert_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/insert_button_down.xcf b/static/images/toolbar/insert_button_down.xcf
deleted file mode 100644
index 3676a0a..0000000
Binary files a/static/images/toolbar/insert_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/insert_button_down_hover.png b/static/images/toolbar/insert_button_down_hover.png
deleted file mode 100644
index 06c9990..0000000
Binary files a/static/images/toolbar/insert_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/insert_button_down_hover.xcf b/static/images/toolbar/insert_button_down_hover.xcf
deleted file mode 100644
index e5e80f9..0000000
Binary files a/static/images/toolbar/insert_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/insert_button_hover.png b/static/images/toolbar/insert_button_hover.png
deleted file mode 100644
index 33be27d..0000000
Binary files a/static/images/toolbar/insert_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/insert_button_hover.xcf b/static/images/toolbar/insert_button_hover.xcf
deleted file mode 100644
index e134a89..0000000
Binary files a/static/images/toolbar/insert_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/italic_button.png b/static/images/toolbar/italic_button.png
deleted file mode 100644
index 4109162..0000000
Binary files a/static/images/toolbar/italic_button.png and /dev/null differ
diff --git a/static/images/toolbar/italic_button.xcf b/static/images/toolbar/italic_button.xcf
index e98334f..230c714 100644
Binary files a/static/images/toolbar/italic_button.xcf and b/static/images/toolbar/italic_button.xcf differ
diff --git a/static/images/toolbar/italic_button_down.png b/static/images/toolbar/italic_button_down.png
deleted file mode 100644
index 762c766..0000000
Binary files a/static/images/toolbar/italic_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/italic_button_down.xcf b/static/images/toolbar/italic_button_down.xcf
deleted file mode 100644
index ac1b073..0000000
Binary files a/static/images/toolbar/italic_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/italic_button_down_hover.png b/static/images/toolbar/italic_button_down_hover.png
deleted file mode 100644
index 4fcc407..0000000
Binary files a/static/images/toolbar/italic_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/italic_button_down_hover.xcf b/static/images/toolbar/italic_button_down_hover.xcf
deleted file mode 100644
index 3af4a6e..0000000
Binary files a/static/images/toolbar/italic_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/italic_button_hover.png b/static/images/toolbar/italic_button_hover.png
deleted file mode 100644
index f9a3d2f..0000000
Binary files a/static/images/toolbar/italic_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/italic_button_hover.xcf b/static/images/toolbar/italic_button_hover.xcf
deleted file mode 100644
index b598868..0000000
Binary files a/static/images/toolbar/italic_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/link_button.png b/static/images/toolbar/link_button.png
deleted file mode 100644
index 3d9353b..0000000
Binary files a/static/images/toolbar/link_button.png and /dev/null differ
diff --git a/static/images/toolbar/link_button.xcf b/static/images/toolbar/link_button.xcf
index d78e871..a9b90ed 100644
Binary files a/static/images/toolbar/link_button.xcf and b/static/images/toolbar/link_button.xcf differ
diff --git a/static/images/toolbar/link_button_down.png b/static/images/toolbar/link_button_down.png
deleted file mode 100644
index 61dff42..0000000
Binary files a/static/images/toolbar/link_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/link_button_down.xcf b/static/images/toolbar/link_button_down.xcf
deleted file mode 100644
index 005e22a..0000000
Binary files a/static/images/toolbar/link_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/link_button_down_hover.png b/static/images/toolbar/link_button_down_hover.png
deleted file mode 100644
index 9617fc1..0000000
Binary files a/static/images/toolbar/link_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/link_button_down_hover.xcf b/static/images/toolbar/link_button_down_hover.xcf
deleted file mode 100644
index 53922e4..0000000
Binary files a/static/images/toolbar/link_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/link_button_hover.png b/static/images/toolbar/link_button_hover.png
deleted file mode 100644
index bf9d79b..0000000
Binary files a/static/images/toolbar/link_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/link_button_hover.xcf b/static/images/toolbar/link_button_hover.xcf
deleted file mode 100644
index 9e20775..0000000
Binary files a/static/images/toolbar/link_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/new_note_button.png b/static/images/toolbar/new_note_button.png
deleted file mode 100644
index b3164b3..0000000
Binary files a/static/images/toolbar/new_note_button.png and /dev/null differ
diff --git a/static/images/toolbar/new_note_button.xcf b/static/images/toolbar/new_note_button.xcf
index bf23e4d..a9865a3 100644
Binary files a/static/images/toolbar/new_note_button.xcf and b/static/images/toolbar/new_note_button.xcf differ
diff --git a/static/images/toolbar/new_note_button_down.png b/static/images/toolbar/new_note_button_down.png
deleted file mode 100644
index 9614a9b..0000000
Binary files a/static/images/toolbar/new_note_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/new_note_button_down.xcf b/static/images/toolbar/new_note_button_down.xcf
deleted file mode 100644
index ea8dfbf..0000000
Binary files a/static/images/toolbar/new_note_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/new_note_button_down_hover.png b/static/images/toolbar/new_note_button_down_hover.png
deleted file mode 100644
index a787409..0000000
Binary files a/static/images/toolbar/new_note_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/new_note_button_down_hover.xcf b/static/images/toolbar/new_note_button_down_hover.xcf
deleted file mode 100644
index 443b703..0000000
Binary files a/static/images/toolbar/new_note_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/new_note_button_hover.png b/static/images/toolbar/new_note_button_hover.png
deleted file mode 100644
index 4020983..0000000
Binary files a/static/images/toolbar/new_note_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/new_note_button_hover.xcf b/static/images/toolbar/new_note_button_hover.xcf
deleted file mode 100644
index 3f371f6..0000000
Binary files a/static/images/toolbar/new_note_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/numbered_list_button.png b/static/images/toolbar/numbered_list_button.png
deleted file mode 100644
index f1ec2ae..0000000
Binary files a/static/images/toolbar/numbered_list_button.png and /dev/null differ
diff --git a/static/images/toolbar/numbered_list_button.xcf b/static/images/toolbar/numbered_list_button.xcf
index 327c423..e2f98c2 100644
Binary files a/static/images/toolbar/numbered_list_button.xcf and b/static/images/toolbar/numbered_list_button.xcf differ
diff --git a/static/images/toolbar/numbered_list_button_down.png b/static/images/toolbar/numbered_list_button_down.png
deleted file mode 100644
index 9490ad9..0000000
Binary files a/static/images/toolbar/numbered_list_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/numbered_list_button_down.xcf b/static/images/toolbar/numbered_list_button_down.xcf
deleted file mode 100644
index 8128d38..0000000
Binary files a/static/images/toolbar/numbered_list_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/numbered_list_button_down_hover.png b/static/images/toolbar/numbered_list_button_down_hover.png
deleted file mode 100644
index b8a5592..0000000
Binary files a/static/images/toolbar/numbered_list_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/numbered_list_button_down_hover.xcf b/static/images/toolbar/numbered_list_button_down_hover.xcf
deleted file mode 100644
index 033f964..0000000
Binary files a/static/images/toolbar/numbered_list_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/numbered_list_button_hover.png b/static/images/toolbar/numbered_list_button_hover.png
deleted file mode 100644
index 6cc6f7e..0000000
Binary files a/static/images/toolbar/numbered_list_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/numbered_list_button_hover.xcf b/static/images/toolbar/numbered_list_button_hover.xcf
deleted file mode 100644
index 95c6046..0000000
Binary files a/static/images/toolbar/numbered_list_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/paperclip.png b/static/images/toolbar/paperclip.png
deleted file mode 100644
index 3878ed5..0000000
Binary files a/static/images/toolbar/paperclip.png and /dev/null differ
diff --git a/static/images/toolbar/small/attach_button.png b/static/images/toolbar/small/attach_button.png
deleted file mode 100644
index 6821190..0000000
Binary files a/static/images/toolbar/small/attach_button.png and /dev/null differ
diff --git a/static/images/toolbar/small/attach_button.xcf b/static/images/toolbar/small/attach_button.xcf
index 0653a39..257adae 100644
Binary files a/static/images/toolbar/small/attach_button.xcf and b/static/images/toolbar/small/attach_button.xcf differ
diff --git a/static/images/toolbar/small/attach_button_down.png b/static/images/toolbar/small/attach_button_down.png
deleted file mode 100644
index feb315e..0000000
Binary files a/static/images/toolbar/small/attach_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/small/attach_button_down.xcf b/static/images/toolbar/small/attach_button_down.xcf
deleted file mode 100644
index 2ecf7df..0000000
Binary files a/static/images/toolbar/small/attach_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/attach_button_down_hover.png b/static/images/toolbar/small/attach_button_down_hover.png
deleted file mode 100644
index 31d13ea..0000000
Binary files a/static/images/toolbar/small/attach_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/attach_button_down_hover.xcf b/static/images/toolbar/small/attach_button_down_hover.xcf
deleted file mode 100644
index b0d36b3..0000000
Binary files a/static/images/toolbar/small/attach_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/attach_button_hover.png b/static/images/toolbar/small/attach_button_hover.png
deleted file mode 100644
index b7656b4..0000000
Binary files a/static/images/toolbar/small/attach_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/attach_button_hover.xcf b/static/images/toolbar/small/attach_button_hover.xcf
deleted file mode 100644
index 44a0f9d..0000000
Binary files a/static/images/toolbar/small/attach_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/bold_button.png b/static/images/toolbar/small/bold_button.png
deleted file mode 100644
index 2843077..0000000
Binary files a/static/images/toolbar/small/bold_button.png and /dev/null differ
diff --git a/static/images/toolbar/small/bold_button.xcf b/static/images/toolbar/small/bold_button.xcf
index df31b50..e93ea4c 100644
Binary files a/static/images/toolbar/small/bold_button.xcf and b/static/images/toolbar/small/bold_button.xcf differ
diff --git a/static/images/toolbar/small/bold_button_down.png b/static/images/toolbar/small/bold_button_down.png
deleted file mode 100644
index b7eb203..0000000
Binary files a/static/images/toolbar/small/bold_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/small/bold_button_down.xcf b/static/images/toolbar/small/bold_button_down.xcf
deleted file mode 100644
index 71310ac..0000000
Binary files a/static/images/toolbar/small/bold_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/bold_button_down_hover.png b/static/images/toolbar/small/bold_button_down_hover.png
deleted file mode 100644
index bb5d5cc..0000000
Binary files a/static/images/toolbar/small/bold_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/bold_button_down_hover.xcf b/static/images/toolbar/small/bold_button_down_hover.xcf
deleted file mode 100644
index 43109c5..0000000
Binary files a/static/images/toolbar/small/bold_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/bold_button_hover.png b/static/images/toolbar/small/bold_button_hover.png
deleted file mode 100644
index 3be7212..0000000
Binary files a/static/images/toolbar/small/bold_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/bold_button_hover.xcf b/static/images/toolbar/small/bold_button_hover.xcf
deleted file mode 100644
index 158bf2b..0000000
Binary files a/static/images/toolbar/small/bold_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/bullet_list_button.png b/static/images/toolbar/small/bullet_list_button.png
deleted file mode 100644
index 0dfc897..0000000
Binary files a/static/images/toolbar/small/bullet_list_button.png and /dev/null differ
diff --git a/static/images/toolbar/small/bullet_list_button.xcf b/static/images/toolbar/small/bullet_list_button.xcf
index b8bf25d..569702f 100644
Binary files a/static/images/toolbar/small/bullet_list_button.xcf and b/static/images/toolbar/small/bullet_list_button.xcf differ
diff --git a/static/images/toolbar/small/bullet_list_button_down.png b/static/images/toolbar/small/bullet_list_button_down.png
deleted file mode 100644
index 6ef2676..0000000
Binary files a/static/images/toolbar/small/bullet_list_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/small/bullet_list_button_down.xcf b/static/images/toolbar/small/bullet_list_button_down.xcf
deleted file mode 100644
index 9a6b6b5..0000000
Binary files a/static/images/toolbar/small/bullet_list_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/bullet_list_button_down_hover.png b/static/images/toolbar/small/bullet_list_button_down_hover.png
deleted file mode 100644
index c778f0c..0000000
Binary files a/static/images/toolbar/small/bullet_list_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/bullet_list_button_down_hover.xcf b/static/images/toolbar/small/bullet_list_button_down_hover.xcf
deleted file mode 100644
index e32843a..0000000
Binary files a/static/images/toolbar/small/bullet_list_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/bullet_list_button_hover.png b/static/images/toolbar/small/bullet_list_button_hover.png
deleted file mode 100644
index 623a4e4..0000000
Binary files a/static/images/toolbar/small/bullet_list_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/bullet_list_button_hover.xcf b/static/images/toolbar/small/bullet_list_button_hover.xcf
deleted file mode 100644
index 7ffb11d..0000000
Binary files a/static/images/toolbar/small/bullet_list_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/buttons.png b/static/images/toolbar/small/buttons.png
new file mode 100644
index 0000000..3b90be6
Binary files /dev/null and b/static/images/toolbar/small/buttons.png differ
diff --git a/static/images/toolbar/small/font_button.png b/static/images/toolbar/small/font_button.png
deleted file mode 100644
index e0d67b8..0000000
Binary files a/static/images/toolbar/small/font_button.png and /dev/null differ
diff --git a/static/images/toolbar/small/font_button.xcf b/static/images/toolbar/small/font_button.xcf
index fc89f25..a185d22 100644
Binary files a/static/images/toolbar/small/font_button.xcf and b/static/images/toolbar/small/font_button.xcf differ
diff --git a/static/images/toolbar/small/font_button_down.png b/static/images/toolbar/small/font_button_down.png
deleted file mode 100644
index eedcfbf..0000000
Binary files a/static/images/toolbar/small/font_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/small/font_button_down.xcf b/static/images/toolbar/small/font_button_down.xcf
deleted file mode 100644
index 94b8e52..0000000
Binary files a/static/images/toolbar/small/font_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/font_button_down_hover.png b/static/images/toolbar/small/font_button_down_hover.png
deleted file mode 100644
index 549562c..0000000
Binary files a/static/images/toolbar/small/font_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/font_button_down_hover.xcf b/static/images/toolbar/small/font_button_down_hover.xcf
deleted file mode 100644
index b306a10..0000000
Binary files a/static/images/toolbar/small/font_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/font_button_hover.png b/static/images/toolbar/small/font_button_hover.png
deleted file mode 100644
index 6b9925e..0000000
Binary files a/static/images/toolbar/small/font_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/font_button_hover.xcf b/static/images/toolbar/small/font_button_hover.xcf
deleted file mode 100644
index 9adf123..0000000
Binary files a/static/images/toolbar/small/font_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/insert_button.png b/static/images/toolbar/small/insert_button.png
deleted file mode 100644
index fbf8205..0000000
Binary files a/static/images/toolbar/small/insert_button.png and /dev/null differ
diff --git a/static/images/toolbar/small/insert_button.xcf b/static/images/toolbar/small/insert_button.xcf
index 6b336bc..33911b0 100644
Binary files a/static/images/toolbar/small/insert_button.xcf and b/static/images/toolbar/small/insert_button.xcf differ
diff --git a/static/images/toolbar/small/insert_button_down.png b/static/images/toolbar/small/insert_button_down.png
deleted file mode 100644
index 19ea397..0000000
Binary files a/static/images/toolbar/small/insert_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/small/insert_button_down.xcf b/static/images/toolbar/small/insert_button_down.xcf
deleted file mode 100644
index b2c57c7..0000000
Binary files a/static/images/toolbar/small/insert_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/insert_button_down_hover.png b/static/images/toolbar/small/insert_button_down_hover.png
deleted file mode 100644
index c407624..0000000
Binary files a/static/images/toolbar/small/insert_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/insert_button_down_hover.xcf b/static/images/toolbar/small/insert_button_down_hover.xcf
deleted file mode 100644
index 9b58eab..0000000
Binary files a/static/images/toolbar/small/insert_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/insert_button_hover.png b/static/images/toolbar/small/insert_button_hover.png
deleted file mode 100644
index 7abae56..0000000
Binary files a/static/images/toolbar/small/insert_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/insert_button_hover.xcf b/static/images/toolbar/small/insert_button_hover.xcf
deleted file mode 100644
index 56765b5..0000000
Binary files a/static/images/toolbar/small/insert_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/italic_button.png b/static/images/toolbar/small/italic_button.png
deleted file mode 100644
index b17240b..0000000
Binary files a/static/images/toolbar/small/italic_button.png and /dev/null differ
diff --git a/static/images/toolbar/small/italic_button.xcf b/static/images/toolbar/small/italic_button.xcf
index dcde354..ebf2116 100644
Binary files a/static/images/toolbar/small/italic_button.xcf and b/static/images/toolbar/small/italic_button.xcf differ
diff --git a/static/images/toolbar/small/italic_button_down.png b/static/images/toolbar/small/italic_button_down.png
deleted file mode 100644
index e37a055..0000000
Binary files a/static/images/toolbar/small/italic_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/small/italic_button_down.xcf b/static/images/toolbar/small/italic_button_down.xcf
deleted file mode 100644
index 9e70275..0000000
Binary files a/static/images/toolbar/small/italic_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/italic_button_down_hover.png b/static/images/toolbar/small/italic_button_down_hover.png
deleted file mode 100644
index fc488b0..0000000
Binary files a/static/images/toolbar/small/italic_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/italic_button_down_hover.xcf b/static/images/toolbar/small/italic_button_down_hover.xcf
deleted file mode 100644
index a0ad42e..0000000
Binary files a/static/images/toolbar/small/italic_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/italic_button_hover.png b/static/images/toolbar/small/italic_button_hover.png
deleted file mode 100644
index 3fa35d8..0000000
Binary files a/static/images/toolbar/small/italic_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/italic_button_hover.xcf b/static/images/toolbar/small/italic_button_hover.xcf
deleted file mode 100644
index 3d37944..0000000
Binary files a/static/images/toolbar/small/italic_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/link_button.png b/static/images/toolbar/small/link_button.png
deleted file mode 100644
index cca977c..0000000
Binary files a/static/images/toolbar/small/link_button.png and /dev/null differ
diff --git a/static/images/toolbar/small/link_button.xcf b/static/images/toolbar/small/link_button.xcf
index 2dd4443..997225b 100644
Binary files a/static/images/toolbar/small/link_button.xcf and b/static/images/toolbar/small/link_button.xcf differ
diff --git a/static/images/toolbar/small/link_button_down.png b/static/images/toolbar/small/link_button_down.png
deleted file mode 100644
index 5ce721c..0000000
Binary files a/static/images/toolbar/small/link_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/small/link_button_down.xcf b/static/images/toolbar/small/link_button_down.xcf
deleted file mode 100644
index 6b9092a..0000000
Binary files a/static/images/toolbar/small/link_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/link_button_down_hover.png b/static/images/toolbar/small/link_button_down_hover.png
deleted file mode 100644
index 338dd30..0000000
Binary files a/static/images/toolbar/small/link_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/link_button_down_hover.xcf b/static/images/toolbar/small/link_button_down_hover.xcf
deleted file mode 100644
index 54164d4..0000000
Binary files a/static/images/toolbar/small/link_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/link_button_hover.png b/static/images/toolbar/small/link_button_hover.png
deleted file mode 100644
index bad0d7e..0000000
Binary files a/static/images/toolbar/small/link_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/link_button_hover.xcf b/static/images/toolbar/small/link_button_hover.xcf
deleted file mode 100644
index a152462..0000000
Binary files a/static/images/toolbar/small/link_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/new_note_button.png b/static/images/toolbar/small/new_note_button.png
deleted file mode 100644
index 9166ee6..0000000
Binary files a/static/images/toolbar/small/new_note_button.png and /dev/null differ
diff --git a/static/images/toolbar/small/new_note_button.xcf b/static/images/toolbar/small/new_note_button.xcf
index 1c3dd9d..1ce8f0e 100644
Binary files a/static/images/toolbar/small/new_note_button.xcf and b/static/images/toolbar/small/new_note_button.xcf differ
diff --git a/static/images/toolbar/small/new_note_button_down.png b/static/images/toolbar/small/new_note_button_down.png
deleted file mode 100644
index a64494f..0000000
Binary files a/static/images/toolbar/small/new_note_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/small/new_note_button_down.xcf b/static/images/toolbar/small/new_note_button_down.xcf
deleted file mode 100644
index f57b5e2..0000000
Binary files a/static/images/toolbar/small/new_note_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/new_note_button_down_hover.png b/static/images/toolbar/small/new_note_button_down_hover.png
deleted file mode 100644
index 079465f..0000000
Binary files a/static/images/toolbar/small/new_note_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/new_note_button_down_hover.xcf b/static/images/toolbar/small/new_note_button_down_hover.xcf
deleted file mode 100644
index 3179435..0000000
Binary files a/static/images/toolbar/small/new_note_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/new_note_button_hover.png b/static/images/toolbar/small/new_note_button_hover.png
deleted file mode 100644
index b8f1b86..0000000
Binary files a/static/images/toolbar/small/new_note_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/new_note_button_hover.xcf b/static/images/toolbar/small/new_note_button_hover.xcf
deleted file mode 100644
index 42d4d5e..0000000
Binary files a/static/images/toolbar/small/new_note_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/numbered_list_button.png b/static/images/toolbar/small/numbered_list_button.png
deleted file mode 100644
index 963ce2b..0000000
Binary files a/static/images/toolbar/small/numbered_list_button.png and /dev/null differ
diff --git a/static/images/toolbar/small/numbered_list_button.xcf b/static/images/toolbar/small/numbered_list_button.xcf
index 43e25e7..79e71ea 100644
Binary files a/static/images/toolbar/small/numbered_list_button.xcf and b/static/images/toolbar/small/numbered_list_button.xcf differ
diff --git a/static/images/toolbar/small/numbered_list_button_down.png b/static/images/toolbar/small/numbered_list_button_down.png
deleted file mode 100644
index 9f0f68d..0000000
Binary files a/static/images/toolbar/small/numbered_list_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/small/numbered_list_button_down.xcf b/static/images/toolbar/small/numbered_list_button_down.xcf
deleted file mode 100644
index d22193b..0000000
Binary files a/static/images/toolbar/small/numbered_list_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/numbered_list_button_down_hover.png b/static/images/toolbar/small/numbered_list_button_down_hover.png
deleted file mode 100644
index 0233c96..0000000
Binary files a/static/images/toolbar/small/numbered_list_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/numbered_list_button_down_hover.xcf b/static/images/toolbar/small/numbered_list_button_down_hover.xcf
deleted file mode 100644
index 999dfc9..0000000
Binary files a/static/images/toolbar/small/numbered_list_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/numbered_list_button_hover.png b/static/images/toolbar/small/numbered_list_button_hover.png
deleted file mode 100644
index bfdd9fd..0000000
Binary files a/static/images/toolbar/small/numbered_list_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/numbered_list_button_hover.xcf b/static/images/toolbar/small/numbered_list_button_hover.xcf
deleted file mode 100644
index 1779cb0..0000000
Binary files a/static/images/toolbar/small/numbered_list_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/paperclip.png b/static/images/toolbar/small/paperclip.png
deleted file mode 100644
index 1508980..0000000
Binary files a/static/images/toolbar/small/paperclip.png and /dev/null differ
diff --git a/static/images/toolbar/small/strikethrough_button.png b/static/images/toolbar/small/strikethrough_button.png
deleted file mode 100644
index 03106b1..0000000
Binary files a/static/images/toolbar/small/strikethrough_button.png and /dev/null differ
diff --git a/static/images/toolbar/small/strikethrough_button.xcf b/static/images/toolbar/small/strikethrough_button.xcf
index cb21187..7b2ba7b 100644
Binary files a/static/images/toolbar/small/strikethrough_button.xcf and b/static/images/toolbar/small/strikethrough_button.xcf differ
diff --git a/static/images/toolbar/small/strikethrough_button_down.png b/static/images/toolbar/small/strikethrough_button_down.png
deleted file mode 100644
index 99d5221..0000000
Binary files a/static/images/toolbar/small/strikethrough_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/small/strikethrough_button_down.xcf b/static/images/toolbar/small/strikethrough_button_down.xcf
deleted file mode 100644
index 5c9e1db..0000000
Binary files a/static/images/toolbar/small/strikethrough_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/strikethrough_button_down_hover.png b/static/images/toolbar/small/strikethrough_button_down_hover.png
deleted file mode 100644
index 646378c..0000000
Binary files a/static/images/toolbar/small/strikethrough_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/strikethrough_button_down_hover.xcf b/static/images/toolbar/small/strikethrough_button_down_hover.xcf
deleted file mode 100644
index 3e0e9e3..0000000
Binary files a/static/images/toolbar/small/strikethrough_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/strikethrough_button_hover.png b/static/images/toolbar/small/strikethrough_button_hover.png
deleted file mode 100644
index a5a88d4..0000000
Binary files a/static/images/toolbar/small/strikethrough_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/strikethrough_button_hover.xcf b/static/images/toolbar/small/strikethrough_button_hover.xcf
deleted file mode 100644
index 36a63e7..0000000
Binary files a/static/images/toolbar/small/strikethrough_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/title_button.png b/static/images/toolbar/small/title_button.png
deleted file mode 100644
index e9f5242..0000000
Binary files a/static/images/toolbar/small/title_button.png and /dev/null differ
diff --git a/static/images/toolbar/small/title_button.xcf b/static/images/toolbar/small/title_button.xcf
index 591c94e..4cbb753 100644
Binary files a/static/images/toolbar/small/title_button.xcf and b/static/images/toolbar/small/title_button.xcf differ
diff --git a/static/images/toolbar/small/title_button_down.png b/static/images/toolbar/small/title_button_down.png
deleted file mode 100644
index f24c3df..0000000
Binary files a/static/images/toolbar/small/title_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/small/title_button_down.xcf b/static/images/toolbar/small/title_button_down.xcf
deleted file mode 100644
index a55ed17..0000000
Binary files a/static/images/toolbar/small/title_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/title_button_down_hover.png b/static/images/toolbar/small/title_button_down_hover.png
deleted file mode 100644
index 75de4d5..0000000
Binary files a/static/images/toolbar/small/title_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/title_button_down_hover.xcf b/static/images/toolbar/small/title_button_down_hover.xcf
deleted file mode 100644
index 8cb7b56..0000000
Binary files a/static/images/toolbar/small/title_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/title_button_hover.png b/static/images/toolbar/small/title_button_hover.png
deleted file mode 100644
index 7ad8396..0000000
Binary files a/static/images/toolbar/small/title_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/title_button_hover.xcf b/static/images/toolbar/small/title_button_hover.xcf
deleted file mode 100644
index de781bb..0000000
Binary files a/static/images/toolbar/small/title_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/underline_button.png b/static/images/toolbar/small/underline_button.png
deleted file mode 100644
index 0211f59..0000000
Binary files a/static/images/toolbar/small/underline_button.png and /dev/null differ
diff --git a/static/images/toolbar/small/underline_button.xcf b/static/images/toolbar/small/underline_button.xcf
index 9ff7a16..d2a217e 100644
Binary files a/static/images/toolbar/small/underline_button.xcf and b/static/images/toolbar/small/underline_button.xcf differ
diff --git a/static/images/toolbar/small/underline_button_down.png b/static/images/toolbar/small/underline_button_down.png
deleted file mode 100644
index 354a5fb..0000000
Binary files a/static/images/toolbar/small/underline_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/small/underline_button_down.xcf b/static/images/toolbar/small/underline_button_down.xcf
deleted file mode 100644
index 382094e..0000000
Binary files a/static/images/toolbar/small/underline_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/underline_button_down_hover.png b/static/images/toolbar/small/underline_button_down_hover.png
deleted file mode 100644
index 999e93f..0000000
Binary files a/static/images/toolbar/small/underline_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/underline_button_down_hover.xcf b/static/images/toolbar/small/underline_button_down_hover.xcf
deleted file mode 100644
index 44e9c55..0000000
Binary files a/static/images/toolbar/small/underline_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/small/underline_button_hover.png b/static/images/toolbar/small/underline_button_hover.png
deleted file mode 100644
index a6c0e3d..0000000
Binary files a/static/images/toolbar/small/underline_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/small/underline_button_hover.xcf b/static/images/toolbar/small/underline_button_hover.xcf
deleted file mode 100644
index dd9c11e..0000000
Binary files a/static/images/toolbar/small/underline_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/strikethrough_button.png b/static/images/toolbar/strikethrough_button.png
deleted file mode 100644
index 2c767c2..0000000
Binary files a/static/images/toolbar/strikethrough_button.png and /dev/null differ
diff --git a/static/images/toolbar/strikethrough_button.xcf b/static/images/toolbar/strikethrough_button.xcf
index 7999504..41b6777 100644
Binary files a/static/images/toolbar/strikethrough_button.xcf and b/static/images/toolbar/strikethrough_button.xcf differ
diff --git a/static/images/toolbar/strikethrough_button_down.png b/static/images/toolbar/strikethrough_button_down.png
deleted file mode 100644
index a6dea41..0000000
Binary files a/static/images/toolbar/strikethrough_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/strikethrough_button_down.xcf b/static/images/toolbar/strikethrough_button_down.xcf
deleted file mode 100644
index 01c6585..0000000
Binary files a/static/images/toolbar/strikethrough_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/strikethrough_button_down_hover.png b/static/images/toolbar/strikethrough_button_down_hover.png
deleted file mode 100644
index c5887d7..0000000
Binary files a/static/images/toolbar/strikethrough_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/strikethrough_button_down_hover.xcf b/static/images/toolbar/strikethrough_button_down_hover.xcf
deleted file mode 100644
index f86e433..0000000
Binary files a/static/images/toolbar/strikethrough_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/strikethrough_button_hover.png b/static/images/toolbar/strikethrough_button_hover.png
deleted file mode 100644
index 96bd278..0000000
Binary files a/static/images/toolbar/strikethrough_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/strikethrough_button_hover.xcf b/static/images/toolbar/strikethrough_button_hover.xcf
deleted file mode 100644
index 7923f83..0000000
Binary files a/static/images/toolbar/strikethrough_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/button.xcf b/static/images/toolbar/themes/default/button.xcf
similarity index 100%
rename from static/images/toolbar/button.xcf
rename to static/images/toolbar/themes/default/button.xcf
diff --git a/static/images/toolbar/button_down.xcf b/static/images/toolbar/themes/default/button_down.xcf
similarity index 100%
rename from static/images/toolbar/button_down.xcf
rename to static/images/toolbar/themes/default/button_down.xcf
diff --git a/static/images/toolbar/button_down_hover.xcf b/static/images/toolbar/themes/default/button_down_hover.xcf
similarity index 100%
rename from static/images/toolbar/button_down_hover.xcf
rename to static/images/toolbar/themes/default/button_down_hover.xcf
diff --git a/static/images/toolbar/button_hover.xcf b/static/images/toolbar/themes/default/button_hover.xcf
similarity index 100%
rename from static/images/toolbar/button_hover.xcf
rename to static/images/toolbar/themes/default/button_hover.xcf
diff --git a/static/images/toolbar/themes/default/buttons.png b/static/images/toolbar/themes/default/buttons.png
new file mode 100644
index 0000000..5cdd4fd
Binary files /dev/null and b/static/images/toolbar/themes/default/buttons.png differ
diff --git a/static/images/toolbar/small/button.xcf b/static/images/toolbar/themes/default/small/button.xcf
similarity index 100%
rename from static/images/toolbar/small/button.xcf
rename to static/images/toolbar/themes/default/small/button.xcf
diff --git a/static/images/toolbar/small/button_down.xcf b/static/images/toolbar/themes/default/small/button_down.xcf
similarity index 100%
rename from static/images/toolbar/small/button_down.xcf
rename to static/images/toolbar/themes/default/small/button_down.xcf
diff --git a/static/images/toolbar/small/button_down_hover.xcf b/static/images/toolbar/themes/default/small/button_down_hover.xcf
similarity index 100%
rename from static/images/toolbar/small/button_down_hover.xcf
rename to static/images/toolbar/themes/default/small/button_down_hover.xcf
diff --git a/static/images/toolbar/small/button_hover.xcf b/static/images/toolbar/themes/default/small/button_hover.xcf
similarity index 100%
rename from static/images/toolbar/small/button_hover.xcf
rename to static/images/toolbar/themes/default/small/button_hover.xcf
diff --git a/static/images/toolbar/themes/default/small/buttons.png b/static/images/toolbar/themes/default/small/buttons.png
new file mode 100644
index 0000000..3ba35e0
Binary files /dev/null and b/static/images/toolbar/themes/default/small/buttons.png differ
diff --git a/static/images/toolbar/title_button.png b/static/images/toolbar/title_button.png
deleted file mode 100644
index b60e8eb..0000000
Binary files a/static/images/toolbar/title_button.png and /dev/null differ
diff --git a/static/images/toolbar/title_button.xcf b/static/images/toolbar/title_button.xcf
index 5780cb9..9602b4e 100644
Binary files a/static/images/toolbar/title_button.xcf and b/static/images/toolbar/title_button.xcf differ
diff --git a/static/images/toolbar/title_button_down.png b/static/images/toolbar/title_button_down.png
deleted file mode 100644
index fe5e33c..0000000
Binary files a/static/images/toolbar/title_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/title_button_down.xcf b/static/images/toolbar/title_button_down.xcf
deleted file mode 100644
index 835638b..0000000
Binary files a/static/images/toolbar/title_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/title_button_down_hover.png b/static/images/toolbar/title_button_down_hover.png
deleted file mode 100644
index 2596a70..0000000
Binary files a/static/images/toolbar/title_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/title_button_down_hover.xcf b/static/images/toolbar/title_button_down_hover.xcf
deleted file mode 100644
index a5186b4..0000000
Binary files a/static/images/toolbar/title_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/title_button_hover.png b/static/images/toolbar/title_button_hover.png
deleted file mode 100644
index c38c299..0000000
Binary files a/static/images/toolbar/title_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/title_button_hover.xcf b/static/images/toolbar/title_button_hover.xcf
deleted file mode 100644
index 30166e2..0000000
Binary files a/static/images/toolbar/title_button_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/underline_button.png b/static/images/toolbar/underline_button.png
deleted file mode 100644
index ad0362e..0000000
Binary files a/static/images/toolbar/underline_button.png and /dev/null differ
diff --git a/static/images/toolbar/underline_button.xcf b/static/images/toolbar/underline_button.xcf
index abdfc88..fc4764c 100644
Binary files a/static/images/toolbar/underline_button.xcf and b/static/images/toolbar/underline_button.xcf differ
diff --git a/static/images/toolbar/underline_button_down.png b/static/images/toolbar/underline_button_down.png
deleted file mode 100644
index db2d11e..0000000
Binary files a/static/images/toolbar/underline_button_down.png and /dev/null differ
diff --git a/static/images/toolbar/underline_button_down.xcf b/static/images/toolbar/underline_button_down.xcf
deleted file mode 100644
index cc1faf8..0000000
Binary files a/static/images/toolbar/underline_button_down.xcf and /dev/null differ
diff --git a/static/images/toolbar/underline_button_down_hover.png b/static/images/toolbar/underline_button_down_hover.png
deleted file mode 100644
index b677c7d..0000000
Binary files a/static/images/toolbar/underline_button_down_hover.png and /dev/null differ
diff --git a/static/images/toolbar/underline_button_down_hover.xcf b/static/images/toolbar/underline_button_down_hover.xcf
deleted file mode 100644
index abc0b45..0000000
Binary files a/static/images/toolbar/underline_button_down_hover.xcf and /dev/null differ
diff --git a/static/images/toolbar/underline_button_hover.png b/static/images/toolbar/underline_button_hover.png
deleted file mode 100644
index 5326a09..0000000
Binary files a/static/images/toolbar/underline_button_hover.png and /dev/null differ
diff --git a/static/images/toolbar/underline_button_hover.xcf b/static/images/toolbar/underline_button_hover.xcf
deleted file mode 100644
index ddf7e86..0000000
Binary files a/static/images/toolbar/underline_button_hover.xcf and /dev/null differ
diff --git a/static/js/Wiki.js b/static/js/Wiki.js
index ea31fc6..9ceee19 100644
--- a/static/js/Wiki.js
+++ b/static/js/Wiki.js
@@ -24,6 +24,7 @@ function Wiki( invoker ) {
   this.groups = evalJSON( getElement( "groups" ).value );
   this.font_size = null;
   this.small_toolbar = false;
+  this.theme = "default";
   this.large_toolbar_bottom = 0;
   this.autosaver = null;
 
@@ -348,18 +349,18 @@ Wiki.prototype.populate = function ( startup_notes, current_notes, note_read_wri
     connect( "insertUnorderedList", "onclick", function ( event ) { self.toggle_button( event, "insertUnorderedList" ); } );
     connect( "insertOrderedList", "onclick", function ( event ) { self.toggle_button( event, "insertOrderedList" ); } );
 
-    this.make_image_button( "newNote", "new_note" );
-    this.make_image_button( "createLink", "link" );
+    this.make_image_button( "newNote" );
+    this.make_image_button( "createLink" );
     if ( this.notebook.read_write == NOTEBOOK_READ_WRITE )
-      this.make_image_button( "attachFile", "attach" );
+      this.make_image_button( "attachFile" );
     this.make_image_button( "bold" );
     this.make_image_button( "italic" );
     this.make_image_button( "underline" );
     this.make_image_button( "strikethrough" );
     this.make_image_button( "font" );
     this.make_image_button( "title" );
-    this.make_image_button( "insertUnorderedList", "bullet_list" );
-    this.make_image_button( "insertOrderedList", "numbered_list" );
+    this.make_image_button( "insertUnorderedList" );
+    this.make_image_button( "insertOrderedList" );
 
     // grab the next available object id
     this.invoker.invoke( "/next_id", "POST", null,
@@ -454,7 +455,7 @@ Wiki.prototype.populate = function ( startup_notes, current_notes, note_read_wri
       event.stop();
     } );
 
-    this.make_image_button( "new_notebook", "new_note", true );
+    this.make_image_button( "new_notebook", true );
   }
 
   var new_note_tree_link_button = getElement( "new_note_tree_link" );
@@ -466,7 +467,7 @@ Wiki.prototype.populate = function ( startup_notes, current_notes, note_read_wri
       event.stop();
     } );
 
-    this.make_image_button( "new_note_tree_link", "new_note", true );
+    this.make_image_button( "new_note_tree_link", true );
   }
 }
 
@@ -1262,20 +1263,13 @@ Wiki.prototype.focus_next_editor = function () {
   next_editor.highlight();
 }
 
-Wiki.prototype.get_toolbar_image_dir = function ( always_small ) {
-  var toolbar_image_dir = IMAGE_DIR + "toolbar/";
-  if ( always_small || this.small_toolbar )
-    toolbar_image_dir += "small/";
-
-  return toolbar_image_dir;
-}
-
 Wiki.prototype.resize_toolbar_button = function ( button ) {
   var SMALL_BUTTON_SIZE = 20;
   var LARGE_BUTTON_SIZE = 40;
 
   var button_size = getElementDimensions( button );
   
+  return false; // TODO!!!
   if ( this.small_toolbar || button.always_small ) {
     if ( button_size.w == SMALL_BUTTON_SIZE ) return false;
     setElementDimensions( button, { "w": SMALL_BUTTON_SIZE, "h": SMALL_BUTTON_SIZE } );
@@ -1287,109 +1281,146 @@ Wiki.prototype.resize_toolbar_button = function ( button ) {
   return true;
 }
 
-Wiki.prototype.make_image_button = function ( name, filename_prefix, always_small ) {
+Wiki.prototype.make_image_button = function ( name, always_small ) {
   var button = getElement( name );
-  var toolbar_image_dir = this.get_toolbar_image_dir( always_small );
-
-  if ( !filename_prefix )
-    filename_prefix = name;
 
   button.name = name;
-  button.filename_prefix = filename_prefix;
   button.always_small = always_small;
 
   this.resize_toolbar_button( button );
   this.connect_image_button( button );
 }
 
-Wiki.prototype.connect_image_button = function ( button, filename_prefix ) {
+var BUTTON_UP = "40px 0px";
+var BUTTON_HOVER_UP = "80px 0px";
+var BUTTON_DOWN = "120px 0px";
+var BUTTON_HOVER_DOWN = "160px 0px";
+var BUTTON_DOWN_OFFSET = 2;
+
+Wiki.prototype.connect_image_button = function ( button ) {
   var self = this;
 
   connect( button, "onmouseover", function ( event ) {
-    var toolbar_image_dir = self.get_toolbar_image_dir( button.always_small );
-    if ( /_down/.test( button.src ) )
-      button.src = toolbar_image_dir + button.filename_prefix + "_button_down_hover.png";
-    else
-      button.src = toolbar_image_dir + button.filename_prefix + "_button_hover.png";
+    var bg_pos = getStyle( button.parentNode, "background-position" );
+    if ( bg_pos == BUTTON_DOWN || bg_pos == BUTTON_HOVER_DOWN ) {
+      setStyle( button.parentNode, { "background-position": BUTTON_HOVER_DOWN } );
+      setElementPosition( button, { "x": BUTTON_DOWN_OFFSET, "y": BUTTON_DOWN_OFFSET } );
+    } else {
+      setStyle( button.parentNode, { "background-position": BUTTON_HOVER_UP } );
+      setElementPosition( button, { "x": 0, "y": 0 } );
+    }
   } );
 
   connect( button, "onmouseout", function ( event ) {
-    var toolbar_image_dir = self.get_toolbar_image_dir( button.always_small );
-    if ( /_down/.test( button.src ) )
-      button.src = toolbar_image_dir + button.filename_prefix + "_button_down.png";
-    else
-      button.src = toolbar_image_dir + button.filename_prefix + "_button.png";
+    var bg_pos = getStyle( button.parentNode, "background-position" );
+    if ( bg_pos == BUTTON_DOWN || bg_pos == BUTTON_HOVER_DOWN ) {
+      setStyle( button.parentNode, { "background-position": BUTTON_DOWN } );
+      setElementPosition( button, { "x": BUTTON_DOWN_OFFSET, "y": BUTTON_DOWN_OFFSET } );
+    } else {
+      setStyle( button.parentNode, { "background-position": BUTTON_UP } );
+      setElementPosition( button, { "x": 0, "y": 0 } );
+    }
   } );
 
-  if ( button.name == "newNote" || button.name == "new_notebook" || button.name == "new_note_tree_link" ) {
-    connect( button, "onmousedown", function ( event ) {
-      var toolbar_image_dir = self.get_toolbar_image_dir( button.always_small );
-      if ( /_hover/.test( button.src ) )
-        button.src = toolbar_image_dir + button.filename_prefix + "_button_down_hover.png";
-      else
-        button.src = toolbar_image_dir + button.filename_prefix + "_button_down.png";
-    } );
+
+  function stateless_button( button ) {
+    return ( button.name == "newNote" || button.name == "new_notebook" || button.name == "new_note_tree_link" );
+  }
+
+  connect( button, "onmousedown", function ( event ) {
+    event.stop(); // prevents button outline from being shown
+
+    // bail if there is no focused editor on which to act
+    if ( !self.focused_editor && !stateless_button( button ) )
+      return;
+
+    var bg_pos = getStyle( button.parentNode, "background-position" );
+    if ( bg_pos == BUTTON_HOVER_UP || bg_pos == BUTTON_HOVER_DOWN ) {
+      setStyle( button.parentNode, { "background-position": BUTTON_HOVER_DOWN } );
+      setElementPosition( button, { "x": BUTTON_DOWN_OFFSET, "y": BUTTON_DOWN_OFFSET } );
+    } else {
+      setStyle( button.parentNode, { "background-position": BUTTON_DOWN } );
+      setElementPosition( button, { "x": BUTTON_DOWN_OFFSET, "y": BUTTON_DOWN_OFFSET } );
+    }
+  } );
+
+  if ( stateless_button( button ) ) {
     connect( button, "onmouseup", function ( event ) {
-      var toolbar_image_dir = self.get_toolbar_image_dir( button.always_small );
-      if ( /_hover/.test( button.src ) )
-        button.src = toolbar_image_dir + button.filename_prefix + "_button_hover.png";
-      else
-        button.src = toolbar_image_dir + button.filename_prefix + "_button.png";
+      var bg_pos = getStyle( button.parentNode, "background-position" );
+      if ( bg_pos == BUTTON_HOVER_UP || bg_pos == BUTTON_HOVER_DOWN ) {
+        setStyle( button.parentNode, { "background-position": BUTTON_HOVER_UP } );
+        setElementPosition( button, { "x": 0, "y": 0 } );
+      } else {
+        setStyle( button.parentNode, { "background-position": BUTTON_UP } );
+        setElementPosition( button, { "x": 0, "y": 0 } );
+      }
     } );
   }
 }
 
 Wiki.prototype.down_image_button = function ( name ) {
   var button = getElement( name );
-  if ( !button || !button.filename_prefix )
+  if ( !button )
     return;
 
-  var toolbar_image_dir = this.get_toolbar_image_dir( button.always_small );
+  var bg_pos = getStyle( button.parentNode, "background-position" );
 
-  if ( !this.resize_toolbar_button( button ) && /_down/.test( button.src ) )
+  if ( !this.resize_toolbar_button( button ) && ( bg_pos == BUTTON_DOWN || bg_pos == BUTTON_HOVER_DOWN ) )
     return;
 
-  if ( /_hover/.test( button.src ) )
-    button.src = toolbar_image_dir + button.filename_prefix + "_button_down_hover.png";
-  else
-    button.src = toolbar_image_dir + button.filename_prefix + "_button_down.png";
+  if ( bg_pos == BUTTON_HOVER_UP || bg_pos == BUTTON_HOVER_DOWN ) {
+    setStyle( button.parentNode, { "background-position": BUTTON_HOVER_DOWN } );
+    setElementPosition( button, { "x": BUTTON_DOWN_OFFSET, "y": BUTTON_DOWN_OFFSET } );
+  } else {
+    setStyle( button.parentNode, { "background-position": BUTTON_DOWN } );
+    setElementPosition( button, { "x": BUTTON_DOWN_OFFSET, "y": BUTTON_DOWN_OFFSET } );
+  }
 }
 
 Wiki.prototype.up_image_button = function ( name ) {
   var button = getElement( name );
-  if ( !button || !button.filename_prefix )
+  if ( !button )
     return;
 
-  var toolbar_image_dir = this.get_toolbar_image_dir( button.always_small );
+  var bg_pos = getStyle( button.parentNode, "background-position" );
 
-  if ( !this.resize_toolbar_button( button ) && !/_down/.test( button.src ) )
+  if ( !this.resize_toolbar_button( button ) && ( bg_pos == BUTTON_UP || bg_pos == BUTTON_HOVER_UP ) )
     return;
 
-  if ( /_hover/.test( button.src ) )
-    button.src = toolbar_image_dir + button.filename_prefix + "_button_hover.png";
-  else
-    button.src = toolbar_image_dir + button.filename_prefix + "_button.png";
+  if ( bg_pos == BUTTON_HOVER_UP || bg_pos == BUTTON_HOVER_DOWN ) {
+    setStyle( button.parentNode, { "background-position": BUTTON_HOVER_UP } );
+    setElementPosition( button, { "x": 0, "y": 0 } );
+  } else {
+    setStyle( button.parentNode, { "background-position": BUTTON_UP } );
+    setElementPosition( button, { "x": 0, "y": 0 } );
+  }
 }
 
 Wiki.prototype.toggle_image_button = function ( name ) {
   var button = getElement( name );
-  if ( !button || !button.filename_prefix )
+  if ( !button )
     return;
 
-  var toolbar_image_dir = this.get_toolbar_image_dir( button.always_small );
+  var bg_pos = getStyle( button.parentNode, "background-position" );
 
-  if ( /_down/.test( button.src ) ) {
-    if ( /_hover/.test( button.src ) )
-      button.src = toolbar_image_dir + button.filename_prefix + "_button_hover.png";
-    else
-      button.src = toolbar_image_dir + button.filename_prefix + "_button.png";
+  if ( bg_pos == BUTTON_DOWN || bg_pos == BUTTON_HOVER_DOWN ) {
+    if ( bg_pos == BUTTON_HOVER_DOWN ) {
+      setStyle( button.parentNode, { "background-position": BUTTON_HOVER_UP } );
+      setElementPosition( button, { "x": 0, "y": 0 } );
+    } else {
+      setStyle( button.parentNode, { "background-position": BUTTON_UP } );
+      setElementPosition( button, { "x": 0, "y": 0 } );
+    }
     this.resize_toolbar_button( button );
     return false;
   } else {
-    if ( /_hover/.test( button.src ) )
-      button.src = toolbar_image_dir + button.filename_prefix + "_button_down_hover.png";
-    else
-      button.src = toolbar_image_dir + button.filename_prefix + "_button_down.png";
+    if ( bg_pos == BUTTON_HOVER_UP ) {
+      setStyle( button.parentNode, { "background-position": BUTTON_HOVER_DOWN } );
+      setElementPosition( button, { "x": BUTTON_DOWN_OFFSET, "y": BUTTON_DOWN_OFFSET } );
+    } else {
+      setStyle( button.parentNode, { "background-position": BUTTON_DOWN } );
+      setElementPosition( button, { "x": BUTTON_DOWN_OFFSET, "y": BUTTON_DOWN_OFFSET } );
+    }
     this.resize_toolbar_button( button );
     return true;
   }
diff --git a/tools/tile_images.sh b/tools/tile_images.sh
new file mode 100755
index 0000000..97e1de7
--- /dev/null
+++ b/tools/tile_images.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+montage -tile x1 -geometry 40x40 -background none static/images/toolbar/*_button.xcf static/images/toolbar/buttons.png
+montage -tile x1 -geometry 20x20 -background none static/images/toolbar/small/*_button.xcf static/images/toolbar/small/buttons.png
+
+for theme_dir in static/images/toolbar/themes/* ; do
+  montage -tile x1 -geometry 40x40 -background none $theme_dir/*.xcf $theme_dir/buttons.png
+  montage -tile x1 -geometry 20x20 -background none $theme_dir/small/*.xcf $theme_dir/small/buttons.png
+done
diff --git a/view/Front_page.py b/view/Front_page.py
index 3d66b9e..6cdbab4 100644
--- a/view/Front_page.py
+++ b/view/Front_page.py
@@ -361,16 +361,7 @@ class Front_page( Product_page ):
       ),
 
       P(
-        Span( id = u"new_note_button_preload" ),
-        Span( id = u"link_button_preload" ),
-        Span( id = u"bold_button_preload" ),
-        Span( id = u"italic_button_preload" ),
-        Span( id = u"underline_button_preload" ),
-        Span( id = u"strikethrough_button_preload" ),
-        Span( id = u"font_button_preload" ),
-        Span( id = u"title_button_preload" ),
-        Span( id = u"bullet_list_button_preload" ),
-        Span( id = u"numbered_list_button_preload" ),
-        Span( id = u"note_icon_preload" ),
+        Span( id = u"buttons_preload" ),
+        Span( id = u"themes_default_buttons_preload" ),
       ),
     )
diff --git a/view/Toolbar.py b/view/Toolbar.py
index 5889aa3..2c47af9 100644
--- a/view/Toolbar.py
+++ b/view/Toolbar.py
@@ -9,124 +9,79 @@ class Toolbar( Div ):
       Div(
         P(
           Div( Input(
-            type = u"image",
+            type = u"button",
             id = u"newNote", title = u"make a new %s [ctrl-M]" % ( note_word or u"note" ),
-            src = u"/static/images/toolbar/new_note_button.png",
-            width = u"40", height = u"40",
             class_ = "image_button",
-          ) ),
+          ), class_ = u"button_background" ),
           Div( Input(
-            type = u"image",
+            type = u"button",
             id = u"createLink", title = u"link [ctrl-L]",
             src = u"/static/images/toolbar/link_button.png",
-            width = u"40", height = u"40",
             class_ = "image_button",
-          ) ),
+          ), class_ = u"button_background" ),
           # Notebook.READ_WRITE_FOR_OWN_NOTES should not have a file upload button
           ( notebook.read_write == Notebook.READ_WRITE ) and Div( Input(
-            type = u"image",
+            type = u"button",
             id = u"attachFile", title = u"attach file or image",
             src = u"/static/images/toolbar/attach_button.png",
-            width = u"40", height = u"40",
             class_ = "image_button",
-          ) ) or None,
+          ), class_ = u"button_background" ) or None,
         ),
         P(
           Div( Input(
-            type = u"image",
+            type = u"button",
             id = u"bold", title = u"bold [ctrl-B]",
             src = u"/static/images/toolbar/bold_button.png",
-            width = u"40", height = u"40",
             class_ = "image_button",
-          ) ),
+          ), class_ = u"button_background" ),
           Div( Input(
-            type = u"image",
+            type = u"button",
             id = u"italic", title = u"italic [ctrl-I]",
             src = u"/static/images/toolbar/italic_button.png",
-            width = u"40", height = u"40",
             class_ = "image_button",
-          ) ),
+          ), class_ = u"button_background" ),
           Div( Input(
-            type = u"image",
+            type = u"button",
             id = u"underline", title = u"underline [ctrl-U]",
             src = u"/static/images/toolbar/underline_button.png",
-            width = u"40", height = u"40",
             class_ = "image_button",
-          ) ),
+          ), class_ = u"button_background" ),
           Div( Input(
-            type = u"image",
+            type = u"button",
             id = u"strikethrough", title = u"strikethrough [ctrl-S]",
             src = u"/static/images/toolbar/strikethrough_button.png",
-            width = u"40", height = u"40",
             class_ = "image_button",
-          ) ),
+          ), class_ = u"button_background" ),
           Div( Input(
-            type = u"image",
+            type = u"button",
             id = u"font", title = u"font",
             src = u"/static/images/toolbar/font_button.png",
-            width = u"40", height = u"40",
             class_ = "image_button",
-          ) ),
+          ), class_ = u"button_background" ),
           Div( Input(
-            type = u"image",
+            type = u"button",
             id = u"title", title = u"title",
             src = u"/static/images/toolbar/title_button.png",
-            width = u"40", height = u"40",
             class_ = "image_button",
-          ) ),
+          ), class_ = u"button_background" ),
         ),
         P(
           Div( Input(
-            type = u"image",
+            type = u"button",
             id = u"insertUnorderedList", title = u"bullet list [ctrl-period]",
             src = u"/static/images/toolbar/bullet_list_button.png",
-            width = u"40", height = u"40",
             class_ = "image_button",
-          ) ),
+          ), class_ = u"button_background" ),
           Div( Input(
-            type = u"image",
+            type = u"button",
             id = u"insertOrderedList", title = u"numbered list [ctrl-1]",
             src = u"/static/images/toolbar/numbered_list_button.png",
-            width = u"40", height = u"40",
             class_ = "image_button",
-          ) ),
+          ), class_ = u"button_background" ),
         ),
         class_ = u"button_wrapper",
       ),
 
-      Span( id = "new_note_button_hover_preload" ),
-      Span( id = "link_button_hover_preload" ),
-      Span( id = "attach_button_hover_preload" ),
-      Span( id = "bold_button_hover_preload" ),
-      Span( id = "italic_button_hover_preload" ),
-      Span( id = "underline_button_hover_preload" ),
-      Span( id = "strikethrough_button_hover_preload" ),
-      Span( id = "font_button_hover_preload" ),
-      Span( id = "bullet_list_button_hover_preload" ),
-      Span( id = "numbered_list_button_hover_preload" ),
-
-      Span( id = "new_note_button_down_hover_preload" ),
-      Span( id = "link_button_down_hover_preload" ),
-      Span( id = "attach_button_down_hover_preload" ),
-      Span( id = "bold_button_down_hover_preload" ),
-      Span( id = "italic_button_down_hover_preload" ),
-      Span( id = "underline_button_down_hover_preload" ),
-      Span( id = "strikethrough_button_down_hover_preload" ),
-      Span( id = "font_button_down_hover_preload" ),
-      Span( id = "bullet_list_button_down_hover_preload" ),
-      Span( id = "numbered_list_button_down_hover_preload" ),
-
-      Span( id = "new_note_button_down_preload" ),
-      Span( id = "link_button_down_preload" ),
-      Span( id = "attach_button_down_preload" ),
-      Span( id = "bold_button_down_preload" ),
-      Span( id = "italic_button_down_preload" ),
-      Span( id = "underline_button_down_preload" ),
-      Span( id = "strikethrough_button_down_preload" ),
-      Span( id = "font_button_down_preload" ),
-      Span( id = "bullet_list_button_down_preload" ),
-      Span( id = "numbered_list_button_down_preload" ),
-
       id = u"toolbar",
       class_ = hide_toolbar and u"undisplayed" or None,
     )