diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 19d240eb1b..ec9bcfa8e1 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -443,7 +443,7 @@ Editor::register_actions ()
 
 	act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-zoom", _("Zoom Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom));	
 	mouse_zoom_button.set_related_action (act);
-	mouse_zoom_button.set_image (::get_icon("tool_zoom"));
+	mouse_zoom_button.set_image (::get_icon("tool_zoom_ardour"));
 	mouse_zoom_button.add_elements ( ArdourButton::Inset );
 	mouse_zoom_button.set_name ("mouse mode button");
 
diff --git a/gtk2_ardour/icons/inspector_on.png b/gtk2_ardour/icons/inspector_on.png
index cbcc1fa48f..755359812d 100644
Binary files a/gtk2_ardour/icons/inspector_on.png and b/gtk2_ardour/icons/inspector_on.png differ
diff --git a/gtk2_ardour/icons/inspector_on_active.png b/gtk2_ardour/icons/inspector_on_active.png
index 8a68f61e14..ccd6a664a8 100644
Binary files a/gtk2_ardour/icons/inspector_on_active.png and b/gtk2_ardour/icons/inspector_on_active.png differ
diff --git a/gtk2_ardour/icons/inspector_on_prelight.png b/gtk2_ardour/icons/inspector_on_prelight.png
index 18fc476395..dabddd38e4 100644
Binary files a/gtk2_ardour/icons/inspector_on_prelight.png and b/gtk2_ardour/icons/inspector_on_prelight.png differ
diff --git a/gtk2_ardour/icons/lock_session.png b/gtk2_ardour/icons/lock_session.png
new file mode 100644
index 0000000000..bc46b5c511
Binary files /dev/null and b/gtk2_ardour/icons/lock_session.png differ
diff --git a/gtk2_ardour/icons/lock_session_active.png b/gtk2_ardour/icons/lock_session_active.png
new file mode 100644
index 0000000000..6df328bb0d
Binary files /dev/null and b/gtk2_ardour/icons/lock_session_active.png differ
diff --git a/gtk2_ardour/icons/lock_session_prelight.png b/gtk2_ardour/icons/lock_session_prelight.png
new file mode 100644
index 0000000000..c9d8927d35
Binary files /dev/null and b/gtk2_ardour/icons/lock_session_prelight.png differ
diff --git a/gtk2_ardour/icons/meter_bridge_on.png b/gtk2_ardour/icons/meter_bridge_on.png
new file mode 100644
index 0000000000..ffc25c2cfd
Binary files /dev/null and b/gtk2_ardour/icons/meter_bridge_on.png differ
diff --git a/gtk2_ardour/icons/meter_bridge_on_active.png b/gtk2_ardour/icons/meter_bridge_on_active.png
new file mode 100644
index 0000000000..8fc50c9d44
Binary files /dev/null and b/gtk2_ardour/icons/meter_bridge_on_active.png differ
diff --git a/gtk2_ardour/icons/meter_bridge_on_prelight.png b/gtk2_ardour/icons/meter_bridge_on_prelight.png
new file mode 100644
index 0000000000..bf672e227a
Binary files /dev/null and b/gtk2_ardour/icons/meter_bridge_on_prelight.png differ
diff --git a/gtk2_ardour/icons/mixer_on.png b/gtk2_ardour/icons/mixer_on.png
index e207a8a2b1..4e2cbff056 100644
Binary files a/gtk2_ardour/icons/mixer_on.png and b/gtk2_ardour/icons/mixer_on.png differ
diff --git a/gtk2_ardour/icons/mixer_on_active.png b/gtk2_ardour/icons/mixer_on_active.png
index 6e9c63610b..ffea8da62f 100644
Binary files a/gtk2_ardour/icons/mixer_on_active.png and b/gtk2_ardour/icons/mixer_on_active.png differ
diff --git a/gtk2_ardour/icons/mixer_on_prelight.png b/gtk2_ardour/icons/mixer_on_prelight.png
index 01a0fab721..8ca4afc94d 100644
Binary files a/gtk2_ardour/icons/mixer_on_prelight.png and b/gtk2_ardour/icons/mixer_on_prelight.png differ
diff --git a/gtk2_ardour/icons/sessionlock.png b/gtk2_ardour/icons/sessionlock.png
new file mode 100644
index 0000000000..01bf23b570
Binary files /dev/null and b/gtk2_ardour/icons/sessionlock.png differ
diff --git a/gtk2_ardour/icons/tool_arrow.png b/gtk2_ardour/icons/tool_arrow.png
new file mode 100644
index 0000000000..d9eebaab4e
Binary files /dev/null and b/gtk2_ardour/icons/tool_arrow.png differ
diff --git a/gtk2_ardour/icons/tool_arrow_active.png b/gtk2_ardour/icons/tool_arrow_active.png
new file mode 100644
index 0000000000..8b0b9a83a5
Binary files /dev/null and b/gtk2_ardour/icons/tool_arrow_active.png differ
diff --git a/gtk2_ardour/icons/tool_arrow_prelight.png b/gtk2_ardour/icons/tool_arrow_prelight.png
new file mode 100644
index 0000000000..b1ea252e3c
Binary files /dev/null and b/gtk2_ardour/icons/tool_arrow_prelight.png differ
diff --git a/gtk2_ardour/icons/tool_cut.png b/gtk2_ardour/icons/tool_cut.png
new file mode 100644
index 0000000000..805b2be99f
Binary files /dev/null and b/gtk2_ardour/icons/tool_cut.png differ
diff --git a/gtk2_ardour/icons/tool_cut_active.png b/gtk2_ardour/icons/tool_cut_active.png
new file mode 100644
index 0000000000..5cae518c04
Binary files /dev/null and b/gtk2_ardour/icons/tool_cut_active.png differ
diff --git a/gtk2_ardour/icons/tool_cut_prelight.png b/gtk2_ardour/icons/tool_cut_prelight.png
new file mode 100644
index 0000000000..49b90b90b8
Binary files /dev/null and b/gtk2_ardour/icons/tool_cut_prelight.png differ
diff --git a/gtk2_ardour/icons/tool_marker.png b/gtk2_ardour/icons/tool_marker.png
new file mode 100644
index 0000000000..a9a0769902
Binary files /dev/null and b/gtk2_ardour/icons/tool_marker.png differ
diff --git a/gtk2_ardour/icons/tool_marker_active.png b/gtk2_ardour/icons/tool_marker_active.png
new file mode 100644
index 0000000000..cf278e1986
Binary files /dev/null and b/gtk2_ardour/icons/tool_marker_active.png differ
diff --git a/gtk2_ardour/icons/tool_marker_prelight.png b/gtk2_ardour/icons/tool_marker_prelight.png
new file mode 100644
index 0000000000..ad29ed6efe
Binary files /dev/null and b/gtk2_ardour/icons/tool_marker_prelight.png differ
diff --git a/gtk2_ardour/icons/tool_zoom_active.png b/gtk2_ardour/icons/tool_zoom_active.png
new file mode 100644
index 0000000000..f545c19805
Binary files /dev/null and b/gtk2_ardour/icons/tool_zoom_active.png differ
diff --git a/gtk2_ardour/icons/tool_zoom.png b/gtk2_ardour/icons/tool_zoom_ardour.png
similarity index 100%
rename from gtk2_ardour/icons/tool_zoom.png
rename to gtk2_ardour/icons/tool_zoom_ardour.png
diff --git a/gtk2_ardour/icons/tool_zoom_prelight.png b/gtk2_ardour/icons/tool_zoom_prelight.png
new file mode 100644
index 0000000000..fc4276b5af
Binary files /dev/null and b/gtk2_ardour/icons/tool_zoom_prelight.png differ
diff --git a/gtk2_ardour/icons/tracks.png b/gtk2_ardour/icons/tracks.png
new file mode 100644
index 0000000000..16122d4660
Binary files /dev/null and b/gtk2_ardour/icons/tracks.png differ
diff --git a/gtk2_ardour/icons/tracks_active.png b/gtk2_ardour/icons/tracks_active.png
new file mode 100644
index 0000000000..912d3c5d12
Binary files /dev/null and b/gtk2_ardour/icons/tracks_active.png differ
diff --git a/gtk2_ardour/icons/tracks_prelight.png b/gtk2_ardour/icons/tracks_prelight.png
new file mode 100644
index 0000000000..e917e68161
Binary files /dev/null and b/gtk2_ardour/icons/tracks_prelight.png differ
diff --git a/gtk2_ardour/icons/transport_end.png b/gtk2_ardour/icons/transport_end.png
index ba20d49d9b..6e98a9a826 100644
Binary files a/gtk2_ardour/icons/transport_end.png and b/gtk2_ardour/icons/transport_end.png differ
diff --git a/gtk2_ardour/icons/transport_end_active.png b/gtk2_ardour/icons/transport_end_active.png
index dec7761b98..cd3938c4f5 100644
Binary files a/gtk2_ardour/icons/transport_end_active.png and b/gtk2_ardour/icons/transport_end_active.png differ
diff --git a/gtk2_ardour/icons/transport_end_prelight.png b/gtk2_ardour/icons/transport_end_prelight.png
index 9c0de57adf..db3c1b23bc 100644
Binary files a/gtk2_ardour/icons/transport_end_prelight.png and b/gtk2_ardour/icons/transport_end_prelight.png differ
diff --git a/gtk2_ardour/icons/transport_loop.png b/gtk2_ardour/icons/transport_loop.png
index 6501814c95..f32d645056 100644
Binary files a/gtk2_ardour/icons/transport_loop.png and b/gtk2_ardour/icons/transport_loop.png differ
diff --git a/gtk2_ardour/icons/transport_loop_active.png b/gtk2_ardour/icons/transport_loop_active.png
index 21a71dcb45..6e11357d00 100644
Binary files a/gtk2_ardour/icons/transport_loop_active.png and b/gtk2_ardour/icons/transport_loop_active.png differ
diff --git a/gtk2_ardour/icons/transport_loop_prelight.png b/gtk2_ardour/icons/transport_loop_prelight.png
index bb4b30a7cc..ff427639c5 100644
Binary files a/gtk2_ardour/icons/transport_loop_prelight.png and b/gtk2_ardour/icons/transport_loop_prelight.png differ
diff --git a/gtk2_ardour/icons/transport_play.png b/gtk2_ardour/icons/transport_play.png
index 397467d9e4..07bb37bf80 100644
Binary files a/gtk2_ardour/icons/transport_play.png and b/gtk2_ardour/icons/transport_play.png differ
diff --git a/gtk2_ardour/icons/transport_play_active.png b/gtk2_ardour/icons/transport_play_active.png
index 617026f016..aff12e3534 100644
Binary files a/gtk2_ardour/icons/transport_play_active.png and b/gtk2_ardour/icons/transport_play_active.png differ
diff --git a/gtk2_ardour/icons/transport_play_prelight.png b/gtk2_ardour/icons/transport_play_prelight.png
index 5ed902dbd5..e3ad7e4ee1 100644
Binary files a/gtk2_ardour/icons/transport_play_prelight.png and b/gtk2_ardour/icons/transport_play_prelight.png differ
diff --git a/gtk2_ardour/icons/transport_record.png b/gtk2_ardour/icons/transport_record.png
index 14ec665991..0186439071 100644
Binary files a/gtk2_ardour/icons/transport_record.png and b/gtk2_ardour/icons/transport_record.png differ
diff --git a/gtk2_ardour/icons/transport_record_active.png b/gtk2_ardour/icons/transport_record_active.png
index 2b92d11b54..6e79744141 100644
Binary files a/gtk2_ardour/icons/transport_record_active.png and b/gtk2_ardour/icons/transport_record_active.png differ
diff --git a/gtk2_ardour/icons/transport_record_prelight.png b/gtk2_ardour/icons/transport_record_prelight.png
index 9872def26d..4f232653fd 100644
Binary files a/gtk2_ardour/icons/transport_record_prelight.png and b/gtk2_ardour/icons/transport_record_prelight.png differ
diff --git a/gtk2_ardour/icons/transport_start.png b/gtk2_ardour/icons/transport_start.png
index 997b5ff3c7..7946e11799 100644
Binary files a/gtk2_ardour/icons/transport_start.png and b/gtk2_ardour/icons/transport_start.png differ
diff --git a/gtk2_ardour/icons/transport_start_active.png b/gtk2_ardour/icons/transport_start_active.png
index 5f361abaa4..156df0087a 100644
Binary files a/gtk2_ardour/icons/transport_start_active.png and b/gtk2_ardour/icons/transport_start_active.png differ
diff --git a/gtk2_ardour/icons/transport_start_prelight.png b/gtk2_ardour/icons/transport_start_prelight.png
index e08e0feeff..4f4c0e4a0d 100644
Binary files a/gtk2_ardour/icons/transport_start_prelight.png and b/gtk2_ardour/icons/transport_start_prelight.png differ
diff --git a/gtk2_ardour/icons/transport_stop.png b/gtk2_ardour/icons/transport_stop.png
index 1503434cad..0023a52e39 100644
Binary files a/gtk2_ardour/icons/transport_stop.png and b/gtk2_ardour/icons/transport_stop.png differ
diff --git a/gtk2_ardour/icons/transport_stop_active.png b/gtk2_ardour/icons/transport_stop_active.png
index db3df74a2f..e919e6d29f 100644
Binary files a/gtk2_ardour/icons/transport_stop_active.png and b/gtk2_ardour/icons/transport_stop_active.png differ
diff --git a/gtk2_ardour/icons/transport_stop_prelight.png b/gtk2_ardour/icons/transport_stop_prelight.png
index 8da755cace..640d641883 100644
Binary files a/gtk2_ardour/icons/transport_stop_prelight.png and b/gtk2_ardour/icons/transport_stop_prelight.png differ
diff --git a/gtk2_ardour/ui/tracks_tools.xml b/gtk2_ardour/ui/tracks_tools.xml
index a2a53730f3..b0eafd251f 100644
--- a/gtk2_ardour/ui/tracks_tools.xml
+++ b/gtk2_ardour/ui/tracks_tools.xml
@@ -1,47 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <Layout>
-  <HBox spacing="1">
-    <iconbutton id="inspector_on_button"
-                width="47" height="26"
-                normalicon="inspector_on"
-                activeicon="inspector_on_active"
-                prelighticon="inspector_on_prelight"/>
-    <iconbutton id="mixer_on_button"
-                width="48" height="26"
-                normalicon="mixer_on"
-                activeicon="mixer_on_active"
-                prelighticon="mixer_on_prelight"/>
-    <layout     width="48" height="26" bgnormal=""/>
-    <iconbutton id="transport_start_button"
-                width="34" height="26"
-                normalicon="transport_start"
-                activeicon="transport_start_active"
-                prelighticon="transport_start_prelight"/>
-    <iconbutton id="transport_end_button"
-                width="34" height="26"
-                normalicon="transport_end"
-                activeicon="transport_end_active"
-                prelighticon="transport_end_prelight"/>
-    <iconbutton id="transport_play_button"
-                width="34" height="26"
-                normalicon="transport_play"
-                activeicon="transport_play_active"
-                prelighticon="transport_play_prelight"/>
-    <iconbutton id="transport_record_button"
-                width="34" height="26"
-                normalicon="transport_record"
-                activeicon="transport_record_active"
-                prelighticon="transport_record_prelight"/>
-    <iconbutton id="transport_stop_button"
-                width="34" height="26"
-                normalicon="transport_stop"
-                activeicon="transport_stop_active"
-                prelighticon="transport_stop_prelight"/>
-    <iconbutton id="transport_loop_button"
-                width="34" height="26"
-                normalicon="transport_loop"
-                activeicon="transport_loop_active"
-                prelighticon="transport_loop_prelight"/>
-  </HBox>
+  <VBox>
+    <HBox>
+      <iconbutton id="tracks_button"
+                  width="53" height="53"
+                  normalicon="tracks"
+                  activeicon="tracks_active"
+                  prelighticon="tracks_prelight"/>
+    </HBox>
+    <HBox spacing="1">
+      <iconbutton id="inspector_on_button"
+                  width="48" height="26"
+                  normalicon="inspector_on"
+                  activeicon="inspector_on_active"
+                  prelighticon="inspector_on_prelight"/>
+      <iconbutton id="mixer_on_button"
+                  width="48" height="26"
+                  normalicon="mixer_on"
+                  activeicon="mixer_on_active"
+                  prelighticon="mixer_on_prelight"/>
+      <iconbutton id="meter_bridge_on_button"
+                  width="48" height="26"
+                  normalicon="meter_bridge_on"
+                  activeicon="meter_bridge_on_active"
+                  prelighticon="meter_bridge_on_prelight"/>
+      <layout     width="54" height="26" bgnormal=""/>
+      <iconbutton id="transport_start_button"
+                  width="34" height="26"
+                  normalicon="transport_start"
+                  activeicon="transport_start_active"
+                  prelighticon="transport_start_prelight"/>
+      <iconbutton id="transport_end_button"
+                  width="34" height="26"
+                  normalicon="transport_end"
+                  activeicon="transport_end_active"
+                  prelighticon="transport_end_prelight"/>
+      <iconbutton id="transport_play_button"
+                  width="34" height="26"
+                  normalicon="transport_play"
+                  activeicon="transport_play_active"
+                  prelighticon="transport_play_prelight"/>
+      <iconbutton id="transport_record_button"
+                  width="34" height="26"
+                  normalicon="transport_record"
+                  activeicon="transport_record_active"
+                  prelighticon="transport_record_prelight"/>
+      <iconbutton id="transport_stop_button"
+                  width="34" height="26"
+                  normalicon="transport_stop"
+                  activeicon="transport_stop_active"
+                  prelighticon="transport_stop_prelight"/>
+      <iconbutton id="transport_loop_button"
+                  width="34" height="26"
+                  normalicon="transport_loop"
+                  activeicon="transport_loop_active"
+                  prelighticon="transport_loop_prelight"/>
+      <iconbutton id="lock_session_button"
+                  width="34" height="26"
+                  normalicon="lock_session"
+                  activeicon="lock_session_active"
+                  prelighticon="lock_session_prelight"/>
+      <layout     width="60" height="26" bgnormal=""/>
+      <iconbutton id="tool_marker_button"
+                  width="34" height="26"
+                  normalicon="tool_marker"
+                  activeicon="tool_marker_active"
+                  prelighticon="tool_marker_prelight"/>
+      <iconbutton id="tool_arrow_button"
+                  width="34" height="26"
+                  normalicon="tool_arrow"
+                  activeicon="tool_arrow_active"
+                  prelighticon="tool_arrow_prelight"/>
+      <iconbutton id="tool_cut_button"
+                  width="34" height="26"
+                  normalicon="tool_cut"
+                  activeicon="tool_cut_active"
+                  prelighticon="tool_cut_prelight"/>
+      <iconbutton id="tool_zoom_button"
+                  width="34" height="26"
+                  normalicon="tool_zoom"
+                  activeicon="tool_zoom_active"
+                  prelighticon="tool_zoom_prelight"/>
+      <layout     width="68" height="26" bgnormal=""/>
+    </HBox>
+  </VBox>
 </Layout>