Qt: Add stock icons.

The new icons are patterned after the existing capture icons. They could probably benefit from some adjustments here and there. Start moving toward icon names and a directory layout compliant with freedesktop.org's Icon Naming Specification and Icon Theme Specification. We aren't fully compliant and might never be but anyone with exposure to FDO icon themes should at least know where everything is. Make Capture Start (x-capture-start) the first icon in the toolbar. Define the Colorize Packets, Auto Scroll, and zoom icons even though the Qt UI doesn't use them yet. Leave the Capture Filter, Display Filter, Coloring Rules, Preferences, and Help icons off for now. The GTK+ toolbar is overly cluttered and I'm not sure they're necessary. Try not to break ui/gtk/toolbar_icons.h. Remove welcome.qrc. I initially added it in case we needed to overlay the welcome screen with translucent .pngs but that never happened. To do: - Move the old GTK+ icons to their own directory. - Find a better name for the "toolbar" directory. "stock"? - Make the toolbar configurable. Change-Id: Ie07592113d307b8db786aedace672312a870fe38 Reviewed-on: https://code.wireshark.org/review/4182 Reviewed-by: Gerald Combs <gerald@wireshark.org>
author: Gerald Combs <gerald@wireshark.org> 2014-09-18 14:09:55 -0700
committer: Gerald Combs <gerald@wireshark.org> 2014-09-20 19:54:04 +0000
commit: 8576e1c103cb0606d100c31b9794bcdb61bd50c6 (patch)
tree: 429fcda5b0cf673edf8411b2b65e79f2c8bd9d71
parent: 801824b8a7a9885ab066ee7d10e7e03a2a948315 (diff)
download: wireshark-8576e1c103cb0606d100c31b9794bcdb61bd50c6.tar.gz
118 files changed, 4900 insertions, 96 deletions
diff --git a/Makefile.am b/Makefile.am
index 2d3b9beafe..d7c368a16c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -840,9 +840,6 @@ EXTRA_DIST = \
 	image/capture_comment_add.png	\
 	image/capture_comment_disabled.png	\
 	image/capture_comment_update.png	\
-	image/capture_start_24.png		\
-	image/capture_start_active_24.png	\
-	image/capture_stop_24.png		\
 	image/clist_ascend.xpm			\
 	image/clist_descend.xpm			\
 	image/copy-8.png			\
@@ -904,6 +901,93 @@ EXTRA_DIST = \
 	image/stock_dialog_warning_48.xpm	\
 	image/text2pcap.rc.in			\
 	image/tfshark.rc.in			\
+	image/toolbar/16x16/edit-find.png	\
+	image/toolbar/16x16/edit-find.svg	\
+	image/toolbar/16x16/go-first.png		\
+	image/toolbar/16x16/go-first.svg		\
+	image/toolbar/16x16/go-jump.png		\
+	image/toolbar/16x16/go-jump.svg		\
+	image/toolbar/16x16/go-last.png		\
+	image/toolbar/16x16/go-last.svg		\
+	image/toolbar/16x16/go-next.png		\
+	image/toolbar/16x16/go-next.svg		\
+	image/toolbar/16x16/go-next.svg.png		\
+	image/toolbar/16x16/go-previous.png		\
+	image/toolbar/16x16/go-previous.svg		\
+	image/toolbar/16x16/x-capture-file-close.png		\
+	image/toolbar/16x16/x-capture-file-close.svg		\
+	image/toolbar/16x16/x-capture-file-reload.png		\
+	image/toolbar/16x16/x-capture-file-reload.svg		\
+	image/toolbar/16x16/x-capture-file-save.png		\
+	image/toolbar/16x16/x-capture-options-gear.svg		\
+	image/toolbar/16x16/x-capture-options-wrench.svg	\
+	image/toolbar/16x16/x-capture-options.png		\
+	image/toolbar/16x16/x-capture-restart-fin.svg		\
+	image/toolbar/16x16/x-capture-restart-triangle1.svg	\
+	image/toolbar/16x16/x-capture-restart-triangle2.svg	\
+	image/toolbar/16x16/x-capture-restart-turn1.svg		\
+	image/toolbar/16x16/x-capture-restart-turn2.svg		\
+	image/toolbar/16x16/x-capture-restart.png		\
+	image/toolbar/16x16/x-capture-start.png			\
+	image/toolbar/16x16/x-capture-start.svg			\
+	image/toolbar/16x16/x-capture-stop-red.svg		\
+	image/toolbar/16x16/x-capture-stop-white.svg		\
+	image/toolbar/16x16/x-capture-stop.png			\
+	image/toolbar/16x16/x-colorize-packets.png	\
+	image/toolbar/16x16/x-colorize-packets.svg	\
+	image/toolbar/16x16/x-resize-columns.png	\
+	image/toolbar/16x16/x-resize-columns.svg	\
+	image/toolbar/16x16/x-stay-last.png		\
+	image/toolbar/16x16/x-stay-last.svg		\
+	image/toolbar/16x16/zoom-in.png			\
+	image/toolbar/16x16/zoom-in.svg			\
+	image/toolbar/16x16/zoom-original.png		\
+	image/toolbar/16x16/zoom-original.svg		\
+	image/toolbar/16x16/zoom-out.png		\
+	image/toolbar/16x16/zoom-out.svg		\
+	image/toolbar/24x24/edit-find.png	\
+	image/toolbar/24x24/edit-find.svg	\
+	image/toolbar/24x24/go-first.png		\
+	image/toolbar/24x24/go-first.svg		\
+	image/toolbar/24x24/go-jump.png		\
+	image/toolbar/24x24/go-jump.svg		\
+	image/toolbar/24x24/go-last.png		\
+	image/toolbar/24x24/go-last.svg		\
+	image/toolbar/24x24/go-next.png		\
+	image/toolbar/24x24/go-next.svg		\
+	image/toolbar/24x24/go-previous.png		\
+	image/toolbar/24x24/go-previous.svg		\
+	image/toolbar/24x24/x-capture-file-close.png		\
+	image/toolbar/24x24/x-capture-file-close.svg		\
+	image/toolbar/24x24/x-capture-file-reload.png		\
+	image/toolbar/24x24/x-capture-file-reload.svg		\
+	image/toolbar/24x24/x-capture-file-save.png		\
+	image/toolbar/24x24/x-capture-options-gear.svg		\
+	image/toolbar/24x24/x-capture-options-wrench.svg	\
+	image/toolbar/24x24/x-capture-options.png		\
+	image/toolbar/24x24/x-capture-restart-fin.svg		\
+	image/toolbar/24x24/x-capture-restart-triangle1.svg	\
+	image/toolbar/24x24/x-capture-restart-triangle2.svg	\
+	image/toolbar/24x24/x-capture-restart-turn1.svg		\
+	image/toolbar/24x24/x-capture-restart-turn2.svg		\
+	image/toolbar/24x24/x-capture-restart.png		\
+	image/toolbar/24x24/x-capture-start.png			\
+	image/toolbar/24x24/x-capture-start.svg			\
+	image/toolbar/24x24/x-capture-stop-red.svg		\
+	image/toolbar/24x24/x-capture-stop-white.svg		\
+	image/toolbar/24x24/x-capture-stop.png			\
+	image/toolbar/24x24/x-colorize-packets.png	\
+	image/toolbar/24x24/x-colorize-packets.svg	\
+	image/toolbar/24x24/x-resize-columns.png	\
+	image/toolbar/24x24/x-resize-columns.svg	\
+	image/toolbar/24x24/x-stay-last.png		\
+	image/toolbar/24x24/x-stay-last.svg		\
+	image/toolbar/24x24/zoom-in.png			\
+	image/toolbar/24x24/zoom-in.svg			\
+	image/toolbar/24x24/zoom-original.png		\
+	image/toolbar/24x24/zoom-original.svg		\
+	image/toolbar/24x24/zoom-out.png		\
+	image/toolbar/24x24/zoom-out.svg		\
 	image/toolbar.qrc			\
 	image/toolbar/analyze_24.xpm 		\
 	image/toolbar/audio_player_24.xpm	\
@@ -916,15 +1000,7 @@ EXTRA_DIST = \
 	image/toolbar/capture_filter_24.xpm	\
 	image/toolbar/capture_interfaces_16.png	\
 	image/toolbar/capture_interfaces_24.png	\
-	image/toolbar/capture_options_16.png	\
-	image/toolbar/capture_options_24.png	\
 	image/toolbar/capture_prepare_16.xpm	\
-	image/toolbar/capture_restart_16.png	\
-	image/toolbar/capture_restart_24.png	\
-	image/toolbar/capture_start_16.png	\
-	image/toolbar/capture_start_24.png	\
-	image/toolbar/capture_stop_16.png	\
-	image/toolbar/capture_stop_24.png	\
 	image/toolbar/checkbox_16.xpm		\
 	image/toolbar/colorize_24.xpm		\
 	image/toolbar/conversations_16.xpm	\
@@ -967,8 +1043,6 @@ EXTRA_DIST = \
 	image/toolbar/telephone_16.xpm	\
 	image/toolbar/telephony_16.xpm	\
 	image/toolbar/time_24.xpm	\
-	image/toolbar/toolbar_wireshark_file_16.png	\
-	image/toolbar/toolbar_wireshark_file_24.png	\
 	image/toolbar/voip_flow_24.xpm	\
 	image/toolbar/web_support_24.xpm	\
 	image/toolbar/wep_closed_24.xpm \
diff --git a/configure.ac b/configure.ac
index ed5e851b31..294f342a7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1406,6 +1406,7 @@ AC_SUBST(QT_MIN_VERSION)
 # 5.0.0:  19 Dec 2012
 # 5.1.0:  03 Jul 2013
 # 5.2.0:  12 Dec 2013
+# 5.3.0:  20 May 2014
 
 have_qt=no
 have_gtk=no
diff --git a/image/capture_start_24.png b/image/capture_start_24.png
deleted file mode 100644
index e1ac781b76..0000000000
--- a/image/capture_start_24.png
+++ /dev/null
diff --git a/image/capture_start_active_24.png b/image/capture_start_active_24.png
deleted file mode 100644
index 91f56032fb..0000000000
--- a/image/capture_start_active_24.png
+++ /dev/null
diff --git a/image/capture_stop_24.png b/image/capture_stop_24.png
deleted file mode 100644
index 0485a48efb..0000000000
--- a/image/capture_stop_24.png
+++ /dev/null
diff --git a/image/toolbar.qrc b/image/toolbar.qrc
index dc06cf7dfb..d17e6b6167 100644
--- a/image/toolbar.qrc
+++ b/image/toolbar.qrc
@@ -1,18 +1,63 @@
 <RCC>
-    <qresource prefix="/toolbar/main">
-        <file>capture_start_24.png</file>
-        <file>capture_stop_24.png</file>
-        <file>capture_start_active_24.png</file>
-        <file>toolbar/toolbar_wireshark_file_24.png</file>
-    </qresource>
     <qresource prefix="/menu/help">
         <file alias="wsicon16.png">wsicon16.png</file>
         <file alias="gnome_emblem_web_16.png">toolbar/gnome_emblem_web_16.png</file>
         <file alias="wsicon-ask.png">wsicon-ask.png</file>
+        <file>toolbar/16x16/go-first.png</file>
+        <file>toolbar/16x16/go-jump.png</file>
+        <file>toolbar/16x16/go-last.png</file>
+        <file>toolbar/16x16/go-next.png</file>
+        <file>toolbar/16x16/go-next.svg.png</file>
+        <file>toolbar/16x16/go-previous.svg</file>
+        <file>toolbar/16x16/x-colorize-packets.png</file>
+        <file>toolbar/16x16/x-resize-columns.png</file>
+        <file>toolbar/16x16/x-stay-last.png</file>
+        <file>toolbar/16x16/zoom-in.png</file>
+        <file>toolbar/16x16/zoom-original.png</file>
+        <file>toolbar/16x16/zoom-out.png</file>
+        <file>toolbar/24x24/go-first.png</file>
+        <file>toolbar/24x24/go-jump.png</file>
+        <file>toolbar/24x24/go-last.png</file>
+        <file>toolbar/24x24/go-next.png</file>
+        <file>toolbar/24x24/go-previous.png</file>
+        <file>toolbar/24x24/x-colorize-packets.png</file>
+        <file>toolbar/24x24/x-resize-columns.png</file>
+        <file>toolbar/24x24/x-stay-last.png</file>
+        <file>toolbar/24x24/zoom-in.png</file>
+        <file>toolbar/24x24/zoom-original.png</file>
+        <file>toolbar/24x24/zoom-out.png</file>
     </qresource>
     <qresource prefix="/stock">
         <file>minus-8.png</file>
         <file>plus-8.png</file>
         <file>copy-8.png</file>
     </qresource>
+    <qresource prefix="/icons">
+        <file>toolbar/16x16/edit-find.png</file>
+        <file>toolbar/16x16/go-first.png</file>
+        <file>toolbar/16x16/go-jump.png</file>
+        <file>toolbar/16x16/go-last.png</file>
+        <file>toolbar/16x16/go-next.png</file>
+        <file>toolbar/16x16/go-previous.png</file>
+        <file>toolbar/16x16/x-capture-file-close.png</file>
+        <file>toolbar/16x16/x-capture-file-reload.png</file>
+        <file>toolbar/16x16/x-capture-file-save.png</file>
+        <file>toolbar/16x16/x-capture-options.png</file>
+        <file>toolbar/16x16/x-capture-restart.png</file>
+        <file>toolbar/16x16/x-capture-start.png</file>
+        <file>toolbar/16x16/x-capture-stop.png</file>
+        <file>toolbar/24x24/edit-find.png</file>
+        <file>toolbar/24x24/go-first.png</file>
+        <file>toolbar/24x24/go-jump.png</file>
+        <file>toolbar/24x24/go-last.png</file>
+        <file>toolbar/24x24/go-next.png</file>
+        <file>toolbar/24x24/go-previous.png</file>
+        <file>toolbar/24x24/x-capture-file-close.png</file>
+        <file>toolbar/24x24/x-capture-file-reload.png</file>
+        <file>toolbar/24x24/x-capture-file-save.png</file>
+        <file>toolbar/24x24/x-capture-options.png</file>
+        <file>toolbar/24x24/x-capture-restart.png</file>
+        <file>toolbar/24x24/x-capture-start.png</file>
+        <file>toolbar/24x24/x-capture-stop.png</file>
+    </qresource>
 </RCC>
diff --git a/image/toolbar/16x16/edit-find.png b/image/toolbar/16x16/edit-find.png
new file mode 100644
index 0000000000..32bc0149c7
--- /dev/null
+++ b/image/toolbar/16x16/edit-find.png
diff --git a/image/toolbar/16x16/edit-find.svg b/image/toolbar/16x16/edit-find.svg
new file mode 100644
index 0000000000..e16f162aa9
--- /dev/null
+++ b/image/toolbar/16x16/edit-find.svg
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="edit-find.svg"
+   inkscape:export-filename="edit-find.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32.125"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="80"
+     inkscape:window-y="784"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g3763"
+       transform="matrix(0.50914019,-0.29395223,0.29395223,0.50914019,-301.43501,516.71748)">
+      <g
+         transform="translate(-10,2)"
+         id="g3759">
+        <rect
+           style="fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.7009567;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect2987"
+           width="3"
+           height="9"
+           x="16.5"
+           y="1042.3622"
+           rx="1.7009567"
+           ry="1.7009567" />
+        <path
+           style="fill:none;stroke:#2e3436;stroke-width:3.4019134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 18,1030.3622 c 0,13 0,13 0,13"
+           id="path3757"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         transform="matrix(1.3,0,0,1.4444444,-1.1,1026.4733)"
+         d="M 12,6.5 C 12,8.9852814 9.7614237,11 7,11 4.2385763,11 2,8.9852814 2,6.5 2,4.0147186 4.2385763,2 7,2 c 2.7614237,0 5,2.0147186 5,4.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="5"
+         sodipodi:cy="6.5"
+         sodipodi:cx="7"
+         id="path2985"
+         style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:1.24128401;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#2e3436;stroke-width:1.26713073;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3769"
+       sodipodi:cx="11"
+       sodipodi:cy="8"
+       sodipodi:rx="2.9472158"
+       sodipodi:ry="2.9472158"
+       d="M 8.2358567,6.9774576 A 2.9472158,2.9472158 0 0 1 11.758699,5.1521137"
+       transform="matrix(0.78918459,0,0,0.78918459,-1.4346112,1035.5437)"
+       sodipodi:start="3.4959119"
+       sodipodi:end="4.9727497"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/go-first.png b/image/toolbar/16x16/go-first.png
new file mode 100644
index 0000000000..137708d95a
--- /dev/null
+++ b/image/toolbar/16x16/go-first.png
diff --git a/image/toolbar/16x16/go-first.svg b/image/toolbar/16x16/go-first.svg
new file mode 100644
index 0000000000..cea04ff8f0
--- /dev/null
+++ b/image/toolbar/16x16/go-first.svg
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="go-first.svg"
+   inkscape:export-filename="go-first.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop3787" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3789" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3772">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop3774" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3776" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3772"
+       id="linearGradient3778"
+       x1="6"
+       y1="1041.6122"
+       x2="18"
+       y2="1041.6122"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3772"
+       id="linearGradient3783"
+       gradientUnits="userSpaceOnUse"
+       x1="12"
+       y1="20"
+       x2="12"
+       y2="14"
+       gradientTransform="translate(-2,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3791"
+       x1="6"
+       y1="1041.6122"
+       x2="18"
+       y2="1041.6122"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3796"
+       gradientUnits="userSpaceOnUse"
+       x1="12"
+       y1="6"
+       x2="12"
+       y2="13"
+       gradientTransform="translate(4,1028.3622)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3772"
+       id="linearGradient3798"
+       gradientUnits="userSpaceOnUse"
+       x1="6"
+       y1="1041.6122"
+       x2="18"
+       y2="1041.6122"
+       gradientTransform="translate(-2,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3800"
+       gradientUnits="userSpaceOnUse"
+       x1="6"
+       y1="1041.6122"
+       x2="18"
+       y2="1041.6122"
+       gradientTransform="translate(4,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4505"
+       id="linearGradient4503"
+       gradientUnits="userSpaceOnUse"
+       x1="6"
+       y1="5"
+       x2="6"
+       y2="8"
+       gradientTransform="translate(4,1031.3622)" />
+    <linearGradient
+       id="linearGradient4505">
+      <stop
+         id="stop4507"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15753424;" />
+      <stop
+         id="stop4509"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient4511"
+       gradientUnits="userSpaceOnUse"
+       x1="6"
+       y1="11"
+       x2="6"
+       y2="8"
+       gradientTransform="translate(4,-1.000031)" />
+    <linearGradient
+       id="linearGradient4404">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4406" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4408" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient3087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,6.84e-5,12.000056)"
+       x1="6"
+       y1="11"
+       x2="6"
+       y2="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4505"
+       id="linearGradient3089"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,9.9e-5,1044.3623)"
+       x1="6"
+       y1="5"
+       x2="6"
+       y2="8" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="23.291667"
+     inkscape:cx="8.6363933"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1291"
+     inkscape:window-height="779"
+     inkscape:window-x="303"
+     inkscape:window-y="146"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       inkscape:transform-center-y="-1.309546"
+       transform="matrix(1.219616,0,0,0.6984127,11.850752,1034.0844)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <rect
+       style="color:#000000;fill:#555753;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3009"
+       width="14"
+       height="1"
+       x="1"
+       y="1036.3622" />
+    <g
+       id="g3077"
+       transform="matrix(0,1,-1,0,1053.3623,1036.3622)">
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         id="path2987"
+         d="m 7.611628,1040.6189 c 0.471232,0.074 0.629062,0.8236 0.677227,2.2678 0.0067,-2e-4 0.01262,0 0.01936,0 l 5.572611,0 c 0.343025,0 0.619179,0.2022 0.619179,0.4537 l 0,4.082 c 0,0.2513 -0.276154,0.4535 -0.619179,0.4535 l -5.572611,0 c -0.0067,0 -0.01267,10e-5 -0.01936,0 -0.10323,3.0955 -0.677799,2.7404 -3.869869,0.3829 -3.8919808,-2.8745 -3.8919808,-2.8804 0,-5.7548 1.702742,-1.2575 2.653884,-1.9687 3.192642,-1.8851 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <g
+         id="g4385"
+         transform="translate(0,1)">
+        <path
+           sodipodi:type="star"
+           style="fill:#60b60e;fill-opacity:1;stroke:none"
+           id="path3873"
+           sodipodi:sides="3"
+           sodipodi:cx="28"
+           sodipodi:cy="8"
+           sodipodi:r1="6"
+           sodipodi:r2="3"
+           sodipodi:arg1="1.5707963"
+           sodipodi:arg2="2.6179939"
+           inkscape:flatsided="true"
+           inkscape:rounded="1"
+           inkscape:randomized="0"
+           d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+           transform="matrix(0,-0.27296167,0.22222222,0,3.8888889,1052.0051)"
+           inkscape:transform-center-x="0.41666431"
+           inkscape:transform-center-y="-5.8852633e-05" />
+        <rect
+           style="color:#000000;fill:#60b60e;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4383"
+           width="7"
+           height="2"
+           x="6"
+           y="7"
+           transform="translate(0,1036.3622)" />
+      </g>
+      <g
+         id="g4422"
+         transform="translate(0,1)">
+        <path
+           inkscape:connector-curvature="0"
+           d="m 6,7 7,0 0,2 -7,0 z M 7,7.9999732 C 7,10.836674 7,10.836674 5,9.4183238 3,7.9999732 3,7.9999732 5,6.5816229 7,5.1632723 7,5.1632723 7,7.9999732 z"
+           style="color:#000000;fill:url(#linearGradient3087);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           transform="translate(0,1036.3622)"
+           id="rect4426" />
+      </g>
+      <g
+         transform="translate(0,4.9999996)"
+         id="g4499">
+        <path
+           id="path4501"
+           style="color:#000000;fill:url(#linearGradient3089);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 6,1039.3622 7,0 0,2 -7,0 z m 1,1 c 0,2.8367 0,2.8367 -2,1.4183 -2,-1.4183 -2,-1.4183 0,-2.8367 2,-1.4183 2,-1.4183 2,1.4184 z"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/go-jump.png b/image/toolbar/16x16/go-jump.png
new file mode 100644
index 0000000000..7cc1568ca6
--- /dev/null
+++ b/image/toolbar/16x16/go-jump.png
diff --git a/image/toolbar/16x16/go-jump.svg b/image/toolbar/16x16/go-jump.svg
new file mode 100644
index 0000000000..5600b7eebe
--- /dev/null
+++ b/image/toolbar/16x16/go-jump.svg
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="go-jump.svg"
+   inkscape:export-filename="go-jump.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient3031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.99999962,0,0,1,10.999997,2.0499758)"
+       x1="6"
+       y1="11"
+       x2="6"
+       y2="8" />
+    <linearGradient
+       id="linearGradient4404">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4406" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4408" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4505"
+       id="linearGradient3033"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.99999962,0,0,1,10.999997,1034.4122)"
+       x1="6"
+       y1="5"
+       x2="6"
+       y2="8" />
+    <linearGradient
+       id="linearGradient4505">
+      <stop
+         id="stop4507"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15753424;" />
+      <stop
+         id="stop4509"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.9375"
+     inkscape:cx="9.7646492"
+     inkscape:cy="10.289803"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1171"
+     inkscape:window-height="812"
+     inkscape:window-x="386"
+     inkscape:window-y="142"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:none"
+       id="rect4163"
+       width="14"
+       height="14"
+       x="2"
+       y="1038.3622" />
+    <path
+       inkscape:transform-center-y="2.4349423e-05"
+       transform="matrix(0,1.219616,-0.6984127,0,44.777778,1009.213)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star"
+       inkscape:transform-center-x="-1.3095461" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.5,1038.8622 c 13,0 13,0 13,0"
+       id="path4099"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ef2929;stroke:#fce94f;stroke-width:0.99999994000000003px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8,1041.8622 c 7.518518,0 7.518518,0 7.518518,0"
+       id="path4103"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4105"
+       d="m 9,1044.8622 c 6.5,0 6.5,0 6.5,0"
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.5,1050.8622 c 13,0 13,0 13,0"
+       id="path4111"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ef2929;stroke:#fce94f;stroke-width:0.99999994000000003px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8,1042.8622 c 7.518518,0 7.518518,0 7.518518,0"
+       id="path4187"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4185"
+       d="m 8,1040.8622 c 7.518518,0 7.518518,0 7.518518,0"
+       style="fill:#ef2929;stroke:#fce94f;stroke-width:0.99999994000000003px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 7.388367,1037.5689 c -0.471232,0.074 -0.629062,0.8236 -0.677227,2.2678 -0.0067,-2e-4 -0.01262,0 -0.01935,0 l -5.5726114,0 c -0.343025,0 -0.619179,0.2022 -0.619179,0.4537 l 0,4.082 c 0,0.2513 0.276154,0.4535 0.619179,0.4535 l 5.5726114,0 c 0.0067,0 0.01267,10e-5 0.01935,0 0.10323,3.0955 0.677799,2.7404 3.869869,0.3829 3.891981,-2.8745 3.891981,-2.8804 0,-5.7548 -1.702742,-1.2575 -2.653884,-1.9687 -3.192642,-1.8851 z"
+       id="path2987"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g4385"
+       transform="matrix(-1,0,0,1,14.999995,-2.0500382)">
+      <path
+         inkscape:transform-center-y="-5.8852633e-05"
+         inkscape:transform-center-x="0.41666431"
+         transform="matrix(0,-0.27296167,0.22222222,0,3.8888889,1052.0051)"
+         d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+         inkscape:randomized="0"
+         inkscape:rounded="1"
+         inkscape:flatsided="true"
+         sodipodi:arg2="2.6179939"
+         sodipodi:arg1="1.5707963"
+         sodipodi:r2="3"
+         sodipodi:r1="6"
+         sodipodi:cy="8"
+         sodipodi:cx="28"
+         sodipodi:sides="3"
+         id="path3873"
+         style="fill:#60b60e;fill-opacity:1;stroke:none"
+         sodipodi:type="star" />
+      <rect
+         transform="translate(0,1036.3622)"
+         y="7"
+         x="6"
+         height="2"
+         width="7"
+         id="rect4383"
+         style="color:#000000;fill:#60b60e;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <g
+       id="g4422"
+       transform="matrix(-1,0,0,1,14.999995,-2.0500382)">
+      <path
+         id="rect4426"
+         transform="translate(0,1036.3622)"
+         style="color:#000000;fill:url(#linearGradient3031);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 6,7 7,0 0,2 -7,0 z M 7,7.9999732 C 7,10.836674 7,10.836674 5,9.4183238 3,7.9999732 3,7.9999732 5,6.5816229 7,5.1632723 7,5.1632723 7,7.9999732 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g4499"
+       transform="matrix(-1,0,0,1,14.999995,1.9499618)">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 6,1039.3622 7,0 0,2 -7,0 z m 1,1 c 0,2.8367 0,2.8367 -2,1.4183 -2,-1.4183 -2,-1.4183 0,-2.8367 2,-1.4183 2,-1.4183 2,1.4184 z"
+         style="color:#000000;fill:url(#linearGradient3033);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4501" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path3030"
+       d="m 2.5,1047.8622 c 13,0 13,0 13,0"
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:transform-center-x="-1.3095461"
+       sodipodi:type="star"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4183"
+       sodipodi:sides="3"
+       sodipodi:cx="28"
+       sodipodi:cy="8"
+       sodipodi:r1="6"
+       sodipodi:r2="3"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="true"
+       inkscape:rounded="1"
+       inkscape:randomized="0"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       transform="matrix(0,1.219616,-0.6984127,0,30.777778,1009.213)"
+       inkscape:transform-center-y="2.4349423e-05" />
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/go-last.png b/image/toolbar/16x16/go-last.png
new file mode 100644
index 0000000000..6dde22f1f6
--- /dev/null
+++ b/image/toolbar/16x16/go-last.png
diff --git a/image/toolbar/16x16/go-last.svg b/image/toolbar/16x16/go-last.svg
new file mode 100644
index 0000000000..9de94376ce
--- /dev/null
+++ b/image/toolbar/16x16/go-last.svg
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="go-last.svg"
+   inkscape:export-filename="go-last.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient3087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,-0.9999494,12.000056)"
+       x1="6"
+       y1="11"
+       x2="6"
+       y2="8" />
+    <linearGradient
+       id="linearGradient4404">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4406" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4408" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4505"
+       id="linearGradient3089"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,-0.9999188,1044.3623)"
+       x1="6"
+       y1="5"
+       x2="6"
+       y2="8" />
+    <linearGradient
+       id="linearGradient4505">
+      <stop
+         id="stop4507"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15753424;" />
+      <stop
+         id="stop4509"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient3039"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,-1,0,15.999937,12.000056)"
+       x1="6"
+       y1="11"
+       x2="6"
+       y2="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4505"
+       id="linearGradient3041"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,-1,0,15.999906,1044.3623)"
+       x1="6"
+       y1="5"
+       x2="6"
+       y2="8" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="23.291667"
+     inkscape:cx="9.5280802"
+     inkscape:cy="10.261337"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1028"
+     inkscape:window-height="728"
+     inkscape:window-x="854"
+     inkscape:window-y="294"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       inkscape:transform-center-y="-1.309546"
+       transform="matrix(1.219616,0,0,0.6984127,11.850752,1034.0844)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <rect
+       style="color:#000000;fill:#555753;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3009"
+       width="14"
+       height="1"
+       x="1"
+       y="-1052.3622"
+       transform="scale(1,-1)" />
+    <g
+       id="g3077"
+       transform="matrix(0,-1,-1,0,1053.3623,1052.3622)">
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         id="path2987"
+         d="m 7.611628,1040.6189 c 0.471232,0.074 0.629062,0.8236 0.677227,2.2678 0.0067,-2e-4 0.01262,0 0.01936,0 l 5.572611,0 c 0.343025,0 0.619179,0.2022 0.619179,0.4537 l 0,4.082 c 0,0.2513 -0.276154,0.4535 -0.619179,0.4535 l -5.572611,0 c -0.0067,0 -0.01267,10e-5 -0.01936,0 -0.10323,3.0955 -0.677799,2.7404 -3.869869,0.3829 -3.8919808,-2.8745 -3.8919808,-2.8804 0,-5.7548 1.702742,-1.2575 2.653884,-1.9687 3.192642,-1.8851 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <g
+         id="g4385"
+         transform="translate(0,1)">
+        <path
+           sodipodi:type="star"
+           style="fill:#60b60e;fill-opacity:1;stroke:none"
+           id="path3873"
+           sodipodi:sides="3"
+           sodipodi:cx="28"
+           sodipodi:cy="8"
+           sodipodi:r1="6"
+           sodipodi:r2="3"
+           sodipodi:arg1="1.5707963"
+           sodipodi:arg2="2.6179939"
+           inkscape:flatsided="true"
+           inkscape:rounded="1"
+           inkscape:randomized="0"
+           d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+           transform="matrix(0,-0.27296167,0.22222222,0,3.8888889,1052.0051)"
+           inkscape:transform-center-x="0.41666431"
+           inkscape:transform-center-y="-5.8852633e-05" />
+        <rect
+           style="color:#000000;fill:#60b60e;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4383"
+           width="7"
+           height="2"
+           x="6"
+           y="7"
+           transform="translate(0,1036.3622)" />
+      </g>
+      <g
+         id="g4422"
+         transform="translate(0,1)">
+        <path
+           inkscape:connector-curvature="0"
+           d="m 6,7 7,0 0,2 -7,0 z M 7,7.9999732 C 7,10.836674 7,10.836674 5,9.4183238 3,7.9999732 3,7.9999732 5,6.5816229 7,5.1632723 7,5.1632723 7,7.9999732 z"
+           style="color:#000000;fill:url(#linearGradient3039);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           transform="translate(0,1036.3622)"
+           id="rect4426" />
+      </g>
+      <g
+         transform="translate(0,4.9999996)"
+         id="g4499">
+        <path
+           id="path4501"
+           style="color:#000000;fill:url(#linearGradient3041);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 6,1039.3622 7,0 0,2 -7,0 z m 1,1 c 0,2.8367 0,2.8367 -2,1.4183 -2,-1.4183 -2,-1.4183 0,-2.8367 2,-1.4183 2,-1.4183 2,1.4184 z"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/go-next.png b/image/toolbar/16x16/go-next.png
new file mode 100644
index 0000000000..8086b7b7d9
--- /dev/null
+++ b/image/toolbar/16x16/go-next.png
diff --git a/image/toolbar/16x16/go-next.svg b/image/toolbar/16x16/go-next.svg
new file mode 100644
index 0000000000..55abcc9288
--- /dev/null
+++ b/image/toolbar/16x16/go-next.svg
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="go-next.svg"
+   inkscape:export-filename="go-next.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4505"
+       id="linearGradient4503"
+       gradientUnits="userSpaceOnUse"
+       x1="6"
+       y1="5"
+       x2="6"
+       y2="8"
+       gradientTransform="translate(4.0000004,1032.3622)" />
+    <linearGradient
+       id="linearGradient4505">
+      <stop
+         id="stop4507"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15753424;" />
+      <stop
+         id="stop4509"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient4511"
+       gradientUnits="userSpaceOnUse"
+       x1="6"
+       y1="11"
+       x2="6"
+       y2="8"
+       gradientTransform="translate(4.0000004,-3.12e-5)" />
+    <linearGradient
+       id="linearGradient4404">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4406" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4408" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient3031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,11.999995,-3.12e-5)"
+       x1="6"
+       y1="11"
+       x2="6"
+       y2="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4505"
+       id="linearGradient3033"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,11.999995,1032.3622)"
+       x1="6"
+       y1="5"
+       x2="6"
+       y2="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient3080"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,11.999995,-3.12e-5)"
+       x1="6"
+       y1="11"
+       x2="6"
+       y2="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4505"
+       id="linearGradient3082"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,11.999995,1032.3622)"
+       x1="6"
+       y1="5"
+       x2="6"
+       y2="8" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="23.205952"
+     inkscape:cx="5.9455187"
+     inkscape:cy="8.5526086"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1028"
+     inkscape:window-height="728"
+     inkscape:window-x="205"
+     inkscape:window-y="160"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 8.3883674,1039.6189 c -0.471232,0.074 -0.629062,0.8236 -0.677227,2.2678 -0.0067,-2e-4 -0.01262,0 -0.01935,0 l -5.5726114,0 c -0.343025,0 -0.619179,0.2022 -0.619179,0.4537 l 0,4.082 c 0,0.2513 0.276154,0.4535 0.619179,0.4535 l 5.5726114,0 c 0.0067,0 0.01267,10e-5 0.01935,0 0.10323,3.0955 0.677799,2.7404 3.8698686,0.3829 3.891981,-2.8745 3.891981,-2.8804 0,-5.7548 -1.7027416,-1.2575 -2.6538836,-1.9687 -3.1926416,-1.8851 z"
+       id="path2987"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g4385"
+       transform="matrix(-1,0,0,1,15.999995,0)">
+      <path
+         inkscape:transform-center-y="-5.8852633e-05"
+         inkscape:transform-center-x="0.41666431"
+         transform="matrix(0,-0.27296167,0.22222222,0,3.8888889,1052.0051)"
+         d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+         inkscape:randomized="0"
+         inkscape:rounded="1"
+         inkscape:flatsided="true"
+         sodipodi:arg2="2.6179939"
+         sodipodi:arg1="1.5707963"
+         sodipodi:r2="3"
+         sodipodi:r1="6"
+         sodipodi:cy="8"
+         sodipodi:cx="28"
+         sodipodi:sides="3"
+         id="path3873"
+         style="fill:#60b60e;fill-opacity:1;stroke:none"
+         sodipodi:type="star" />
+      <rect
+         transform="translate(0,1036.3622)"
+         y="7"
+         x="6"
+         height="2"
+         width="7"
+         id="rect4383"
+         style="color:#000000;fill:#60b60e;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <g
+       id="g4422"
+       transform="matrix(-1,0,0,1,15.999995,0)">
+      <path
+         id="rect4426"
+         transform="translate(0,1036.3622)"
+         style="color:#000000;fill:url(#linearGradient3080);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 6,7 7,0 0,2 -7,0 z M 7,7.9999732 C 7,10.836674 7,10.836674 5,9.4183238 3,7.9999732 3,7.9999732 5,6.5816229 7,5.1632723 7,5.1632723 7,7.9999732 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g4499"
+       transform="matrix(-1,0,0,1,15.999995,4)">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 6,1039.3622 7,0 0,2 -7,0 z m 1,1 c 0,2.8367 0,2.8367 -2,1.4183 -2,-1.4183 -2,-1.4183 0,-2.8367 2,-1.4183 2,-1.4183 2,1.4184 z"
+         style="color:#000000;fill:url(#linearGradient3082);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4501" />
+    </g>
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/go-next.svg.png b/image/toolbar/16x16/go-next.svg.png
new file mode 100644
index 0000000000..4085344e5d
--- /dev/null
+++ b/image/toolbar/16x16/go-next.svg.png
diff --git a/image/toolbar/16x16/go-previous.png b/image/toolbar/16x16/go-previous.png
new file mode 100644
index 0000000000..ee99b938ee
--- /dev/null
+++ b/image/toolbar/16x16/go-previous.png
diff --git a/image/toolbar/16x16/go-previous.svg b/image/toolbar/16x16/go-previous.svg
new file mode 100644
index 0000000000..a07ae8bde7
--- /dev/null
+++ b/image/toolbar/16x16/go-previous.svg
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="go-previous.svg"
+   inkscape:export-filename="go-previous.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4505">
+      <stop
+         id="stop4507"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15753424;" />
+      <stop
+         id="stop4509"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4404">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4406" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4408" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient4410"
+       x1="6"
+       y1="1046.3622"
+       x2="6"
+       y2="1044.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient4412"
+       gradientUnits="userSpaceOnUse"
+       x1="6"
+       y1="1046.3622"
+       x2="6"
+       y2="1044.3622"
+       gradientTransform="translate(0,1036.3622)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient4445"
+       x1="6"
+       y1="11"
+       x2="6"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient4487"
+       gradientUnits="userSpaceOnUse"
+       x1="6"
+       y1="11"
+       x2="6"
+       y2="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4505"
+       id="linearGradient4503"
+       gradientUnits="userSpaceOnUse"
+       x1="6"
+       y1="5"
+       x2="6"
+       y2="8"
+       gradientTransform="translate(4,1032.3622)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4404"
+       id="linearGradient4511"
+       gradientUnits="userSpaceOnUse"
+       x1="6"
+       y1="11"
+       x2="6"
+       y2="8"
+       gradientTransform="translate(4,0)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.9375"
+     inkscape:cx="7.2417043"
+     inkscape:cy="7.9871428"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1268"
+     inkscape:window-height="758"
+     inkscape:window-x="184"
+     inkscape:window-y="289"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:#ffffff;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+       d="m 7.6116279,1039.6189 c 0.4712323,0.074 0.6290623,0.8236 0.677227,2.2678 0.00669,-2e-4 0.012619,0 0.019355,0 l 5.5726111,0 c 0.343025,0 0.619179,0.2022 0.619179,0.4537 l 0,4.082 c 0,0.2513 -0.276154,0.4535 -0.619179,0.4535 l -5.5726111,0 c -0.00669,0 -0.012668,10e-5 -0.019355,0 -0.1032296,3.0955 -0.6777991,2.7404 -3.8698688,0.3829 -3.89198088,-2.8745 -3.89198088,-2.8804 0,-5.7548 1.7027424,-1.2575 2.6538843,-1.9687 3.1926418,-1.8851 z"
+       id="path2987"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:transform-center-y="-0.66016923"
+       transform="matrix(0.63884647,0,0,0.35209235,5.1122987,1042.4329)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:2.10849929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <g
+       id="g4385">
+      <path
+         inkscape:transform-center-y="-5.8852633e-05"
+         inkscape:transform-center-x="0.41666431"
+         transform="matrix(0,-0.27296167,0.22222222,0,3.8888889,1052.0051)"
+         d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+         inkscape:randomized="0"
+         inkscape:rounded="1"
+         inkscape:flatsided="true"
+         sodipodi:arg2="2.6179939"
+         sodipodi:arg1="1.5707963"
+         sodipodi:r2="3"
+         sodipodi:r1="6"
+         sodipodi:cy="8"
+         sodipodi:cx="28"
+         sodipodi:sides="3"
+         id="path3873"
+         style="fill:#60b60e;fill-opacity:1;stroke:none"
+         sodipodi:type="star" />
+      <rect
+         transform="translate(0,1036.3622)"
+         y="7"
+         x="6"
+         height="2"
+         width="7"
+         id="rect4383"
+         style="color:#000000;fill:#60b60e;stroke:none;stroke-width:0.50000000000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:1" />
+    </g>
+    <g
+       id="g4422">
+      <path
+         id="rect4426"
+         transform="translate(0,1036.3622)"
+         style="color:#000000;fill:url(#linearGradient4511);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 6,7 7,0 0,2 -7,0 z M 7,7.9999732 C 7,10.836674 7,10.836674 5,9.4183238 3,7.9999732 3,7.9999732 5,6.5816229 7,5.1632723 7,5.1632723 7,7.9999732 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g4499"
+       transform="translate(0,4)">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 6,1039.3622 7,0 0,2 -7,0 z m 1,1 c 0,2.8367 0,2.8367 -2,1.4183 -2,-1.4183 -2,-1.4183 0,-2.8367 2,-1.4183 2,-1.4183 2,1.4184 z"
+         style="color:#000000;fill:url(#linearGradient4503);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4501" />
+    </g>
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/x-capture-file-close.png b/image/toolbar/16x16/x-capture-file-close.png
new file mode 100644
index 0000000000..d7300af0fd
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-file-close.png
diff --git a/image/toolbar/16x16/x-capture-file-close.svg b/image/toolbar/16x16/x-capture-file-close.svg
new file mode 100644
index 0000000000..7074c208d3
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-file-close.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-capture-file-close.svg"
+   inkscape:export-filename="x-capture-file-close.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32.125"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="0"
+     inkscape:window-y="774"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3064"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <image
+       sodipodi:absref="/Users/gcombs/Development/wireshark/image/toolbar/16x16/x-capture-file-save.png"
+       xlink:href="x-capture-file-save.png"
+       width="16"
+       height="16"
+       id="image3882"
+       x="18"
+       y="1036.3622" />
+    <g
+       id="g4616"
+       transform="matrix(0.86666667,0,0,0.86666667,1.0666667,139.24829)">
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:1.15384614;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 15,1051.3622 -14,-14"
+         id="path3840"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3066"
+         d="m 1,1051.3622 14,-14"
+         style="fill:none;stroke:#2e3436;stroke-width:1.15384614;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/x-capture-file-reload.png b/image/toolbar/16x16/x-capture-file-reload.png
new file mode 100644
index 0000000000..d033fe20d2
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-file-reload.png
diff --git a/image/toolbar/16x16/x-capture-file-reload.svg b/image/toolbar/16x16/x-capture-file-reload.svg
new file mode 100644
index 0000000000..0fce386261
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-file-reload.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-capture-file-reload.svg"
+   inkscape:export-filename="x-capture-file-reload.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <marker
+       inkscape:stockid="TriangleInSxF"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleInSxF"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3031"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#204a87;fill-rule:evenodd;stroke:#204a87;stroke-width:1pt;marker-start:none"
+         transform="scale(-0.2,-0.2)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="6.294321"
+     inkscape:cy="0.53404635"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="165"
+     inkscape:window-y="807"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3064"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <image
+       sodipodi:absref="/Users/gcombs/Development/wireshark/image/toolbar/16x16/x-capture-file-save.png"
+       xlink:href="x-capture-file-save.png"
+       y="1036.3622"
+       x="0"
+       id="image3882"
+       height="16"
+       width="16" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="4.712389"
+       sodipodi:start="0"
+       transform="matrix(0.82031745,0,0,0.82661548,-24.72381,1037.0557)"
+       d="M 44.767801,8.8390093 A 4.8761611,4.8390093 0 1 1 39.89164,4"
+       sodipodi:ry="4.8390093"
+       sodipodi:rx="4.8761611"
+       sodipodi:cy="8.8390093"
+       sodipodi:cx="39.89164"
+       id="path2989"
+       style="fill:none;stroke:#204a87;stroke-width:2.42877483;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#TriangleInSxF)"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/image/toolbar/toolbar_wireshark_file_16.png b/image/toolbar/16x16/x-capture-file-save.png
index a263bb54ab..a263bb54ab 100644
--- a/image/toolbar/toolbar_wireshark_file_16.png
+++ b/image/toolbar/16x16/x-capture-file-save.png
diff --git a/image/toolbar/capture_options_alt1_16.svg b/image/toolbar/16x16/x-capture-options-gear.svg
index 4a03d39956..4a03d39956 100644
--- a/image/toolbar/capture_options_alt1_16.svg
+++ b/image/toolbar/16x16/x-capture-options-gear.svg
diff --git a/image/toolbar/capture_options_16.svg b/image/toolbar/16x16/x-capture-options-wrench.svg
index 9276524668..9276524668 100644
--- a/image/toolbar/capture_options_16.svg
+++ b/image/toolbar/16x16/x-capture-options-wrench.svg
diff --git a/image/toolbar/capture_options_alt1_16.png b/image/toolbar/16x16/x-capture-options.png
index 4f26785ed0..4f26785ed0 100644
--- a/image/toolbar/capture_options_alt1_16.png
+++ b/image/toolbar/16x16/x-capture-options.png
diff --git a/image/toolbar/capture_restart_16.svg b/image/toolbar/16x16/x-capture-restart-fin.svg
index 8b9526089b..8b9526089b 100644
--- a/image/toolbar/capture_restart_16.svg
+++ b/image/toolbar/16x16/x-capture-restart-fin.svg
diff --git a/image/toolbar/capture_restart_16_alt1.svg b/image/toolbar/16x16/x-capture-restart-triangle1.svg
index 39661823f6..39661823f6 100644
--- a/image/toolbar/capture_restart_16_alt1.svg
+++ b/image/toolbar/16x16/x-capture-restart-triangle1.svg
diff --git a/image/toolbar/capture_restart_16_alt2.svg b/image/toolbar/16x16/x-capture-restart-triangle2.svg
index 10e4fc6873..10e4fc6873 100644
--- a/image/toolbar/capture_restart_16_alt2.svg
+++ b/image/toolbar/16x16/x-capture-restart-triangle2.svg
diff --git a/image/toolbar/capture_restart_16_alt3.svg b/image/toolbar/16x16/x-capture-restart-turn1.svg
index 8d824a3ba1..8d824a3ba1 100644
--- a/image/toolbar/capture_restart_16_alt3.svg
+++ b/image/toolbar/16x16/x-capture-restart-turn1.svg
diff --git a/image/toolbar/capture_restart_16_alt4.svg b/image/toolbar/16x16/x-capture-restart-turn2.svg
index ba3cf215bd..ba3cf215bd 100644
--- a/image/toolbar/capture_restart_16_alt4.svg
+++ b/image/toolbar/16x16/x-capture-restart-turn2.svg
diff --git a/image/toolbar/capture_restart_16.png b/image/toolbar/16x16/x-capture-restart.png
index d8b0f65ce3..d8b0f65ce3 100644
--- a/image/toolbar/capture_restart_16.png
+++ b/image/toolbar/16x16/x-capture-restart.png
diff --git a/image/toolbar/capture_start_16.png b/image/toolbar/16x16/x-capture-start.png
index 73435a6ce0..73435a6ce0 100644
--- a/image/toolbar/capture_start_16.png
+++ b/image/toolbar/16x16/x-capture-start.png
diff --git a/image/toolbar/capture_start_16.svg b/image/toolbar/16x16/x-capture-start.svg
index 5fe4353017..5fe4353017 100644
--- a/image/toolbar/capture_start_16.svg
+++ b/image/toolbar/16x16/x-capture-start.svg
diff --git a/image/toolbar/capture_stop_16.svg b/image/toolbar/16x16/x-capture-stop-red.svg
index 42e138902b..42e138902b 100644
--- a/image/toolbar/capture_stop_16.svg
+++ b/image/toolbar/16x16/x-capture-stop-red.svg
diff --git a/image/toolbar/capture_stop_16_alt1.svg b/image/toolbar/16x16/x-capture-stop-white.svg
index dd6bf9f082..dd6bf9f082 100644
--- a/image/toolbar/capture_stop_16_alt1.svg
+++ b/image/toolbar/16x16/x-capture-stop-white.svg
diff --git a/image/toolbar/capture_stop_16.png b/image/toolbar/16x16/x-capture-stop.png
index 94be4c7142..94be4c7142 100644
--- a/image/toolbar/capture_stop_16.png
+++ b/image/toolbar/16x16/x-capture-stop.png
diff --git a/image/toolbar/16x16/x-colorize-packets.png b/image/toolbar/16x16/x-colorize-packets.png
new file mode 100644
index 0000000000..3efe934602
--- /dev/null
+++ b/image/toolbar/16x16/x-colorize-packets.png
diff --git a/image/toolbar/16x16/x-colorize-packets.svg b/image/toolbar/16x16/x-colorize-packets.svg
new file mode 100644
index 0000000000..7c64eeae42
--- /dev/null
+++ b/image/toolbar/16x16/x-colorize-packets.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-stay-last.svg"
+   inkscape:export-filename="x-colorize-packets.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.9375"
+     inkscape:cx="28.024207"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1028"
+     inkscape:window-height="728"
+     inkscape:window-x="283"
+     inkscape:window-y="792"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4163"
+       width="14"
+       height="14"
+       x="1"
+       y="1"
+       transform="translate(0,1036.3622)" />
+    <path
+       inkscape:transform-center-y="2.4349423e-05"
+       transform="matrix(0,1.219616,-0.6984127,0,44.777778,1009.213)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star"
+       inkscape:transform-center-x="-1.3095461" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1037.8622 c 13,0 13,0 13,0"
+       id="path4099"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#204a87;stroke:#ef2929;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4821429,1040.8622 c 13.0357141,0 13.0357141,0 13.0357141,0"
+       id="path4103"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4105"
+       d="m 1.5185185,1043.8622 c 12.9629625,0 12.9629625,0 12.9629625,0"
+       style="fill:none;stroke:#3465a4;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4109"
+       d="m 1.5185185,1046.8622 c 12.9629625,0 12.9629625,0 12.9629625,0"
+       style="fill:none;stroke:#75507b;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1049.8622 c 13,0 13,0 13,0"
+       id="path4111"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/x-resize-columns.png b/image/toolbar/16x16/x-resize-columns.png
new file mode 100644
index 0000000000..d938e7407d
--- /dev/null
+++ b/image/toolbar/16x16/x-resize-columns.png
diff --git a/image/toolbar/16x16/x-resize-columns.svg b/image/toolbar/16x16/x-resize-columns.svg
new file mode 100644
index 0000000000..eab2b56c58
--- /dev/null
+++ b/image/toolbar/16x16/x-resize-columns.svg
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-resize-columns.svg"
+   inkscape:export-filename="x-resize-columns.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.9375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1028"
+     inkscape:window-height="728"
+     inkscape:window-x="273"
+     inkscape:window-y="791"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="15,11"
+       id="guide4572" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4163"
+       width="14"
+       height="14"
+       x="1"
+       y="1"
+       transform="translate(0,1036.3622)" />
+    <path
+       inkscape:transform-center-y="2.4349423e-05"
+       transform="matrix(0,1.219616,-0.6984127,0,44.777778,1009.213)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star"
+       inkscape:transform-center-x="-1.3095461" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1037.8622 c 13,0 13,0 13,0"
+       id="path4099"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#204a87;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4821429,1040.8622 c 13.0357141,0 13.0357141,0 13.0357141,0"
+       id="path4103"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4105"
+       d="m 1.5185185,1043.8622 c 12.9629625,0 12.9629625,0 12.9629625,0"
+       style="fill:none;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4109"
+       d="m 1.5185185,1046.8622 c 12.9629625,0 12.9629625,0 12.9629625,0"
+       style="fill:none;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1050.8622 c 13,0 13,0 13,0"
+       id="path4111"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4574"
+       d="m 10.5,1037.8264 c 0,13.0358 0,13.0358 0,13.0358"
+       style="fill:#204a87;stroke:#888a85;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:type="star"
+       style="fill:#3465a4;fill-opacity:1;stroke:#204a87;stroke-width:3.77817893;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4292"
+       sodipodi:sides="3"
+       sodipodi:cx="28"
+       sodipodi:cy="8"
+       sodipodi:r1="6"
+       sodipodi:r2="3"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="true"
+       inkscape:rounded="1"
+       inkscape:randomized="0"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       transform="matrix(0,0.36778522,0.19047619,0,10.833334,1032.3979)"
+       inkscape:transform-center-x="0.35719741"
+       inkscape:transform-center-y="-3.5440869e-05" />
+    <path
+       style="fill:#204a87;stroke:#888a85;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.5540002,1037.8264 c 0,13.0358 0,13.0358 0,13.0358"
+       id="path4588"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:transform-center-x="-0.35719788"
+       transform="matrix(0,0.36778522,-0.19047619,0,5.1666667,1032.3979)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path4590"
+       style="fill:#3465a4;fill-opacity:1;stroke:#204a87;stroke-width:3.77817893;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star"
+       inkscape:transform-center-y="-3.5440869e-05" />
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/x-stay-last.png b/image/toolbar/16x16/x-stay-last.png
new file mode 100644
index 0000000000..6a6d72d1e0
--- /dev/null
+++ b/image/toolbar/16x16/x-stay-last.png
diff --git a/image/toolbar/16x16/x-stay-last.svg b/image/toolbar/16x16/x-stay-last.svg
new file mode 100644
index 0000000000..acec8379f7
--- /dev/null
+++ b/image/toolbar/16x16/x-stay-last.svg
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-colorize-packets.svg"
+   inkscape:export-filename="x-colorize-packets.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.9375"
+     inkscape:cx="7.7733362"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1028"
+     inkscape:window-height="728"
+     inkscape:window-x="283"
+     inkscape:window-y="792"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4163"
+       width="14"
+       height="14"
+       x="1"
+       y="1"
+       transform="translate(0,1036.3622)" />
+    <path
+       inkscape:transform-center-y="2.4349423e-05"
+       transform="matrix(0,1.219616,-0.6984127,0,44.777778,1009.213)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star"
+       inkscape:transform-center-x="-1.3095461" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1037.8622 c 13,0 13,0 13,0"
+       id="path4099"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#204a87;stroke:#ef2929;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4821429,1040.8622 c 13.0357141,0 13.0357141,0 13.0357141,0"
+       id="path4103"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4105"
+       d="m 1.5185185,1043.8622 c 12.9629625,0 12.9629625,0 12.9629625,0"
+       style="fill:none;stroke:#3465a4;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4109"
+       d="m 1.5185185,1046.8622 c 12.9629625,0 12.9629625,0 12.9629625,0"
+       style="fill:none;stroke:#75507b;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1050.8622 c 13,0 13,0 13,0"
+       id="path4111"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="fill:#c4a000;fill-opacity:1;stroke:#725000;stroke-width:3.77809595999999992;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4205"
+       sodipodi:sides="3"
+       sodipodi:cx="28"
+       sodipodi:cy="8"
+       sodipodi:r1="6"
+       sodipodi:r2="3"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="true"
+       inkscape:rounded="1"
+       inkscape:randomized="0"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       transform="matrix(-0.36780134,0,0,-0.19047619,21.631938,1050.5289)"
+       inkscape:transform-center-y="0.35714706" />
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/zoom-in.png b/image/toolbar/16x16/zoom-in.png
new file mode 100644
index 0000000000..4b2d18290c
--- /dev/null
+++ b/image/toolbar/16x16/zoom-in.png
diff --git a/image/toolbar/16x16/zoom-in.svg b/image/toolbar/16x16/zoom-in.svg
new file mode 100644
index 0000000000..9b4453e6f7
--- /dev/null
+++ b/image/toolbar/16x16/zoom-in.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="zoom-in.svg"
+   inkscape:export-filename="edit-find.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32.125"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="132"
+     inkscape:window-y="882"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g3759"
+       transform="matrix(0.41569296,-0.41571122,0.41569296,0.41571122,-430.24983,621.04542)">
+      <rect
+         ry="1.7009567"
+         rx="1.7010314"
+         y="1042.3622"
+         x="16.5"
+         height="9"
+         width="3"
+         id="rect2987"
+         style="fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.70099401;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3757"
+         d="m 18,1030.3622 c 0,13 0,13 0,13"
+         style="fill:none;stroke:#2e3436;stroke-width:3.40198803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.94884175;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2985"
+       sodipodi:cx="7"
+       sodipodi:cy="6.5"
+       sodipodi:rx="5"
+       sodipodi:ry="4.5"
+       d="M 12,6.5 C 12,8.9852814 9.7614237,11 7,11 4.2385763,11 2,8.9852814 2,6.5 2,4.0147186 4.2385763,2 7,2 c 2.7614237,0 5,2.0147186 5,4.5 z"
+       transform="matrix(0.86588083,-0.49991653,0.55546279,0.96208979,-3.171674,1040.108)" />
+    <rect
+       style="fill:#2e3436;stroke:none"
+       id="rect3760"
+       width="7"
+       height="1"
+       x="3"
+       y="1042.3622" />
+    <rect
+       y="-7"
+       x="1039.3622"
+       height="1"
+       width="7"
+       id="rect3762"
+       style="fill:#2e3436;stroke:none"
+       transform="matrix(0,1,-1,0,0,0)" />
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/zoom-original.png b/image/toolbar/16x16/zoom-original.png
new file mode 100644
index 0000000000..fbe95e11c5
--- /dev/null
+++ b/image/toolbar/16x16/zoom-original.png
diff --git a/image/toolbar/16x16/zoom-original.svg b/image/toolbar/16x16/zoom-original.svg
new file mode 100644
index 0000000000..22b89524c5
--- /dev/null
+++ b/image/toolbar/16x16/zoom-original.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="zoom-original.svg"
+   inkscape:export-filename="zoom-original.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32.125"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="132"
+     inkscape:window-y="882"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g3759"
+       transform="matrix(0.41569296,-0.41571122,0.41569296,0.41571122,-430.24983,621.04542)">
+      <rect
+         ry="1.7009567"
+         rx="1.7010314"
+         y="1042.3622"
+         x="16.5"
+         height="9"
+         width="3"
+         id="rect2987"
+         style="fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.70099401;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3757"
+         d="m 18,1030.3622 c 0,13 0,13 0,13"
+         style="fill:none;stroke:#2e3436;stroke-width:3.40198803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.94884175;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2985"
+       sodipodi:cx="7"
+       sodipodi:cy="6.5"
+       sodipodi:rx="5"
+       sodipodi:ry="4.5"
+       d="M 12,6.5 C 12,8.9852814 9.7614237,11 7,11 4.2385763,11 2,8.9852814 2,6.5 2,4.0147186 4.2385763,2 7,2 c 2.7614237,0 5,2.0147186 5,4.5 z"
+       transform="matrix(0.86588083,-0.49991653,0.55546279,0.96208979,-3.171674,1040.108)" />
+    <rect
+       style="fill:#2e3436;stroke:none"
+       id="rect3760"
+       width="7"
+       height="1"
+       x="3"
+       y="1041.3622" />
+    <rect
+       y="1043.3622"
+       x="3"
+       height="1"
+       width="7"
+       id="rect3816"
+       style="fill:#2e3436;stroke:none" />
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/zoom-out.png b/image/toolbar/16x16/zoom-out.png
new file mode 100644
index 0000000000..fa295789ae
--- /dev/null
+++ b/image/toolbar/16x16/zoom-out.png
diff --git a/image/toolbar/16x16/zoom-out.svg b/image/toolbar/16x16/zoom-out.svg
new file mode 100644
index 0000000000..9c0af8f6b0
--- /dev/null
+++ b/image/toolbar/16x16/zoom-out.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="zoom-out.svg"
+   inkscape:export-filename="zoom-in.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32.125"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="132"
+     inkscape:window-y="882"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g3759"
+       transform="matrix(0.41569296,-0.41571122,0.41569296,0.41571122,-430.24983,621.04542)">
+      <rect
+         ry="1.7009567"
+         rx="1.7010314"
+         y="1042.3622"
+         x="16.5"
+         height="9"
+         width="3"
+         id="rect2987"
+         style="fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.70099401;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3757"
+         d="m 18,1030.3622 c 0,13 0,13 0,13"
+         style="fill:none;stroke:#2e3436;stroke-width:3.40198803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.94884175;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2985"
+       sodipodi:cx="7"
+       sodipodi:cy="6.5"
+       sodipodi:rx="5"
+       sodipodi:ry="4.5"
+       d="M 12,6.5 C 12,8.9852814 9.7614237,11 7,11 4.2385763,11 2,8.9852814 2,6.5 2,4.0147186 4.2385763,2 7,2 c 2.7614237,0 5,2.0147186 5,4.5 z"
+       transform="matrix(0.86588083,-0.49991653,0.55546279,0.96208979,-3.171674,1040.108)" />
+    <rect
+       style="fill:#2e3436;stroke:none"
+       id="rect3760"
+       width="7"
+       height="1"
+       x="3"
+       y="1042.3622" />
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/edit-find.png b/image/toolbar/24x24/edit-find.png
new file mode 100644
index 0000000000..b3c2ec8fd0
--- /dev/null
+++ b/image/toolbar/24x24/edit-find.png
diff --git a/image/toolbar/24x24/edit-find.svg b/image/toolbar/24x24/edit-find.svg
new file mode 100644
index 0000000000..67497daabe
--- /dev/null
+++ b/image/toolbar/24x24/edit-find.svg
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="edit-find.svg"
+   inkscape:export-filename="edit-find.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.416667"
+     inkscape:cx="11.182879"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="285"
+     inkscape:window-y="790"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <g
+       id="g3763"
+       transform="matrix(0.82446641,-0.47637689,0.47600591,0.82510896,-489.17862,185.1767)">
+      <g
+         transform="translate(-10,2)"
+         id="g3759">
+        <rect
+           style="fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.04999804;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect2987"
+           width="3"
+           height="9"
+           x="16.5"
+           y="1042.3622"
+           rx="1.0504072"
+           ry="1.0495892" />
+        <path
+           style="fill:none;stroke:#2e3436;stroke-width:2.09999609;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 18,1030.3622 c 0,13 0,13 0,13"
+           id="path3757"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         transform="matrix(1.3,0,0,1.4444444,-1.1,1026.4733)"
+         d="M 12,6.5 C 12,8.9852814 9.7614237,11 7,11 4.2385763,11 2,8.9852814 2,6.5 2,4.0147186 4.2385763,2 7,2 c 2.7614237,0 5,2.0147186 5,4.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="5"
+         sodipodi:cy="6.5"
+         sodipodi:cx="7"
+         id="path2985"
+         style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.7662428;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#2e3436;stroke-width:0.78219789;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3769"
+       sodipodi:cx="11"
+       sodipodi:cy="8"
+       sodipodi:rx="2.9472158"
+       sodipodi:ry="2.9472158"
+       d="M 8.2358567,6.9774576 A 2.9472158,2.9472158 0 0 1 11.758699,5.1521137"
+       transform="matrix(1.277951,0,0,1.2789469,-3.7024834,1025.3339)"
+       sodipodi:start="3.4959119"
+       sodipodi:end="4.9727497"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/go-first.png b/image/toolbar/24x24/go-first.png
new file mode 100644
index 0000000000..5aaedb1234
--- /dev/null
+++ b/image/toolbar/24x24/go-first.png
diff --git a/image/toolbar/24x24/go-first.svg b/image/toolbar/24x24/go-first.svg
new file mode 100644
index 0000000000..c8973891e7
--- /dev/null
+++ b/image/toolbar/24x24/go-first.svg
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="go-first.svg"
+   inkscape:export-filename="go-first.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4100">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4102" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4104" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4084">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4086" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4088" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4084"
+       id="linearGradient4095"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="21"
+       x2="14"
+       y2="14"
+       gradientTransform="translate(-6,1028.3622)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4100"
+       id="linearGradient4106"
+       x1="12"
+       y1="6"
+       x2="12"
+       y2="14"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,1028.3622)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4084"
+       id="linearGradient4108"
+       gradientUnits="userSpaceOnUse"
+       x1="11"
+       y1="1049.3622"
+       x2="11"
+       y2="1042.3622"
+       gradientTransform="translate(-6,0)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="23.291667"
+     inkscape:cx="17.625568"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1255"
+     inkscape:window-height="731"
+     inkscape:window-x="330"
+     inkscape:window-y="70"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 12,1032.8622 c -1.291133,0 -2.5875124,1.5759 -5.1697769,4.7188 -4.2357679,5.1553 -4.8739666,6.0832 0.6876058,6.25 l 0,6.0312 c 0,0.554 0.3634633,1 0.8149402,1 l 7.3344619,0 c 0.451476,0 0.81494,-0.446 0.81494,-1 l 0,-6.0312 c 5.561572,-0.1668 4.923374,-1.0947 0.687606,-6.25 -2.582265,-3.1429 -3.878645,-4.7188 -5.169777,-4.7188 z"
+       id="path3884"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3886"
+       width="21"
+       height="2"
+       x="1.5"
+       y="1029.8622"
+       rx="1"
+       ry="1" />
+    <path
+       inkscape:transform-center-y="-1.309546"
+       transform="matrix(1.219616,0,0,0.6984127,11.850752,1034.0844)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <path
+       sodipodi:type="star"
+       style="fill:#60b60e;fill-opacity:1;stroke:none"
+       id="path4058"
+       sodipodi:sides="3"
+       sodipodi:cx="28"
+       sodipodi:cy="8"
+       sodipodi:r1="6"
+       sodipodi:r2="3"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="true"
+       inkscape:rounded="1"
+       inkscape:randomized="0"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       transform="matrix(0.69692343,0,0,0.50793651,-7.5138561,1035.7511)"
+       inkscape:transform-center-y="-0.95235263" />
+    <rect
+       style="color:#000000;fill:#60b60e;stroke:none;stroke-width:0.50000000000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:1"
+       id="rect4060"
+       width="6"
+       height="8"
+       x="9"
+       y="13"
+       transform="translate(0,1028.3622)" />
+    <g
+       id="g4066"
+       style="fill:url(#linearGradient4108);fill-opacity:1;stroke:none"
+       transform="translate(10,0)">
+      <path
+         id="rect4064"
+         style="color:#000000;fill:url(#linearGradient4095);fill-opacity:1;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -1,1041.3622 6,0 0,8 -6,0 z m 3,1.5 c -7.2426409,0 -7.2426409,0 -3.6213208,-4.5714 C 2,1033.7194 2,1033.7194 5.62132,1038.2908 c 3.621321,4.5714 3.621321,4.5714 -3.62132,4.5714 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g4070"
+       transform="translate(-2,0)">
+      <path
+         id="rect4074"
+         style="color:#000000;fill:url(#linearGradient4106);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 11,1041.3622 6,0 0,8 -6,0 z m 3,1.5 c -7.2426409,0 -7.2426409,0 -3.621321,-4.5714 3.621321,-4.5714 3.621321,-4.5714 7.242641,0 3.621321,4.5714 3.621321,4.5714 -3.62132,4.5714 z"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/go-jump.png b/image/toolbar/24x24/go-jump.png
new file mode 100644
index 0000000000..39135a9608
--- /dev/null
+++ b/image/toolbar/24x24/go-jump.png
diff --git a/image/toolbar/24x24/go-jump.svg b/image/toolbar/24x24/go-jump.svg
new file mode 100644
index 0000000000..6a6a1c5be1
--- /dev/null
+++ b/image/toolbar/24x24/go-jump.svg
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="go-jump.svg"
+   inkscape:export-filename="go-jump.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3835">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15686275;"
+         offset="0"
+         id="stop3837" />
+      <stop
+         id="stop3855"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3857"
+       id="linearGradient3024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,10.995535,-6)"
+       x1="-4"
+       y1="1040.3622"
+       x2="-4"
+       y2="1046.3622" />
+    <linearGradient
+       id="linearGradient3857">
+      <stop
+         id="stop3859"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15686275;" />
+      <stop
+         id="stop3863"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4100">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4102" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4104" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4084"
+       id="linearGradient4108"
+       gradientUnits="userSpaceOnUse"
+       x1="11"
+       y1="1049.3622"
+       x2="11"
+       y2="1042.3622"
+       gradientTransform="translate(0.99999997,3)" />
+    <linearGradient
+       id="linearGradient4084">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4086" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4088" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4208">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4210" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4212" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4084"
+       id="linearGradient3105"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,-1036.8622,1042.8622)"
+       x1="11"
+       y1="1049.3622"
+       x2="11"
+       y2="1042.3622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4100"
+       id="linearGradient3116"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,4.9993325,1053.3622)"
+       x1="12"
+       y1="6"
+       x2="12"
+       y2="14" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4084"
+       id="linearGradient3118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,-7.0006675,1047.3622)"
+       x1="14"
+       y1="21"
+       x2="14"
+       y2="14" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4084"
+       id="linearGradient3120"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,-1035.3622,1047.3622)"
+       x1="11"
+       y1="1049.3622"
+       x2="11"
+       y2="1042.3622" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="23.291667"
+     inkscape:cx="13.241778"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1214"
+     inkscape:window-height="763"
+     inkscape:window-x="322"
+     inkscape:window-y="155"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:none"
+       id="rect4165"
+       width="22"
+       height="22"
+       x="2.0000002"
+       y="1030.3619" />
+    <path
+       inkscape:transform-center-y="-1.309546"
+       transform="matrix(1.219616,0,0,0.6984127,11.850752,1034.0844)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.5,1030.8622 c 21,0 21,0 21,0"
+       id="path4113"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1039.8622 c 10.5,0 10.5,0 10.5,0"
+       id="path4117"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4119"
+       d="m 13,1033.8622 c 10.5,0 10.5,0 10.5,0"
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1042.8622 c 10.5,0 10.5,0 10.5,0"
+       id="path4121"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4123"
+       d="m 2.5,1048.8622 c 21,0 21,0 21,0"
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.5,1051.8622 c 21,0 21,0 21,0"
+       id="path4127"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="color:#000000;fill:#fce94f;stroke:none;stroke-width:0.50000000000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3124"
+       width="22"
+       height="3"
+       x="2"
+       y="7"
+       transform="translate(0,1028.3622)" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 18.5,1037.3622 c 0,-1.2911 -1.5759,-2.5875 -4.7188,-5.1698 -5.1553,-4.2357 -6.0832,-4.8739 -6.25,0.6876 l -6.0312,0 c -0.554,0 -1.00000003,0.3635 -1.00000003,0.815 l 0,7.3344 c 0,0.4515 0.44600003,0.815 1.00000003,0.815 l 6.0312,0 c 0.1668,5.5615 1.0947,4.9233 6.25,0.6876 3.1429,-2.5823 4.7188,-3.8787 4.7188,-5.1698 z"
+       id="path3884"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="fill:#60b60e;fill-opacity:1;stroke:none"
+       id="path4058"
+       sodipodi:sides="3"
+       sodipodi:cx="28"
+       sodipodi:cy="8"
+       sodipodi:r1="6"
+       sodipodi:r2="3"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="true"
+       inkscape:rounded="1"
+       inkscape:randomized="0"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       transform="matrix(0,0.69692343,-0.50793651,0,15.6111,1017.8483)"
+       inkscape:transform-center-y="-0.95235263" />
+    <rect
+       style="color:#000000;fill:#60b60e;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4060"
+       width="6"
+       height="8"
+       x="1034.3625"
+       y="-10.000019"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <g
+       id="g4066"
+       style="fill:url(#linearGradient3120);fill-opacity:1;stroke:none"
+       transform="matrix(0,1,-1,0,1051.3622,1035.3622)">
+      <path
+         id="rect4064"
+         style="color:#000000;fill:url(#linearGradient3118);fill-opacity:1;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -1,1041.3622 6,0 0,8 -6,0 z m 3,1.5 c -7.2426409,0 -7.2426409,0 -3.6213208,-4.5714 C 2,1033.7194 2,1033.7194 5.62132,1038.2908 c 3.621321,4.5714 3.621321,4.5714 -3.62132,4.5714 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g4070"
+       transform="matrix(0,1,-1,0,1051.3622,1023.3622)">
+      <path
+         id="rect4074"
+         style="color:#000000;fill:url(#linearGradient3116);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 11,1041.3622 6,0 0,8 -6,0 z m 3,1.5 c -7.2426409,0 -7.2426409,0 -3.621321,-4.5714 3.621321,-4.5714 3.621321,-4.5714 7.242641,0 3.621321,4.5714 3.621321,4.5714 -3.62132,4.5714 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.5,1045.8622 c 21,0 21,0 21,0"
+       id="path3122"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/go-last.png b/image/toolbar/24x24/go-last.png
new file mode 100644
index 0000000000..2427e604a5
--- /dev/null
+++ b/image/toolbar/24x24/go-last.png
diff --git a/image/toolbar/24x24/go-last.svg b/image/toolbar/24x24/go-last.svg
new file mode 100644
index 0000000000..cde521a1b3
--- /dev/null
+++ b/image/toolbar/24x24/go-last.svg
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="go-last.svg"
+   inkscape:export-filename="go-last.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4100"
+       id="linearGradient4106"
+       x1="12"
+       y1="6"
+       x2="12"
+       y2="14"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,1028.3622)" />
+    <linearGradient
+       id="linearGradient4100">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4102" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4104" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4084"
+       id="linearGradient4108"
+       gradientUnits="userSpaceOnUse"
+       x1="11"
+       y1="1049.3622"
+       x2="11"
+       y2="1042.3622"
+       gradientTransform="translate(-6,-1.8299802e-5)" />
+    <linearGradient
+       id="linearGradient4084">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4086" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4088" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4084"
+       id="linearGradient4095"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="21"
+       x2="14"
+       y2="14"
+       gradientTransform="translate(-6,1028.3622)" />
+    <linearGradient
+       id="linearGradient4131">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15753424;"
+         offset="0"
+         id="stop4133" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4135" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4084"
+       id="linearGradient3041"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,-1,-6,1052.3624)"
+       x1="14"
+       y1="21"
+       x2="14"
+       y2="14" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4084"
+       id="linearGradient3043"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,-1,-6,2080.7246)"
+       x1="11"
+       y1="1049.3622"
+       x2="11"
+       y2="1042.3622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4100"
+       id="linearGradient3045"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,-1,0,1052.3624)"
+       x1="12"
+       y1="6"
+       x2="12"
+       y2="14" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="23.291667"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1028"
+     inkscape:window-height="728"
+     inkscape:window-x="626"
+     inkscape:window-y="213"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <path
+       inkscape:transform-center-y="-1.309546"
+       transform="matrix(1.219616,0,0,0.6984127,11.850752,1034.0844)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 12,1047.8624 c -1.291133,0 -2.5875124,-1.5759 -5.1697769,-4.7188 -4.2357679,-5.1553 -4.8739666,-6.0832 0.6876058,-6.25 l 0,-6.0312 c 0,-0.554 0.3634633,-1 0.8149402,-1 l 7.3344619,0 c 0.451476,0 0.81494,0.446 0.81494,1 l 0,6.0312 c 5.561572,0.1668 4.923374,1.0947 0.687606,6.25 -2.582265,3.1429 -3.878645,4.7188 -5.169777,4.7188 z"
+       id="path3884"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3886"
+       width="21"
+       height="2"
+       x="1.5"
+       y="-1050.8622"
+       rx="1"
+       ry="1"
+       transform="scale(1,-1)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#60b60e;fill-opacity:1;stroke:none"
+       id="path4058"
+       sodipodi:sides="3"
+       sodipodi:cx="28"
+       sodipodi:cy="8"
+       sodipodi:r1="6"
+       sodipodi:r2="3"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="true"
+       inkscape:rounded="1"
+       inkscape:randomized="0"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       transform="matrix(0.69692343,0,0,-0.50793651,-7.513856,1044.9735)"
+       inkscape:transform-center-y="-0.95235263" />
+    <rect
+       style="color:#000000;fill:#60b60e;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4060"
+       width="6"
+       height="8"
+       x="9"
+       y="-1039.3622"
+       transform="scale(1,-1)" />
+    <g
+       id="g4066"
+       style="fill:url(#linearGradient3043);fill-opacity:1;stroke:none"
+       transform="matrix(1,0,0,-1,10,2080.7246)">
+      <path
+         id="rect4064"
+         style="color:#000000;fill:url(#linearGradient3041);fill-opacity:1;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -1,1041.3622 6,0 0,8 -6,0 z m 3,1.5 c -7.2426409,0 -7.2426409,0 -3.6213208,-4.5714 C 2,1033.7194 2,1033.7194 5.62132,1038.2908 c 3.621321,4.5714 3.621321,4.5714 -3.62132,4.5714 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g4070"
+       transform="matrix(1,0,0,-1,-2,2080.7246)">
+      <path
+         id="rect4074"
+         style="color:#000000;fill:url(#linearGradient3045);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 11,1041.3622 6,0 0,8 -6,0 z m 3,1.5 c -7.2426409,0 -7.2426409,0 -3.621321,-4.5714 3.621321,-4.5714 3.621321,-4.5714 7.242641,0 3.621321,4.5714 3.621321,4.5714 -3.62132,4.5714 z"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/go-next.png b/image/toolbar/24x24/go-next.png
new file mode 100644
index 0000000000..3ff3fe985b
--- /dev/null
+++ b/image/toolbar/24x24/go-next.png
diff --git a/image/toolbar/24x24/go-next.svg b/image/toolbar/24x24/go-next.svg
new file mode 100644
index 0000000000..fe9e024394
--- /dev/null
+++ b/image/toolbar/24x24/go-next.svg
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="go-next.svg"
+   inkscape:export-filename="go-next.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       gradientTransform="translate(9.9999999,-6)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient3857"
+       id="linearGradient3853"
+       gradientUnits="userSpaceOnUse"
+       x1="-4"
+       y1="1040.3622"
+       x2="-4"
+       y2="1046.3622" />
+    <linearGradient
+       id="linearGradient3857">
+      <stop
+         id="stop3859"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15686275;" />
+      <stop
+         id="stop3863"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(9.9999999,-6)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient3835"
+       id="linearGradient3849"
+       gradientUnits="userSpaceOnUse"
+       x1="5"
+       y1="1052.3622"
+       x2="5"
+       y2="1046.3622" />
+    <linearGradient
+       id="linearGradient3835">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15686275;"
+         offset="0"
+         id="stop3837" />
+      <stop
+         id="stop3855"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3835"
+       id="linearGradient3022"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,10.995535,-6)"
+       x1="5"
+       y1="1052.3622"
+       x2="5"
+       y2="1046.3622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3857"
+       id="linearGradient3024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,10.995535,-6)"
+       x1="-4"
+       y1="1040.3622"
+       x2="-4"
+       y2="1046.3622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3857"
+       id="linearGradient3053"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(10,-6)"
+       x1="-4"
+       y1="1040.3622"
+       x2="-4"
+       y2="1046.3622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3835"
+       id="linearGradient3056"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(10,-6)"
+       x1="5"
+       y1="1052.3622"
+       x2="5"
+       y2="1046.3622" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="23.205952"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1028"
+     inkscape:window-height="728"
+     inkscape:window-x="2075"
+     inkscape:window-y="624"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 12.625,1031.874 c -0.761061,0.1308 -1.015962,1.4739 -1.09375,4.0584 -0.01078,-3e-4 -0.02039,0 -0.03125,0 l -9,0 c -0.554,0 -1,0.362 -1,0.8116 l 0,7.3049 c 0,0.4497 0.446,0.8117 1,0.8117 l 9,0 c 0.01086,0 0.02047,2e-4 0.03125,0 0.166726,5.5391 1.094675,4.9035 6.25,0.6848 6.285714,-5.1437 6.285714,-5.1541 0,-10.2979 -2.75,-2.2503 -4.286133,-3.5229 -5.15625,-3.3735 z"
+       id="path2987"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="fill:#60b60e;fill-opacity:0.94117647;stroke:none"
+       id="path3820"
+       sodipodi:sides="3"
+       sodipodi:cx="28"
+       sodipodi:cy="8"
+       sodipodi:r1="6"
+       sodipodi:r2="3"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="true"
+       inkscape:rounded="1"
+       inkscape:randomized="0"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       transform="matrix(0,-0.69692343,-0.50793651,0,19.606646,1059.8761)"
+       inkscape:transform-center-x="0.95239711" />
+    <rect
+       style="color:#000000;fill:#60b60e;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3822"
+       width="11"
+       height="6"
+       x="-13.995535"
+       y="1037.3622"
+       transform="scale(-1,1)" />
+    <path
+       id="rect3826"
+       style="color:#000000;fill:url(#linearGradient3056);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 13.995535,1037.3622 -11,0 0,6 11,0 z m -1.5,3 c 0,7.2427 0,7.2427 4.571428,3.6214 4.571429,-3.6214 4.571429,-3.6214 10e-7,-7.2427 -4.571429,-3.6213 -4.571429,-3.6213 -4.571429,3.6213 z"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 13.995535,1037.3622 -11,0 0,6 11,0 z m -1.5,3 c 0,7.2427 0,7.2427 4.571428,3.6214 4.571429,-3.6214 4.571429,-3.6214 10e-7,-7.2427 -4.571429,-3.6213 -4.571429,-3.6213 -4.571429,3.6213 z"
+       style="color:#000000;fill:url(#linearGradient3053);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3851" />
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/go-previous.png b/image/toolbar/24x24/go-previous.png
new file mode 100644
index 0000000000..605318ea4b
--- /dev/null
+++ b/image/toolbar/24x24/go-previous.png
diff --git a/image/toolbar/24x24/go-previous.svg b/image/toolbar/24x24/go-previous.svg
new file mode 100644
index 0000000000..93937953cd
--- /dev/null
+++ b/image/toolbar/24x24/go-previous.svg
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="go-previous.svg"
+   inkscape:export-filename="go-previous.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3857">
+      <stop
+         id="stop3859"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15686275;" />
+      <stop
+         id="stop3863"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3835">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15686275;"
+         offset="0"
+         id="stop3837" />
+      <stop
+         id="stop3855"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3835"
+       id="linearGradient3849"
+       gradientUnits="userSpaceOnUse"
+       x1="5"
+       y1="1052.3622"
+       x2="5"
+       y2="1046.3622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3857"
+       id="linearGradient3853"
+       gradientUnits="userSpaceOnUse"
+       x1="-4"
+       y1="1040.3622"
+       x2="-4"
+       y2="1046.3622" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="24.208333"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3828"
+     showgrid="true"
+     inkscape:window-width="1329"
+     inkscape:window-height="749"
+     inkscape:window-x="473"
+     inkscape:window-y="145"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <path
+       style="fill:#ffffff;stroke:#888a85;stroke-width:1.00000011999999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+       d="m 11.370535,1031.874 c 0.761061,0.1308 1.015962,1.4739 1.09375,4.0584 0.01078,-3e-4 0.02039,0 0.03125,0 l 9,0 c 0.554,0 1,0.362 1,0.8116 l 0,7.3049 c 0,0.4497 -0.446,0.8117 -1,0.8117 l -9,0 c -0.01086,0 -0.02047,2e-4 -0.03125,0 -0.166726,5.5391 -1.094675,4.9035 -6.2499995,0.6848 -6.285714,-5.1437 -6.285714,-5.1541 0,-10.2979 2.75,-2.2503 4.2861325,-3.5229 5.1562495,-3.3735 z"
+       id="path2987"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:transform-center-y="-1.309546"
+       transform="matrix(1.219616,0,0,0.6984127,3.8507518,1036.5844)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <path
+       sodipodi:type="star"
+       style="fill:#60b60e;fill-opacity:0.94117647;stroke:none"
+       id="path3820"
+       sodipodi:sides="3"
+       sodipodi:cx="28"
+       sodipodi:cy="8"
+       sodipodi:r1="6"
+       sodipodi:r2="3"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="true"
+       inkscape:rounded="1"
+       inkscape:randomized="0"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       transform="matrix(0,-0.69692343,0.50793651,0,4.3888889,1059.8761)"
+       inkscape:transform-center-x="0.95239711" />
+    <rect
+       style="color:#000000;fill:#60b60e;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3822"
+       width="11"
+       height="6"
+       x="10"
+       y="1037.3622" />
+    <g
+       id="g3828"
+       style="fill:#60b60e;fill-opacity:0.44214878"
+       transform="translate(10,-6)">
+      <path
+         id="rect3826"
+         style="color:#000000;fill:url(#linearGradient3849);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 0,1043.3622 11,0 0,6 -11,0 z m 1.5,3 c 0,7.2427 0,7.2427 -4.5714285,3.6214 -4.5714285,-3.6214 -4.5714285,-3.6214 -10e-8,-7.2427 C 1.5,1039.1196 1.5,1039.1196 1.5,1046.3622 z"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 0,1043.3622 11,0 0,6 -11,0 z m 1.5,3 c 0,7.2427 0,7.2427 -4.5714285,3.6214 -4.5714285,-3.6214 -4.5714285,-3.6214 -10e-8,-7.2427 C 1.5,1039.1196 1.5,1039.1196 1.5,1046.3622 z"
+         style="color:#000000;fill:url(#linearGradient3853);fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path3851" />
+    </g>
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/x-capture-file-close.png b/image/toolbar/24x24/x-capture-file-close.png
new file mode 100644
index 0000000000..9a563bdc17
--- /dev/null
+++ b/image/toolbar/24x24/x-capture-file-close.png
diff --git a/image/toolbar/24x24/x-capture-file-close.svg b/image/toolbar/24x24/x-capture-file-close.svg
new file mode 100644
index 0000000000..a6ddfb2b36
--- /dev/null
+++ b/image/toolbar/24x24/x-capture-file-close.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-capture-file-close.svg"
+   inkscape:export-filename="x-capture-file-close.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.416667"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="0"
+     inkscape:window-y="774"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3064"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <image
+       sodipodi:absref="/Users/gcombs/Development/wireshark/image/toolbar/24x24/x-capture-file-save.png"
+       xlink:href="x-capture-file-save.png"
+       y="1028.3622"
+       x="26"
+       id="image3836"
+       height="24"
+       width="24"
+       style="fill:#2e3436;stroke:#2e3436" />
+    <g
+       id="g4612"
+       transform="matrix(0.91304348,0,0,0.91304348,1.0434783,90.466278)">
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:2.19047618;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 22.5,1050.8622 -21,-21"
+         id="path3840"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3066"
+         d="m 1.5,1050.8622 21,-21"
+         style="fill:none;stroke:#2e3436;stroke-width:2.19047618;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/x-capture-file-reload.png b/image/toolbar/24x24/x-capture-file-reload.png
new file mode 100644
index 0000000000..b0b76a602b
--- /dev/null
+++ b/image/toolbar/24x24/x-capture-file-reload.png
diff --git a/image/toolbar/24x24/x-capture-file-reload.svg b/image/toolbar/24x24/x-capture-file-reload.svg
new file mode 100644
index 0000000000..cad49c7efb
--- /dev/null
+++ b/image/toolbar/24x24/x-capture-file-reload.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-capture-file-reload.svg"
+   inkscape:export-filename="x-capture-file-reload.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <marker
+       inkscape:stockid="TriangleInSxF"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleInSxF"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3031"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#204a87;fill-rule:evenodd;stroke:#204a87;stroke-width:1pt;marker-start:none"
+         transform="scale(-0.2,-0.2)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="6.294321"
+     inkscape:cy="0.53404635"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="0"
+     inkscape:window-y="774"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3064"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <image
+       sodipodi:absref="/Users/gcombs/Development/wireshark/image/toolbar/24x24/x-capture-file-save.png"
+       xlink:href="x-capture-file-save.png"
+       style="fill:#2e3436;stroke:#2e3436"
+       width="24"
+       height="24"
+       id="image3836"
+       x="0"
+       y="1028.3622" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="4.712389"
+       sodipodi:start="0"
+       transform="matrix(1.2304762,0,0,1.2295211,-37.085712,1029.5448)"
+       d="M 44.767801,8.8390093 A 4.8761611,4.8390093 0 1 1 39.89164,4"
+       sodipodi:ry="4.8390093"
+       sodipodi:rx="4.8761611"
+       sodipodi:cy="8.8390093"
+       sodipodi:cx="39.89164"
+       id="path2989"
+       style="fill:none;stroke:#204a87;stroke-width:1.62601817000000004;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#TriangleInSxF)"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/image/toolbar/toolbar_wireshark_file_24.png b/image/toolbar/24x24/x-capture-file-save.png
index 483eae94e2..483eae94e2 100644
--- a/image/toolbar/toolbar_wireshark_file_24.png
+++ b/image/toolbar/24x24/x-capture-file-save.png
diff --git a/image/toolbar/capture_options_alt1_24.svg b/image/toolbar/24x24/x-capture-options-gear.svg
index c47e5d1a44..c47e5d1a44 100644
--- a/image/toolbar/capture_options_alt1_24.svg
+++ b/image/toolbar/24x24/x-capture-options-gear.svg
diff --git a/image/toolbar/capture_options_24.svg b/image/toolbar/24x24/x-capture-options-wrench.svg
index f3a40f3e7a..f3a40f3e7a 100644
--- a/image/toolbar/capture_options_24.svg
+++ b/image/toolbar/24x24/x-capture-options-wrench.svg
diff --git a/image/toolbar/capture_options_alt1_24.png b/image/toolbar/24x24/x-capture-options.png
index c117e7c238..c117e7c238 100644
--- a/image/toolbar/capture_options_alt1_24.png
+++ b/image/toolbar/24x24/x-capture-options.png
diff --git a/image/toolbar/capture_restart_24.svg b/image/toolbar/24x24/x-capture-restart-fin.svg
index dd32fa99db..dd32fa99db 100644
--- a/image/toolbar/capture_restart_24.svg
+++ b/image/toolbar/24x24/x-capture-restart-fin.svg
diff --git a/image/toolbar/capture_restart_24_alt1.svg b/image/toolbar/24x24/x-capture-restart-triangle1.svg
index 282152c80d..282152c80d 100644
--- a/image/toolbar/capture_restart_24_alt1.svg
+++ b/image/toolbar/24x24/x-capture-restart-triangle1.svg
diff --git a/image/toolbar/capture_restart_24_alt2.svg b/image/toolbar/24x24/x-capture-restart-triangle2.svg
index 5e65e22574..5e65e22574 100644
--- a/image/toolbar/capture_restart_24_alt2.svg
+++ b/image/toolbar/24x24/x-capture-restart-triangle2.svg
diff --git a/image/toolbar/capture_restart_24_alt3.svg b/image/toolbar/24x24/x-capture-restart-turn1.svg
index be34730e84..be34730e84 100644
--- a/image/toolbar/capture_restart_24_alt3.svg
+++ b/image/toolbar/24x24/x-capture-restart-turn1.svg
diff --git a/image/toolbar/capture_restart_24_alt4.svg b/image/toolbar/24x24/x-capture-restart-turn2.svg
index b2187d9415..b2187d9415 100644
--- a/image/toolbar/capture_restart_24_alt4.svg
+++ b/image/toolbar/24x24/x-capture-restart-turn2.svg
diff --git a/image/toolbar/capture_restart_24.png b/image/toolbar/24x24/x-capture-restart.png
index a9b57d8759..a9b57d8759 100644
--- a/image/toolbar/capture_restart_24.png
+++ b/image/toolbar/24x24/x-capture-restart.png
diff --git a/image/toolbar/capture_start_24.png b/image/toolbar/24x24/x-capture-start.png
index e38d1ca978..e38d1ca978 100644
--- a/image/toolbar/capture_start_24.png
+++ b/image/toolbar/24x24/x-capture-start.png
diff --git a/image/toolbar/capture_start_24.svg b/image/toolbar/24x24/x-capture-start.svg
index 6433a11dad..6433a11dad 100644
--- a/image/toolbar/capture_start_24.svg
+++ b/image/toolbar/24x24/x-capture-start.svg
diff --git a/image/toolbar/capture_stop_24.svg b/image/toolbar/24x24/x-capture-stop-red.svg
index 2cff0b6994..2cff0b6994 100644
--- a/image/toolbar/capture_stop_24.svg
+++ b/image/toolbar/24x24/x-capture-stop-red.svg
diff --git a/image/toolbar/capture_stop_24_alt1.svg b/image/toolbar/24x24/x-capture-stop-white.svg
index 98880b9d8b..98880b9d8b 100644
--- a/image/toolbar/capture_stop_24_alt1.svg
+++ b/image/toolbar/24x24/x-capture-stop-white.svg
diff --git a/image/toolbar/capture_stop_24.png b/image/toolbar/24x24/x-capture-stop.png
index 4f75ec9f6a..4f75ec9f6a 100644
--- a/image/toolbar/capture_stop_24.png
+++ b/image/toolbar/24x24/x-capture-stop.png
diff --git a/image/toolbar/24x24/x-colorize-packets.png b/image/toolbar/24x24/x-colorize-packets.png
new file mode 100644
index 0000000000..ee04849adf
--- /dev/null
+++ b/image/toolbar/24x24/x-colorize-packets.png
diff --git a/image/toolbar/24x24/x-colorize-packets.svg b/image/toolbar/24x24/x-colorize-packets.svg
new file mode 100644
index 0000000000..c986c4f504
--- /dev/null
+++ b/image/toolbar/24x24/x-colorize-packets.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-colorize-packets.svg"
+   inkscape:export-filename="go-jump.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="23.291667"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1028"
+     inkscape:window-height="728"
+     inkscape:window-x="132"
+     inkscape:window-y="821"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4165"
+       width="22"
+       height="22"
+       x="1"
+       y="1"
+       transform="translate(0,1028.3622)" />
+    <path
+       inkscape:transform-center-y="-1.309546"
+       transform="matrix(1.219616,0,0,0.6984127,11.850752,1034.0844)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1029.8622 c 21,0 21,0 21,0"
+       id="path4113"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4115"
+       d="m 1.5,1032.8622 c 21,0 21,0 21,0"
+       style="fill:#ef2929;stroke:#ef2929;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#73d216;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4999999,1038.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       id="path4117"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4119"
+       d="m 1.4999999,1035.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       style="fill:none;stroke:#3465a4;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#3465a4;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4999999,1041.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       id="path4121"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4123"
+       d="m 1.5,1047.8622 c 21,0 21,0 21,0"
+       style="fill:none;stroke:#c4a000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#75507b;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4999999,1044.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       id="path4125"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1050.8622 c 21,0 21,0 21,0"
+       id="path4127"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/x-resize-columns.png b/image/toolbar/24x24/x-resize-columns.png
new file mode 100644
index 0000000000..56b404fb0a
--- /dev/null
+++ b/image/toolbar/24x24/x-resize-columns.png
diff --git a/image/toolbar/24x24/x-resize-columns.svg b/image/toolbar/24x24/x-resize-columns.svg
new file mode 100644
index 0000000000..9b08891b10
--- /dev/null
+++ b/image/toolbar/24x24/x-resize-columns.svg
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-resize-columns.svg"
+   inkscape:export-filename="x-resize-columns.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="23.291667"
+     inkscape:cx="11.248658"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1028"
+     inkscape:window-height="728"
+     inkscape:window-x="132"
+     inkscape:window-y="821"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="12,21"
+       id="guide4544" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,18"
+       id="guide4552" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4165"
+       width="22"
+       height="22"
+       x="1"
+       y="1"
+       transform="translate(0,1028.3622)" />
+    <path
+       inkscape:transform-center-y="-1.309546"
+       transform="matrix(1.219616,0,0,0.6984127,11.850752,1034.0844)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1029.8622 c 21,0 21,0 21,0"
+       id="path4113"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4115"
+       d="m 1.5,1032.8622 c 21,0 21,0 21,0"
+       style="fill:#ef2929;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4999999,1038.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       id="path4117"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4119"
+       d="m 1.4999999,1035.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       style="fill:none;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4999999,1041.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       id="path4121"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4123"
+       d="m 1.5,1047.8622 c 21,0 21,0 21,0"
+       style="fill:#f57900;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4999999,1044.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       id="path4125"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1050.8622 c 21,0 21,0 21,0"
+       id="path4127"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#888a85;stroke:#888a85;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 12.5,1029.8622 c 0,21 0,21 0,21"
+       id="path4546"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="fill:#3465a4;fill-opacity:1;stroke:#204a87;stroke-width:3.77799654;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4292"
+       sodipodi:sides="3"
+       sodipodi:cx="28"
+       sodipodi:cy="8"
+       sodipodi:r1="6"
+       sodipodi:r2="3"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="true"
+       inkscape:rounded="1"
+       inkscape:randomized="0"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       transform="matrix(0,0.36782069,0.19047619,0,12.833333,1025.8965)"
+       inkscape:transform-center-x="0.35719799"
+       inkscape:transform-center-y="-3.6850305e-05" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4548"
+       d="m 5.4999996,1029.8604 c 0,21.0018 0,21.0018 0,21.0018"
+       style="fill:#888a85;stroke:#888a85;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:transform-center-x="-0.35719839"
+       transform="matrix(0,0.36781774,-0.19047619,0,5.1666667,1025.8956)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path4550"
+       style="fill:#3465a4;fill-opacity:1;stroke:#204a87;stroke-width:3.7780118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star"
+       inkscape:transform-center-y="-4.3803627e-05" />
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/x-stay-last.png b/image/toolbar/24x24/x-stay-last.png
new file mode 100644
index 0000000000..9d26572c7e
--- /dev/null
+++ b/image/toolbar/24x24/x-stay-last.png
diff --git a/image/toolbar/24x24/x-stay-last.svg b/image/toolbar/24x24/x-stay-last.svg
new file mode 100644
index 0000000000..06ce2fdc8b
--- /dev/null
+++ b/image/toolbar/24x24/x-stay-last.svg
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-stay-last.svg"
+   inkscape:export-filename="x-stay-last.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="23.291667"
+     inkscape:cx="10.503891"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1028"
+     inkscape:window-height="728"
+     inkscape:window-x="132"
+     inkscape:window-y="821"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4165"
+       width="22"
+       height="22"
+       x="1"
+       y="1"
+       transform="translate(0,1028.3622)" />
+    <path
+       inkscape:transform-center-y="-1.309546"
+       transform="matrix(1.219616,0,0,0.6984127,11.850752,1034.0844)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1029.8622 c 21,0 21,0 21,0"
+       id="path4113"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4115"
+       d="m 1.5,1032.8622 c 21,0 21,0 21,0"
+       style="fill:#ef2929;stroke:#ef2929;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#73d216;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4999999,1038.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       id="path4117"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4119"
+       d="m 1.4999999,1035.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       style="fill:none;stroke:#3465a4;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#3465a4;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4999999,1041.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       id="path4121"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4123"
+       d="m 1.5,1047.8622 c 21,0 21,0 21,0"
+       style="fill:#f57900;stroke:#f57900;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#75507b;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4999999,1044.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       id="path4125"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1050.8622 c 21,0 21,0 21,0"
+       id="path4127"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="fill:#c4a000;fill-opacity:1;stroke:#725000;stroke-width:2.32891345;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4292"
+       sodipodi:sides="3"
+       sodipodi:cx="28"
+       sodipodi:cy="8"
+       sodipodi:r1="6"
+       sodipodi:r2="3"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="true"
+       inkscape:rounded="1"
+       inkscape:randomized="0"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       transform="matrix(0.58076952,0,0,-0.31746032,1.2384534,1050.3066)"
+       inkscape:transform-center-y="0.59532957" />
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/zoom-in.png b/image/toolbar/24x24/zoom-in.png
new file mode 100644
index 0000000000..b792c9c691
--- /dev/null
+++ b/image/toolbar/24x24/zoom-in.png
diff --git a/image/toolbar/24x24/zoom-in.svg b/image/toolbar/24x24/zoom-in.svg
new file mode 100644
index 0000000000..4c140e2ffe
--- /dev/null
+++ b/image/toolbar/24x24/zoom-in.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="zoom-in.svg"
+   inkscape:export-filename="edit-find.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.416667"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="285"
+     inkscape:window-y="790"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <g
+       id="g3759"
+       transform="matrix(0.67307799,-0.67353235,0.67334032,0.67379466,-697.89982,353.9867)">
+      <rect
+         ry="1.0495892"
+         rx="1.0504072"
+         y="1042.3622"
+         x="16.5"
+         height="9"
+         width="3"
+         id="rect2987"
+         style="fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.04999804;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3757"
+         d="m 18,1030.3622 c 0,13 0,13 0,13"
+         style="fill:none;stroke:#2e3436;stroke-width:2.09999609;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.59280384;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2985"
+       sodipodi:cx="7"
+       sodipodi:cy="6.5"
+       sodipodi:rx="5"
+       sodipodi:ry="4.5"
+       d="m 12,6.5 a 5,4.5 0 1 1 -10,0 5,4.5 0 1 1 10,0 z"
+       transform="matrix(1.3854093,-0.80046638,0.88874043,1.5404982,-5.9746781,1033.4462)" />
+    <rect
+       style="fill:#2e3436;stroke:none"
+       id="rect3760"
+       width="11"
+       height="1"
+       x="4"
+       y="1037.3622" />
+    <rect
+       y="-10"
+       x="1032.3622"
+       height="1"
+       width="11.000004"
+       id="rect3762"
+       style="fill:#2e3436;stroke:none"
+       transform="matrix(0,1,-1,0,0,0)" />
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/zoom-original.png b/image/toolbar/24x24/zoom-original.png
new file mode 100644
index 0000000000..f02c8ab327
--- /dev/null
+++ b/image/toolbar/24x24/zoom-original.png
diff --git a/image/toolbar/24x24/zoom-original.svg b/image/toolbar/24x24/zoom-original.svg
new file mode 100644
index 0000000000..a74693fda5
--- /dev/null
+++ b/image/toolbar/24x24/zoom-original.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="zoom-original.svg"
+   inkscape:export-filename="zoom-original.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.416667"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="285"
+     inkscape:window-y="790"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <g
+       id="g3759"
+       transform="matrix(0.67307799,-0.67353235,0.67334032,0.67379466,-697.89982,353.9867)">
+      <rect
+         ry="1.0495892"
+         rx="1.0504072"
+         y="1042.3622"
+         x="16.5"
+         height="9"
+         width="3"
+         id="rect2987"
+         style="fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.04999804;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3757"
+         d="m 18,1030.3622 c 0,13 0,13 0,13"
+         style="fill:none;stroke:#2e3436;stroke-width:2.09999609;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.59280384;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2985"
+       sodipodi:cx="7"
+       sodipodi:cy="6.5"
+       sodipodi:rx="5"
+       sodipodi:ry="4.5"
+       d="m 12,6.5 a 5,4.5 0 1 1 -10,0 5,4.5 0 1 1 10,0 z"
+       transform="matrix(1.3854093,-0.80046638,0.88874043,1.5404982,-5.9746781,1033.4462)" />
+    <rect
+       style="fill:#2e3436;stroke:none"
+       id="rect3760"
+       width="11"
+       height="1"
+       x="4"
+       y="1035.3622" />
+    <rect
+       y="1039.3622"
+       x="4"
+       height="1"
+       width="11"
+       id="rect4485"
+       style="fill:#2e3436;stroke:none" />
+  </g>
+</svg>
diff --git a/image/toolbar/24x24/zoom-out.png b/image/toolbar/24x24/zoom-out.png
new file mode 100644
index 0000000000..52f95d8de5
--- /dev/null
+++ b/image/toolbar/24x24/zoom-out.png
diff --git a/image/toolbar/24x24/zoom-out.svg b/image/toolbar/24x24/zoom-out.svg
new file mode 100644
index 0000000000..179273f21c
--- /dev/null
+++ b/image/toolbar/24x24/zoom-out.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="zoom-out.svg"
+   inkscape:export-filename="zoom-in.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.416667"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="285"
+     inkscape:window-y="790"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <g
+       id="g3759"
+       transform="matrix(0.67307799,-0.67353235,0.67334032,0.67379466,-697.89982,353.9867)">
+      <rect
+         ry="1.0495892"
+         rx="1.0504072"
+         y="1042.3622"
+         x="16.5"
+         height="9"
+         width="3"
+         id="rect2987"
+         style="fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.04999804;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3757"
+         d="m 18,1030.3622 c 0,13 0,13 0,13"
+         style="fill:none;stroke:#2e3436;stroke-width:2.09999609;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.59280384;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2985"
+       sodipodi:cx="7"
+       sodipodi:cy="6.5"
+       sodipodi:rx="5"
+       sodipodi:ry="4.5"
+       d="m 12,6.5 a 5,4.5 0 1 1 -10,0 5,4.5 0 1 1 10,0 z"
+       transform="matrix(1.3854093,-0.80046638,0.88874043,1.5404982,-5.9746781,1033.4462)" />
+    <rect
+       style="fill:#2e3436;stroke:none"
+       id="rect3760"
+       width="11"
+       height="1"
+       x="4"
+       y="1037.3622" />
+  </g>
+</svg>
diff --git a/image/toolbar/capture_options_16.png b/image/toolbar/capture_options_16.png
deleted file mode 100644
index cb47cde833..0000000000
--- a/image/toolbar/capture_options_16.png
+++ /dev/null
diff --git a/image/toolbar/capture_options_24.png b/image/toolbar/capture_options_24.png
deleted file mode 100644
index 7c1dff2d31..0000000000
--- a/image/toolbar/capture_options_24.png
+++ /dev/null
diff --git a/image/toolbar/capture_restart_16_alt1.png b/image/toolbar/capture_restart_16_alt1.png
deleted file mode 100644
index aa52a9685c..0000000000
--- a/image/toolbar/capture_restart_16_alt1.png
+++ /dev/null
diff --git a/image/toolbar/capture_restart_16_alt2.png b/image/toolbar/capture_restart_16_alt2.png
deleted file mode 100644
index cc2ea90c47..0000000000
--- a/image/toolbar/capture_restart_16_alt2.png
+++ /dev/null
diff --git a/image/toolbar/capture_restart_16_alt3.png b/image/toolbar/capture_restart_16_alt3.png
deleted file mode 100644
index e8885bcc06..0000000000
--- a/image/toolbar/capture_restart_16_alt3.png
+++ /dev/null
diff --git a/image/toolbar/capture_restart_16_alt4.png b/image/toolbar/capture_restart_16_alt4.png
deleted file mode 100644
index 8fe10605d4..0000000000
--- a/image/toolbar/capture_restart_16_alt4.png
+++ /dev/null
diff --git a/image/toolbar/capture_restart_24_alt1.png b/image/toolbar/capture_restart_24_alt1.png
deleted file mode 100644
index 46f542ccd8..0000000000
--- a/image/toolbar/capture_restart_24_alt1.png
+++ /dev/null
diff --git a/image/toolbar/capture_restart_24_alt2.png b/image/toolbar/capture_restart_24_alt2.png
deleted file mode 100644
index 1c386f65ba..0000000000
--- a/image/toolbar/capture_restart_24_alt2.png
+++ /dev/null
diff --git a/image/toolbar/capture_restart_24_alt3.png b/image/toolbar/capture_restart_24_alt3.png
deleted file mode 100644
index 74597313ad..0000000000
--- a/image/toolbar/capture_restart_24_alt3.png
+++ /dev/null
diff --git a/image/toolbar/capture_restart_24_alt4.png b/image/toolbar/capture_restart_24_alt4.png
deleted file mode 100644
index 0d74ff440f..0000000000
--- a/image/toolbar/capture_restart_24_alt4.png
+++ /dev/null
diff --git a/image/toolbar/capture_stop_16_alt1.png b/image/toolbar/capture_stop_16_alt1.png
deleted file mode 100644
index 7d56b4e602..0000000000
--- a/image/toolbar/capture_stop_16_alt1.png
+++ /dev/null
diff --git a/image/toolbar/capture_stop_24_alt1.png b/image/toolbar/capture_stop_24_alt1.png
deleted file mode 100644
index 08f1191954..0000000000
--- a/image/toolbar/capture_stop_24_alt1.png
+++ /dev/null
diff --git a/image/wsicon-ask.png b/image/wsicon-ask.png
index 9885699118..8bd324fc75 100644
--- a/image/wsicon-ask.png
+++ b/image/wsicon-ask.png
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index 0b64cf3e0b..e521f74b79 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -129,12 +129,7 @@ pipe_icon.h:
 
 TOOLBAR_COMMON_ICONS = \
 	capture_interfaces \
-	capture_options_alt1 \
-	capture_restart \
-	capture_start \
-	capture_stop \
-	gnome_emblem_web \
-	toolbar_wireshark_file
+	gnome_emblem_web
 
 toolbar_icons.h:
 	echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
@@ -145,6 +140,13 @@ toolbar_icons.h:
 	for icon24 in $(TOOLBAR_COMMON_ICONS) ; do \
 		gdk-pixbuf-csource --raw --name=$${icon24}_24_pb_data $(top_srcdir)/image/toolbar/$${icon24}_24.png >> $@ ;\
 	done
+	for icon_size in 16 24 ; do \
+		gdk-pixbuf-csource --raw --name=toolbar_wireshark_file_$${icon_size}_pb_data $(top_srcdir)/image/toolbar/$${icon_size}x$${icon_size}/x-capture-file-save.png >> $@ ;\
+		gdk-pixbuf-csource --raw --name=capture_options_alt1_$${icon_size}_pb_data $(top_srcdir)/image/toolbar/$${icon_size}x$${icon_size}/x-capture-options.png >> $@ ;\
+		gdk-pixbuf-csource --raw --name=capture_restart_$${icon_size}_pb_data $(top_srcdir)/image/toolbar/$${icon_size}x$${icon_size}/x-capture-restart.png >> $@ ;\
+		gdk-pixbuf-csource --raw --name=capture_start_$${icon_size}_pb_data $(top_srcdir)/image/toolbar/$${icon_size}x$${icon_size}/x-capture-start.png >> $@ ;\
+		gdk-pixbuf-csource --raw --name=capture_stop_$${icon_size}_pb_data $(top_srcdir)/image/toolbar/$${icon_size}x$${icon_size}/x-capture-stop.png >> $@ ;\
+	done
 
 layouts.h:
 	echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index cbd9a63118..28d982d530 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -107,6 +107,7 @@ file(GLOB EXTA_QT_HEADERS
 	qt_ui_utils.h
 	related_packet_delegate.h
 	sparkline_delegate.h
+	stock_icon.h
 )
 
 set(WIRESHARK_QT_SRC
@@ -182,6 +183,7 @@ set(WIRESHARK_QT_SRC
 	simple_dialog_qt.cpp
 	splash_overlay.cpp
 	sparkline_delegate.cpp
+	stock_icon.cpp
 	summary_dialog.cpp
 	syntax_line_edit.cpp
 	tcp_stream_dialog.cpp
@@ -264,7 +266,6 @@ set(WIRESHARK_QT_QRC
 	../../image/status.qrc
 	../../image/toolbar.qrc
 	i18n.qrc
-	welcome.qrc
 )
 
 set(WIRESHARK_QT_TS
diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common
index dd34ebc240..d869da1501 100644
--- a/ui/qt/Makefile.common
+++ b/ui/qt/Makefile.common
@@ -263,8 +263,7 @@ QRC_FILES =	\
 	../../image/layout.qrc	\
 	../../image/status.qrc	\
 	../../image/toolbar.qrc	\
-	i18n.qrc	\
-	welcome.qrc
+	i18n.qrc
 
 #
 # .ts files.
@@ -374,9 +373,10 @@ WIRESHARK_QT_SRC =	\
 	sequence_dialog.cpp	\
 	simple_dialog_qt.cpp	\
 	sparkline_delegate.cpp	\
+	splash_overlay.cpp	\
 	stats_tree_dialog.cpp	\
+	stock_icon.cpp		\
 	summary_dialog.cpp	\
-	splash_overlay.cpp	\
 	syntax_line_edit.cpp	\
 	tcp_stream_dialog.cpp	\
 	time_shift_dialog.cpp	\
@@ -392,4 +392,5 @@ noinst_HEADERS =	\
 	packet_list_record.h	\
 	qcustomplot.h	\
 	qt_ui_utils.h	\
+	stock_icon.h	\
 	tango_colors.h
diff --git a/ui/qt/Wireshark.pro b/ui/qt/Wireshark.pro
index 51693d29de..01a27b9b35 100644
--- a/ui/qt/Wireshark.pro
+++ b/ui/qt/Wireshark.pro
@@ -500,7 +500,6 @@ RESOURCES += \
     ../../image/status.qrc \
     ../../image/toolbar.qrc \
     i18n.qrc \
-    welcome.qrc \
 
 
 # wireshark_en should be pluralonly.
@@ -658,6 +657,7 @@ SOURCES += \
     sparkline_delegate.cpp \
     splash_overlay.cpp \
     stats_tree_dialog.cpp \
+    stock_icon.cpp \
     summary_dialog.cpp \
     syntax_line_edit.cpp \
     tcp_stream_dialog.cpp \
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 07e635979a..fe0b27225d 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -44,12 +44,13 @@
 #include "ui/recent.h"
 #include "ui/util.h"
 
-#include "wireshark_application.h"
-#include "proto_tree.h"
 #include "byte_view_tab.h"
 #include "display_filter_edit.h"
-#include "import_text_dialog.h"
 #include "export_dissection_dialog.h"
+#include "import_text_dialog.h"
+#include "proto_tree.h"
+#include "stock_icon.h"
+#include "wireshark_application.h"
 
 #include "qt_ui_utils.h"
 
@@ -136,13 +137,37 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(df_edit, SIGNAL(addBookmark(QString)), this, SLOT(addDisplayFilterButton(QString)));
     connect(this, SIGNAL(displayFilterSuccess(bool)), df_edit, SLOT(displayFilterSuccess(bool)));
 
-    // http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
-    // http://qt-project.org/doc/qt-4.8/qstyle.html#StandardPixmap-enum
-    main_ui_->actionFileOpen->setIcon(
-                QIcon().fromTheme("document-open", style()->standardIcon(QStyle::SP_DirIcon)));
-    // main_ui_->actionFileSave set in main_window.ui
-    main_ui_->actionFileClose->setIcon(
-                QIcon().fromTheme("process-stop", style()->standardIcon(QStyle::SP_DialogCloseButton)));
+#if defined(Q_OS_MAC)
+    // XXX Force icons to 24x24 for now, otherwise actionFileOpen looks wonky on OS X.
+    main_ui_->mainToolBar->setIconSize(QSize(24, 24));
+#elif defined(Q_OS_WIN)
+    // Current GTK+ and other Windows app behavior.
+    main_ui_->mainToolBar->setIconSize(QSize(16, 16));
+#endif
+
+    main_ui_->actionCaptureStart->setIcon(StockIcon("x-capture-start"));
+    main_ui_->actionCaptureStop->setIcon(StockIcon("x-capture-stop"));
+    main_ui_->actionCaptureRestart->setIcon(StockIcon("x-capture-restart"));
+    main_ui_->actionCaptureOptions->setIcon(StockIcon("x-capture-options"));
+
+    main_ui_->actionFileOpen->setIcon(StockIcon("document-open"));
+    main_ui_->actionFileSave->setIcon(StockIcon("x-capture-file-save"));
+    main_ui_->actionFileClose->setIcon(StockIcon("x-capture-file-close"));
+    main_ui_->actionViewReload->setIcon(StockIcon("x-capture-file-reload"));
+
+    main_ui_->actionEditFindPacket->setIcon(StockIcon("edit-find"));
+    main_ui_->actionGoPreviousPacket->setIcon(StockIcon("go-previous"));
+    main_ui_->actionGoNextPacket->setIcon(StockIcon("go-next"));
+    main_ui_->actionGoGoToPacket->setIcon(StockIcon("go-jump"));
+    main_ui_->actionGoFirstPacket->setIcon(StockIcon("go-first"));
+    main_ui_->actionGoLastPacket->setIcon(StockIcon("go-last"));
+
+//    main_ui_->actionViewColorizePackets->setIcon(StockIcon("x-colorize-packets"));
+//    main_ui_->actionViewAutoScroll->setIcon(StockIcon("x-stay-last"));
+
+//    main_ui_->actionViewZoomIn->setIcon(StockIcon("zoom-in"));
+//    main_ui_->actionViewZoomOut->setIcon(StockIcon("zoom-out"));
+//    main_ui_->actionViewZoomOriginal->setIcon(StockIcon("zoom-original"));
 
     // In Qt4 multiple toolbars and "pretty" are mutually exculsive on OS X. If
     // unifiedTitleAndToolBarOnMac is enabled everything ends up in the same row.
@@ -1484,9 +1509,9 @@ void MainWindow::setMenusForCaptureInProgress(bool capture_in_progress) {
 
 #ifdef HAVE_LIBPCAP
     main_ui_->actionCaptureOptions->setEnabled(!capture_in_progress);
-    main_ui_->actionStartCapture->setEnabled(!capture_in_progress);
-    main_ui_->actionStartCapture->setChecked(capture_in_progress);
-    main_ui_->actionStopCapture->setEnabled(capture_in_progress);
+    main_ui_->actionCaptureStart->setEnabled(!capture_in_progress);
+    main_ui_->actionCaptureStart->setChecked(capture_in_progress);
+    main_ui_->actionCaptureStop->setEnabled(capture_in_progress);
     main_ui_->actionCaptureRestart->setEnabled(capture_in_progress);
 #endif /* HAVE_LIBPCAP */
 
@@ -1496,8 +1521,8 @@ void MainWindow::setMenusForCaptureStopping() {
     main_ui_->actionFileQuit->setEnabled(false);
     main_ui_->actionSummary->setEnabled(false);
 #ifdef HAVE_LIBPCAP
-    main_ui_->actionStartCapture->setChecked(false);
-    main_ui_->actionStopCapture->setEnabled(false);
+    main_ui_->actionCaptureStart->setChecked(false);
+    main_ui_->actionCaptureStop->setEnabled(false);
     main_ui_->actionCaptureRestart->setEnabled(false);
 #endif /* HAVE_LIBPCAP */
 }
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index df20da5078..ff328967a9 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -336,8 +336,8 @@ private slots:
     void on_goToCancel_clicked();
     void on_goToGo_clicked();
     void on_goToLineEdit_returnPressed();
-    void on_actionStartCapture_triggered();
-    void on_actionStopCapture_triggered();
+    void on_actionCaptureStart_triggered();
+    void on_actionCaptureStop_triggered();
 
     void on_actionSummary_triggered();
     void on_actionStatisticsFlowGraph_triggered();
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index 5e42d75660..d24b2b0503 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -177,8 +177,8 @@
      <string>&amp;Capture</string>
     </property>
     <addaction name="actionCaptureOptions"/>
-    <addaction name="actionStartCapture"/>
-    <addaction name="actionStopCapture"/>
+    <addaction name="actionCaptureStart"/>
+    <addaction name="actionCaptureStop"/>
     <addaction name="actionCaptureRestart"/>
     <addaction name="actionCaptureCaptureFilters"/>
     <addaction name="actionCaptureRefreshInterfaces"/>
@@ -462,15 +462,12 @@
     <string>Main Toolbar</string>
    </property>
    <property name="movable">
-    <bool>true</bool>
-   </property>
-   <property name="allowedAreas">
-    <set>Qt::BottomToolBarArea|Qt::TopToolBarArea</set>
+    <bool>false</bool>
    </property>
    <property name="iconSize">
     <size>
-     <width>24</width>
-     <height>24</height>
+     <width>32</width>
+     <height>32</height>
     </size>
    </property>
    <property name="toolButtonStyle">
@@ -482,12 +479,23 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="actionStartCapture"/>
-   <addaction name="actionStopCapture"/>
+   <addaction name="actionCaptureStart"/>
+   <addaction name="actionCaptureStop"/>
+   <addaction name="actionCaptureRestart"/>
+   <addaction name="actionCaptureOptions"/>
    <addaction name="separator"/>
    <addaction name="actionFileOpen"/>
    <addaction name="actionFileSave"/>
    <addaction name="actionFileClose"/>
+   <addaction name="actionViewReload"/>
+   <addaction name="separator"/>
+   <addaction name="actionEditFindPacket"/>
+   <addaction name="actionGoPreviousPacket"/>
+   <addaction name="actionGoNextPacket"/>
+   <addaction name="actionGoGoToPacket"/>
+   <addaction name="actionGoFirstPacket"/>
+   <addaction name="actionGoLastPacket"/>
+   <addaction name="separator"/>
   </widget>
   <widget class="MainStatusBar" name="statusBar"/>
   <widget class="QToolBar" name="displayFilterToolBar">
@@ -529,27 +537,10 @@
     <enum>QAction::QuitRole</enum>
    </property>
   </action>
-  <action name="actionCaptureInterfaces">
-   <property name="text">
-    <string>&amp;Interfaces...</string>
-   </property>
-   <property name="toolTip">
-    <string>Show interface details</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+I</string>
-   </property>
-  </action>
-  <action name="actionStartCapture">
+  <action name="actionCaptureStart">
    <property name="checkable">
     <bool>true</bool>
    </property>
-   <property name="icon">
-    <iconset resource="../../image/toolbar.qrc">
-     <normaloff>:/toolbar/main/capture_start_24.png</normaloff>
-     <normalon>:/toolbar/main/capture_start_active_24.png</normalon>
-     <disabledon>:/toolbar/main/capture_start_active_24.png</disabledon>:/toolbar/main/capture_start_24.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Start</string>
    </property>
@@ -560,11 +551,7 @@
     <string>Ctrl+E</string>
    </property>
   </action>
-  <action name="actionStopCapture">
-   <property name="icon">
-    <iconset resource="../../image/toolbar.qrc">
-     <normaloff>:/toolbar/main/capture_stop_24.png</normaloff>:/toolbar/main/capture_stop_24.png</iconset>
-   </property>
+  <action name="actionCaptureStop">
    <property name="text">
     <string>S&amp;top</string>
    </property>
@@ -580,7 +567,7 @@
     <string>Close</string>
    </property>
    <property name="toolTip">
-    <string>Close the current capture file</string>
+    <string>Close this capture file</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+W</string>
@@ -816,15 +803,11 @@
    </property>
   </action>
   <action name="actionFileSave">
-   <property name="icon">
-    <iconset resource="../../image/toolbar.qrc">
-     <normaloff>:/toolbar/main/toolbar/toolbar_wireshark_file_24.png</normaloff>:/toolbar/main/toolbar/toolbar_wireshark_file_24.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Save</string>
    </property>
    <property name="toolTip">
-    <string>Save the current file</string>
+    <string>Save this capture file</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+S</string>
@@ -832,7 +815,7 @@
   </action>
   <action name="actionFileSaveAs">
    <property name="icon">
-    <iconset resource="../../image/toolbar.qrc">
+    <iconset>
      <normaloff>:/toolbar/main/toolbar/toolbar_wireshark_file_24.png</normaloff>:/toolbar/main/toolbar/toolbar_wireshark_file_24.png</iconset>
    </property>
    <property name="text">
@@ -894,7 +877,7 @@
     <string>&amp;Reload</string>
    </property>
    <property name="toolTip">
-    <string>Reload the current file</string>
+    <string>Reload this file</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+R</string>
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 714e8b5ee8..712c08c3b6 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -1158,9 +1158,9 @@ void MainWindow::interfaceSelectionChanged()
     // XXX This doesn't disable the toolbar button when using
     // QtMacExtras.
     if (global_capture_opts.num_selected > 0 && capture_filter_valid_) {
-        main_ui_->actionStartCapture->setEnabled(true);
+        main_ui_->actionCaptureStart->setEnabled(true);
     } else {
-        main_ui_->actionStartCapture->setEnabled(false);
+        main_ui_->actionCaptureStart->setEnabled(false);
     }
 #endif // HAVE_LIBPCAP
 }
@@ -2326,7 +2326,7 @@ void MainWindow::on_goToLineEdit_returnPressed()
     on_goToGo_clicked();
 }
 
-void MainWindow::on_actionStartCapture_triggered()
+void MainWindow::on_actionCaptureStart_triggered()
 {
 //#ifdef HAVE_AIRPCAP
 //  airpcap_if_active = airpcap_if_selected;
@@ -2368,7 +2368,7 @@ void MainWindow::on_actionStartCapture_triggered()
 #endif // HAVE_LIBPCAP
 }
 
-void MainWindow::on_actionStopCapture_triggered()
+void MainWindow::on_actionCaptureStop_triggered()
 {
     stopCapture();
 }
diff --git a/ui/qt/stock_icon.cpp b/ui/qt/stock_icon.cpp
new file mode 100644
index 0000000000..c365aaac7c
--- /dev/null
+++ b/ui/qt/stock_icon.cpp
@@ -0,0 +1,95 @@
+/* stock_icon.cpp
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "stock_icon.h"
+
+// Stock icons. Based on gtk/stock_icons.h
+
+// Toolbar icon sizes:
+// OS X freestanding: 32x32, 32x32@2x, segmented (inside a button): <= 19x19
+// Windows: 16x16, 24x24, 32x32
+// GNOME: 24x24 (default), 48x48
+
+// References:
+//
+// http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
+// http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
+//
+// http://mithatkonar.com/wiki/doku.php/qt/icons
+//
+// https://developer.apple.com/library/mac/documentation/userexperience/conceptual/applehiguidelines/IconsImages/IconsImages.html#//apple_ref/doc/uid/20000967-TPXREF102
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dn742485.aspx
+// https://developer.gnome.org/hig-book/stable/icons-types.html.en
+// http://msdn.microsoft.com/en-us/library/ms246582.aspx
+
+// To do:
+// - 32x32, 48x48, 64x64, and unscaled (.svg) icons
+// - Indent find & go actions when those panes are open.
+// - Replace or remove:
+//   WIRESHARK_STOCK_CAPTURE_FILTER x-capture-filter
+//   WIRESHARK_STOCK_DISPLAY_FILTER x-display-filter
+//   GTK_STOCK_SELECT_COLOR x-coloring-rules
+//   GTK_STOCK_PREFERENCES preferences-system
+//   GTK_STOCK_HELP help-contents
+
+#include "wireshark_application.h"
+
+#include <QFile>
+#include <QStyle>
+
+QString path_pfx_ = ":/icons/toolbar/";
+
+StockIcon::StockIcon(const char *icon_name) :
+    QIcon()
+{
+    if (strcmp(icon_name, "document-open") == 0) {
+        QIcon dir_icon = fromTheme(icon_name, wsApp->style()->standardIcon(QStyle::SP_DirIcon));
+        swap(dir_icon);
+        return;
+    }
+
+    if (hasThemeIcon(icon_name)) {
+        QIcon theme_icon = fromTheme(icon_name);
+        swap(theme_icon);
+        return;
+    } else {
+        QStringList types = QStringList() << "16x16" << "24x24";
+        foreach (QString type, types) {
+            QString icon_path = path_pfx_ + QString("%1/%2.png").arg(type).arg(icon_name);
+            if (QFile::exists(icon_path)) {
+                addFile(icon_path);
+            }
+        }
+    }
+}
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/ui/qt/stock_icon.h b/ui/qt/stock_icon.h
new file mode 100644
index 0000000000..3c83beb7ba
--- /dev/null
+++ b/ui/qt/stock_icon.h
@@ -0,0 +1,58 @@
+/* stock_icon.h
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef STOCK_ICON_H
+#define STOCK_ICON_H
+
+#include <QIcon>
+
+/** @file
+ *  Goal: Beautiful icons appropriate for each of our supported platforms.
+ */
+
+// Supported standard names:
+// document-open
+
+// Supported custom names (see images/toolbar):
+// x-capture-file-close
+// x-capture-file-save
+
+class StockIcon : public QIcon
+{
+public:
+    explicit StockIcon(const char *icon_name);
+
+};
+
+#endif // STOCK_ICON_H
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/ui/qt/welcome.qrc b/ui/qt/welcome.qrc
deleted file mode 100644
index bf4962eb02..0000000000
--- a/ui/qt/welcome.qrc
+++ /dev/null
@@ -1,3 +0,0 @@
-<RCC>
-    <qresource prefix="/welcome"/>
-</RCC>
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 4e524f1ac3..04ac8b03cb 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -580,7 +580,6 @@ WiresharkApplication::WiresharkApplication(int &argc,  char **argv) :
     Q_INIT_RESOURCE(layout);
     Q_INIT_RESOURCE(status);
     Q_INIT_RESOURCE(toolbar);
-    Q_INIT_RESOURCE(welcome);
 
 #ifdef Q_OS_WIN
     /* RichEd20.DLL is needed for native file dialog filter entries. */
author	Gerald Combs <gerald@wireshark.org>	2014-09-18 14:09:55 -0700
committer	Gerald Combs <gerald@wireshark.org>	2014-09-20 19:54:04 +0000
commit	8576e1c103cb0606d100c31b9794bcdb61bd50c6 (patch)
tree	429fcda5b0cf673edf8411b2b65e79f2c8bd9d71
parent	801824b8a7a9885ab066ee7d10e7e03a2a948315 (diff)
download	wireshark-8576e1c103cb0606d100c31b9794bcdb61bd50c6.tar.gz