diff --git a/NEWS b/NEWS
index 9237137..0120d9c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+1.3.24: May 12, 2008
+ * Created different sizes of toolbar buttons.
+ * Made the toolbar auto-resize based on browser window size.
+
 1.3.23: May 9, 2008
  * Fixed tools/release.sh to include an empty session directory in the
    produced tarball. Without a session directory, installing and running 
diff --git a/static/css/product.css b/static/css/product.css
index 94a10ab..5246d88 100644
--- a/static/css/product.css
+++ b/static/css/product.css
@@ -1,55 +1,61 @@
 #new_note_button_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/new_note_button.png);
+  background-image: url(/static/images/toolbar/new_note_button.png);
 }
 
 #link_button_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/link_button.png);
+  background-image: url(/static/images/toolbar/link_button.png);
 }
 
 #attach_button_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/attach_button.png);
+  background-image: url(/static/images/toolbar/attach_button.png);
 }
 
 #bold_button_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/bold_button.png);
+  background-image: url(/static/images/toolbar/bold_button.png);
 }
 
 #italic_button_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/italic_button.png);
+  background-image: url(/static/images/toolbar/italic_button.png);
 }
 
 #underline_button_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/underline_button.png);
+  background-image: url(/static/images/toolbar/underline_button.png);
 }
 
 #title_button_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/title_button.png);
+  background-image: url(/static/images/toolbar/title_button.png);
 }
 
 #bullet_list_button_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/bullet_list_button.png);
+  background-image: url(/static/images/toolbar/bullet_list_button.png);
 }
 
 #numbered_list_button_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/numbered_list_button.png);
+  background-image: url(/static/images/toolbar/numbered_list_button.png);
+}
+
+#note_icon_preload {
+  height: 0;
+  overflow: hidden;
+  background-image: url(/static/images/note_icon.png);
 }
 
 .hook_area {
diff --git a/static/css/style.css b/static/css/style.css
index 4ac539e..3ff57bd 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -53,181 +53,181 @@ img {
 }
 
 #toolbar div {
-  margin-bottom: 0.25em;
+  margin-bottom: 0.1em;
 }
 
 #new_note_button_hover_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/new_note_button_hover.png);
+  background-image: url(/static/images/toolbar/new_note_button_hover.png);
 }
 
 #link_button_hover_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/link_button_hover.png);
+  background-image: url(/static/images/toolbar/link_button_hover.png);
 }
 
 #attach_button_hover_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/attach_button_hover.png);
+  background-image: url(/static/images/toolbar/attach_button_hover.png);
 }
 
 #bold_button_hover_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/bold_button_hover.png);
+  background-image: url(/static/images/toolbar/bold_button_hover.png);
 }
 
 #italic_button_hover_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/italic_button_hover.png);
+  background-image: url(/static/images/toolbar/italic_button_hover.png);
 }
 
 #underline_button_hover_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/underline_button_hover.png);
+  background-image: url(/static/images/toolbar/underline_button_hover.png);
 }
 
 #title_button_hover_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/title_button_hover.png);
+  background-image: url(/static/images/toolbar/title_button_hover.png);
 }
 
 #bullet_list_button_hover_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/bullet_list_button_hover.png);
+  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/numbered_list_button_hover.png);
+  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/new_note_button_down_hover.png);
+  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/link_button_down_hover.png);
+  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/attach_button_down_hover.png);
+  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/bold_button_down_hover.png);
+  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/italic_button_down_hover.png);
+  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/underline_button_down_hover.png);
+  background-image: url(/static/images/toolbar/underline_button_down_hover.png);
 }
 
 #title_button_down_hover_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/title_button_down_hover.png);
+  background-image: url(/static/images/toolbar/title_button_down_hover.png);
 }
 
 #bullet_list_button_down_hover_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/bullet_list_button_down_hover.png);
+  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/numbered_list_button_down_hover.png);
+  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/new_note_button_down.png);
+  background-image: url(/static/images/toolbar/new_note_button_down.png);
 }
 
 #link_button_down_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/link_button_down.png);
+  background-image: url(/static/images/toolbar/link_button_down.png);
 }
 
 #attach_button_down_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/attach_button_down.png);
+  background-image: url(/static/images/toolbar/attach_button_down.png);
 }
 
 #bold_button_down_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/bold_button_down.png);
+  background-image: url(/static/images/toolbar/bold_button_down.png);
 }
 
 #italic_button_down_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/italic_button_down.png);
+  background-image: url(/static/images/toolbar/italic_button_down.png);
 }
 
 #underline_button_down_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/underline_button_down.png);
+  background-image: url(/static/images/toolbar/underline_button_down.png);
 }
 
 #title_button_down_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/title_button_down.png);
+  background-image: url(/static/images/toolbar/title_button_down.png);
 }
 
 #bullet_list_button_down_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/bullet_list_button_down.png);
+  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/numbered_list_button_down.png);
+  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/arrow_up_hover.png);
+  background-image: url(/static/images/toolbar/arrow_up_hover.png);
 }
 
 #current_notebook_down_hover_preload {
   height: 0;
   overflow: hidden;
-  background-image: url(/static/images/arrow_down_hover.png);
+  background-image: url(/static/images/toolbar/arrow_down_hover.png);
 }
 
 #tree_arrow_hover_preload {
@@ -248,12 +248,6 @@ img {
   background-image: url(/static/images/tree_arrow_down_hover.png);
 }
 
-#note_icon_preload {
-  height: 0;
-  overflow: hidden;
-  background-image: url(/static/images/note_icon.png);
-}
-
 #note_tree_area {
   position: fixed;
   width: 17em;
diff --git a/static/images/images.txt b/static/images/images.txt
index 16f104b..4f2ff54 100644
--- a/static/images/images.txt
+++ b/static/images/images.txt
@@ -1,9 +1,14 @@
-Button dimensions are 40x40 pixels.
+For the large toolbar, button dimensions are 40x40 pixels. Button fonts are
+Bitstream Vera Sans (regular, bold, and mono oblique). Most buttons are at 22
+pt. The link button is at 12 pt. The list buttons are at 10 pt with a -4 pixel
+line spacing. Down (pressed) buttons have their text offset two pixels down
+and two pixels to the right.
 
+For the small version of the toolbar, button dimensions are 20x20 pixels.
 Button fonts are Bitstream Vera Sans (regular, bold, and mono oblique). Most
-buttons are at 22 pt. The link button is at 12 pt. The list buttons are at 10
-pt with a -4 pixel line spacing. Down (pressed) buttons have their text offset
-two pixels down and two pixels to the right.
+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.
 
 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.
diff --git a/static/images/attach_button.png b/static/images/toolbar/attach_button.png
similarity index 100%
rename from static/images/attach_button.png
rename to static/images/toolbar/attach_button.png
diff --git a/static/images/attach_button.xcf b/static/images/toolbar/attach_button.xcf
similarity index 100%
rename from static/images/attach_button.xcf
rename to static/images/toolbar/attach_button.xcf
diff --git a/static/images/attach_button_down.png b/static/images/toolbar/attach_button_down.png
similarity index 100%
rename from static/images/attach_button_down.png
rename to static/images/toolbar/attach_button_down.png
diff --git a/static/images/attach_button_down.xcf b/static/images/toolbar/attach_button_down.xcf
similarity index 100%
rename from static/images/attach_button_down.xcf
rename to static/images/toolbar/attach_button_down.xcf
diff --git a/static/images/attach_button_down_hover.png b/static/images/toolbar/attach_button_down_hover.png
similarity index 100%
rename from static/images/attach_button_down_hover.png
rename to static/images/toolbar/attach_button_down_hover.png
diff --git a/static/images/attach_button_down_hover.xcf b/static/images/toolbar/attach_button_down_hover.xcf
similarity index 100%
rename from static/images/attach_button_down_hover.xcf
rename to static/images/toolbar/attach_button_down_hover.xcf
diff --git a/static/images/attach_button_hover.png b/static/images/toolbar/attach_button_hover.png
similarity index 100%
rename from static/images/attach_button_hover.png
rename to static/images/toolbar/attach_button_hover.png
diff --git a/static/images/attach_button_hover.xcf b/static/images/toolbar/attach_button_hover.xcf
similarity index 100%
rename from static/images/attach_button_hover.xcf
rename to static/images/toolbar/attach_button_hover.xcf
diff --git a/static/images/bold_button.png b/static/images/toolbar/bold_button.png
similarity index 100%
rename from static/images/bold_button.png
rename to static/images/toolbar/bold_button.png
diff --git a/static/images/bold_button.xcf b/static/images/toolbar/bold_button.xcf
similarity index 100%
rename from static/images/bold_button.xcf
rename to static/images/toolbar/bold_button.xcf
diff --git a/static/images/bold_button_down.png b/static/images/toolbar/bold_button_down.png
similarity index 100%
rename from static/images/bold_button_down.png
rename to static/images/toolbar/bold_button_down.png
diff --git a/static/images/bold_button_down.xcf b/static/images/toolbar/bold_button_down.xcf
similarity index 100%
rename from static/images/bold_button_down.xcf
rename to static/images/toolbar/bold_button_down.xcf
diff --git a/static/images/bold_button_down_hover.png b/static/images/toolbar/bold_button_down_hover.png
similarity index 100%
rename from static/images/bold_button_down_hover.png
rename to static/images/toolbar/bold_button_down_hover.png
diff --git a/static/images/bold_button_down_hover.xcf b/static/images/toolbar/bold_button_down_hover.xcf
similarity index 100%
rename from static/images/bold_button_down_hover.xcf
rename to static/images/toolbar/bold_button_down_hover.xcf
diff --git a/static/images/bold_button_hover.png b/static/images/toolbar/bold_button_hover.png
similarity index 100%
rename from static/images/bold_button_hover.png
rename to static/images/toolbar/bold_button_hover.png
diff --git a/static/images/bold_button_hover.xcf b/static/images/toolbar/bold_button_hover.xcf
similarity index 100%
rename from static/images/bold_button_hover.xcf
rename to static/images/toolbar/bold_button_hover.xcf
diff --git a/static/images/bullet_list_button.png b/static/images/toolbar/bullet_list_button.png
similarity index 100%
rename from static/images/bullet_list_button.png
rename to static/images/toolbar/bullet_list_button.png
diff --git a/static/images/bullet_list_button.xcf b/static/images/toolbar/bullet_list_button.xcf
similarity index 100%
rename from static/images/bullet_list_button.xcf
rename to static/images/toolbar/bullet_list_button.xcf
diff --git a/static/images/bullet_list_button_down.png b/static/images/toolbar/bullet_list_button_down.png
similarity index 100%
rename from static/images/bullet_list_button_down.png
rename to static/images/toolbar/bullet_list_button_down.png
diff --git a/static/images/bullet_list_button_down.xcf b/static/images/toolbar/bullet_list_button_down.xcf
similarity index 100%
rename from static/images/bullet_list_button_down.xcf
rename to static/images/toolbar/bullet_list_button_down.xcf
diff --git a/static/images/bullet_list_button_down_hover.png b/static/images/toolbar/bullet_list_button_down_hover.png
similarity index 100%
rename from static/images/bullet_list_button_down_hover.png
rename to static/images/toolbar/bullet_list_button_down_hover.png
diff --git a/static/images/bullet_list_button_down_hover.xcf b/static/images/toolbar/bullet_list_button_down_hover.xcf
similarity index 100%
rename from static/images/bullet_list_button_down_hover.xcf
rename to static/images/toolbar/bullet_list_button_down_hover.xcf
diff --git a/static/images/bullet_list_button_hover.png b/static/images/toolbar/bullet_list_button_hover.png
similarity index 100%
rename from static/images/bullet_list_button_hover.png
rename to static/images/toolbar/bullet_list_button_hover.png
diff --git a/static/images/bullet_list_button_hover.xcf b/static/images/toolbar/bullet_list_button_hover.xcf
similarity index 100%
rename from static/images/bullet_list_button_hover.xcf
rename to static/images/toolbar/bullet_list_button_hover.xcf
diff --git a/static/images/button.xcf b/static/images/toolbar/button.xcf
similarity index 100%
rename from static/images/button.xcf
rename to static/images/toolbar/button.xcf
diff --git a/static/images/button_down.xcf b/static/images/toolbar/button_down.xcf
similarity index 100%
rename from static/images/button_down.xcf
rename to static/images/toolbar/button_down.xcf
diff --git a/static/images/button_down_hover.xcf b/static/images/toolbar/button_down_hover.xcf
similarity index 100%
rename from static/images/button_down_hover.xcf
rename to static/images/toolbar/button_down_hover.xcf
diff --git a/static/images/button_hover.xcf b/static/images/toolbar/button_hover.xcf
similarity index 100%
rename from static/images/button_hover.xcf
rename to static/images/toolbar/button_hover.xcf
diff --git a/static/images/italic_button.png b/static/images/toolbar/italic_button.png
similarity index 100%
rename from static/images/italic_button.png
rename to static/images/toolbar/italic_button.png
diff --git a/static/images/italic_button.xcf b/static/images/toolbar/italic_button.xcf
similarity index 100%
rename from static/images/italic_button.xcf
rename to static/images/toolbar/italic_button.xcf
diff --git a/static/images/italic_button_down.png b/static/images/toolbar/italic_button_down.png
similarity index 100%
rename from static/images/italic_button_down.png
rename to static/images/toolbar/italic_button_down.png
diff --git a/static/images/italic_button_down.xcf b/static/images/toolbar/italic_button_down.xcf
similarity index 100%
rename from static/images/italic_button_down.xcf
rename to static/images/toolbar/italic_button_down.xcf
diff --git a/static/images/italic_button_down_hover.png b/static/images/toolbar/italic_button_down_hover.png
similarity index 100%
rename from static/images/italic_button_down_hover.png
rename to static/images/toolbar/italic_button_down_hover.png
diff --git a/static/images/italic_button_down_hover.xcf b/static/images/toolbar/italic_button_down_hover.xcf
similarity index 100%
rename from static/images/italic_button_down_hover.xcf
rename to static/images/toolbar/italic_button_down_hover.xcf
diff --git a/static/images/italic_button_hover.png b/static/images/toolbar/italic_button_hover.png
similarity index 100%
rename from static/images/italic_button_hover.png
rename to static/images/toolbar/italic_button_hover.png
diff --git a/static/images/italic_button_hover.xcf b/static/images/toolbar/italic_button_hover.xcf
similarity index 100%
rename from static/images/italic_button_hover.xcf
rename to static/images/toolbar/italic_button_hover.xcf
diff --git a/static/images/link_button.png b/static/images/toolbar/link_button.png
similarity index 100%
rename from static/images/link_button.png
rename to static/images/toolbar/link_button.png
diff --git a/static/images/link_button.xcf b/static/images/toolbar/link_button.xcf
similarity index 100%
rename from static/images/link_button.xcf
rename to static/images/toolbar/link_button.xcf
diff --git a/static/images/link_button_down.png b/static/images/toolbar/link_button_down.png
similarity index 100%
rename from static/images/link_button_down.png
rename to static/images/toolbar/link_button_down.png
diff --git a/static/images/link_button_down.xcf b/static/images/toolbar/link_button_down.xcf
similarity index 100%
rename from static/images/link_button_down.xcf
rename to static/images/toolbar/link_button_down.xcf
diff --git a/static/images/link_button_down_hover.png b/static/images/toolbar/link_button_down_hover.png
similarity index 100%
rename from static/images/link_button_down_hover.png
rename to static/images/toolbar/link_button_down_hover.png
diff --git a/static/images/link_button_down_hover.xcf b/static/images/toolbar/link_button_down_hover.xcf
similarity index 100%
rename from static/images/link_button_down_hover.xcf
rename to static/images/toolbar/link_button_down_hover.xcf
diff --git a/static/images/link_button_hover.png b/static/images/toolbar/link_button_hover.png
similarity index 100%
rename from static/images/link_button_hover.png
rename to static/images/toolbar/link_button_hover.png
diff --git a/static/images/link_button_hover.xcf b/static/images/toolbar/link_button_hover.xcf
similarity index 100%
rename from static/images/link_button_hover.xcf
rename to static/images/toolbar/link_button_hover.xcf
diff --git a/static/images/new_note_button.png b/static/images/toolbar/new_note_button.png
similarity index 100%
rename from static/images/new_note_button.png
rename to static/images/toolbar/new_note_button.png
diff --git a/static/images/new_note_button.xcf b/static/images/toolbar/new_note_button.xcf
similarity index 100%
rename from static/images/new_note_button.xcf
rename to static/images/toolbar/new_note_button.xcf
diff --git a/static/images/new_note_button_down.png b/static/images/toolbar/new_note_button_down.png
similarity index 100%
rename from static/images/new_note_button_down.png
rename to static/images/toolbar/new_note_button_down.png
diff --git a/static/images/new_note_button_down.xcf b/static/images/toolbar/new_note_button_down.xcf
similarity index 100%
rename from static/images/new_note_button_down.xcf
rename to static/images/toolbar/new_note_button_down.xcf
diff --git a/static/images/new_note_button_down_hover.png b/static/images/toolbar/new_note_button_down_hover.png
similarity index 100%
rename from static/images/new_note_button_down_hover.png
rename to static/images/toolbar/new_note_button_down_hover.png
diff --git a/static/images/new_note_button_down_hover.xcf b/static/images/toolbar/new_note_button_down_hover.xcf
similarity index 100%
rename from static/images/new_note_button_down_hover.xcf
rename to static/images/toolbar/new_note_button_down_hover.xcf
diff --git a/static/images/new_note_button_hover.png b/static/images/toolbar/new_note_button_hover.png
similarity index 100%
rename from static/images/new_note_button_hover.png
rename to static/images/toolbar/new_note_button_hover.png
diff --git a/static/images/new_note_button_hover.xcf b/static/images/toolbar/new_note_button_hover.xcf
similarity index 100%
rename from static/images/new_note_button_hover.xcf
rename to static/images/toolbar/new_note_button_hover.xcf
diff --git a/static/images/numbered_list_button.png b/static/images/toolbar/numbered_list_button.png
similarity index 100%
rename from static/images/numbered_list_button.png
rename to static/images/toolbar/numbered_list_button.png
diff --git a/static/images/numbered_list_button.xcf b/static/images/toolbar/numbered_list_button.xcf
similarity index 100%
rename from static/images/numbered_list_button.xcf
rename to static/images/toolbar/numbered_list_button.xcf
diff --git a/static/images/numbered_list_button_down.png b/static/images/toolbar/numbered_list_button_down.png
similarity index 100%
rename from static/images/numbered_list_button_down.png
rename to static/images/toolbar/numbered_list_button_down.png
diff --git a/static/images/numbered_list_button_down.xcf b/static/images/toolbar/numbered_list_button_down.xcf
similarity index 100%
rename from static/images/numbered_list_button_down.xcf
rename to static/images/toolbar/numbered_list_button_down.xcf
diff --git a/static/images/numbered_list_button_down_hover.png b/static/images/toolbar/numbered_list_button_down_hover.png
similarity index 100%
rename from static/images/numbered_list_button_down_hover.png
rename to static/images/toolbar/numbered_list_button_down_hover.png
diff --git a/static/images/numbered_list_button_down_hover.xcf b/static/images/toolbar/numbered_list_button_down_hover.xcf
similarity index 100%
rename from static/images/numbered_list_button_down_hover.xcf
rename to static/images/toolbar/numbered_list_button_down_hover.xcf
diff --git a/static/images/numbered_list_button_hover.png b/static/images/toolbar/numbered_list_button_hover.png
similarity index 100%
rename from static/images/numbered_list_button_hover.png
rename to static/images/toolbar/numbered_list_button_hover.png
diff --git a/static/images/numbered_list_button_hover.xcf b/static/images/toolbar/numbered_list_button_hover.xcf
similarity index 100%
rename from static/images/numbered_list_button_hover.xcf
rename to static/images/toolbar/numbered_list_button_hover.xcf
diff --git a/static/images/paperclip.png b/static/images/toolbar/paperclip.png
similarity index 100%
rename from static/images/paperclip.png
rename to static/images/toolbar/paperclip.png
diff --git a/static/images/paperclip.svg b/static/images/toolbar/paperclip.svg
similarity index 100%
rename from static/images/paperclip.svg
rename to static/images/toolbar/paperclip.svg
diff --git a/static/images/toolbar/small/attach_button.png b/static/images/toolbar/small/attach_button.png
new file mode 100644
index 0000000..6821190
Binary files /dev/null and b/static/images/toolbar/small/attach_button.png differ
diff --git a/static/images/toolbar/small/attach_button.xcf b/static/images/toolbar/small/attach_button.xcf
new file mode 100644
index 0000000..0653a39
Binary files /dev/null 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
new file mode 100644
index 0000000..feb315e
Binary files /dev/null and b/static/images/toolbar/small/attach_button_down.png differ
diff --git a/static/images/toolbar/small/attach_button_down.xcf b/static/images/toolbar/small/attach_button_down.xcf
new file mode 100644
index 0000000..2ecf7df
Binary files /dev/null and b/static/images/toolbar/small/attach_button_down.xcf differ
diff --git a/static/images/toolbar/small/attach_button_down_hover.png b/static/images/toolbar/small/attach_button_down_hover.png
new file mode 100644
index 0000000..31d13ea
Binary files /dev/null and b/static/images/toolbar/small/attach_button_down_hover.png differ
diff --git a/static/images/toolbar/small/attach_button_down_hover.xcf b/static/images/toolbar/small/attach_button_down_hover.xcf
new file mode 100644
index 0000000..b0d36b3
Binary files /dev/null and b/static/images/toolbar/small/attach_button_down_hover.xcf differ
diff --git a/static/images/toolbar/small/attach_button_hover.png b/static/images/toolbar/small/attach_button_hover.png
new file mode 100644
index 0000000..b7656b4
Binary files /dev/null and b/static/images/toolbar/small/attach_button_hover.png differ
diff --git a/static/images/toolbar/small/attach_button_hover.xcf b/static/images/toolbar/small/attach_button_hover.xcf
new file mode 100644
index 0000000..44a0f9d
Binary files /dev/null and b/static/images/toolbar/small/attach_button_hover.xcf differ
diff --git a/static/images/toolbar/small/bold_button.png b/static/images/toolbar/small/bold_button.png
new file mode 100644
index 0000000..2843077
Binary files /dev/null and b/static/images/toolbar/small/bold_button.png differ
diff --git a/static/images/toolbar/small/bold_button.xcf b/static/images/toolbar/small/bold_button.xcf
new file mode 100644
index 0000000..df31b50
Binary files /dev/null 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
new file mode 100644
index 0000000..b7eb203
Binary files /dev/null and b/static/images/toolbar/small/bold_button_down.png differ
diff --git a/static/images/toolbar/small/bold_button_down.xcf b/static/images/toolbar/small/bold_button_down.xcf
new file mode 100644
index 0000000..71310ac
Binary files /dev/null and b/static/images/toolbar/small/bold_button_down.xcf differ
diff --git a/static/images/toolbar/small/bold_button_down_hover.png b/static/images/toolbar/small/bold_button_down_hover.png
new file mode 100644
index 0000000..bb5d5cc
Binary files /dev/null and b/static/images/toolbar/small/bold_button_down_hover.png differ
diff --git a/static/images/toolbar/small/bold_button_down_hover.xcf b/static/images/toolbar/small/bold_button_down_hover.xcf
new file mode 100644
index 0000000..43109c5
Binary files /dev/null and b/static/images/toolbar/small/bold_button_down_hover.xcf differ
diff --git a/static/images/toolbar/small/bold_button_hover.png b/static/images/toolbar/small/bold_button_hover.png
new file mode 100644
index 0000000..3be7212
Binary files /dev/null and b/static/images/toolbar/small/bold_button_hover.png differ
diff --git a/static/images/toolbar/small/bold_button_hover.xcf b/static/images/toolbar/small/bold_button_hover.xcf
new file mode 100644
index 0000000..158bf2b
Binary files /dev/null and b/static/images/toolbar/small/bold_button_hover.xcf differ
diff --git a/static/images/toolbar/small/bullet_list_button.png b/static/images/toolbar/small/bullet_list_button.png
new file mode 100644
index 0000000..0dfc897
Binary files /dev/null and b/static/images/toolbar/small/bullet_list_button.png differ
diff --git a/static/images/toolbar/small/bullet_list_button.xcf b/static/images/toolbar/small/bullet_list_button.xcf
new file mode 100644
index 0000000..b8bf25d
Binary files /dev/null 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
new file mode 100644
index 0000000..6ef2676
Binary files /dev/null and b/static/images/toolbar/small/bullet_list_button_down.png differ
diff --git a/static/images/toolbar/small/bullet_list_button_down.xcf b/static/images/toolbar/small/bullet_list_button_down.xcf
new file mode 100644
index 0000000..9a6b6b5
Binary files /dev/null and b/static/images/toolbar/small/bullet_list_button_down.xcf 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
new file mode 100644
index 0000000..c778f0c
Binary files /dev/null and b/static/images/toolbar/small/bullet_list_button_down_hover.png 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
new file mode 100644
index 0000000..e32843a
Binary files /dev/null and b/static/images/toolbar/small/bullet_list_button_down_hover.xcf differ
diff --git a/static/images/toolbar/small/bullet_list_button_hover.png b/static/images/toolbar/small/bullet_list_button_hover.png
new file mode 100644
index 0000000..623a4e4
Binary files /dev/null and b/static/images/toolbar/small/bullet_list_button_hover.png differ
diff --git a/static/images/toolbar/small/bullet_list_button_hover.xcf b/static/images/toolbar/small/bullet_list_button_hover.xcf
new file mode 100644
index 0000000..7ffb11d
Binary files /dev/null and b/static/images/toolbar/small/bullet_list_button_hover.xcf differ
diff --git a/static/images/toolbar/small/button.xcf b/static/images/toolbar/small/button.xcf
new file mode 100644
index 0000000..b842ce6
Binary files /dev/null and b/static/images/toolbar/small/button.xcf differ
diff --git a/static/images/toolbar/small/button_down.xcf b/static/images/toolbar/small/button_down.xcf
new file mode 100644
index 0000000..e62a99f
Binary files /dev/null and b/static/images/toolbar/small/button_down.xcf differ
diff --git a/static/images/toolbar/small/button_down_hover.xcf b/static/images/toolbar/small/button_down_hover.xcf
new file mode 100644
index 0000000..0824f1e
Binary files /dev/null and b/static/images/toolbar/small/button_down_hover.xcf differ
diff --git a/static/images/toolbar/small/button_hover.xcf b/static/images/toolbar/small/button_hover.xcf
new file mode 100644
index 0000000..04af42d
Binary files /dev/null and b/static/images/toolbar/small/button_hover.xcf differ
diff --git a/static/images/toolbar/small/italic_button.png b/static/images/toolbar/small/italic_button.png
new file mode 100644
index 0000000..b17240b
Binary files /dev/null and b/static/images/toolbar/small/italic_button.png differ
diff --git a/static/images/toolbar/small/italic_button.xcf b/static/images/toolbar/small/italic_button.xcf
new file mode 100644
index 0000000..dcde354
Binary files /dev/null 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
new file mode 100644
index 0000000..e37a055
Binary files /dev/null and b/static/images/toolbar/small/italic_button_down.png differ
diff --git a/static/images/toolbar/small/italic_button_down.xcf b/static/images/toolbar/small/italic_button_down.xcf
new file mode 100644
index 0000000..9e70275
Binary files /dev/null and b/static/images/toolbar/small/italic_button_down.xcf differ
diff --git a/static/images/toolbar/small/italic_button_down_hover.png b/static/images/toolbar/small/italic_button_down_hover.png
new file mode 100644
index 0000000..fc488b0
Binary files /dev/null and b/static/images/toolbar/small/italic_button_down_hover.png differ
diff --git a/static/images/toolbar/small/italic_button_down_hover.xcf b/static/images/toolbar/small/italic_button_down_hover.xcf
new file mode 100644
index 0000000..a0ad42e
Binary files /dev/null and b/static/images/toolbar/small/italic_button_down_hover.xcf differ
diff --git a/static/images/toolbar/small/italic_button_hover.png b/static/images/toolbar/small/italic_button_hover.png
new file mode 100644
index 0000000..3fa35d8
Binary files /dev/null and b/static/images/toolbar/small/italic_button_hover.png differ
diff --git a/static/images/toolbar/small/italic_button_hover.xcf b/static/images/toolbar/small/italic_button_hover.xcf
new file mode 100644
index 0000000..3d37944
Binary files /dev/null and b/static/images/toolbar/small/italic_button_hover.xcf differ
diff --git a/static/images/toolbar/small/link_button.png b/static/images/toolbar/small/link_button.png
new file mode 100644
index 0000000..cca977c
Binary files /dev/null and b/static/images/toolbar/small/link_button.png differ
diff --git a/static/images/toolbar/small/link_button.xcf b/static/images/toolbar/small/link_button.xcf
new file mode 100644
index 0000000..2dd4443
Binary files /dev/null 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
new file mode 100644
index 0000000..5ce721c
Binary files /dev/null and b/static/images/toolbar/small/link_button_down.png differ
diff --git a/static/images/toolbar/small/link_button_down.xcf b/static/images/toolbar/small/link_button_down.xcf
new file mode 100644
index 0000000..6b9092a
Binary files /dev/null and b/static/images/toolbar/small/link_button_down.xcf differ
diff --git a/static/images/toolbar/small/link_button_down_hover.png b/static/images/toolbar/small/link_button_down_hover.png
new file mode 100644
index 0000000..338dd30
Binary files /dev/null and b/static/images/toolbar/small/link_button_down_hover.png differ
diff --git a/static/images/toolbar/small/link_button_down_hover.xcf b/static/images/toolbar/small/link_button_down_hover.xcf
new file mode 100644
index 0000000..54164d4
Binary files /dev/null and b/static/images/toolbar/small/link_button_down_hover.xcf differ
diff --git a/static/images/toolbar/small/link_button_hover.png b/static/images/toolbar/small/link_button_hover.png
new file mode 100644
index 0000000..bad0d7e
Binary files /dev/null and b/static/images/toolbar/small/link_button_hover.png differ
diff --git a/static/images/toolbar/small/link_button_hover.xcf b/static/images/toolbar/small/link_button_hover.xcf
new file mode 100644
index 0000000..a152462
Binary files /dev/null and b/static/images/toolbar/small/link_button_hover.xcf differ
diff --git a/static/images/toolbar/small/new_note_button.png b/static/images/toolbar/small/new_note_button.png
new file mode 100644
index 0000000..9166ee6
Binary files /dev/null and b/static/images/toolbar/small/new_note_button.png differ
diff --git a/static/images/toolbar/small/new_note_button.xcf b/static/images/toolbar/small/new_note_button.xcf
new file mode 100644
index 0000000..1c3dd9d
Binary files /dev/null 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
new file mode 100644
index 0000000..a64494f
Binary files /dev/null and b/static/images/toolbar/small/new_note_button_down.png differ
diff --git a/static/images/toolbar/small/new_note_button_down.xcf b/static/images/toolbar/small/new_note_button_down.xcf
new file mode 100644
index 0000000..f57b5e2
Binary files /dev/null and b/static/images/toolbar/small/new_note_button_down.xcf 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
new file mode 100644
index 0000000..079465f
Binary files /dev/null and b/static/images/toolbar/small/new_note_button_down_hover.png 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
new file mode 100644
index 0000000..3179435
Binary files /dev/null and b/static/images/toolbar/small/new_note_button_down_hover.xcf differ
diff --git a/static/images/toolbar/small/new_note_button_hover.png b/static/images/toolbar/small/new_note_button_hover.png
new file mode 100644
index 0000000..45ed8b6
Binary files /dev/null and b/static/images/toolbar/small/new_note_button_hover.png differ
diff --git a/static/images/toolbar/small/new_note_button_hover.xcf b/static/images/toolbar/small/new_note_button_hover.xcf
new file mode 100644
index 0000000..ac977fa
Binary files /dev/null and b/static/images/toolbar/small/new_note_button_hover.xcf differ
diff --git a/static/images/toolbar/small/numbered_list_button.png b/static/images/toolbar/small/numbered_list_button.png
new file mode 100644
index 0000000..963ce2b
Binary files /dev/null and b/static/images/toolbar/small/numbered_list_button.png differ
diff --git a/static/images/toolbar/small/numbered_list_button.xcf b/static/images/toolbar/small/numbered_list_button.xcf
new file mode 100644
index 0000000..43e25e7
Binary files /dev/null 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
new file mode 100644
index 0000000..9f0f68d
Binary files /dev/null and b/static/images/toolbar/small/numbered_list_button_down.png differ
diff --git a/static/images/toolbar/small/numbered_list_button_down.xcf b/static/images/toolbar/small/numbered_list_button_down.xcf
new file mode 100644
index 0000000..d22193b
Binary files /dev/null and b/static/images/toolbar/small/numbered_list_button_down.xcf 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
new file mode 100644
index 0000000..0233c96
Binary files /dev/null and b/static/images/toolbar/small/numbered_list_button_down_hover.png 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
new file mode 100644
index 0000000..999dfc9
Binary files /dev/null and b/static/images/toolbar/small/numbered_list_button_down_hover.xcf differ
diff --git a/static/images/toolbar/small/numbered_list_button_hover.png b/static/images/toolbar/small/numbered_list_button_hover.png
new file mode 100644
index 0000000..bfdd9fd
Binary files /dev/null and b/static/images/toolbar/small/numbered_list_button_hover.png differ
diff --git a/static/images/toolbar/small/numbered_list_button_hover.xcf b/static/images/toolbar/small/numbered_list_button_hover.xcf
new file mode 100644
index 0000000..1779cb0
Binary files /dev/null and b/static/images/toolbar/small/numbered_list_button_hover.xcf differ
diff --git a/static/images/toolbar/small/paperclip.png b/static/images/toolbar/small/paperclip.png
new file mode 100644
index 0000000..1508980
Binary files /dev/null and b/static/images/toolbar/small/paperclip.png differ
diff --git a/static/images/toolbar/small/title_button.png b/static/images/toolbar/small/title_button.png
new file mode 100644
index 0000000..e9f5242
Binary files /dev/null and b/static/images/toolbar/small/title_button.png differ
diff --git a/static/images/toolbar/small/title_button.xcf b/static/images/toolbar/small/title_button.xcf
new file mode 100644
index 0000000..591c94e
Binary files /dev/null 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
new file mode 100644
index 0000000..f24c3df
Binary files /dev/null and b/static/images/toolbar/small/title_button_down.png differ
diff --git a/static/images/toolbar/small/title_button_down.xcf b/static/images/toolbar/small/title_button_down.xcf
new file mode 100644
index 0000000..a55ed17
Binary files /dev/null and b/static/images/toolbar/small/title_button_down.xcf differ
diff --git a/static/images/toolbar/small/title_button_down_hover.png b/static/images/toolbar/small/title_button_down_hover.png
new file mode 100644
index 0000000..75de4d5
Binary files /dev/null and b/static/images/toolbar/small/title_button_down_hover.png differ
diff --git a/static/images/toolbar/small/title_button_down_hover.xcf b/static/images/toolbar/small/title_button_down_hover.xcf
new file mode 100644
index 0000000..8cb7b56
Binary files /dev/null and b/static/images/toolbar/small/title_button_down_hover.xcf differ
diff --git a/static/images/toolbar/small/title_button_hover.png b/static/images/toolbar/small/title_button_hover.png
new file mode 100644
index 0000000..7ad8396
Binary files /dev/null and b/static/images/toolbar/small/title_button_hover.png differ
diff --git a/static/images/toolbar/small/title_button_hover.xcf b/static/images/toolbar/small/title_button_hover.xcf
new file mode 100644
index 0000000..de781bb
Binary files /dev/null and b/static/images/toolbar/small/title_button_hover.xcf differ
diff --git a/static/images/toolbar/small/underline_button.png b/static/images/toolbar/small/underline_button.png
new file mode 100644
index 0000000..0211f59
Binary files /dev/null and b/static/images/toolbar/small/underline_button.png differ
diff --git a/static/images/toolbar/small/underline_button.xcf b/static/images/toolbar/small/underline_button.xcf
new file mode 100644
index 0000000..9ff7a16
Binary files /dev/null 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
new file mode 100644
index 0000000..354a5fb
Binary files /dev/null and b/static/images/toolbar/small/underline_button_down.png differ
diff --git a/static/images/toolbar/small/underline_button_down.xcf b/static/images/toolbar/small/underline_button_down.xcf
new file mode 100644
index 0000000..382094e
Binary files /dev/null and b/static/images/toolbar/small/underline_button_down.xcf differ
diff --git a/static/images/toolbar/small/underline_button_down_hover.png b/static/images/toolbar/small/underline_button_down_hover.png
new file mode 100644
index 0000000..999e93f
Binary files /dev/null and b/static/images/toolbar/small/underline_button_down_hover.png differ
diff --git a/static/images/toolbar/small/underline_button_down_hover.xcf b/static/images/toolbar/small/underline_button_down_hover.xcf
new file mode 100644
index 0000000..44e9c55
Binary files /dev/null and b/static/images/toolbar/small/underline_button_down_hover.xcf differ
diff --git a/static/images/toolbar/small/underline_button_hover.png b/static/images/toolbar/small/underline_button_hover.png
new file mode 100644
index 0000000..6227b66
Binary files /dev/null and b/static/images/toolbar/small/underline_button_hover.png differ
diff --git a/static/images/toolbar/small/underline_button_hover.xcf b/static/images/toolbar/small/underline_button_hover.xcf
new file mode 100644
index 0000000..6aea34e
Binary files /dev/null and b/static/images/toolbar/small/underline_button_hover.xcf differ
diff --git a/static/images/title_button.png b/static/images/toolbar/title_button.png
similarity index 100%
rename from static/images/title_button.png
rename to static/images/toolbar/title_button.png
diff --git a/static/images/title_button.xcf b/static/images/toolbar/title_button.xcf
similarity index 100%
rename from static/images/title_button.xcf
rename to static/images/toolbar/title_button.xcf
diff --git a/static/images/title_button_down.png b/static/images/toolbar/title_button_down.png
similarity index 100%
rename from static/images/title_button_down.png
rename to static/images/toolbar/title_button_down.png
diff --git a/static/images/title_button_down.xcf b/static/images/toolbar/title_button_down.xcf
similarity index 100%
rename from static/images/title_button_down.xcf
rename to static/images/toolbar/title_button_down.xcf
diff --git a/static/images/title_button_down_hover.png b/static/images/toolbar/title_button_down_hover.png
similarity index 100%
rename from static/images/title_button_down_hover.png
rename to static/images/toolbar/title_button_down_hover.png
diff --git a/static/images/title_button_down_hover.xcf b/static/images/toolbar/title_button_down_hover.xcf
similarity index 100%
rename from static/images/title_button_down_hover.xcf
rename to static/images/toolbar/title_button_down_hover.xcf
diff --git a/static/images/title_button_hover.png b/static/images/toolbar/title_button_hover.png
similarity index 100%
rename from static/images/title_button_hover.png
rename to static/images/toolbar/title_button_hover.png
diff --git a/static/images/title_button_hover.xcf b/static/images/toolbar/title_button_hover.xcf
similarity index 100%
rename from static/images/title_button_hover.xcf
rename to static/images/toolbar/title_button_hover.xcf
diff --git a/static/images/underline_button.png b/static/images/toolbar/underline_button.png
similarity index 100%
rename from static/images/underline_button.png
rename to static/images/toolbar/underline_button.png
diff --git a/static/images/underline_button.xcf b/static/images/toolbar/underline_button.xcf
similarity index 100%
rename from static/images/underline_button.xcf
rename to static/images/toolbar/underline_button.xcf
diff --git a/static/images/underline_button_down.png b/static/images/toolbar/underline_button_down.png
similarity index 100%
rename from static/images/underline_button_down.png
rename to static/images/toolbar/underline_button_down.png
diff --git a/static/images/underline_button_down.xcf b/static/images/toolbar/underline_button_down.xcf
similarity index 100%
rename from static/images/underline_button_down.xcf
rename to static/images/toolbar/underline_button_down.xcf
diff --git a/static/images/underline_button_down_hover.png b/static/images/toolbar/underline_button_down_hover.png
similarity index 100%
rename from static/images/underline_button_down_hover.png
rename to static/images/toolbar/underline_button_down_hover.png
diff --git a/static/images/underline_button_down_hover.xcf b/static/images/toolbar/underline_button_down_hover.xcf
similarity index 100%
rename from static/images/underline_button_down_hover.xcf
rename to static/images/toolbar/underline_button_down_hover.xcf
diff --git a/static/images/underline_button_hover.png b/static/images/toolbar/underline_button_hover.png
similarity index 100%
rename from static/images/underline_button_hover.png
rename to static/images/toolbar/underline_button_hover.png
diff --git a/static/images/underline_button_hover.xcf b/static/images/toolbar/underline_button_hover.xcf
similarity index 100%
rename from static/images/underline_button_hover.xcf
rename to static/images/toolbar/underline_button_hover.xcf
diff --git a/static/js/Wiki.js b/static/js/Wiki.js
index a20a1a7..3f2a862 100644
--- a/static/js/Wiki.js
+++ b/static/js/Wiki.js
@@ -20,6 +20,8 @@ function Wiki( invoker ) {
   this.signup_plan = getElement( "signup_plan" ).value;
   this.email_address = getElement( "email_address" ).value || "";
   this.font_size = null;
+  this.small_toolbar = false;
+  this.large_toolbar_bottom = 0;
 
   var total_notes_count_node = getElement( "total_notes_count" );
   if ( total_notes_count_node )
@@ -71,6 +73,7 @@ function Wiki( invoker ) {
   connect( "html", "onclick", this, "background_clicked" );
   connect( "html", "onkeydown", this, "key_pressed" );
   connect( window, "onresize", this, "resize_editors" );
+  connect( window, "onresize", this, "resize_toolbar" );
   connect( document, "onmouseover", this, "detect_font_resize" );
 
   var blank_note_stub = getElement( "blank_note_stub" );
@@ -136,6 +139,8 @@ function Wiki( invoker ) {
       self.move_current_notebook_down( event );
     } );
   }
+
+  this.resize_toolbar();
 }
 
 Wiki.prototype.update_next_id = function ( result ) {
@@ -300,7 +305,7 @@ 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", true );
+    this.make_image_button( "newNote", "new_note" );
     this.make_image_button( "createLink", "link" );
     this.make_image_button( "attachFile", "attach" );
     this.make_image_button( "bold" );
@@ -753,6 +758,27 @@ Wiki.prototype.resize_editors = function () {
   }
 }
 
+Wiki.prototype.resize_toolbar = function () {
+  var last_toolbar_button = getElement( "insertOrderedList" );
+  var current_toolbar_bottom = getElementPosition( last_toolbar_button ).y + getElementDimensions( last_toolbar_button ).h;
+  var viewport_size = getViewportDimensions();
+  var VIEWPORT_WIDTH_THRESHOLD = 1000;
+
+  // if the toolbar is large and the bottom of the toolbar is outside of the viewport or the
+  // viewport is too narrow, then make the toolbar smaller
+  if ( !this.small_toolbar && ( current_toolbar_bottom > viewport_size.h || viewport_size.w < VIEWPORT_WIDTH_THRESHOLD ) ) {
+    this.large_toolbar_bottom = current_toolbar_bottom;
+    this.small_toolbar = true;
+    this.update_toolbar();
+  // otherwise, if the toolbar is small and making the toolbar large would still fit within the
+  // viewport and the viewport is wide, then make the toolbar large again
+  } else if ( this.small_toolbar && this.large_toolbar_bottom <= viewport_size.h && viewport_size.w >= VIEWPORT_WIDTH_THRESHOLD ) {
+    if ( !this.small_toolbar ) return; // it's already big, so bail
+    this.small_toolbar = false;
+    this.update_toolbar();
+  }
+}
+
 Wiki.prototype.detect_font_resize = function () {
   if ( !window.getComputedStyle ) return;
 
@@ -842,6 +868,7 @@ Wiki.prototype.editor_focused = function ( editor, synchronous ) {
   }
 
   this.focused_editor = editor;
+  this.update_toolbar();
 }
 
 Wiki.prototype.key_pressed = function ( event ) {
@@ -904,82 +931,126 @@ Wiki.prototype.editor_key_pressed = function ( editor, event ) {
   }
 }
 
-Wiki.prototype.make_image_button = function ( name, filename_prefix, handle_mouse_up_and_down ) {
+Wiki.prototype.get_toolbar_image_dir = function () {
+  var toolbar_image_dir = IMAGE_DIR + "toolbar/";
+  if ( 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 );
+  
+  if ( this.small_toolbar ) {
+    if ( button_size.w == SMALL_BUTTON_SIZE ) return false;
+    setElementDimensions( button, { "w": SMALL_BUTTON_SIZE, "h": SMALL_BUTTON_SIZE } );
+  } else {
+    if ( button_size.w == LARGE_BUTTON_SIZE ) return false;
+    setElementDimensions( button, { "w": LARGE_BUTTON_SIZE, "h": LARGE_BUTTON_SIZE } );
+  }
+
+  return true;
+}
+
+Wiki.prototype.make_image_button = function ( name, filename_prefix ) {
   var button = getElement( name );
+  var toolbar_image_dir = this.get_toolbar_image_dir();
 
   if ( !filename_prefix )
     filename_prefix = name;
 
+  button.name = name;
   button.filename_prefix = filename_prefix;
 
+  this.resize_toolbar_button( button );
+  this.connect_image_button( button );
+}
+
+Wiki.prototype.connect_image_button = function ( button, filename_prefix ) {
+  var self = this;
+
   connect( button, "onmouseover", function ( event ) {
+    var toolbar_image_dir = self.get_toolbar_image_dir();
     if ( /_down/.test( button.src ) )
-      button.src = IMAGE_DIR + filename_prefix + "_button_down_hover.png";
+      button.src = toolbar_image_dir + button.filename_prefix + "_button_down_hover.png";
     else
-      button.src = IMAGE_DIR + filename_prefix + "_button_hover.png";
+      button.src = toolbar_image_dir + button.filename_prefix + "_button_hover.png";
   } );
 
   connect( button, "onmouseout", function ( event ) {
+    var toolbar_image_dir = self.get_toolbar_image_dir();
     if ( /_down/.test( button.src ) )
-      button.src = IMAGE_DIR + filename_prefix + "_button_down.png";
+      button.src = toolbar_image_dir + button.filename_prefix + "_button_down.png";
     else
-      button.src = IMAGE_DIR + filename_prefix + "_button.png";
+      button.src = toolbar_image_dir + button.filename_prefix + "_button.png";
   } );
 
-  if ( handle_mouse_up_and_down ) {
+  if ( button.name == "newNote" ) {
     connect( button, "onmousedown", function ( event ) {
+      var toolbar_image_dir = self.get_toolbar_image_dir();
       if ( /_hover/.test( button.src ) )
-        button.src = IMAGE_DIR + filename_prefix + "_button_down_hover.png";
+        button.src = toolbar_image_dir + button.filename_prefix + "_button_down_hover.png";
       else
-        button.src = IMAGE_DIR + filename_prefix + "_button_down.png";
+        button.src = toolbar_image_dir + button.filename_prefix + "_button_down.png";
     } );
     connect( button, "onmouseup", function ( event ) {
+      var toolbar_image_dir = self.get_toolbar_image_dir();
       if ( /_hover/.test( button.src ) )
-        button.src = IMAGE_DIR + filename_prefix + "_button_hover.png";
+        button.src = toolbar_image_dir + button.filename_prefix + "_button_hover.png";
       else
-        button.src = IMAGE_DIR + filename_prefix + "_button.png";
+        button.src = toolbar_image_dir + button.filename_prefix + "_button.png";
     } );
   }
 }
 
 Wiki.prototype.down_image_button = function ( name ) {
   var button = getElement( name );
+  var toolbar_image_dir = this.get_toolbar_image_dir();
 
-  if ( /_down/.test( button.src ) )
+  if ( /_down/.test( button.src ) && !this.resize_toolbar_button( button ) )
     return;
 
   if ( /_hover/.test( button.src ) )
-    button.src = IMAGE_DIR + button.filename_prefix + "_button_down_hover.png";
+    button.src = toolbar_image_dir + button.filename_prefix + "_button_down_hover.png";
   else
-    button.src = IMAGE_DIR + button.filename_prefix + "_button_down.png";
+    button.src = toolbar_image_dir + button.filename_prefix + "_button_down.png";
+
 }
 
 Wiki.prototype.up_image_button = function ( name ) {
   var button = getElement( name );
+  var toolbar_image_dir = this.get_toolbar_image_dir();
 
-  if ( !/_down/.test( button.src ) )
+  if ( !/_down/.test( button.src ) && !this.resize_toolbar_button( button ) )
     return;
 
   if ( /_hover/.test( button.src ) )
-    button.src = IMAGE_DIR + button.filename_prefix + "_button_hover.png";
+    button.src = toolbar_image_dir + button.filename_prefix + "_button_hover.png";
   else
-    button.src = IMAGE_DIR + button.filename_prefix + "_button.png";
+    button.src = toolbar_image_dir + button.filename_prefix + "_button.png";
 }
 
 Wiki.prototype.toggle_image_button = function ( name ) {
   var button = getElement( name );
+  var toolbar_image_dir = this.get_toolbar_image_dir();
 
   if ( /_down/.test( button.src ) ) {
     if ( /_hover/.test( button.src ) )
-      button.src = IMAGE_DIR + button.filename_prefix + "_button_hover.png";
+      button.src = toolbar_image_dir + button.filename_prefix + "_button_hover.png";
     else
-      button.src = IMAGE_DIR + button.filename_prefix + "_button.png";
+      button.src = toolbar_image_dir + button.filename_prefix + "_button.png";
+    this.resize_toolbar_button( button );
     return false;
   } else {
     if ( /_hover/.test( button.src ) )
-      button.src = IMAGE_DIR + button.filename_prefix + "_button_down_hover.png";
+      button.src = toolbar_image_dir + button.filename_prefix + "_button_down_hover.png";
     else
-      button.src = IMAGE_DIR + button.filename_prefix + "_button_down.png";
+      button.src = toolbar_image_dir + button.filename_prefix + "_button_down.png";
+    this.resize_toolbar_button( button );
     return true;
   }
 }
@@ -1002,7 +1073,7 @@ Wiki.prototype.toggle_button = function ( event, button_id ) {
 }
 
 Wiki.prototype.update_button = function ( button_id, state_name, node_names ) {
-  if ( this.focused_editor.state_enabled( state_name, node_names ) )
+  if ( state_name && this.focused_editor.state_enabled( state_name, node_names ) )
     this.down_image_button( button_id );
   else
     this.up_image_button( button_id );
@@ -1013,6 +1084,7 @@ Wiki.prototype.update_toolbar = function() {
     return;
 
   var node_names = this.focused_editor.current_node_names();
+  this.update_button( "newNote" );
   this.update_button( "bold", "b", node_names );
   this.update_button( "italic", "i", node_names );
   this.update_button( "underline", "u", node_names );
diff --git a/view/Toolbar.py b/view/Toolbar.py
index 9361906..7336e32 100644
--- a/view/Toolbar.py
+++ b/view/Toolbar.py
@@ -10,21 +10,21 @@ class Toolbar( Div ):
           Div( Input(
             type = u"image",
             id = u"newNote", title = u"new note [ctrl-N]",
-            src = u"/static/images/new_note_button.png",
+            src = u"/static/images/toolbar/new_note_button.png",
             width = u"40", height = u"40",
             class_ = "image_button",
           ) ),
           Div( Input(
             type = u"image",
             id = u"createLink", title = u"link [ctrl-L]",
-            src = u"/static/images/link_button.png",
+            src = u"/static/images/toolbar/link_button.png",
             width = u"40", height = u"40",
             class_ = "image_button",
           ) ),
           Div( Input(
             type = u"image",
             id = u"attachFile", title = u"attach file",
-            src = u"/static/images/attach_button.png",
+            src = u"/static/images/toolbar/attach_button.png",
             width = u"40", height = u"40",
             class_ = "image_button",
           ) ),
@@ -33,28 +33,28 @@ class Toolbar( Div ):
           Div( Input(
             type = u"image",
             id = u"bold", title = u"bold [ctrl-B]",
-            src = u"/static/images/bold_button.png",
+            src = u"/static/images/toolbar/bold_button.png",
             width = u"40", height = u"40",
             class_ = "image_button",
           ) ),
           Div( Input(
             type = u"image",
             id = u"italic", title = u"italic [ctrl-I]",
-            src = u"/static/images/italic_button.png",
+            src = u"/static/images/toolbar/italic_button.png",
             width = u"40", height = u"40",
             class_ = "image_button",
           ) ),
           Div( Input(
             type = u"image",
             id = u"underline", title = u"underline [ctrl-U]",
-            src = u"/static/images/underline_button.png",
+            src = u"/static/images/toolbar/underline_button.png",
             width = u"40", height = u"40",
             class_ = "image_button",
           ) ),
           Div( Input(
             type = u"image",
             id = u"title", title = u"title [ctrl-T]",
-            src = u"/static/images/title_button.png",
+            src = u"/static/images/toolbar/title_button.png",
             width = u"40", height = u"40",
             class_ = "image_button",
           ) ),
@@ -63,14 +63,14 @@ class Toolbar( Div ):
           Div( Input(
             type = u"image",
             id = u"insertUnorderedList", title = u"bullet list [ctrl-period]",
-            src = u"/static/images/bullet_list_button.png",
+            src = u"/static/images/toolbar/bullet_list_button.png",
             width = u"40", height = u"40",
             class_ = "image_button",
           ) ),
           Div( Input(
             type = u"image",
             id = u"insertOrderedList", title = u"numbered list [ctrl-1]",
-            src = u"/static/images/numbered_list_button.png",
+            src = u"/static/images/toolbar/numbered_list_button.png",
             width = u"40", height = u"40",
             class_ = "image_button",
           ) ),