diff --git a/gtk2_ardour/icons/export_icons.sh b/gtk2_ardour/icons/export_icons.sh
deleted file mode 100755
index 11e5c40cbe..0000000000
--- a/gtk2_ardour/icons/export_icons.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-# Export one PNG for every icon-size in app-icon_tango.svg. The "targets" layer in the SVG should be hidden.
-
-for s in \
- "ardour-app-icon_tango_256px" \
- "ardour-app-icon_tango_048px" \
- "ardour-app-icon_tango_032px" \
- "ardour-app-icon_tango_022px" \
- "ardour-app-icon_tango_016px" \
- "ardour-app-icon_osx" \
- "ardour-app-icon_osx_mask";
- do inkscape --export-id "$s" --export-png "$s.png" app-icon_tango.svg;
-done
diff --git a/gtk2_ardour/icons/tool_object.xpm b/gtk2_ardour/icons/tool_object.xpm
deleted file mode 100644
index b6b2fea299..0000000000
--- a/gtk2_ardour/icons/tool_object.xpm
+++ /dev/null
@@ -1,54 +0,0 @@
-/* XPM */
-static char * tool_object_xpm[] = {
-"16 12 39 1",
-" c None",
-". c #000000",
-"+ c #0C0C0C",
-"@ c #151515",
-"# c #D1D1D1",
-"$ c #121212",
-"% c #161616",
-"& c #DADADA",
-"* c #131313",
-"= c #D6D6D6",
-"- c #0F0F0F",
-"; c #050505",
-"> c #D3D3D3",
-", c #0A0A0A",
-"' c #070707",
-") c #E5E5E5",
-"! c #292929",
-"~ c #B0B0B0",
-"{ c #262626",
-"] c #5C5C5C",
-"^ c #333333",
-"/ c #0E0E0E",
-"( c #111111",
-"_ c #3D3D3D",
-": c #F4F4F4",
-"< c #FFFFFF",
-"[ c #EBEBEB",
-"} c #D0D0D0",
-"| c #030303",
-"1 c #F1F1F1",
-"2 c #FDFDFD",
-"3 c #C3C3C3",
-"4 c #101010",
-"5 c #141414",
-"6 c #F2F2F2",
-"7 c #4E4E4E",
-"8 c #686868",
-"9 c #0B0B0B",
-"0 c #020202",
-" .+. ",
-" @#$ ",
-" %&* ",
-" +=-.. ",
-" ;>.,,-.. ",
-" .')!~{]^/ ",
-" (_:<<<[}| ",
-" '12<<<<<| ",
-" -~<<<<<34 ",
-" .56<<<<7| ",
-" /8<<<),. ",
-" .9|||0- "};
diff --git a/icons/metronome.svg b/icons/metronome.svg
deleted file mode 100644
index 8c637ed31f..0000000000
--- a/icons/metronome.svg
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
diff --git a/icons/midi_panic.svg b/icons/midi_panic.svg
deleted file mode 100644
index 5c894daeaa..0000000000
--- a/icons/midi_panic.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
diff --git a/icons/Ardour Mouse Cursors.svg b/tools/misc_resources/Ardour Mouse Cursors.svg
similarity index 100%
rename from icons/Ardour Mouse Cursors.svg
rename to tools/misc_resources/Ardour Mouse Cursors.svg
diff --git a/icons/Music_dynamic_forte.svg b/tools/misc_resources/Music_dynamic_forte.svg
similarity index 100%
rename from icons/Music_dynamic_forte.svg
rename to tools/misc_resources/Music_dynamic_forte.svg
diff --git a/icons/Music_dynamic_fortissimo.svg b/tools/misc_resources/Music_dynamic_fortissimo.svg
similarity index 100%
rename from icons/Music_dynamic_fortissimo.svg
rename to tools/misc_resources/Music_dynamic_fortissimo.svg
diff --git a/icons/Music_dynamic_fortississimo.svg b/tools/misc_resources/Music_dynamic_fortississimo.svg
similarity index 100%
rename from icons/Music_dynamic_fortississimo.svg
rename to tools/misc_resources/Music_dynamic_fortississimo.svg
diff --git a/icons/Music_dynamic_mezzo_forte.svg b/tools/misc_resources/Music_dynamic_mezzo_forte.svg
similarity index 100%
rename from icons/Music_dynamic_mezzo_forte.svg
rename to tools/misc_resources/Music_dynamic_mezzo_forte.svg
diff --git a/icons/Music_dynamic_mezzo_piano.svg b/tools/misc_resources/Music_dynamic_mezzo_piano.svg
similarity index 100%
rename from icons/Music_dynamic_mezzo_piano.svg
rename to tools/misc_resources/Music_dynamic_mezzo_piano.svg
diff --git a/icons/Music_dynamic_pianissimo.svg b/tools/misc_resources/Music_dynamic_pianissimo.svg
similarity index 100%
rename from icons/Music_dynamic_pianissimo.svg
rename to tools/misc_resources/Music_dynamic_pianissimo.svg
diff --git a/icons/Music_dynamic_pianississimo.svg b/tools/misc_resources/Music_dynamic_pianississimo.svg
similarity index 100%
rename from icons/Music_dynamic_pianississimo.svg
rename to tools/misc_resources/Music_dynamic_pianississimo.svg
diff --git a/icons/Music_dynamic_piano.svg b/tools/misc_resources/Music_dynamic_piano.svg
similarity index 100%
rename from icons/Music_dynamic_piano.svg
rename to tools/misc_resources/Music_dynamic_piano.svg
diff --git a/gtk2_ardour/icons/app-icon_tango.svg b/tools/misc_resources/app-icon_tango.svg
similarity index 100%
rename from gtk2_ardour/icons/app-icon_tango.svg
rename to tools/misc_resources/app-icon_tango.svg
diff --git a/icons/ardour_bw.ai b/tools/misc_resources/ardour_bw.ai
similarity index 100%
rename from icons/ardour_bw.ai
rename to tools/misc_resources/ardour_bw.ai
diff --git a/icons/ardour_bw.svg b/tools/misc_resources/ardour_bw.svg
similarity index 100%
rename from icons/ardour_bw.svg
rename to tools/misc_resources/ardour_bw.svg
diff --git a/icons/ardour_track-bus_list_states.svg b/tools/misc_resources/ardour_track-bus_list_states.svg
similarity index 100%
rename from icons/ardour_track-bus_list_states.svg
rename to tools/misc_resources/ardour_track-bus_list_states.svg
diff --git a/icons/chord.svg b/tools/misc_resources/chord.svg
similarity index 100%
rename from icons/chord.svg
rename to tools/misc_resources/chord.svg
diff --git a/gtk2_ardour/icons/crossfade_in_default.svg b/tools/misc_resources/crossfade_in_default.svg
similarity index 100%
rename from gtk2_ardour/icons/crossfade_in_default.svg
rename to tools/misc_resources/crossfade_in_default.svg
diff --git a/gtk2_ardour/icons/crossfade_out_default.svg b/tools/misc_resources/crossfade_out_default.svg
similarity index 100%
rename from gtk2_ardour/icons/crossfade_out_default.svg
rename to tools/misc_resources/crossfade_out_default.svg
diff --git a/icons/eighthnote.svg b/tools/misc_resources/eighthnote.svg
similarity index 100%
rename from icons/eighthnote.svg
rename to tools/misc_resources/eighthnote.svg
diff --git a/icons/fade_in_cursor.svg b/tools/misc_resources/fade_in_cursor.svg
similarity index 100%
rename from icons/fade_in_cursor.svg
rename to tools/misc_resources/fade_in_cursor.svg
diff --git a/icons/fade_out_cursor.svg b/tools/misc_resources/fade_out_cursor.svg
similarity index 100%
rename from icons/fade_out_cursor.svg
rename to tools/misc_resources/fade_out_cursor.svg
diff --git a/icons/halfnote.svg b/tools/misc_resources/halfnote.svg
similarity index 100%
rename from icons/halfnote.svg
rename to tools/misc_resources/halfnote.svg
diff --git a/icons/i_beam_cursor.svg b/tools/misc_resources/i_beam_cursor.svg
similarity index 100%
rename from icons/i_beam_cursor.svg
rename to tools/misc_resources/i_beam_cursor.svg
diff --git a/icons/icon/ardour.icns b/tools/misc_resources/icon/ardour.icns
similarity index 100%
rename from icons/icon/ardour.icns
rename to tools/misc_resources/icon/ardour.icns
diff --git a/icons/icon/ardour_icon_mac.png b/tools/misc_resources/icon/ardour_icon_mac.png
similarity index 100%
rename from icons/icon/ardour_icon_mac.png
rename to tools/misc_resources/icon/ardour_icon_mac.png
diff --git a/icons/icon/ardour_icon_mac_mask.png b/tools/misc_resources/icon/ardour_icon_mac_mask.png
similarity index 100%
rename from icons/icon/ardour_icon_mac_mask.png
rename to tools/misc_resources/icon/ardour_icon_mac_mask.png
diff --git a/icons/icon/ardour_icon_tango_16px.xcf b/tools/misc_resources/icon/ardour_icon_tango_16px.xcf
similarity index 100%
rename from icons/icon/ardour_icon_tango_16px.xcf
rename to tools/misc_resources/icon/ardour_icon_tango_16px.xcf
diff --git a/icons/icon/ardour_icon_tango_16px_blue.png b/tools/misc_resources/icon/ardour_icon_tango_16px_blue.png
similarity index 100%
rename from icons/icon/ardour_icon_tango_16px_blue.png
rename to tools/misc_resources/icon/ardour_icon_tango_16px_blue.png
diff --git a/icons/icon/ardour_icon_tango_16px_red.png b/tools/misc_resources/icon/ardour_icon_tango_16px_red.png
similarity index 100%
rename from icons/icon/ardour_icon_tango_16px_red.png
rename to tools/misc_resources/icon/ardour_icon_tango_16px_red.png
diff --git a/icons/icon/ardour_icon_tango_22px.xcf b/tools/misc_resources/icon/ardour_icon_tango_22px.xcf
similarity index 100%
rename from icons/icon/ardour_icon_tango_22px.xcf
rename to tools/misc_resources/icon/ardour_icon_tango_22px.xcf
diff --git a/icons/icon/ardour_icon_tango_22px_blue.png b/tools/misc_resources/icon/ardour_icon_tango_22px_blue.png
similarity index 100%
rename from icons/icon/ardour_icon_tango_22px_blue.png
rename to tools/misc_resources/icon/ardour_icon_tango_22px_blue.png
diff --git a/icons/icon/ardour_icon_tango_22px_red.png b/tools/misc_resources/icon/ardour_icon_tango_22px_red.png
similarity index 100%
rename from icons/icon/ardour_icon_tango_22px_red.png
rename to tools/misc_resources/icon/ardour_icon_tango_22px_red.png
diff --git a/icons/icon/ardour_icon_tango_32px.xcf b/tools/misc_resources/icon/ardour_icon_tango_32px.xcf
similarity index 100%
rename from icons/icon/ardour_icon_tango_32px.xcf
rename to tools/misc_resources/icon/ardour_icon_tango_32px.xcf
diff --git a/icons/icon/ardour_icon_tango_32px_blue.png b/tools/misc_resources/icon/ardour_icon_tango_32px_blue.png
similarity index 100%
rename from icons/icon/ardour_icon_tango_32px_blue.png
rename to tools/misc_resources/icon/ardour_icon_tango_32px_blue.png
diff --git a/icons/icon/ardour_icon_tango_32px_red.png b/tools/misc_resources/icon/ardour_icon_tango_32px_red.png
similarity index 100%
rename from icons/icon/ardour_icon_tango_32px_red.png
rename to tools/misc_resources/icon/ardour_icon_tango_32px_red.png
diff --git a/icons/icon/ardour_icon_tango_48px.xcf b/tools/misc_resources/icon/ardour_icon_tango_48px.xcf
similarity index 100%
rename from icons/icon/ardour_icon_tango_48px.xcf
rename to tools/misc_resources/icon/ardour_icon_tango_48px.xcf
diff --git a/icons/icon/ardour_icon_tango_48px_blue.png b/tools/misc_resources/icon/ardour_icon_tango_48px_blue.png
similarity index 100%
rename from icons/icon/ardour_icon_tango_48px_blue.png
rename to tools/misc_resources/icon/ardour_icon_tango_48px_blue.png
diff --git a/icons/icon/ardour_icon_tango_48px_red.png b/tools/misc_resources/icon/ardour_icon_tango_48px_red.png
similarity index 100%
rename from icons/icon/ardour_icon_tango_48px_red.png
rename to tools/misc_resources/icon/ardour_icon_tango_48px_red.png
diff --git a/gtk2_ardour/icons/join_tools.svg b/tools/misc_resources/join_tools.svg
similarity index 100%
rename from gtk2_ardour/icons/join_tools.svg
rename to tools/misc_resources/join_tools.svg
diff --git a/icons/made_with/ardour_made.png b/tools/misc_resources/made_with/ardour_made.png
similarity index 100%
rename from icons/made_with/ardour_made.png
rename to tools/misc_resources/made_with/ardour_made.png
diff --git a/icons/made_with/ardour_made.xar b/tools/misc_resources/made_with/ardour_made.xar
similarity index 100%
rename from icons/made_with/ardour_made.xar
rename to tools/misc_resources/made_with/ardour_made.xar
diff --git a/gtk2_ardour/icons/metronome.svg b/tools/misc_resources/metronome.svg
similarity index 100%
rename from gtk2_ardour/icons/metronome.svg
rename to tools/misc_resources/metronome.svg
diff --git a/gtk2_ardour/icons/midi_panic.svg b/tools/misc_resources/midi_panic.svg
similarity index 100%
rename from gtk2_ardour/icons/midi_panic.svg
rename to tools/misc_resources/midi_panic.svg
diff --git a/icons/midi_socket.svg b/tools/misc_resources/midi_socket.svg
similarity index 100%
rename from icons/midi_socket.svg
rename to tools/misc_resources/midi_socket.svg
diff --git a/icons/quarternote.svg b/tools/misc_resources/quarternote.svg
similarity index 100%
rename from icons/quarternote.svg
rename to tools/misc_resources/quarternote.svg
diff --git a/gtk2_ardour/icons/search.svg b/tools/misc_resources/search.svg
similarity index 100%
rename from gtk2_ardour/icons/search.svg
rename to tools/misc_resources/search.svg
diff --git a/icons/sixteenthnote.svg b/tools/misc_resources/sixteenthnote.svg
similarity index 100%
rename from icons/sixteenthnote.svg
rename to tools/misc_resources/sixteenthnote.svg
diff --git a/icons/sixyfourthnote.svg b/tools/misc_resources/sixyfourthnote.svg
similarity index 100%
rename from icons/sixyfourthnote.svg
rename to tools/misc_resources/sixyfourthnote.svg
diff --git a/icons/thirtysecondnote.svg b/tools/misc_resources/thirtysecondnote.svg
similarity index 100%
rename from icons/thirtysecondnote.svg
rename to tools/misc_resources/thirtysecondnote.svg
diff --git a/gtk2_ardour/icons/transport_end.svg b/tools/misc_resources/transport_end.svg
similarity index 100%
rename from gtk2_ardour/icons/transport_end.svg
rename to tools/misc_resources/transport_end.svg
diff --git a/gtk2_ardour/icons/transport_icons.svg b/tools/misc_resources/transport_icons.svg
similarity index 100%
rename from gtk2_ardour/icons/transport_icons.svg
rename to tools/misc_resources/transport_icons.svg
diff --git a/gtk2_ardour/icons/transport_play.svg b/tools/misc_resources/transport_play.svg
similarity index 100%
rename from gtk2_ardour/icons/transport_play.svg
rename to tools/misc_resources/transport_play.svg
diff --git a/gtk2_ardour/icons/transport_range.svg b/tools/misc_resources/transport_range.svg
similarity index 100%
rename from gtk2_ardour/icons/transport_range.svg
rename to tools/misc_resources/transport_range.svg
diff --git a/gtk2_ardour/icons/transport_record.svg b/tools/misc_resources/transport_record.svg
similarity index 100%
rename from gtk2_ardour/icons/transport_record.svg
rename to tools/misc_resources/transport_record.svg
diff --git a/gtk2_ardour/icons/transport_start.svg b/tools/misc_resources/transport_start.svg
similarity index 100%
rename from gtk2_ardour/icons/transport_start.svg
rename to tools/misc_resources/transport_start.svg
diff --git a/gtk2_ardour/icons/transport_stop.svg b/tools/misc_resources/transport_stop.svg
similarity index 100%
rename from gtk2_ardour/icons/transport_stop.svg
rename to tools/misc_resources/transport_stop.svg
diff --git a/gtk2_ardour/icons/tw_edit_icons_07.xcf b/tools/misc_resources/tw_edit_icons_07.xcf
similarity index 100%
rename from gtk2_ardour/icons/tw_edit_icons_07.xcf
rename to tools/misc_resources/tw_edit_icons_07.xcf
diff --git a/icons/wholenote.svg b/tools/misc_resources/wholenote.svg
similarity index 100%
rename from icons/wholenote.svg
rename to tools/misc_resources/wholenote.svg
diff --git a/icons/zoom_full.svg b/tools/misc_resources/zoom_full.svg
similarity index 100%
rename from icons/zoom_full.svg
rename to tools/misc_resources/zoom_full.svg
diff --git a/icons/zoom_in.svg b/tools/misc_resources/zoom_in.svg
similarity index 100%
rename from icons/zoom_in.svg
rename to tools/misc_resources/zoom_in.svg
diff --git a/icons/zoom_in_cursor.svg b/tools/misc_resources/zoom_in_cursor.svg
similarity index 100%
rename from icons/zoom_in_cursor.svg
rename to tools/misc_resources/zoom_in_cursor.svg
diff --git a/icons/zoom_out.svg b/tools/misc_resources/zoom_out.svg
similarity index 100%
rename from icons/zoom_out.svg
rename to tools/misc_resources/zoom_out.svg
diff --git a/icons/zoom_out_cursor.svg b/tools/misc_resources/zoom_out_cursor.svg
similarity index 100%
rename from icons/zoom_out_cursor.svg
rename to tools/misc_resources/zoom_out_cursor.svg