232 files changed, 251 insertions, 258 deletions

diff --git a/image/stock_icons.qrc b/image/stock_icons.qrc
new file mode 100644
index 0000000000..555ffcc39f
--- /dev/null
+++ b/image/stock_icons.qrc
@@ -0,0 +1,143 @@
+<RCC>
+    <qresource prefix="/menu/help">
+        <file>wsicon16.png</file>
+        <file>wsicon-ask.png</file>
+    </qresource>
+    <qresource prefix="/stock">
+        <file>minus-8.png</file>
+        <file>plus-8.png</file>
+        <file>copy-8.png</file>
+        <file>delete_list.png</file>
+        <file>delete_list@2x.png</file>
+        <file>arrow_up.png</file>
+        <file>arrow_up@2x.png</file>
+        <file>arrow_down.png</file>
+        <file>arrow_down@2x.png</file>
+    </qresource>
+    <qresource prefix="">
+        <file>stock_icons/14x14/x-capture-comment-update.png</file>
+        <file>stock_icons/14x14/x-capture-comment-update@2x.png</file>
+        <file>stock_icons/14x14/x-capture-filter-bookmark.png</file>
+        <file>stock_icons/14x14/x-capture-filter-bookmark@2x.png</file>
+        <file>stock_icons/14x14/x-capture-filter-bookmark.active.png</file>
+        <file>stock_icons/14x14/x-capture-filter-bookmark.active@2x.png</file>
+        <file>stock_icons/14x14/x-capture-filter-bookmark.selected.png</file>
+        <file>stock_icons/14x14/x-capture-filter-bookmark.selected@2x.png</file>
+        <file>stock_icons/14x14/x-display-filter-bookmark.png</file>
+        <file>stock_icons/14x14/x-display-filter-bookmark@2x.png</file>
+        <file>stock_icons/14x14/x-display-filter-bookmark.active.png</file>
+        <file>stock_icons/14x14/x-display-filter-bookmark.active@2x.png</file>
+        <file>stock_icons/14x14/x-display-filter-bookmark.selected.png</file>
+        <file>stock_icons/14x14/x-display-filter-bookmark.selected@2x.png</file>
+        <file>stock_icons/14x14/x-expert-chat.png</file>
+        <file>stock_icons/14x14/x-expert-chat@2x.png</file>
+        <file>stock_icons/14x14/x-expert-error.png</file>
+        <file>stock_icons/14x14/x-expert-error@2x.png</file>
+        <file>stock_icons/14x14/x-expert-none.png</file>
+        <file>stock_icons/14x14/x-expert-none@2x.png</file>
+        <file>stock_icons/14x14/x-expert-note.png</file>
+        <file>stock_icons/14x14/x-expert-note@2x.png</file>
+        <file>stock_icons/14x14/x-expert-warn.png</file>
+        <file>stock_icons/14x14/x-expert-warn@2x.png</file>
+        <file>stock_icons/14x14/x-filter-clear.png</file>
+        <file>stock_icons/14x14/x-filter-clear@2x.png</file>
+        <file>stock_icons/14x14/x-filter-clear.active.png</file>
+        <file>stock_icons/14x14/x-filter-clear.active@2x.png</file>
+        <file>stock_icons/14x14/x-filter-clear.selected.png</file>
+        <file>stock_icons/14x14/x-filter-clear.selected@2x.png</file>
+        <file>stock_icons/14x14/x-filter-dropdown.png</file>
+        <file>stock_icons/14x14/x-filter-dropdown@2x.png</file>
+        <file>stock_icons/14x14/x-filter-matching-bookmark.png</file>
+        <file>stock_icons/14x14/x-filter-matching-bookmark@2x.png</file>
+        <file>stock_icons/14x14/x-filter-matching-bookmark.active.png</file>
+        <file>stock_icons/14x14/x-filter-matching-bookmark.active@2x.png</file>
+        <file>stock_icons/14x14/x-filter-matching-bookmark.selected.png</file>
+        <file>stock_icons/14x14/x-filter-matching-bookmark.selected@2x.png</file>
+        <file>stock_icons/16x16/edit-find.png</file>
+        <file>stock_icons/16x16/edit-find@2x.png</file>
+        <file>stock_icons/16x16/go-first.png</file>
+        <file>stock_icons/16x16/go-first@2x.png</file>
+        <file>stock_icons/16x16/go-jump.png</file>
+        <file>stock_icons/16x16/go-jump@2x.png</file>
+        <file>stock_icons/16x16/go-last.png</file>
+        <file>stock_icons/16x16/go-last@2x.png</file>
+        <file>stock_icons/16x16/go-next.png</file>
+        <file>stock_icons/16x16/go-next@2x.png</file>
+        <file>stock_icons/16x16/go-previous.png</file>
+        <file>stock_icons/16x16/go-previous@2x.png</file>
+        <file>stock_icons/16x16/x-capture-file-close.png</file>
+        <file>stock_icons/16x16/x-capture-file-close@2x.png</file>
+        <file>stock_icons/16x16/x-capture-file-save.png</file>
+        <file>stock_icons/16x16/x-capture-file-save@2x.png</file>
+        <file>stock_icons/16x16/x-capture-file-reload.png</file>
+        <file>stock_icons/16x16/x-capture-file-reload@2x.png</file>
+        <file>stock_icons/16x16/x-capture-options.png</file>
+        <file>stock_icons/16x16/x-capture-options@2x.png</file>
+        <file>stock_icons/16x16/x-capture-restart.png</file>
+        <file>stock_icons/16x16/x-capture-restart@2x.png</file>
+        <file>stock_icons/16x16/x-capture-start.on.png</file>
+        <file>stock_icons/16x16/x-capture-start.on@2x.png</file>
+        <file>stock_icons/16x16/x-capture-start.png</file>
+        <file>stock_icons/16x16/x-capture-start@2x.png</file>
+        <file>stock_icons/16x16/x-capture-stop.png</file>
+        <file>stock_icons/16x16/x-capture-stop@2x.png</file>
+        <file>stock_icons/16x16/x-colorize-packets.png</file>
+        <file>stock_icons/16x16/x-colorize-packets@2x.png</file>
+        <file>stock_icons/16x16/x-resize-columns.png</file>
+        <file>stock_icons/16x16/x-resize-columns@2x.png</file>
+        <file>stock_icons/16x16/x-stay-last.png</file>
+        <file>stock_icons/16x16/x-stay-last@2x.png</file>
+        <file>stock_icons/16x16/zoom-in.png</file>
+        <file>stock_icons/16x16/zoom-in@2x.png</file>
+        <file>stock_icons/16x16/zoom-original.png</file>
+        <file>stock_icons/16x16/zoom-original@2x.png</file>
+        <file>stock_icons/16x16/zoom-out.png</file>
+        <file>stock_icons/16x16/zoom-out@2x.png</file>
+        <file>stock_icons/24x14/x-filter-apply.png</file>
+        <file>stock_icons/24x14/x-filter-apply@2x.png</file>
+        <file>stock_icons/24x14/x-filter-apply.active.png</file>
+        <file>stock_icons/24x14/x-filter-apply.active@2x.png</file>
+        <file>stock_icons/24x14/x-filter-apply.selected.png</file>
+        <file>stock_icons/24x14/x-filter-apply.selected@2x.png</file>
+        <file>stock_icons/24x24/edit-find.png</file>
+        <file>stock_icons/24x24/edit-find@2x.png</file>
+        <file>stock_icons/24x24/go-first.png</file>
+        <file>stock_icons/24x24/go-first@2x.png</file>
+        <file>stock_icons/24x24/go-jump.png</file>
+        <file>stock_icons/24x24/go-jump@2x.png</file>
+        <file>stock_icons/24x24/go-last.png</file>
+        <file>stock_icons/24x24/go-last@2x.png</file>
+        <file>stock_icons/24x24/go-next.png</file>
+        <file>stock_icons/24x24/go-next@2x.png</file>
+        <file>stock_icons/24x24/go-previous.png</file>
+        <file>stock_icons/24x24/go-previous@2x.png</file>
+        <file>stock_icons/24x24/x-capture-file-reload.png</file>
+        <file>stock_icons/24x24/x-capture-file-reload@2x.png</file>
+        <file>stock_icons/24x24/x-capture-options.png</file>
+        <file>stock_icons/24x24/x-capture-options@2x.png</file>
+        <file>stock_icons/24x24/x-capture-restart.png</file>
+        <file>stock_icons/24x24/x-capture-restart@2x.png</file>
+        <file>stock_icons/24x24/x-capture-start.on.png</file>
+        <file>stock_icons/24x24/x-capture-start.on@2x.png</file>
+        <file>stock_icons/24x24/x-capture-start.png</file>
+        <file>stock_icons/24x24/x-capture-start@2x.png</file>
+        <file>stock_icons/24x24/x-capture-stop.png</file>
+        <file>stock_icons/24x24/x-capture-stop@2x.png</file>
+        <file>stock_icons/24x24/x-colorize-packets.png</file>
+        <file>stock_icons/24x24/x-colorize-packets@2x.png</file>
+        <file>stock_icons/24x24/x-resize-columns.png</file>
+        <file>stock_icons/24x24/x-resize-columns@2x.png</file>
+        <file>stock_icons/24x24/x-stay-last.png</file>
+        <file>stock_icons/24x24/x-stay-last@2x.png</file>
+        <file>stock_icons/24x24/zoom-in.png</file>
+        <file>stock_icons/24x24/zoom-in@2x.png</file>
+        <file>stock_icons/24x24/zoom-original.png</file>
+        <file>stock_icons/24x24/zoom-original@2x.png</file>
+        <file>stock_icons/24x24/zoom-out.png</file>
+        <file>stock_icons/24x24/zoom-out@2x.png</file>
+        <file>stock_icons/24x24/x-capture-file-close.png</file>
+        <file>stock_icons/24x24/x-capture-file-close@2x.png</file>
+        <file>stock_icons/24x24/x-capture-file-save.png</file>
+        <file>stock_icons/24x24/x-capture-file-save@2x.png</file>
+    </qresource>
+</RCC>
diff --git a/image/toolbar/14x14/x-capture-comment-update.png b/image/stock_icons/14x14/x-capture-comment-update.png
index 70496766ef..70496766ef 100644
--- a/image/toolbar/14x14/x-capture-comment-update.png
+++ b/image/stock_icons/14x14/x-capture-comment-update.png
diff --git a/image/toolbar/14x14/x-capture-comment-update.svg b/image/stock_icons/14x14/x-capture-comment-update.svg
index 4bffb99275..4bffb99275 100644
--- a/image/toolbar/14x14/x-capture-comment-update.svg
+++ b/image/stock_icons/14x14/x-capture-comment-update.svg
diff --git a/image/toolbar/14x14/x-capture-comment-update@2x.png b/image/stock_icons/14x14/x-capture-comment-update@2x.png
index 45d532d94e..45d532d94e 100644
--- a/image/toolbar/14x14/x-capture-comment-update@2x.png
+++ b/image/stock_icons/14x14/x-capture-comment-update@2x.png
diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.active.png b/image/stock_icons/14x14/x-capture-filter-bookmark.active.png
index 72b105e8c2..72b105e8c2 100644
--- a/image/toolbar/14x14/x-capture-filter-bookmark.active.png
+++ b/image/stock_icons/14x14/x-capture-filter-bookmark.active.png
diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.active.svg b/image/stock_icons/14x14/x-capture-filter-bookmark.active.svg
index f1085c1d18..f1085c1d18 100644
--- a/image/toolbar/14x14/x-capture-filter-bookmark.active.svg
+++ b/image/stock_icons/14x14/x-capture-filter-bookmark.active.svg
diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png b/image/stock_icons/14x14/x-capture-filter-bookmark.active@2x.png
index a453553114..a453553114 100644
--- a/image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png
+++ b/image/stock_icons/14x14/x-capture-filter-bookmark.active@2x.png
diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.png b/image/stock_icons/14x14/x-capture-filter-bookmark.png
index 00f83f76b9..00f83f76b9 100644
--- a/image/toolbar/14x14/x-capture-filter-bookmark.png
+++ b/image/stock_icons/14x14/x-capture-filter-bookmark.png
diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.selected.png b/image/stock_icons/14x14/x-capture-filter-bookmark.selected.png
index 63bfabdf0b..63bfabdf0b 100644
--- a/image/toolbar/14x14/x-capture-filter-bookmark.selected.png
+++ b/image/stock_icons/14x14/x-capture-filter-bookmark.selected.png
diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.selected.svg b/image/stock_icons/14x14/x-capture-filter-bookmark.selected.svg
index 572ea701a1..572ea701a1 100644
--- a/image/toolbar/14x14/x-capture-filter-bookmark.selected.svg
+++ b/image/stock_icons/14x14/x-capture-filter-bookmark.selected.svg
diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png b/image/stock_icons/14x14/x-capture-filter-bookmark.selected@2x.png
index 08013cbc0b..08013cbc0b 100644
--- a/image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png
+++ b/image/stock_icons/14x14/x-capture-filter-bookmark.selected@2x.png
diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.svg b/image/stock_icons/14x14/x-capture-filter-bookmark.svg
index 5a9d9fe732..5a9d9fe732 100644
--- a/image/toolbar/14x14/x-capture-filter-bookmark.svg
+++ b/image/stock_icons/14x14/x-capture-filter-bookmark.svg
diff --git a/image/toolbar/14x14/x-capture-filter-bookmark@2x.png b/image/stock_icons/14x14/x-capture-filter-bookmark@2x.png
index cde8131495..cde8131495 100644
--- a/image/toolbar/14x14/x-capture-filter-bookmark@2x.png
+++ b/image/stock_icons/14x14/x-capture-filter-bookmark@2x.png
diff --git a/image/toolbar/14x14/x-display-filter-bookmark.active.png b/image/stock_icons/14x14/x-display-filter-bookmark.active.png
index a9bf35a7dd..a9bf35a7dd 100644
--- a/image/toolbar/14x14/x-display-filter-bookmark.active.png
+++ b/image/stock_icons/14x14/x-display-filter-bookmark.active.png
diff --git a/image/toolbar/14x14/x-display-filter-bookmark.active.svg b/image/stock_icons/14x14/x-display-filter-bookmark.active.svg
index 59336bb970..59336bb970 100644
--- a/image/toolbar/14x14/x-display-filter-bookmark.active.svg
+++ b/image/stock_icons/14x14/x-display-filter-bookmark.active.svg
diff --git a/image/toolbar/14x14/x-display-filter-bookmark.active@2x.png b/image/stock_icons/14x14/x-display-filter-bookmark.active@2x.png
index 507373872f..507373872f 100644
--- a/image/toolbar/14x14/x-display-filter-bookmark.active@2x.png
+++ b/image/stock_icons/14x14/x-display-filter-bookmark.active@2x.png
diff --git a/image/toolbar/14x14/x-display-filter-bookmark.png b/image/stock_icons/14x14/x-display-filter-bookmark.png
index fbeeb3466d..fbeeb3466d 100644
--- a/image/toolbar/14x14/x-display-filter-bookmark.png
+++ b/image/stock_icons/14x14/x-display-filter-bookmark.png
diff --git a/image/toolbar/14x14/x-display-filter-bookmark.selected.png b/image/stock_icons/14x14/x-display-filter-bookmark.selected.png
index 0bb4dcd817..0bb4dcd817 100644
--- a/image/toolbar/14x14/x-display-filter-bookmark.selected.png
+++ b/image/stock_icons/14x14/x-display-filter-bookmark.selected.png
diff --git a/image/toolbar/14x14/x-display-filter-bookmark.selected.svg b/image/stock_icons/14x14/x-display-filter-bookmark.selected.svg
index 3690c887a3..3690c887a3 100644
--- a/image/toolbar/14x14/x-display-filter-bookmark.selected.svg
+++ b/image/stock_icons/14x14/x-display-filter-bookmark.selected.svg
diff --git a/image/toolbar/14x14/x-display-filter-bookmark.selected@2x.png b/image/stock_icons/14x14/x-display-filter-bookmark.selected@2x.png
index ae64fd7a86..ae64fd7a86 100644
--- a/image/toolbar/14x14/x-display-filter-bookmark.selected@2x.png
+++ b/image/stock_icons/14x14/x-display-filter-bookmark.selected@2x.png
diff --git a/image/toolbar/14x14/x-display-filter-bookmark.svg b/image/stock_icons/14x14/x-display-filter-bookmark.svg
index 0e8dc9eff9..0e8dc9eff9 100644
--- a/image/toolbar/14x14/x-display-filter-bookmark.svg
+++ b/image/stock_icons/14x14/x-display-filter-bookmark.svg
diff --git a/image/toolbar/14x14/x-display-filter-bookmark@2x.png b/image/stock_icons/14x14/x-display-filter-bookmark@2x.png
index 5b7526c4bc..5b7526c4bc 100644
--- a/image/toolbar/14x14/x-display-filter-bookmark@2x.png
+++ b/image/stock_icons/14x14/x-display-filter-bookmark@2x.png
diff --git a/image/toolbar/14x14/x-expert-chat.png b/image/stock_icons/14x14/x-expert-chat.png
index e93ad17836..e93ad17836 100644
--- a/image/toolbar/14x14/x-expert-chat.png
+++ b/image/stock_icons/14x14/x-expert-chat.png
diff --git a/image/toolbar/14x14/x-expert-chat@2x.png b/image/stock_icons/14x14/x-expert-chat@2x.png
index 228174b1d3..228174b1d3 100644
--- a/image/toolbar/14x14/x-expert-chat@2x.png
+++ b/image/stock_icons/14x14/x-expert-chat@2x.png
diff --git a/image/toolbar/14x14/x-expert-error.png b/image/stock_icons/14x14/x-expert-error.png
index cd64a93f16..cd64a93f16 100644
--- a/image/toolbar/14x14/x-expert-error.png
+++ b/image/stock_icons/14x14/x-expert-error.png
diff --git a/image/toolbar/14x14/x-expert-error@2x.png b/image/stock_icons/14x14/x-expert-error@2x.png
index 4cb29e8cb1..4cb29e8cb1 100644
--- a/image/toolbar/14x14/x-expert-error@2x.png
+++ b/image/stock_icons/14x14/x-expert-error@2x.png
diff --git a/image/toolbar/14x14/x-expert-indicators-all.svg b/image/stock_icons/14x14/x-expert-indicators-all.svg
index 4c019e4228..4c019e4228 100644
--- a/image/toolbar/14x14/x-expert-indicators-all.svg
+++ b/image/stock_icons/14x14/x-expert-indicators-all.svg
diff --git a/image/toolbar/14x14/x-expert-none.png b/image/stock_icons/14x14/x-expert-none.png
index 500f825b76..500f825b76 100644
--- a/image/toolbar/14x14/x-expert-none.png
+++ b/image/stock_icons/14x14/x-expert-none.png
diff --git a/image/toolbar/14x14/x-expert-none@2x.png b/image/stock_icons/14x14/x-expert-none@2x.png
index eb3c42e6b2..eb3c42e6b2 100644
--- a/image/toolbar/14x14/x-expert-none@2x.png
+++ b/image/stock_icons/14x14/x-expert-none@2x.png
diff --git a/image/toolbar/14x14/x-expert-note.png b/image/stock_icons/14x14/x-expert-note.png
index 88154d5d7a..88154d5d7a 100644
--- a/image/toolbar/14x14/x-expert-note.png
+++ b/image/stock_icons/14x14/x-expert-note.png
diff --git a/image/toolbar/14x14/x-expert-note@2x.png b/image/stock_icons/14x14/x-expert-note@2x.png
index 0854a65838..0854a65838 100644
--- a/image/toolbar/14x14/x-expert-note@2x.png
+++ b/image/stock_icons/14x14/x-expert-note@2x.png
diff --git a/image/toolbar/14x14/x-expert-warn.png b/image/stock_icons/14x14/x-expert-warn.png
index 9aa1de61b2..9aa1de61b2 100644
--- a/image/toolbar/14x14/x-expert-warn.png
+++ b/image/stock_icons/14x14/x-expert-warn.png
diff --git a/image/toolbar/14x14/x-expert-warn@2x.png b/image/stock_icons/14x14/x-expert-warn@2x.png
index 9fddefd8c4..9fddefd8c4 100644
--- a/image/toolbar/14x14/x-expert-warn@2x.png
+++ b/image/stock_icons/14x14/x-expert-warn@2x.png
diff --git a/image/toolbar/14x14/x-filter-clear.active.png b/image/stock_icons/14x14/x-filter-clear.active.png
index 2c0ed113db..2c0ed113db 100644
--- a/image/toolbar/14x14/x-filter-clear.active.png
+++ b/image/stock_icons/14x14/x-filter-clear.active.png
diff --git a/image/toolbar/14x14/x-filter-clear.active.svg b/image/stock_icons/14x14/x-filter-clear.active.svg
index 3450bcf533..3450bcf533 100644
--- a/image/toolbar/14x14/x-filter-clear.active.svg
+++ b/image/stock_icons/14x14/x-filter-clear.active.svg
diff --git a/image/toolbar/14x14/x-filter-clear.active@2x.png b/image/stock_icons/14x14/x-filter-clear.active@2x.png
index 344253fff4..344253fff4 100644
--- a/image/toolbar/14x14/x-filter-clear.active@2x.png
+++ b/image/stock_icons/14x14/x-filter-clear.active@2x.png
diff --git a/image/toolbar/14x14/x-filter-clear.png b/image/stock_icons/14x14/x-filter-clear.png
index 85ea100b0b..85ea100b0b 100644
--- a/image/toolbar/14x14/x-filter-clear.png
+++ b/image/stock_icons/14x14/x-filter-clear.png
diff --git a/image/toolbar/14x14/x-filter-clear.selected.png b/image/stock_icons/14x14/x-filter-clear.selected.png
index d94d4f99db..d94d4f99db 100644
--- a/image/toolbar/14x14/x-filter-clear.selected.png
+++ b/image/stock_icons/14x14/x-filter-clear.selected.png
diff --git a/image/toolbar/14x14/x-filter-clear.selected.svg b/image/stock_icons/14x14/x-filter-clear.selected.svg
index ea77368620..ea77368620 100644
--- a/image/toolbar/14x14/x-filter-clear.selected.svg
+++ b/image/stock_icons/14x14/x-filter-clear.selected.svg
diff --git a/image/toolbar/14x14/x-filter-clear.selected@2x.png b/image/stock_icons/14x14/x-filter-clear.selected@2x.png
index 27cf07f871..27cf07f871 100644
--- a/image/toolbar/14x14/x-filter-clear.selected@2x.png
+++ b/image/stock_icons/14x14/x-filter-clear.selected@2x.png
diff --git a/image/toolbar/14x14/x-filter-clear.svg b/image/stock_icons/14x14/x-filter-clear.svg
index 01e74d9c56..01e74d9c56 100644
--- a/image/toolbar/14x14/x-filter-clear.svg
+++ b/image/stock_icons/14x14/x-filter-clear.svg
diff --git a/image/toolbar/14x14/x-filter-clear@2x.png b/image/stock_icons/14x14/x-filter-clear@2x.png
index 492948c900..492948c900 100644
--- a/image/toolbar/14x14/x-filter-clear@2x.png
+++ b/image/stock_icons/14x14/x-filter-clear@2x.png
diff --git a/image/toolbar/14x14/x-filter-dropdown.png b/image/stock_icons/14x14/x-filter-dropdown.png
index a994dccf52..a994dccf52 100644
--- a/image/toolbar/14x14/x-filter-dropdown.png
+++ b/image/stock_icons/14x14/x-filter-dropdown.png
diff --git a/image/toolbar/14x14/x-filter-dropdown.svg b/image/stock_icons/14x14/x-filter-dropdown.svg
index 6346f18c3f..6346f18c3f 100644
--- a/image/toolbar/14x14/x-filter-dropdown.svg
+++ b/image/stock_icons/14x14/x-filter-dropdown.svg
diff --git a/image/toolbar/14x14/x-filter-dropdown@2x.png b/image/stock_icons/14x14/x-filter-dropdown@2x.png
index 162e4c817e..162e4c817e 100644
--- a/image/toolbar/14x14/x-filter-dropdown@2x.png
+++ b/image/stock_icons/14x14/x-filter-dropdown@2x.png
diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.active.png b/image/stock_icons/14x14/x-filter-matching-bookmark.active.png
index 78486c6155..78486c6155 100644
--- a/image/toolbar/14x14/x-filter-matching-bookmark.active.png
+++ b/image/stock_icons/14x14/x-filter-matching-bookmark.active.png
diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.active.svg b/image/stock_icons/14x14/x-filter-matching-bookmark.active.svg
index 1bcef4e69c..1bcef4e69c 100644
--- a/image/toolbar/14x14/x-filter-matching-bookmark.active.svg
+++ b/image/stock_icons/14x14/x-filter-matching-bookmark.active.svg
diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.active@2x.png b/image/stock_icons/14x14/x-filter-matching-bookmark.active@2x.png
index c1e25bb339..c1e25bb339 100644
--- a/image/toolbar/14x14/x-filter-matching-bookmark.active@2x.png
+++ b/image/stock_icons/14x14/x-filter-matching-bookmark.active@2x.png
diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.png b/image/stock_icons/14x14/x-filter-matching-bookmark.png
index 457eae38a8..457eae38a8 100644
--- a/image/toolbar/14x14/x-filter-matching-bookmark.png
+++ b/image/stock_icons/14x14/x-filter-matching-bookmark.png
diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.selected.png b/image/stock_icons/14x14/x-filter-matching-bookmark.selected.png
index 6d99fd02a5..6d99fd02a5 100644
--- a/image/toolbar/14x14/x-filter-matching-bookmark.selected.png
+++ b/image/stock_icons/14x14/x-filter-matching-bookmark.selected.png
diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.selected.svg b/image/stock_icons/14x14/x-filter-matching-bookmark.selected.svg
index 59a43a01df..59a43a01df 100644
--- a/image/toolbar/14x14/x-filter-matching-bookmark.selected.svg
+++ b/image/stock_icons/14x14/x-filter-matching-bookmark.selected.svg
diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.selected@2x.png b/image/stock_icons/14x14/x-filter-matching-bookmark.selected@2x.png
index 378b44bae8..378b44bae8 100644
--- a/image/toolbar/14x14/x-filter-matching-bookmark.selected@2x.png
+++ b/image/stock_icons/14x14/x-filter-matching-bookmark.selected@2x.png
diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.svg b/image/stock_icons/14x14/x-filter-matching-bookmark.svg
index 774970abeb..774970abeb 100644
--- a/image/toolbar/14x14/x-filter-matching-bookmark.svg
+++ b/image/stock_icons/14x14/x-filter-matching-bookmark.svg
diff --git a/image/toolbar/14x14/x-filter-matching-bookmark@2x.png b/image/stock_icons/14x14/x-filter-matching-bookmark@2x.png
index 02af7246ef..02af7246ef 100644
--- a/image/toolbar/14x14/x-filter-matching-bookmark@2x.png
+++ b/image/stock_icons/14x14/x-filter-matching-bookmark@2x.png
diff --git a/image/toolbar/16x16/edit-find.png b/image/stock_icons/16x16/edit-find.png
index 5ea11cf618..5ea11cf618 100644
--- a/image/toolbar/16x16/edit-find.png
+++ b/image/stock_icons/16x16/edit-find.png
diff --git a/image/toolbar/16x16/edit-find.svg b/image/stock_icons/16x16/edit-find.svg
index e16f162aa9..e16f162aa9 100644
--- a/image/toolbar/16x16/edit-find.svg
+++ b/image/stock_icons/16x16/edit-find.svg
diff --git a/image/toolbar/16x16/edit-find@2x.png b/image/stock_icons/16x16/edit-find@2x.png
index ae4d818bb0..ae4d818bb0 100644
--- a/image/toolbar/16x16/edit-find@2x.png
+++ b/image/stock_icons/16x16/edit-find@2x.png
diff --git a/image/toolbar/16x16/go-first.png b/image/stock_icons/16x16/go-first.png
index b77192cc7f..b77192cc7f 100644
--- a/image/toolbar/16x16/go-first.png
+++ b/image/stock_icons/16x16/go-first.png
diff --git a/image/toolbar/16x16/go-first.svg b/image/stock_icons/16x16/go-first.svg
index cea04ff8f0..cea04ff8f0 100644
--- a/image/toolbar/16x16/go-first.svg
+++ b/image/stock_icons/16x16/go-first.svg
diff --git a/image/toolbar/16x16/go-first@2x.png b/image/stock_icons/16x16/go-first@2x.png
index f9fad2fac9..f9fad2fac9 100644
--- a/image/toolbar/16x16/go-first@2x.png
+++ b/image/stock_icons/16x16/go-first@2x.png
diff --git a/image/toolbar/16x16/go-jump.png b/image/stock_icons/16x16/go-jump.png
index c8ca3633bc..c8ca3633bc 100644
--- a/image/toolbar/16x16/go-jump.png
+++ b/image/stock_icons/16x16/go-jump.png
diff --git a/image/toolbar/16x16/go-jump.svg b/image/stock_icons/16x16/go-jump.svg
index 5600b7eebe..5600b7eebe 100644
--- a/image/toolbar/16x16/go-jump.svg
+++ b/image/stock_icons/16x16/go-jump.svg
diff --git a/image/toolbar/16x16/go-jump@2x.png b/image/stock_icons/16x16/go-jump@2x.png
index a0a283c8ee..a0a283c8ee 100644
--- a/image/toolbar/16x16/go-jump@2x.png
+++ b/image/stock_icons/16x16/go-jump@2x.png
diff --git a/image/toolbar/16x16/go-last.png b/image/stock_icons/16x16/go-last.png
index de43e2ca19..de43e2ca19 100644
--- a/image/toolbar/16x16/go-last.png
+++ b/image/stock_icons/16x16/go-last.png
diff --git a/image/toolbar/16x16/go-last.svg b/image/stock_icons/16x16/go-last.svg
index 9de94376ce..9de94376ce 100644
--- a/image/toolbar/16x16/go-last.svg
+++ b/image/stock_icons/16x16/go-last.svg
diff --git a/image/toolbar/16x16/go-last@2x.png b/image/stock_icons/16x16/go-last@2x.png
index e4d5715955..e4d5715955 100644
--- a/image/toolbar/16x16/go-last@2x.png
+++ b/image/stock_icons/16x16/go-last@2x.png
diff --git a/image/toolbar/16x16/go-next.png b/image/stock_icons/16x16/go-next.png
index c350c1ffc6..c350c1ffc6 100644
--- a/image/toolbar/16x16/go-next.png
+++ b/image/stock_icons/16x16/go-next.png
diff --git a/image/toolbar/16x16/go-next.svg b/image/stock_icons/16x16/go-next.svg
index 55abcc9288..55abcc9288 100644
--- a/image/toolbar/16x16/go-next.svg
+++ b/image/stock_icons/16x16/go-next.svg
diff --git a/image/toolbar/16x16/go-next@2x.png b/image/stock_icons/16x16/go-next@2x.png
index b0201e49bf..b0201e49bf 100644
--- a/image/toolbar/16x16/go-next@2x.png
+++ b/image/stock_icons/16x16/go-next@2x.png
diff --git a/image/toolbar/16x16/go-previous.png b/image/stock_icons/16x16/go-previous.png
index 4a757fd9d1..4a757fd9d1 100644
--- a/image/toolbar/16x16/go-previous.png
+++ b/image/stock_icons/16x16/go-previous.png
diff --git a/image/toolbar/16x16/go-previous.svg b/image/stock_icons/16x16/go-previous.svg
index a07ae8bde7..a07ae8bde7 100644
--- a/image/toolbar/16x16/go-previous.svg
+++ b/image/stock_icons/16x16/go-previous.svg
diff --git a/image/toolbar/16x16/go-previous@2x.png b/image/stock_icons/16x16/go-previous@2x.png
index e2a1463e51..e2a1463e51 100644
--- a/image/toolbar/16x16/go-previous@2x.png
+++ b/image/stock_icons/16x16/go-previous@2x.png
diff --git a/image/toolbar/16x16/x-capture-file-close.png b/image/stock_icons/16x16/x-capture-file-close.png
index 91e746ee7f..91e746ee7f 100644
--- a/image/toolbar/16x16/x-capture-file-close.png
+++ b/image/stock_icons/16x16/x-capture-file-close.png
diff --git a/image/toolbar/16x16/x-capture-file-close.svg b/image/stock_icons/16x16/x-capture-file-close.svg
index cc09a35d2a..cc09a35d2a 100644
--- a/image/toolbar/16x16/x-capture-file-close.svg
+++ b/image/stock_icons/16x16/x-capture-file-close.svg
diff --git a/image/toolbar/16x16/x-capture-file-close@2x.png b/image/stock_icons/16x16/x-capture-file-close@2x.png
index f15849fd21..f15849fd21 100644
--- a/image/toolbar/16x16/x-capture-file-close@2x.png
+++ b/image/stock_icons/16x16/x-capture-file-close@2x.png
diff --git a/image/toolbar/16x16/x-capture-file-close@2x.svg b/image/stock_icons/16x16/x-capture-file-close@2x.svg
index a44a4034b4..a44a4034b4 100644
--- a/image/toolbar/16x16/x-capture-file-close@2x.svg
+++ b/image/stock_icons/16x16/x-capture-file-close@2x.svg
diff --git a/image/toolbar/16x16/x-capture-file-reload.png b/image/stock_icons/16x16/x-capture-file-reload.png
index 11c9a4c93f..11c9a4c93f 100644
--- a/image/toolbar/16x16/x-capture-file-reload.png
+++ b/image/stock_icons/16x16/x-capture-file-reload.png
diff --git a/image/toolbar/16x16/x-capture-file-reload.svg b/image/stock_icons/16x16/x-capture-file-reload.svg
index 90e3ee7870..90e3ee7870 100644
--- a/image/toolbar/16x16/x-capture-file-reload.svg
+++ b/image/stock_icons/16x16/x-capture-file-reload.svg
diff --git a/image/toolbar/16x16/x-capture-file-reload@2x.png b/image/stock_icons/16x16/x-capture-file-reload@2x.png
index fecb97cc5d..fecb97cc5d 100644
--- a/image/toolbar/16x16/x-capture-file-reload@2x.png
+++ b/image/stock_icons/16x16/x-capture-file-reload@2x.png
diff --git a/image/toolbar/16x16/x-capture-file-reload@2x.svg b/image/stock_icons/16x16/x-capture-file-reload@2x.svg
index 16bbbfab75..16bbbfab75 100644
--- a/image/toolbar/16x16/x-capture-file-reload@2x.svg
+++ b/image/stock_icons/16x16/x-capture-file-reload@2x.svg
diff --git a/image/toolbar/16x16/x-capture-file-save.png b/image/stock_icons/16x16/x-capture-file-save.png
index 8b7550aa36..8b7550aa36 100644
--- a/image/toolbar/16x16/x-capture-file-save.png
+++ b/image/stock_icons/16x16/x-capture-file-save.png
diff --git a/image/toolbar/16x16/x-capture-file-save.svg b/image/stock_icons/16x16/x-capture-file-save.svg
index 090fb45453..090fb45453 100644
--- a/image/toolbar/16x16/x-capture-file-save.svg
+++ b/image/stock_icons/16x16/x-capture-file-save.svg
diff --git a/image/toolbar/16x16/x-capture-file-save@2x.png b/image/stock_icons/16x16/x-capture-file-save@2x.png
index 44e1d821a8..44e1d821a8 100644
--- a/image/toolbar/16x16/x-capture-file-save@2x.png
+++ b/image/stock_icons/16x16/x-capture-file-save@2x.png
diff --git a/image/toolbar/16x16/x-capture-file-save@2x.svg b/image/stock_icons/16x16/x-capture-file-save@2x.svg
index e34ba10dac..e34ba10dac 100644
--- a/image/toolbar/16x16/x-capture-file-save@2x.svg
+++ b/image/stock_icons/16x16/x-capture-file-save@2x.svg
diff --git a/image/toolbar/16x16/x-capture-options-gear.svg b/image/stock_icons/16x16/x-capture-options-gear.svg
index 4a03d39956..4a03d39956 100644
--- a/image/toolbar/16x16/x-capture-options-gear.svg
+++ b/image/stock_icons/16x16/x-capture-options-gear.svg
diff --git a/image/toolbar/16x16/x-capture-options-wrench.svg b/image/stock_icons/16x16/x-capture-options-wrench.svg
index 9276524668..9276524668 100644
--- a/image/toolbar/16x16/x-capture-options-wrench.svg
+++ b/image/stock_icons/16x16/x-capture-options-wrench.svg
diff --git a/image/toolbar/16x16/x-capture-options.png b/image/stock_icons/16x16/x-capture-options.png
index 6559591b2d..6559591b2d 100644
--- a/image/toolbar/16x16/x-capture-options.png
+++ b/image/stock_icons/16x16/x-capture-options.png
diff --git a/image/toolbar/16x16/x-capture-options@2x.png b/image/stock_icons/16x16/x-capture-options@2x.png
index b953b96889..b953b96889 100644
--- a/image/toolbar/16x16/x-capture-options@2x.png
+++ b/image/stock_icons/16x16/x-capture-options@2x.png
diff --git a/image/toolbar/16x16/x-capture-restart-fin.svg b/image/stock_icons/16x16/x-capture-restart-fin.svg
index 8b9526089b..8b9526089b 100644
--- a/image/toolbar/16x16/x-capture-restart-fin.svg
+++ b/image/stock_icons/16x16/x-capture-restart-fin.svg
diff --git a/image/toolbar/16x16/x-capture-restart-triangle1.svg b/image/stock_icons/16x16/x-capture-restart-triangle1.svg
index 39661823f6..39661823f6 100644
--- a/image/toolbar/16x16/x-capture-restart-triangle1.svg
+++ b/image/stock_icons/16x16/x-capture-restart-triangle1.svg
diff --git a/image/toolbar/16x16/x-capture-restart-triangle2.svg b/image/stock_icons/16x16/x-capture-restart-triangle2.svg
index 10e4fc6873..10e4fc6873 100644
--- a/image/toolbar/16x16/x-capture-restart-triangle2.svg
+++ b/image/stock_icons/16x16/x-capture-restart-triangle2.svg
diff --git a/image/toolbar/16x16/x-capture-restart-turn1.svg b/image/stock_icons/16x16/x-capture-restart-turn1.svg
index 8d824a3ba1..8d824a3ba1 100644
--- a/image/toolbar/16x16/x-capture-restart-turn1.svg
+++ b/image/stock_icons/16x16/x-capture-restart-turn1.svg
diff --git a/image/toolbar/16x16/x-capture-restart-turn2.svg b/image/stock_icons/16x16/x-capture-restart-turn2.svg
index ba3cf215bd..ba3cf215bd 100644
--- a/image/toolbar/16x16/x-capture-restart-turn2.svg
+++ b/image/stock_icons/16x16/x-capture-restart-turn2.svg
diff --git a/image/toolbar/16x16/x-capture-restart.png b/image/stock_icons/16x16/x-capture-restart.png
index fb21b2884b..fb21b2884b 100644
--- a/image/toolbar/16x16/x-capture-restart.png
+++ b/image/stock_icons/16x16/x-capture-restart.png
diff --git a/image/toolbar/16x16/x-capture-restart@2x.png b/image/stock_icons/16x16/x-capture-restart@2x.png
index 7cb85c0a02..7cb85c0a02 100644
--- a/image/toolbar/16x16/x-capture-restart@2x.png
+++ b/image/stock_icons/16x16/x-capture-restart@2x.png
diff --git a/image/toolbar/16x16/x-capture-start.on.png b/image/stock_icons/16x16/x-capture-start.on.png
index 9d1fd1ac80..9d1fd1ac80 100644
--- a/image/toolbar/16x16/x-capture-start.on.png
+++ b/image/stock_icons/16x16/x-capture-start.on.png
diff --git a/image/toolbar/16x16/x-capture-start.on.svg b/image/stock_icons/16x16/x-capture-start.on.svg
index 8e2f4144c1..8e2f4144c1 100644
--- a/image/toolbar/16x16/x-capture-start.on.svg
+++ b/image/stock_icons/16x16/x-capture-start.on.svg
diff --git a/image/toolbar/16x16/x-capture-start.on@2x.png b/image/stock_icons/16x16/x-capture-start.on@2x.png
index 3bd5c5f7d8..3bd5c5f7d8 100644
--- a/image/toolbar/16x16/x-capture-start.on@2x.png
+++ b/image/stock_icons/16x16/x-capture-start.on@2x.png
diff --git a/image/toolbar/16x16/x-capture-start.png b/image/stock_icons/16x16/x-capture-start.png
index a80f3baa4b..a80f3baa4b 100644
--- a/image/toolbar/16x16/x-capture-start.png
+++ b/image/stock_icons/16x16/x-capture-start.png
diff --git a/image/toolbar/16x16/x-capture-start.svg b/image/stock_icons/16x16/x-capture-start.svg
index fbadf4581b..fbadf4581b 100644
--- a/image/toolbar/16x16/x-capture-start.svg
+++ b/image/stock_icons/16x16/x-capture-start.svg
diff --git a/image/toolbar/16x16/x-capture-start@2x.png b/image/stock_icons/16x16/x-capture-start@2x.png
index c1a676dace..c1a676dace 100644
--- a/image/toolbar/16x16/x-capture-start@2x.png
+++ b/image/stock_icons/16x16/x-capture-start@2x.png
diff --git a/image/toolbar/16x16/x-capture-stop-red.svg b/image/stock_icons/16x16/x-capture-stop-red.svg
index 42e138902b..42e138902b 100644
--- a/image/toolbar/16x16/x-capture-stop-red.svg
+++ b/image/stock_icons/16x16/x-capture-stop-red.svg
diff --git a/image/toolbar/16x16/x-capture-stop-white.svg b/image/stock_icons/16x16/x-capture-stop-white.svg
index dd6bf9f082..dd6bf9f082 100644
--- a/image/toolbar/16x16/x-capture-stop-white.svg
+++ b/image/stock_icons/16x16/x-capture-stop-white.svg
diff --git a/image/toolbar/16x16/x-capture-stop.png b/image/stock_icons/16x16/x-capture-stop.png
index 059cca395e..059cca395e 100644
--- a/image/toolbar/16x16/x-capture-stop.png
+++ b/image/stock_icons/16x16/x-capture-stop.png
diff --git a/image/toolbar/16x16/x-capture-stop@2x.png b/image/stock_icons/16x16/x-capture-stop@2x.png
index 2c9d12e201..2c9d12e201 100644
--- a/image/toolbar/16x16/x-capture-stop@2x.png
+++ b/image/stock_icons/16x16/x-capture-stop@2x.png
diff --git a/image/toolbar/16x16/x-colorize-packets.png b/image/stock_icons/16x16/x-colorize-packets.png
index 3509c1f50e..3509c1f50e 100644
--- a/image/toolbar/16x16/x-colorize-packets.png
+++ b/image/stock_icons/16x16/x-colorize-packets.png
diff --git a/image/toolbar/16x16/x-colorize-packets.svg b/image/stock_icons/16x16/x-colorize-packets.svg
index 7c64eeae42..7c64eeae42 100644
--- a/image/toolbar/16x16/x-colorize-packets.svg
+++ b/image/stock_icons/16x16/x-colorize-packets.svg
diff --git a/image/toolbar/16x16/x-colorize-packets@2x.png b/image/stock_icons/16x16/x-colorize-packets@2x.png
index 8e8693a91a..8e8693a91a 100644
--- a/image/toolbar/16x16/x-colorize-packets@2x.png
+++ b/image/stock_icons/16x16/x-colorize-packets@2x.png
diff --git a/image/toolbar/16x16/x-resize-columns.png b/image/stock_icons/16x16/x-resize-columns.png
index ce64c73b37..ce64c73b37 100644
--- a/image/toolbar/16x16/x-resize-columns.png
+++ b/image/stock_icons/16x16/x-resize-columns.png
diff --git a/image/toolbar/16x16/x-resize-columns.svg b/image/stock_icons/16x16/x-resize-columns.svg
index 51bf1cf3eb..51bf1cf3eb 100644
--- a/image/toolbar/16x16/x-resize-columns.svg
+++ b/image/stock_icons/16x16/x-resize-columns.svg
diff --git a/image/toolbar/16x16/x-resize-columns@2x.png b/image/stock_icons/16x16/x-resize-columns@2x.png
index 7034c0b346..7034c0b346 100644
--- a/image/toolbar/16x16/x-resize-columns@2x.png
+++ b/image/stock_icons/16x16/x-resize-columns@2x.png
diff --git a/image/toolbar/16x16/x-stay-last.png b/image/stock_icons/16x16/x-stay-last.png
index dd2f5c6d9a..dd2f5c6d9a 100644
--- a/image/toolbar/16x16/x-stay-last.png
+++ b/image/stock_icons/16x16/x-stay-last.png
diff --git a/image/toolbar/16x16/x-stay-last.svg b/image/stock_icons/16x16/x-stay-last.svg
index 2962556869..2962556869 100644
--- a/image/toolbar/16x16/x-stay-last.svg
+++ b/image/stock_icons/16x16/x-stay-last.svg
diff --git a/image/toolbar/16x16/x-stay-last@2x.png b/image/stock_icons/16x16/x-stay-last@2x.png
index 95e913b6dc..95e913b6dc 100644
--- a/image/toolbar/16x16/x-stay-last@2x.png
+++ b/image/stock_icons/16x16/x-stay-last@2x.png
diff --git a/image/toolbar/16x16/zoom-in.png b/image/stock_icons/16x16/zoom-in.png
index 993841e66a..993841e66a 100644
--- a/image/toolbar/16x16/zoom-in.png
+++ b/image/stock_icons/16x16/zoom-in.png
diff --git a/image/toolbar/16x16/zoom-in.svg b/image/stock_icons/16x16/zoom-in.svg
index 9604c17452..9604c17452 100644
--- a/image/toolbar/16x16/zoom-in.svg
+++ b/image/stock_icons/16x16/zoom-in.svg
diff --git a/image/toolbar/16x16/zoom-in@2x.png b/image/stock_icons/16x16/zoom-in@2x.png
index 8a0a28db38..8a0a28db38 100644
--- a/image/toolbar/16x16/zoom-in@2x.png
+++ b/image/stock_icons/16x16/zoom-in@2x.png
diff --git a/image/toolbar/16x16/zoom-original.png b/image/stock_icons/16x16/zoom-original.png
index 78c21c2d4e..78c21c2d4e 100644
--- a/image/toolbar/16x16/zoom-original.png
+++ b/image/stock_icons/16x16/zoom-original.png
diff --git a/image/toolbar/16x16/zoom-original.svg b/image/stock_icons/16x16/zoom-original.svg
index ef8541e6a9..ef8541e6a9 100644
--- a/image/toolbar/16x16/zoom-original.svg
+++ b/image/stock_icons/16x16/zoom-original.svg
diff --git a/image/toolbar/16x16/zoom-original@2x.png b/image/stock_icons/16x16/zoom-original@2x.png
index 212900e86c..212900e86c 100644
--- a/image/toolbar/16x16/zoom-original@2x.png
+++ b/image/stock_icons/16x16/zoom-original@2x.png
diff --git a/image/toolbar/16x16/zoom-out.png b/image/stock_icons/16x16/zoom-out.png
index 7fa79bf4c9..7fa79bf4c9 100644
--- a/image/toolbar/16x16/zoom-out.png
+++ b/image/stock_icons/16x16/zoom-out.png
diff --git a/image/toolbar/16x16/zoom-out.svg b/image/stock_icons/16x16/zoom-out.svg
index d56b57f608..d56b57f608 100644
--- a/image/toolbar/16x16/zoom-out.svg
+++ b/image/stock_icons/16x16/zoom-out.svg
diff --git a/image/toolbar/16x16/zoom-out@2x.png b/image/stock_icons/16x16/zoom-out@2x.png
index b41eed9915..b41eed9915 100644
--- a/image/toolbar/16x16/zoom-out@2x.png
+++ b/image/stock_icons/16x16/zoom-out@2x.png
diff --git a/image/toolbar/24x14/x-filter-apply.active.png b/image/stock_icons/24x14/x-filter-apply.active.png
index af62445f4d..af62445f4d 100644
--- a/image/toolbar/24x14/x-filter-apply.active.png
+++ b/image/stock_icons/24x14/x-filter-apply.active.png
diff --git a/image/toolbar/24x14/x-filter-apply.active.svg b/image/stock_icons/24x14/x-filter-apply.active.svg
index ad0b22fa68..ad0b22fa68 100644
--- a/image/toolbar/24x14/x-filter-apply.active.svg
+++ b/image/stock_icons/24x14/x-filter-apply.active.svg
diff --git a/image/toolbar/24x14/x-filter-apply.active@2x.png b/image/stock_icons/24x14/x-filter-apply.active@2x.png
index 87d65a8d22..87d65a8d22 100644
--- a/image/toolbar/24x14/x-filter-apply.active@2x.png
+++ b/image/stock_icons/24x14/x-filter-apply.active@2x.png
diff --git a/image/toolbar/24x14/x-filter-apply.png b/image/stock_icons/24x14/x-filter-apply.png
index cf212fa052..cf212fa052 100644
--- a/image/toolbar/24x14/x-filter-apply.png
+++ b/image/stock_icons/24x14/x-filter-apply.png
diff --git a/image/toolbar/24x14/x-filter-apply.selected.png b/image/stock_icons/24x14/x-filter-apply.selected.png
index 7aa4dd9ade..7aa4dd9ade 100644
--- a/image/toolbar/24x14/x-filter-apply.selected.png
+++ b/image/stock_icons/24x14/x-filter-apply.selected.png
diff --git a/image/toolbar/24x14/x-filter-apply.selected.svg b/image/stock_icons/24x14/x-filter-apply.selected.svg
index d1489ddaf3..d1489ddaf3 100644
--- a/image/toolbar/24x14/x-filter-apply.selected.svg
+++ b/image/stock_icons/24x14/x-filter-apply.selected.svg
diff --git a/image/toolbar/24x14/x-filter-apply.selected@2x.png b/image/stock_icons/24x14/x-filter-apply.selected@2x.png
index 14f281b512..14f281b512 100644
--- a/image/toolbar/24x14/x-filter-apply.selected@2x.png
+++ b/image/stock_icons/24x14/x-filter-apply.selected@2x.png
diff --git a/image/toolbar/24x14/x-filter-apply.svg b/image/stock_icons/24x14/x-filter-apply.svg
index d795e46c03..d795e46c03 100644
--- a/image/toolbar/24x14/x-filter-apply.svg
+++ b/image/stock_icons/24x14/x-filter-apply.svg
diff --git a/image/toolbar/24x14/x-filter-apply@2x.png b/image/stock_icons/24x14/x-filter-apply@2x.png
index 952b292ea0..952b292ea0 100644
--- a/image/toolbar/24x14/x-filter-apply@2x.png
+++ b/image/stock_icons/24x14/x-filter-apply@2x.png
diff --git a/image/toolbar/24x24/edit-find.png b/image/stock_icons/24x24/edit-find.png
index f739ea9880..f739ea9880 100644
--- a/image/toolbar/24x24/edit-find.png
+++ b/image/stock_icons/24x24/edit-find.png
diff --git a/image/toolbar/24x24/edit-find.svg b/image/stock_icons/24x24/edit-find.svg
index 67497daabe..67497daabe 100644
--- a/image/toolbar/24x24/edit-find.svg
+++ b/image/stock_icons/24x24/edit-find.svg
diff --git a/image/toolbar/24x24/edit-find@2x.png b/image/stock_icons/24x24/edit-find@2x.png
index 98ae655ffa..98ae655ffa 100644
--- a/image/toolbar/24x24/edit-find@2x.png
+++ b/image/stock_icons/24x24/edit-find@2x.png
diff --git a/image/toolbar/24x24/go-first.png b/image/stock_icons/24x24/go-first.png
index 95b485a04f..95b485a04f 100644
--- a/image/toolbar/24x24/go-first.png
+++ b/image/stock_icons/24x24/go-first.png
diff --git a/image/toolbar/24x24/go-first.svg b/image/stock_icons/24x24/go-first.svg
index c8973891e7..c8973891e7 100644
--- a/image/toolbar/24x24/go-first.svg
+++ b/image/stock_icons/24x24/go-first.svg
diff --git a/image/toolbar/24x24/go-first@2x.png b/image/stock_icons/24x24/go-first@2x.png
index 21c81dcbbd..21c81dcbbd 100644
--- a/image/toolbar/24x24/go-first@2x.png
+++ b/image/stock_icons/24x24/go-first@2x.png
diff --git a/image/toolbar/24x24/go-jump.png b/image/stock_icons/24x24/go-jump.png
index cc13792d2e..cc13792d2e 100644
--- a/image/toolbar/24x24/go-jump.png
+++ b/image/stock_icons/24x24/go-jump.png
diff --git a/image/toolbar/24x24/go-jump.svg b/image/stock_icons/24x24/go-jump.svg
index 6a6a1c5be1..6a6a1c5be1 100644
--- a/image/toolbar/24x24/go-jump.svg
+++ b/image/stock_icons/24x24/go-jump.svg
diff --git a/image/toolbar/24x24/go-jump@2x.png b/image/stock_icons/24x24/go-jump@2x.png
index 49677be9ae..49677be9ae 100644
--- a/image/toolbar/24x24/go-jump@2x.png
+++ b/image/stock_icons/24x24/go-jump@2x.png
diff --git a/image/toolbar/24x24/go-last.png b/image/stock_icons/24x24/go-last.png
index 78ea4b706b..78ea4b706b 100644
--- a/image/toolbar/24x24/go-last.png
+++ b/image/stock_icons/24x24/go-last.png
diff --git a/image/toolbar/24x24/go-last.svg b/image/stock_icons/24x24/go-last.svg
index cde521a1b3..cde521a1b3 100644
--- a/image/toolbar/24x24/go-last.svg
+++ b/image/stock_icons/24x24/go-last.svg
diff --git a/image/toolbar/24x24/go-last@2x.png b/image/stock_icons/24x24/go-last@2x.png
index 742ed28d24..742ed28d24 100644
--- a/image/toolbar/24x24/go-last@2x.png
+++ b/image/stock_icons/24x24/go-last@2x.png
diff --git a/image/toolbar/24x24/go-next.png b/image/stock_icons/24x24/go-next.png
index 0bc6a15620..0bc6a15620 100644
--- a/image/toolbar/24x24/go-next.png
+++ b/image/stock_icons/24x24/go-next.png
diff --git a/image/toolbar/24x24/go-next.svg b/image/stock_icons/24x24/go-next.svg
index fe9e024394..fe9e024394 100644
--- a/image/toolbar/24x24/go-next.svg
+++ b/image/stock_icons/24x24/go-next.svg
diff --git a/image/toolbar/24x24/go-next@2x.png b/image/stock_icons/24x24/go-next@2x.png
index f25a5dbaa4..f25a5dbaa4 100644
--- a/image/toolbar/24x24/go-next@2x.png
+++ b/image/stock_icons/24x24/go-next@2x.png
diff --git a/image/toolbar/24x24/go-previous.png b/image/stock_icons/24x24/go-previous.png
index 6870ea2fbe..6870ea2fbe 100644
--- a/image/toolbar/24x24/go-previous.png
+++ b/image/stock_icons/24x24/go-previous.png
diff --git a/image/toolbar/24x24/go-previous.svg b/image/stock_icons/24x24/go-previous.svg
index 93937953cd..93937953cd 100644
--- a/image/toolbar/24x24/go-previous.svg
+++ b/image/stock_icons/24x24/go-previous.svg
diff --git a/image/toolbar/24x24/go-previous@2x.png b/image/stock_icons/24x24/go-previous@2x.png
index 7f23c8fb64..7f23c8fb64 100644
--- a/image/toolbar/24x24/go-previous@2x.png
+++ b/image/stock_icons/24x24/go-previous@2x.png
diff --git a/image/toolbar/24x24/x-capture-file-close.png b/image/stock_icons/24x24/x-capture-file-close.png
index dab2f84ce0..dab2f84ce0 100644
--- a/image/toolbar/24x24/x-capture-file-close.png
+++ b/image/stock_icons/24x24/x-capture-file-close.png
diff --git a/image/toolbar/24x24/x-capture-file-close.svg b/image/stock_icons/24x24/x-capture-file-close.svg
index e74a6467bc..e74a6467bc 100644
--- a/image/toolbar/24x24/x-capture-file-close.svg
+++ b/image/stock_icons/24x24/x-capture-file-close.svg
diff --git a/image/toolbar/24x24/x-capture-file-close@2x.png b/image/stock_icons/24x24/x-capture-file-close@2x.png
index 4ca5b80675..4ca5b80675 100644
--- a/image/toolbar/24x24/x-capture-file-close@2x.png
+++ b/image/stock_icons/24x24/x-capture-file-close@2x.png
diff --git a/image/toolbar/24x24/x-capture-file-close@2x.svg b/image/stock_icons/24x24/x-capture-file-close@2x.svg
index 9d657ad54c..9d657ad54c 100644
--- a/image/toolbar/24x24/x-capture-file-close@2x.svg
+++ b/image/stock_icons/24x24/x-capture-file-close@2x.svg
diff --git a/image/toolbar/24x24/x-capture-file-reload.png b/image/stock_icons/24x24/x-capture-file-reload.png
index 22e6edb21e..22e6edb21e 100644
--- a/image/toolbar/24x24/x-capture-file-reload.png
+++ b/image/stock_icons/24x24/x-capture-file-reload.png
diff --git a/image/toolbar/24x24/x-capture-file-reload.svg b/image/stock_icons/24x24/x-capture-file-reload.svg
index e244d08a03..e244d08a03 100644
--- a/image/toolbar/24x24/x-capture-file-reload.svg
+++ b/image/stock_icons/24x24/x-capture-file-reload.svg
diff --git a/image/toolbar/24x24/x-capture-file-reload@2x.png b/image/stock_icons/24x24/x-capture-file-reload@2x.png
index e56a0b8beb..e56a0b8beb 100644
--- a/image/toolbar/24x24/x-capture-file-reload@2x.png
+++ b/image/stock_icons/24x24/x-capture-file-reload@2x.png
diff --git a/image/toolbar/24x24/x-capture-file-reload@2x.svg b/image/stock_icons/24x24/x-capture-file-reload@2x.svg
index 13516064e8..df81cb7370 100644
--- a/image/toolbar/24x24/x-capture-file-reload@2x.svg
+++ b/image/stock_icons/24x24/x-capture-file-reload@2x.svg
@@ -84,7 +84,6 @@
      id="layer1"
      transform="translate(0,-1004.3622)">
     <image
-       sodipodi:absref="/Users/gcombs/Development/wireshark/image/toolbar/24x24/../../WiresharkDoc-48.png"
        xlink:href="../../WiresharkDoc-48.png"
        width="48"
        height="48"
diff --git a/image/toolbar/24x24/x-capture-file-save.png b/image/stock_icons/24x24/x-capture-file-save.png
index 48ef2525d0..48ef2525d0 100644
--- a/image/toolbar/24x24/x-capture-file-save.png
+++ b/image/stock_icons/24x24/x-capture-file-save.png
diff --git a/image/toolbar/24x24/x-capture-file-save.svg b/image/stock_icons/24x24/x-capture-file-save.svg
index b8d3cfc7cd..b8d3cfc7cd 100644
--- a/image/toolbar/24x24/x-capture-file-save.svg
+++ b/image/stock_icons/24x24/x-capture-file-save.svg
diff --git a/image/toolbar/24x24/x-capture-file-save@2x.png b/image/stock_icons/24x24/x-capture-file-save@2x.png
index ccc92d61f8..ccc92d61f8 100644
--- a/image/toolbar/24x24/x-capture-file-save@2x.png
+++ b/image/stock_icons/24x24/x-capture-file-save@2x.png
diff --git a/image/toolbar/24x24/x-capture-file-save@2x.svg b/image/stock_icons/24x24/x-capture-file-save@2x.svg
index deafd1719d..deafd1719d 100644
--- a/image/toolbar/24x24/x-capture-file-save@2x.svg
+++ b/image/stock_icons/24x24/x-capture-file-save@2x.svg
diff --git a/image/toolbar/24x24/x-capture-options-gear.svg b/image/stock_icons/24x24/x-capture-options-gear.svg
index c47e5d1a44..c47e5d1a44 100644
--- a/image/toolbar/24x24/x-capture-options-gear.svg
+++ b/image/stock_icons/24x24/x-capture-options-gear.svg
diff --git a/image/toolbar/24x24/x-capture-options-wrench.svg b/image/stock_icons/24x24/x-capture-options-wrench.svg
index f3a40f3e7a..f3a40f3e7a 100644
--- a/image/toolbar/24x24/x-capture-options-wrench.svg
+++ b/image/stock_icons/24x24/x-capture-options-wrench.svg
diff --git a/image/toolbar/24x24/x-capture-options.png b/image/stock_icons/24x24/x-capture-options.png
index a3384e6aca..a3384e6aca 100644
--- a/image/toolbar/24x24/x-capture-options.png
+++ b/image/stock_icons/24x24/x-capture-options.png
diff --git a/image/toolbar/24x24/x-capture-options@2x.png b/image/stock_icons/24x24/x-capture-options@2x.png
index 7ee5c74aff..7ee5c74aff 100644
--- a/image/toolbar/24x24/x-capture-options@2x.png
+++ b/image/stock_icons/24x24/x-capture-options@2x.png
diff --git a/image/toolbar/24x24/x-capture-restart-fin.svg b/image/stock_icons/24x24/x-capture-restart-fin.svg
index dd32fa99db..dd32fa99db 100644
--- a/image/toolbar/24x24/x-capture-restart-fin.svg
+++ b/image/stock_icons/24x24/x-capture-restart-fin.svg
diff --git a/image/toolbar/24x24/x-capture-restart-triangle1.svg b/image/stock_icons/24x24/x-capture-restart-triangle1.svg
index 282152c80d..282152c80d 100644
--- a/image/toolbar/24x24/x-capture-restart-triangle1.svg
+++ b/image/stock_icons/24x24/x-capture-restart-triangle1.svg
diff --git a/image/toolbar/24x24/x-capture-restart-triangle2.svg b/image/stock_icons/24x24/x-capture-restart-triangle2.svg
index 5e65e22574..5e65e22574 100644
--- a/image/toolbar/24x24/x-capture-restart-triangle2.svg
+++ b/image/stock_icons/24x24/x-capture-restart-triangle2.svg
diff --git a/image/toolbar/24x24/x-capture-restart-turn1.svg b/image/stock_icons/24x24/x-capture-restart-turn1.svg
index be34730e84..be34730e84 100644
--- a/image/toolbar/24x24/x-capture-restart-turn1.svg
+++ b/image/stock_icons/24x24/x-capture-restart-turn1.svg
diff --git a/image/toolbar/24x24/x-capture-restart-turn2.svg b/image/stock_icons/24x24/x-capture-restart-turn2.svg
index b2187d9415..b2187d9415 100644
--- a/image/toolbar/24x24/x-capture-restart-turn2.svg
+++ b/image/stock_icons/24x24/x-capture-restart-turn2.svg
diff --git a/image/toolbar/24x24/x-capture-restart.png b/image/stock_icons/24x24/x-capture-restart.png
index eb5eb0b654..eb5eb0b654 100644
--- a/image/toolbar/24x24/x-capture-restart.png
+++ b/image/stock_icons/24x24/x-capture-restart.png
diff --git a/image/toolbar/24x24/x-capture-restart@2x.png b/image/stock_icons/24x24/x-capture-restart@2x.png
index 0ee183c082..0ee183c082 100644
--- a/image/toolbar/24x24/x-capture-restart@2x.png
+++ b/image/stock_icons/24x24/x-capture-restart@2x.png
diff --git a/image/toolbar/24x24/x-capture-start.on.png b/image/stock_icons/24x24/x-capture-start.on.png
index ac5c5cd1b1..ac5c5cd1b1 100644
--- a/image/toolbar/24x24/x-capture-start.on.png
+++ b/image/stock_icons/24x24/x-capture-start.on.png
diff --git a/image/toolbar/24x24/x-capture-start.on.svg b/image/stock_icons/24x24/x-capture-start.on.svg
index 38411e8a54..38411e8a54 100644
--- a/image/toolbar/24x24/x-capture-start.on.svg
+++ b/image/stock_icons/24x24/x-capture-start.on.svg
diff --git a/image/toolbar/24x24/x-capture-start.on@2x.png b/image/stock_icons/24x24/x-capture-start.on@2x.png
index 75a983b7e7..75a983b7e7 100644
--- a/image/toolbar/24x24/x-capture-start.on@2x.png
+++ b/image/stock_icons/24x24/x-capture-start.on@2x.png
diff --git a/image/toolbar/24x24/x-capture-start.png b/image/stock_icons/24x24/x-capture-start.png
index ac0a3d2b02..ac0a3d2b02 100644
--- a/image/toolbar/24x24/x-capture-start.png
+++ b/image/stock_icons/24x24/x-capture-start.png
diff --git a/image/toolbar/24x24/x-capture-start.svg b/image/stock_icons/24x24/x-capture-start.svg
index 099c716f4c..099c716f4c 100644
--- a/image/toolbar/24x24/x-capture-start.svg
+++ b/image/stock_icons/24x24/x-capture-start.svg
diff --git a/image/toolbar/24x24/x-capture-start@2x.png b/image/stock_icons/24x24/x-capture-start@2x.png
index 414fa921b1..414fa921b1 100644
--- a/image/toolbar/24x24/x-capture-start@2x.png
+++ b/image/stock_icons/24x24/x-capture-start@2x.png
diff --git a/image/toolbar/24x24/x-capture-stop-red.svg b/image/stock_icons/24x24/x-capture-stop-red.svg
index 2cff0b6994..2cff0b6994 100644
--- a/image/toolbar/24x24/x-capture-stop-red.svg
+++ b/image/stock_icons/24x24/x-capture-stop-red.svg
diff --git a/image/toolbar/24x24/x-capture-stop-white.svg b/image/stock_icons/24x24/x-capture-stop-white.svg
index 98880b9d8b..98880b9d8b 100644
--- a/image/toolbar/24x24/x-capture-stop-white.svg
+++ b/image/stock_icons/24x24/x-capture-stop-white.svg
diff --git a/image/toolbar/24x24/x-capture-stop.png b/image/stock_icons/24x24/x-capture-stop.png
index 7a64753dd3..7a64753dd3 100644
--- a/image/toolbar/24x24/x-capture-stop.png
+++ b/image/stock_icons/24x24/x-capture-stop.png
diff --git a/image/toolbar/24x24/x-capture-stop@2x.png b/image/stock_icons/24x24/x-capture-stop@2x.png
index 6cb456cfc2..6cb456cfc2 100644
--- a/image/toolbar/24x24/x-capture-stop@2x.png
+++ b/image/stock_icons/24x24/x-capture-stop@2x.png
diff --git a/image/toolbar/24x24/x-colorize-packets.png b/image/stock_icons/24x24/x-colorize-packets.png
index 624b7eae46..624b7eae46 100644
--- a/image/toolbar/24x24/x-colorize-packets.png
+++ b/image/stock_icons/24x24/x-colorize-packets.png
diff --git a/image/toolbar/24x24/x-colorize-packets.svg b/image/stock_icons/24x24/x-colorize-packets.svg
index c986c4f504..c986c4f504 100644
--- a/image/toolbar/24x24/x-colorize-packets.svg
+++ b/image/stock_icons/24x24/x-colorize-packets.svg
diff --git a/image/toolbar/24x24/x-colorize-packets@2x.png b/image/stock_icons/24x24/x-colorize-packets@2x.png
index 50079694a2..50079694a2 100644
--- a/image/toolbar/24x24/x-colorize-packets@2x.png
+++ b/image/stock_icons/24x24/x-colorize-packets@2x.png
diff --git a/image/toolbar/24x24/x-resize-columns-motion.svg b/image/stock_icons/24x24/x-resize-columns-motion.svg
index 3e37afee05..3e37afee05 100644
--- a/image/toolbar/24x24/x-resize-columns-motion.svg
+++ b/image/stock_icons/24x24/x-resize-columns-motion.svg
diff --git a/image/toolbar/24x24/x-resize-columns.png b/image/stock_icons/24x24/x-resize-columns.png
index f79cf3216f..f79cf3216f 100644
--- a/image/toolbar/24x24/x-resize-columns.png
+++ b/image/stock_icons/24x24/x-resize-columns.png
diff --git a/image/toolbar/24x24/x-resize-columns.svg b/image/stock_icons/24x24/x-resize-columns.svg
index fd8f79bcc8..fd8f79bcc8 100644
--- a/image/toolbar/24x24/x-resize-columns.svg
+++ b/image/stock_icons/24x24/x-resize-columns.svg
diff --git a/image/toolbar/24x24/x-resize-columns@2x.png b/image/stock_icons/24x24/x-resize-columns@2x.png
index 7c51e40fe5..7c51e40fe5 100644
--- a/image/toolbar/24x24/x-resize-columns@2x.png
+++ b/image/stock_icons/24x24/x-resize-columns@2x.png
diff --git a/image/toolbar/24x24/x-stay-last.png b/image/stock_icons/24x24/x-stay-last.png
index eba7ae54b2..eba7ae54b2 100644
--- a/image/toolbar/24x24/x-stay-last.png
+++ b/image/stock_icons/24x24/x-stay-last.png
diff --git a/image/toolbar/24x24/x-stay-last.svg b/image/stock_icons/24x24/x-stay-last.svg
index 2bbd401b6f..2bbd401b6f 100644
--- a/image/toolbar/24x24/x-stay-last.svg
+++ b/image/stock_icons/24x24/x-stay-last.svg
diff --git a/image/toolbar/24x24/x-stay-last@2x.png b/image/stock_icons/24x24/x-stay-last@2x.png
index 14d1a40d3e..14d1a40d3e 100644
--- a/image/toolbar/24x24/x-stay-last@2x.png
+++ b/image/stock_icons/24x24/x-stay-last@2x.png
diff --git a/image/toolbar/24x24/zoom-in.png b/image/stock_icons/24x24/zoom-in.png
index 0025c34c00..0025c34c00 100644
--- a/image/toolbar/24x24/zoom-in.png
+++ b/image/stock_icons/24x24/zoom-in.png
diff --git a/image/toolbar/24x24/zoom-in.svg b/image/stock_icons/24x24/zoom-in.svg
index bae0b0748d..bae0b0748d 100644
--- a/image/toolbar/24x24/zoom-in.svg
+++ b/image/stock_icons/24x24/zoom-in.svg
diff --git a/image/toolbar/24x24/zoom-in@2x.png b/image/stock_icons/24x24/zoom-in@2x.png
index f18d1981ec..f18d1981ec 100644
--- a/image/toolbar/24x24/zoom-in@2x.png
+++ b/image/stock_icons/24x24/zoom-in@2x.png
diff --git a/image/toolbar/24x24/zoom-original.png b/image/stock_icons/24x24/zoom-original.png
index c8bb23e388..c8bb23e388 100644
--- a/image/toolbar/24x24/zoom-original.png
+++ b/image/stock_icons/24x24/zoom-original.png
diff --git a/image/toolbar/24x24/zoom-original.svg b/image/stock_icons/24x24/zoom-original.svg
index 5f7c85a258..5f7c85a258 100644
--- a/image/toolbar/24x24/zoom-original.svg
+++ b/image/stock_icons/24x24/zoom-original.svg
diff --git a/image/toolbar/24x24/zoom-original@2x.png b/image/stock_icons/24x24/zoom-original@2x.png
index 2d574c0eb7..2d574c0eb7 100644
--- a/image/toolbar/24x24/zoom-original@2x.png
+++ b/image/stock_icons/24x24/zoom-original@2x.png
diff --git a/image/toolbar/24x24/zoom-out.png b/image/stock_icons/24x24/zoom-out.png
index e582655d3e..e582655d3e 100644
--- a/image/toolbar/24x24/zoom-out.png
+++ b/image/stock_icons/24x24/zoom-out.png
diff --git a/image/toolbar/24x24/zoom-out.svg b/image/stock_icons/24x24/zoom-out.svg
index 354f18f40d..354f18f40d 100644
--- a/image/toolbar/24x24/zoom-out.svg
+++ b/image/stock_icons/24x24/zoom-out.svg
diff --git a/image/toolbar/24x24/zoom-out@2x.png b/image/stock_icons/24x24/zoom-out@2x.png
index 48a1eee8ec..48a1eee8ec 100644
--- a/image/toolbar/24x24/zoom-out@2x.png
+++ b/image/stock_icons/24x24/zoom-out@2x.png
diff --git a/image/toolbar/svg-to-png.sh b/image/stock_icons/svg-to-png.sh
index bcdfa0cf58..bcdfa0cf58 100755
--- a/image/toolbar/svg-to-png.sh
+++ b/image/stock_icons/svg-to-png.sh
diff --git a/image/toolbar/svg/x-filter-apply.svg b/image/stock_icons/svg/x-filter-apply.svg
index defbcf4153..defbcf4153 100644
--- a/image/toolbar/svg/x-filter-apply.svg
+++ b/image/stock_icons/svg/x-filter-apply.svg
diff --git a/image/toolbar/svg/x-filter-bookmark.svg b/image/stock_icons/svg/x-filter-bookmark.svg
index 9f4fb36d32..9f4fb36d32 100644
--- a/image/toolbar/svg/x-filter-bookmark.svg
+++ b/image/stock_icons/svg/x-filter-bookmark.svg
diff --git a/image/toolbar/svg/x-filter-clear.svg b/image/stock_icons/svg/x-filter-clear.svg
index 9f4fb36d32..9f4fb36d32 100644
--- a/image/toolbar/svg/x-filter-clear.svg
+++ b/image/stock_icons/svg/x-filter-clear.svg
diff --git a/image/toolbar.qrc b/image/toolbar.qrc
deleted file mode 100644
index 26a4e21d42..0000000000
--- a/image/toolbar.qrc
+++ /dev/null
@@ -1,143 +0,0 @@
-<RCC>
-    <qresource prefix="/menu/help">
-        <file>wsicon16.png</file>
-        <file>wsicon-ask.png</file>
-    </qresource>
-    <qresource prefix="/stock">
-        <file>minus-8.png</file>
-        <file>plus-8.png</file>
-        <file>copy-8.png</file>
-        <file>delete_list.png</file>
-        <file>delete_list@2x.png</file>
-        <file>arrow_up.png</file>
-        <file>arrow_up@2x.png</file>
-        <file>arrow_down.png</file>
-        <file>arrow_down@2x.png</file>
-    </qresource>
-    <qresource prefix="/icons">
-        <file>toolbar/14x14/x-capture-comment-update.png</file>
-        <file>toolbar/14x14/x-capture-comment-update@2x.png</file>
-        <file>toolbar/14x14/x-capture-filter-bookmark.png</file>
-        <file>toolbar/14x14/x-capture-filter-bookmark@2x.png</file>
-        <file>toolbar/14x14/x-capture-filter-bookmark.active.png</file>
-        <file>toolbar/14x14/x-capture-filter-bookmark.active@2x.png</file>
-        <file>toolbar/14x14/x-capture-filter-bookmark.selected.png</file>
-        <file>toolbar/14x14/x-capture-filter-bookmark.selected@2x.png</file>
-        <file>toolbar/14x14/x-display-filter-bookmark.png</file>
-        <file>toolbar/14x14/x-display-filter-bookmark@2x.png</file>
-        <file>toolbar/14x14/x-display-filter-bookmark.active.png</file>
-        <file>toolbar/14x14/x-display-filter-bookmark.active@2x.png</file>
-        <file>toolbar/14x14/x-display-filter-bookmark.selected.png</file>
-        <file>toolbar/14x14/x-display-filter-bookmark.selected@2x.png</file>
-        <file>toolbar/14x14/x-expert-chat.png</file>
-        <file>toolbar/14x14/x-expert-chat@2x.png</file>
-        <file>toolbar/14x14/x-expert-error.png</file>
-        <file>toolbar/14x14/x-expert-error@2x.png</file>
-        <file>toolbar/14x14/x-expert-none.png</file>
-        <file>toolbar/14x14/x-expert-none@2x.png</file>
-        <file>toolbar/14x14/x-expert-note.png</file>
-        <file>toolbar/14x14/x-expert-note@2x.png</file>
-        <file>toolbar/14x14/x-expert-warn.png</file>
-        <file>toolbar/14x14/x-expert-warn@2x.png</file>
-        <file>toolbar/14x14/x-filter-clear.png</file>
-        <file>toolbar/14x14/x-filter-clear@2x.png</file>
-        <file>toolbar/14x14/x-filter-clear.active.png</file>
-        <file>toolbar/14x14/x-filter-clear.active@2x.png</file>
-        <file>toolbar/14x14/x-filter-clear.selected.png</file>
-        <file>toolbar/14x14/x-filter-clear.selected@2x.png</file>
-        <file>toolbar/14x14/x-filter-dropdown.png</file>
-        <file>toolbar/14x14/x-filter-dropdown@2x.png</file>
-        <file>toolbar/14x14/x-filter-matching-bookmark.png</file>
-        <file>toolbar/14x14/x-filter-matching-bookmark@2x.png</file>
-        <file>toolbar/14x14/x-filter-matching-bookmark.active.png</file>
-        <file>toolbar/14x14/x-filter-matching-bookmark.active@2x.png</file>
-        <file>toolbar/14x14/x-filter-matching-bookmark.selected.png</file>
-        <file>toolbar/14x14/x-filter-matching-bookmark.selected@2x.png</file>
-        <file>toolbar/16x16/edit-find.png</file>
-        <file>toolbar/16x16/edit-find@2x.png</file>
-        <file>toolbar/16x16/go-first.png</file>
-        <file>toolbar/16x16/go-first@2x.png</file>
-        <file>toolbar/16x16/go-jump.png</file>
-        <file>toolbar/16x16/go-jump@2x.png</file>
-        <file>toolbar/16x16/go-last.png</file>
-        <file>toolbar/16x16/go-last@2x.png</file>
-        <file>toolbar/16x16/go-next.png</file>
-        <file>toolbar/16x16/go-next@2x.png</file>
-        <file>toolbar/16x16/go-previous.png</file>
-        <file>toolbar/16x16/go-previous@2x.png</file>
-        <file>toolbar/16x16/x-capture-file-close.png</file>
-        <file>toolbar/16x16/x-capture-file-close@2x.png</file>
-        <file>toolbar/16x16/x-capture-file-save.png</file>
-        <file>toolbar/16x16/x-capture-file-save@2x.png</file>
-        <file>toolbar/16x16/x-capture-file-reload.png</file>
-        <file>toolbar/16x16/x-capture-file-reload@2x.png</file>
-        <file>toolbar/16x16/x-capture-options.png</file>
-        <file>toolbar/16x16/x-capture-options@2x.png</file>
-        <file>toolbar/16x16/x-capture-restart.png</file>
-        <file>toolbar/16x16/x-capture-restart@2x.png</file>
-        <file>toolbar/16x16/x-capture-start.on.png</file>
-        <file>toolbar/16x16/x-capture-start.on@2x.png</file>
-        <file>toolbar/16x16/x-capture-start.png</file>
-        <file>toolbar/16x16/x-capture-start@2x.png</file>
-        <file>toolbar/16x16/x-capture-stop.png</file>
-        <file>toolbar/16x16/x-capture-stop@2x.png</file>
-        <file>toolbar/16x16/x-colorize-packets.png</file>
-        <file>toolbar/16x16/x-colorize-packets@2x.png</file>
-        <file>toolbar/16x16/x-resize-columns.png</file>
-        <file>toolbar/16x16/x-resize-columns@2x.png</file>
-        <file>toolbar/16x16/x-stay-last.png</file>
-        <file>toolbar/16x16/x-stay-last@2x.png</file>
-        <file>toolbar/16x16/zoom-in.png</file>
-        <file>toolbar/16x16/zoom-in@2x.png</file>
-        <file>toolbar/16x16/zoom-original.png</file>
-        <file>toolbar/16x16/zoom-original@2x.png</file>
-        <file>toolbar/16x16/zoom-out.png</file>
-        <file>toolbar/16x16/zoom-out@2x.png</file>
-        <file>toolbar/24x14/x-filter-apply.png</file>
-        <file>toolbar/24x14/x-filter-apply@2x.png</file>
-        <file>toolbar/24x14/x-filter-apply.active.png</file>
-        <file>toolbar/24x14/x-filter-apply.active@2x.png</file>
-        <file>toolbar/24x14/x-filter-apply.selected.png</file>
-        <file>toolbar/24x14/x-filter-apply.selected@2x.png</file>
-        <file>toolbar/24x24/edit-find.png</file>
-        <file>toolbar/24x24/edit-find@2x.png</file>
-        <file>toolbar/24x24/go-first.png</file>
-        <file>toolbar/24x24/go-first@2x.png</file>
-        <file>toolbar/24x24/go-jump.png</file>
-        <file>toolbar/24x24/go-jump@2x.png</file>
-        <file>toolbar/24x24/go-last.png</file>
-        <file>toolbar/24x24/go-last@2x.png</file>
-        <file>toolbar/24x24/go-next.png</file>
-        <file>toolbar/24x24/go-next@2x.png</file>
-        <file>toolbar/24x24/go-previous.png</file>
-        <file>toolbar/24x24/go-previous@2x.png</file>
-        <file>toolbar/24x24/x-capture-file-reload.png</file>
-        <file>toolbar/24x24/x-capture-file-reload@2x.png</file>
-        <file>toolbar/24x24/x-capture-options.png</file>
-        <file>toolbar/24x24/x-capture-options@2x.png</file>
-        <file>toolbar/24x24/x-capture-restart.png</file>
-        <file>toolbar/24x24/x-capture-restart@2x.png</file>
-        <file>toolbar/24x24/x-capture-start.on.png</file>
-        <file>toolbar/24x24/x-capture-start.on@2x.png</file>
-        <file>toolbar/24x24/x-capture-start.png</file>
-        <file>toolbar/24x24/x-capture-start@2x.png</file>
-        <file>toolbar/24x24/x-capture-stop.png</file>
-        <file>toolbar/24x24/x-capture-stop@2x.png</file>
-        <file>toolbar/24x24/x-colorize-packets.png</file>
-        <file>toolbar/24x24/x-colorize-packets@2x.png</file>
-        <file>toolbar/24x24/x-resize-columns.png</file>
-        <file>toolbar/24x24/x-resize-columns@2x.png</file>
-        <file>toolbar/24x24/x-stay-last.png</file>
-        <file>toolbar/24x24/x-stay-last@2x.png</file>
-        <file>toolbar/24x24/zoom-in.png</file>
-        <file>toolbar/24x24/zoom-in@2x.png</file>
-        <file>toolbar/24x24/zoom-original.png</file>
-        <file>toolbar/24x24/zoom-original@2x.png</file>
-        <file>toolbar/24x24/zoom-out.png</file>
-        <file>toolbar/24x24/zoom-out@2x.png</file>
-        <file>toolbar/24x24/x-capture-file-close.png</file>
-        <file>toolbar/24x24/x-capture-file-close@2x.png</file>
-        <file>toolbar/24x24/x-capture-file-save.png</file>
-        <file>toolbar/24x24/x-capture-file-save@2x.png</file>
-    </qresource>
-</RCC>
diff --git a/tools/pre-commit-ignore.conf b/tools/pre-commit-ignore.conf
index 59c65dc086..27a860f63d 100644
--- a/tools/pre-commit-ignore.conf
+++ b/tools/pre-commit-ignore.conf
@@ -17,6 +17,7 @@ epan/nghttp2/*
 epan/wmem/wmem_strbuf.c
 epan/wmem/wmem_strutil.c
 extcap/*
+image/stock_icons/*
 tools/lemon/*
 wsutil/file_util.h
 wsutil/strptime.c
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index 391a47763c..33cfe073ee 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -323,15 +323,15 @@ imagedir = $(top_srcdir)/image
 
 pixbuf_csource_data = \
 	expert_chat_pb_data				\
-	$(imagedir)/toolbar/14x14/x-expert-chat.png	\
+	$(imagedir)/stock_icons/14x14/x-expert-chat.png	\
 	expert_error_pb_data				\
-	$(imagedir)/toolbar/14x14/x-expert-error.png	\
+	$(imagedir)/stock_icons/14x14/x-expert-error.png	\
 	expert_none_pb_data				\
-	$(imagedir)/toolbar/14x14/x-expert-none.png	\
+	$(imagedir)/stock_icons/14x14/x-expert-none.png	\
 	expert_note_pb_data				\
-	$(imagedir)/toolbar/14x14/x-expert-note.png	\
+	$(imagedir)/stock_icons/14x14/x-expert-note.png	\
 	expert_warn_pb_data				\
-	$(imagedir)/toolbar/14x14/x-expert-warn.png	\
+	$(imagedir)/stock_icons/14x14/x-expert-warn.png	\
 	expert_ok_pb_data				\
 	$(imagedir)/expert_ok.png			\
 	capture_comment_add_pb_data			\
@@ -365,25 +365,25 @@ pixbuf_csource_data = \
 	gnome_emblem_web_24_pb_data			\
 	$(imagedir)/toolbar/gnome_emblem_web_24.png	\
 	toolbar_wireshark_file_16_pb_data		\
-	$(imagedir)/toolbar/16x16/x-capture-file-save.png \
+	$(imagedir)/stock_icons/16x16/x-capture-file-save.png \
 	toolbar_wireshark_file_24_pb_data		\
-	$(imagedir)/toolbar/24x24/x-capture-file-save.png \
+	$(imagedir)/stock_icons/24x24/x-capture-file-save.png \
 	capture_options_alt1_16_pb_data			\
-	$(imagedir)/toolbar/16x16/x-capture-options.png \
+	$(imagedir)/stock_icons/16x16/x-capture-options.png \
 	capture_options_alt1_24_pb_data			\
-	$(imagedir)/toolbar/24x24/x-capture-options.png \
+	$(imagedir)/stock_icons/24x24/x-capture-options.png \
 	capture_restart_16_pb_data			\
-	$(imagedir)/toolbar/16x16/x-capture-restart.png \
+	$(imagedir)/stock_icons/16x16/x-capture-restart.png \
 	capture_restart_24_pb_data			\
-	$(imagedir)/toolbar/24x24/x-capture-restart.png \
+	$(imagedir)/stock_icons/24x24/x-capture-restart.png \
 	capture_start_16_pb_data			\
-	$(imagedir)/toolbar/16x16/x-capture-start.png	\
+	$(imagedir)/stock_icons/16x16/x-capture-start.png	\
 	capture_start_24_pb_data			\
-	$(imagedir)/toolbar/24x24/x-capture-start.png	\
+	$(imagedir)/stock_icons/24x24/x-capture-start.png	\
 	capture_stop_16_pb_data				\
-	$(imagedir)/toolbar/16x16/x-capture-stop.png	\
+	$(imagedir)/stock_icons/16x16/x-capture-stop.png	\
 	capture_stop_24_pb_data				\
-	$(imagedir)/toolbar/24x24/x-capture-stop.png	\
+	$(imagedir)/stock_icons/24x24/x-capture-stop.png	\
 	layout_1_pb_data 				\
 	$(imagedir)/layout_1.png			\
 	layout_2_pb_data				\
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index 7c288bfb35..6a64c3a13d 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -2037,7 +2037,7 @@ add_page(gchar *name, gchar *text, gboolean error)
   gtk_list_store_append (GTK_LIST_STORE(model), &iter);
   if (error) {
 #ifdef HAVE_GDK_GRESOURCE
-    icon = pixbuf_to_widget("/org/wireshark/image/toolbar/14x14/x-expert-error.png");
+    icon = pixbuf_to_widget("/org/wireshark/image/stock_icons/14x14/x-expert-error.png");
 #else
     icon = pixbuf_to_widget(expert_error_pb_data);
 #endif
diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c
index 8f6e1270a9..39ba71c59d 100644
--- a/ui/gtk/expert_comp_dlg.c
+++ b/ui/gtk/expert_comp_dlg.c
@@ -838,7 +838,7 @@ expert_comp_init(const char *opt_arg _U_, void* userdata _U_)
     hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
     if ( prefs.gui_expert_composite_eyecandy ) {
 #ifdef HAVE_GDK_GRESOURCE
-        image = pixbuf_to_widget("/org/wireshark/image/toolbar/14x14/x-expert-error.png");
+        image = pixbuf_to_widget("/org/wireshark/image/stock_icons/14x14/x-expert-error.png");
 #else
         image = pixbuf_to_widget(expert_error_pb_data);
 #endif
@@ -856,7 +856,7 @@ expert_comp_init(const char *opt_arg _U_, void* userdata _U_)
     hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
     if ( prefs.gui_expert_composite_eyecandy ) {
 #ifdef HAVE_GDK_GRESOURCE
-        image = pixbuf_to_widget("/org/wireshark/image/toolbar/14x14/x-expert-warn.png");
+        image = pixbuf_to_widget("/org/wireshark/image/stock_icons/14x14/x-expert-warn.png");
 #else
         image = pixbuf_to_widget(expert_warn_pb_data);
 #endif
@@ -875,7 +875,7 @@ expert_comp_init(const char *opt_arg _U_, void* userdata _U_)
     hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
     if ( prefs.gui_expert_composite_eyecandy ) {
 #ifdef HAVE_GDK_GRESOURCE
-        image = pixbuf_to_widget("/org/wireshark/image/toolbar/14x14/x-expert-note.png");
+        image = pixbuf_to_widget("/org/wireshark/image/stock_icons/14x14/x-expert-note.png");
 #else
         image = pixbuf_to_widget(expert_note_pb_data);
 #endif
@@ -893,7 +893,7 @@ expert_comp_init(const char *opt_arg _U_, void* userdata _U_)
     hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
     if ( prefs.gui_expert_composite_eyecandy ) {
 #ifdef HAVE_GDK_GRESOURCE
-        image = pixbuf_to_widget("/org/wireshark/image/toolbar/14x14/x-expert-chat.png");
+        image = pixbuf_to_widget("/org/wireshark/image/stock_icons/14x14/x-expert-chat.png");
 #else
         image = pixbuf_to_widget(expert_chat_pb_data);
 #endif
diff --git a/ui/gtk/main.gresources.xml b/ui/gtk/main.gresources.xml
index 54a4c6d8d9..9cbbfb9d34 100644
--- a/ui/gtk/main.gresources.xml
+++ b/ui/gtk/main.gresources.xml
@@ -43,23 +43,23 @@
         <file>image/toolbar/capture_interfaces_24.png</file>
         <file>image/toolbar/gnome_emblem_web_24.png</file>
 
-        <file>image/toolbar/14x14/x-expert-chat.png</file>
-        <file>image/toolbar/14x14/x-expert-error.png</file>
-        <file>image/toolbar/14x14/x-expert-none.png</file>
-        <file>image/toolbar/14x14/x-expert-note.png</file>
-        <file>image/toolbar/14x14/x-expert-warn.png</file>
+        <file>image/stock_icons/14x14/x-expert-chat.png</file>
+        <file>image/stock_icons/14x14/x-expert-error.png</file>
+        <file>image/stock_icons/14x14/x-expert-none.png</file>
+        <file>image/stock_icons/14x14/x-expert-note.png</file>
+        <file>image/stock_icons/14x14/x-expert-warn.png</file>
         <file>image/expert_ok.png</file>
 
-        <file>image/toolbar/16x16/x-capture-file-save.png</file>
-        <file>image/toolbar/16x16/x-capture-options.png</file>
-        <file>image/toolbar/16x16/x-capture-restart.png</file>
-        <file>image/toolbar/16x16/x-capture-start.png</file>
-        <file>image/toolbar/16x16/x-capture-stop.png</file>
+        <file>image/stock_icons/16x16/x-capture-file-save.png</file>
+        <file>image/stock_icons/16x16/x-capture-options.png</file>
+        <file>image/stock_icons/16x16/x-capture-restart.png</file>
+        <file>image/stock_icons/16x16/x-capture-start.png</file>
+        <file>image/stock_icons/16x16/x-capture-stop.png</file>
 
-        <file>image/toolbar/24x24/x-capture-file-save.png</file>
-        <file>image/toolbar/24x24/x-capture-options.png</file>
-        <file>image/toolbar/24x24/x-capture-restart.png</file>
-        <file>image/toolbar/24x24/x-capture-start.png</file>
-        <file>image/toolbar/24x24/x-capture-stop.png</file>
+        <file>image/stock_icons/24x24/x-capture-file-save.png</file>
+        <file>image/stock_icons/24x24/x-capture-options.png</file>
+        <file>image/stock_icons/24x24/x-capture-restart.png</file>
+        <file>image/stock_icons/24x24/x-capture-start.png</file>
+        <file>image/stock_icons/24x24/x-capture-stop.png</file>
     </gresource>
 </gresources>
diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c
index 45f1ef0129..f0925160f9 100644
--- a/ui/gtk/main_statusbar.c
+++ b/ui/gtk/main_statusbar.c
@@ -576,28 +576,28 @@ status_expert_new(void)
 {
     GtkWidget *expert_image;
 
-    expert_image = PIXBUF_TO_WIDGET(expert_error_pb_data, "/org/wireshark/image/toolbar/14x14/x-expert-error.png");
+    expert_image = PIXBUF_TO_WIDGET(expert_error_pb_data, "/org/wireshark/image/stock_icons/14x14/x-expert-error.png");
     gtk_widget_set_tooltip_text(expert_image, "ERROR is the highest expert info level");
     gtk_widget_show(expert_image);
     expert_info_error = gtk_event_box_new();
     gtk_container_add(GTK_CONTAINER(expert_info_error), expert_image);
     g_signal_connect(expert_info_error, "button_press_event", G_CALLBACK(expert_comp_dlg_event_cb), NULL);
 
-    expert_image = PIXBUF_TO_WIDGET(expert_warn_pb_data, "/org/wireshark/image/toolbar/14x14/x-expert-warn.png");
+    expert_image = PIXBUF_TO_WIDGET(expert_warn_pb_data, "/org/wireshark/image/stock_icons/14x14/x-expert-warn.png");
     gtk_widget_set_tooltip_text(expert_image, "WARNING is the highest expert info level");
     gtk_widget_show(expert_image);
     expert_info_warn = gtk_event_box_new();
     gtk_container_add(GTK_CONTAINER(expert_info_warn), expert_image);
     g_signal_connect(expert_info_warn, "button_press_event", G_CALLBACK(expert_comp_dlg_event_cb), NULL);
 
-    expert_image = PIXBUF_TO_WIDGET(expert_note_pb_data, "/org/wireshark/image/toolbar/14x14/x-expert-note.png");
+    expert_image = PIXBUF_TO_WIDGET(expert_note_pb_data, "/org/wireshark/image/stock_icons/14x14/x-expert-note.png");
     gtk_widget_set_tooltip_text(expert_image, "NOTE is the highest expert info level");
     gtk_widget_show(expert_image);
     expert_info_note = gtk_event_box_new();
     gtk_container_add(GTK_CONTAINER(expert_info_note), expert_image);
     g_signal_connect(expert_info_note, "button_press_event", G_CALLBACK(expert_comp_dlg_event_cb), NULL);
 
-    expert_image = PIXBUF_TO_WIDGET(expert_chat_pb_data, "/org/wireshark/image/toolbar/14x14/x-expert-chat.png");
+    expert_image = PIXBUF_TO_WIDGET(expert_chat_pb_data, "/org/wireshark/image/stock_icons/14x14/x-expert-chat.png");
     gtk_widget_set_tooltip_text(expert_image, "CHAT is the highest expert info level");
     gtk_widget_show(expert_image);
     expert_info_chat = gtk_event_box_new();
@@ -611,14 +611,14 @@ status_expert_new(void)
     gtk_container_add(GTK_CONTAINER(expert_info_comment), expert_image);
     g_signal_connect(expert_info_comment, "button_press_event", G_CALLBACK(expert_comp_dlg_event_cb), NULL);
 
-    expert_image = PIXBUF_TO_WIDGET(expert_none_pb_data, "/org/wireshark/image/toolbar/14x14/x-expert-none.png");
+    expert_image = PIXBUF_TO_WIDGET(expert_none_pb_data, "/org/wireshark/image/stock_icons/14x14/x-expert-none.png");
     gtk_widget_set_tooltip_text(expert_image, "No expert info");
     gtk_widget_show(expert_image);
     expert_info_none = gtk_event_box_new();
     gtk_container_add(GTK_CONTAINER(expert_info_none), expert_image);
     g_signal_connect(expert_info_none, "button_press_event", G_CALLBACK(expert_comp_dlg_event_cb), NULL);
 
-    expert_image = PIXBUF_TO_WIDGET(expert_none_pb_data, "/org/wireshark/image/toolbar/14x14/x-expert-none.png");
+    expert_image = PIXBUF_TO_WIDGET(expert_none_pb_data, "/org/wireshark/image/stock_icons/14x14/x-expert-none.png");
     gtk_widget_show(expert_image);
     expert_info_placeholder = gtk_event_box_new();
     gtk_container_add(GTK_CONTAINER(expert_info_placeholder), expert_image);
diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c
index 79e77467fa..94f638149a 100644
--- a/ui/gtk/stock_icons.c
+++ b/ui/gtk/stock_icons.c
@@ -333,24 +333,24 @@ void stock_icons_init(void) {
               "/org/wireshark/image/toolbar/capture_interfaces_24.png" }
         },
         { WIRESHARK_STOCK_CAPTURE_OPTIONS,
-            { "/org/wireshark/image/toolbar/16x16/x-capture-options.png",
-              "/org/wireshark/image/toolbar/24x24/x-capture-options.png" }
+            { "/org/wireshark/image/stock_icons/16x16/x-capture-options.png",
+              "/org/wireshark/image/stock_icons/24x24/x-capture-options.png" }
         },
         { WIRESHARK_STOCK_CAPTURE_RESTART,
-            { "/org/wireshark/image/toolbar/16x16/x-capture-restart.png",
-              "/org/wireshark/image/toolbar/24x24/x-capture-restart.png" }
+            { "/org/wireshark/image/stock_icons/16x16/x-capture-restart.png",
+              "/org/wireshark/image/stock_icons/24x24/x-capture-restart.png" }
         },
         { WIRESHARK_STOCK_CAPTURE_START,
-            { "/org/wireshark/image/toolbar/16x16/x-capture-start.png",
-              "/org/wireshark/image/toolbar/24x24/x-capture-start.png" }
+            { "/org/wireshark/image/stock_icons/16x16/x-capture-start.png",
+              "/org/wireshark/image/stock_icons/24x24/x-capture-start.png" }
         },
         { WIRESHARK_STOCK_CAPTURE_STOP,
-            { "/org/wireshark/image/toolbar/16x16/x-capture-stop.png",
-              "/org/wireshark/image/toolbar/24x24/x-capture-stop.png" }
+            { "/org/wireshark/image/stock_icons/16x16/x-capture-stop.png",
+              "/org/wireshark/image/stock_icons/24x24/x-capture-stop.png" }
         },
         { WIRESHARK_STOCK_SAVE,
-            { "/org/wireshark/image/toolbar/16x16/x-capture-file-save.png",
-              "/org/wireshark/image/toolbar/24x24/x-capture-file-save.png" }
+            { "/org/wireshark/image/stock_icons/16x16/x-capture-file-save.png",
+              "/org/wireshark/image/stock_icons/24x24/x-capture-file-save.png" }
         },
         { WIRESHARK_STOCK_WIKI,
             { "/org/wireshark/image/toolbar/gnome_emblem_web_16.png",
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 1b3ee4a829..a826ff1f6e 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -593,7 +593,7 @@ set(WIRESHARK_QT_QRC
 	../../image/about.qrc
 	../../image/languages/languages.qrc
 	../../image/layout.qrc
-	../../image/toolbar.qrc
+	../../image/stock_icons.qrc
 	../../image/wsicon.qrc
 	${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc
 )
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index bed07d6a61..5be775ba7f 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -456,7 +456,7 @@ QRC_FILES = \
 	../../image/about.qrc			\
 	../../image/languages/languages.qrc	\
 	../../image/layout.qrc			\
-	../../image/toolbar.qrc			\
+	../../image/stock_icons.qrc		\
 	../../image/wsicon.qrc
 
 #
@@ -469,7 +469,7 @@ QRC_SRC = \
 	qrc_about.cpp		\
 	qrc_languages.cpp	\
 	qrc_layout.cpp		\
-	qrc_toolbar.cpp		\
+	qrc_stock_icons.cpp	\
 	qrc_wsicon.cpp		\
 	qrc_i18n.cpp
 
@@ -795,8 +795,8 @@ qrc_languages.cpp: ../../image/languages/languages.qrc
 qrc_i18n.cpp: i18n.qrc
 	$(AM_V_RCC)$(RCC) $(RCC_OPTIONS) -name i18n -o $@ $<
 
-qrc_toolbar.cpp: ../../image/toolbar.qrc
-	$(AM_V_RCC)$(RCC) $(RCC_OPTIONS) -name toolbar -o $@ $<
+qrc_stock_icons.cpp: ../../image/stock_icons.qrc
+	$(AM_V_RCC)$(RCC) $(RCC_OPTIONS) -name stock_icons -o $@ $<
 
 qrc_wsicon.cpp: ../../image/wsicon.qrc
 	$(AM_V_RCC)$(RCC) $(RCC_OPTIONS) -name wsicon -o $@ $<
diff --git a/ui/qt/capture_file_properties_dialog.ui b/ui/qt/capture_file_properties_dialog.ui
index 0e92c6b518..72b875bf9a 100644
--- a/ui/qt/capture_file_properties_dialog.ui
+++ b/ui/qt/capture_file_properties_dialog.ui
@@ -60,8 +60,5 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../image/toolbar.qrc"/>
- </resources>
  <connections/>
 </ui>
diff --git a/ui/qt/coloring_rules_dialog.ui b/ui/qt/coloring_rules_dialog.ui
index 467aaecc4c..667f74a7ee 100644
--- a/ui/qt/coloring_rules_dialog.ui
+++ b/ui/qt/coloring_rules_dialog.ui
@@ -67,7 +67,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
        </property>
       </widget>
@@ -81,7 +81,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
        </property>
       </widget>
@@ -92,7 +92,7 @@
         <string>Duplicate this coloring rule.</string>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/copy-8.png</normaloff>:/stock/copy-8.png</iconset>
        </property>
       </widget>
@@ -183,7 +183,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../image/toolbar.qrc"/>
+  <include location="../../image/stock_icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/ui/qt/column_preferences_frame.ui b/ui/qt/column_preferences_frame.ui
index 3dfb5a639e..a34e5dc3d6 100644
--- a/ui/qt/column_preferences_frame.ui
+++ b/ui/qt/column_preferences_frame.ui
@@ -57,7 +57,7 @@
      <item>
       <widget class="QToolButton" name="newToolButton">
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
        </property>
       </widget>
@@ -65,7 +65,7 @@
      <item>
       <widget class="QToolButton" name="deleteToolButton">
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
        </property>
       </widget>
@@ -88,7 +88,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../image/toolbar.qrc"/>
+  <include location="../../image/stock_icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/ui/qt/decode_as_dialog.ui b/ui/qt/decode_as_dialog.ui
index f8a78b1e0c..8dbae9e576 100644
--- a/ui/qt/decode_as_dialog.ui
+++ b/ui/qt/decode_as_dialog.ui
@@ -29,7 +29,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
        </property>
       </widget>
@@ -43,7 +43,7 @@
         <bool>false</bool>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
        </property>
       </widget>
@@ -57,7 +57,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/copy-8.png</normaloff>:/stock/copy-8.png</iconset>
        </property>
       </widget>
@@ -121,7 +121,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../image/toolbar.qrc"/>
+  <include location="../../image/stock_icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/ui/qt/filter_dialog.ui b/ui/qt/filter_dialog.ui
index 5ae188028f..5614651d6a 100644
--- a/ui/qt/filter_dialog.ui
+++ b/ui/qt/filter_dialog.ui
@@ -51,7 +51,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
        </property>
       </widget>
@@ -62,7 +62,7 @@
         <string>Remove this filter.</string>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
        </property>
       </widget>
@@ -76,7 +76,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/copy-8.png</normaloff>:/stock/copy-8.png</iconset>
        </property>
       </widget>
@@ -135,7 +135,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../image/toolbar.qrc"/>
+  <include location="../../image/stock_icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/ui/qt/io_graph_dialog.ui b/ui/qt/io_graph_dialog.ui
index 5c4caf16b5..e91e370f5a 100644
--- a/ui/qt/io_graph_dialog.ui
+++ b/ui/qt/io_graph_dialog.ui
@@ -84,7 +84,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
        </property>
       </widget>
@@ -95,7 +95,7 @@
         <string>Remove this graph.</string>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
        </property>
       </widget>
@@ -109,7 +109,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/copy-8.png</normaloff>:/stock/copy-8.png</iconset>
        </property>
       </widget>
@@ -485,7 +485,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../image/toolbar.qrc"/>
+  <include location="../../image/stock_icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index cf1481b550..2d54b578ae 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -913,7 +913,7 @@
   </action>
   <action name="actionHelpWebsite">
    <property name="icon">
-    <iconset resource="../../image/toolbar.qrc">
+    <iconset resource="../../image/stock_icons.qrc">
      <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset>
    </property>
    <property name="text">
@@ -932,7 +932,7 @@
   </action>
   <action name="actionHelpWiki">
    <property name="icon">
-    <iconset resource="../../image/toolbar.qrc">
+    <iconset resource="../../image/stock_icons.qrc">
      <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset>
    </property>
    <property name="text">
@@ -957,7 +957,7 @@
   </action>
   <action name="actionHelpAsk">
    <property name="icon">
-    <iconset resource="../../image/toolbar.qrc">
+    <iconset resource="../../image/stock_icons.qrc">
      <normaloff>:/menu/help/wsicon-ask.png</normaloff>:/menu/help/wsicon-ask.png</iconset>
    </property>
    <property name="text">
@@ -2945,7 +2945,7 @@
   </action>
   <action name="actionNewDisplayFilterExpression">
    <property name="icon">
-    <iconset resource="../../image/toolbar.qrc">
+    <iconset resource="../../image/stock_icons.qrc">
      <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
    </property>
    <property name="text">
@@ -3031,7 +3031,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../image/toolbar.qrc"/>
+  <include location="../../image/stock_icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/ui/qt/manage_interfaces_dialog.ui b/ui/qt/manage_interfaces_dialog.ui
index 417c4c8477..eff0b9475b 100644
--- a/ui/qt/manage_interfaces_dialog.ui
+++ b/ui/qt/manage_interfaces_dialog.ui
@@ -104,7 +104,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../image/toolbar.qrc">
+            <iconset resource="../../image/stock_icons.qrc">
              <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
            </property>
           </widget>
@@ -118,7 +118,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../image/toolbar.qrc">
+            <iconset resource="../../image/stock_icons.qrc">
              <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
            </property>
           </widget>
@@ -173,7 +173,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../image/toolbar.qrc">
+            <iconset resource="../../image/stock_icons.qrc">
              <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
            </property>
           </widget>
@@ -187,7 +187,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../image/toolbar.qrc">
+            <iconset resource="../../image/stock_icons.qrc">
              <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
            </property>
           </widget>
@@ -238,7 +238,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../image/toolbar.qrc"/>
+  <include location="../../image/stock_icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/ui/qt/profile_dialog.ui b/ui/qt/profile_dialog.ui
index 9b9cbf57c7..b1fd7f8ece 100644
--- a/ui/qt/profile_dialog.ui
+++ b/ui/qt/profile_dialog.ui
@@ -49,7 +49,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
        </property>
       </widget>
@@ -60,7 +60,7 @@
         <string>Remove this profile. System provided profiles cannot be removed.</string>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
        </property>
       </widget>
@@ -74,7 +74,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/copy-8.png</normaloff>:/stock/copy-8.png</iconset>
        </property>
       </widget>
@@ -133,7 +133,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../image/toolbar.qrc"/>
+  <include location="../../image/stock_icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/ui/qt/sctp_assoc_analyse_dialog.ui b/ui/qt/sctp_assoc_analyse_dialog.ui
index e16ee1df1c..29366bb4df 100644
--- a/ui/qt/sctp_assoc_analyse_dialog.ui
+++ b/ui/qt/sctp_assoc_analyse_dialog.ui
@@ -547,9 +547,6 @@
    </widget>
   </widget>
  </widget>
- <resources>
-  <include location="../../image/toolbar.qrc"/>
- </resources>
  <connections>
   <connection>
    <sender>pushButton_2</sender>
diff --git a/ui/qt/uat_dialog.ui b/ui/qt/uat_dialog.ui
index f7013add88..3670f9132d 100644
--- a/ui/qt/uat_dialog.ui
+++ b/ui/qt/uat_dialog.ui
@@ -47,7 +47,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
        </property>
       </widget>
@@ -58,7 +58,7 @@
         <string>Remove this entry.</string>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
        </property>
       </widget>
@@ -72,7 +72,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/copy-8.png</normaloff>:/stock/copy-8.png</iconset>
        </property>
       </widget>
@@ -86,7 +86,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/arrow_up.png</normaloff>:/stock/arrow_up.png</iconset>
        </property>
       </widget>
@@ -100,7 +100,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../image/toolbar.qrc">
+        <iconset resource="../../image/stock_icons.qrc">
          <normaloff>:/stock/arrow_down.png</normaloff>:/stock/arrow_down.png</iconset>
        </property>
       </widget>
@@ -114,7 +114,7 @@
         <string/>
        </property>
         <property name="icon">
-          <iconset resource="../../image/toolbar.qrc">
+          <iconset resource="../../image/stock_icons.qrc">
             <normaloff>:/stock/delete_list.png</normaloff>:/stock/delete_list.png
           </iconset>
         </property>
@@ -166,7 +166,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../image/toolbar.qrc"/>
+  <include location="../../image/stock_icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/ui/qt/uat_frame.ui b/ui/qt/uat_frame.ui
index 6a22bbff65..97f3d1097d 100644
--- a/ui/qt/uat_frame.ui
+++ b/ui/qt/uat_frame.ui
@@ -56,7 +56,7 @@
               <string/>
             </property>
             <property name="icon">
-              <iconset resource="../../image/toolbar.qrc">
+              <iconset resource="../../image/stock_icons.qrc">
                 <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png
               </iconset>
             </property>
@@ -71,7 +71,7 @@
               <string>Remove this entry.</string>
             </property>
             <property name="icon">
-              <iconset resource="../../image/toolbar.qrc">
+              <iconset resource="../../image/stock_icons.qrc">
                 <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png
               </iconset>
             </property>
@@ -89,7 +89,7 @@
               <string/>
             </property>
             <property name="icon">
-              <iconset resource="../../image/toolbar.qrc">
+              <iconset resource="../../image/stock_icons.qrc">
                 <normaloff>:/stock/copy-8.png</normaloff>:/stock/copy-8.png
               </iconset>
             </property>
@@ -104,7 +104,7 @@
               <string/>
             </property>
             <property name="icon">
-              <iconset resource="../../image/toolbar.qrc">
+              <iconset resource="../../image/stock_icons.qrc">
                 <normaloff>:/stock/arrow_up.png</normaloff>:/stock/arrow_up.png
               </iconset>
             </property>
@@ -119,7 +119,7 @@
               <string/>
             </property>
             <property name="icon">
-              <iconset resource="../../image/toolbar.qrc">
+              <iconset resource="../../image/stock_icons.qrc">
                 <normaloff>:/stock/arrow_down.png</normaloff>:/stock/arrow_down.png
               </iconset>
             </property>
@@ -134,7 +134,7 @@
               <string/>
             </property>
             <property name="icon">
-              <iconset resource="../../image/toolbar.qrc">
+              <iconset resource="../../image/stock_icons.qrc">
                 <normaloff>:/stock/delete_list.png</normaloff>:/stock/delete_list.png
               </iconset>
             </property>
@@ -176,7 +176,7 @@
     </customwidget>
   </customwidgets>
   <resources>
-  <include location="../../image/toolbar.qrc"/>
+  <include location="../../image/stock_icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/ui/qt/utils/stock_icon.cpp b/ui/qt/utils/stock_icon.cpp
index 985c60b2ec..b96ace74b4 100644
--- a/ui/qt/utils/stock_icon.cpp
+++ b/ui/qt/utils/stock_icon.cpp
@@ -58,8 +58,7 @@
 #include <QPainter>
 #include <QStyle>
 
-// XXX We're using icons in more than just the toolbar.
-static const QString path_pfx_ = ":/icons/toolbar/";
+static const QString path_pfx_ = ":/stock_icons/";
 
 // Map FreeDesktop icon names to Qt standard pixmaps.
 static QMap<QString, QStyle::StandardPixmap> icon_name_to_standard_pixmap_;
diff --git a/ui/qt/widgets/capture_filter_combo.cpp b/ui/qt/widgets/capture_filter_combo.cpp
index e8c3bc41fc..fca7ee8b8c 100644
--- a/ui/qt/widgets/capture_filter_combo.cpp
+++ b/ui/qt/widgets/capture_filter_combo.cpp
@@ -66,7 +66,7 @@ CaptureFilterCombo::CaptureFilterCombo(QWidget *parent, bool plain) :
             " }"
 
             "QComboBox::down-arrow {"
-            "  image: url(:/icons/toolbar/14x14/x-filter-dropdown.png);"
+            "  image: url(:/stock_icons/14x14/x-filter-dropdown.png);"
             " }"
 
             "QComboBox::down-arrow:on { /* shift the arrow when popup is open */"
diff --git a/ui/qt/widgets/display_filter_combo.cpp b/ui/qt/widgets/display_filter_combo.cpp
index 3e726cd5fd..b11d05fee1 100644
--- a/ui/qt/widgets/display_filter_combo.cpp
+++ b/ui/qt/widgets/display_filter_combo.cpp
@@ -70,7 +70,7 @@ DisplayFilterCombo::DisplayFilterCombo(QWidget *parent) :
             " }"
 
             "QComboBox::down-arrow {"
-            "  image: url(:/icons/toolbar/14x14/x-filter-dropdown.png);"
+            "  image: url(:/stock_icons/14x14/x-filter-dropdown.png);"
             " }"
 
             "QComboBox::down-arrow:on { /* shift the arrow when popup is open */"
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index b2eb02ca79..d0fe96e436 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -735,7 +735,7 @@ WiresharkApplication::WiresharkApplication(int &argc,  char **argv) :
     Q_INIT_RESOURCE(about);
     Q_INIT_RESOURCE(i18n);
     Q_INIT_RESOURCE(layout);
-    Q_INIT_RESOURCE(toolbar);
+    Q_INIT_RESOURCE(stock_icons);
     Q_INIT_RESOURCE(wsicon);
     Q_INIT_RESOURCE(languages);