diff --git a/gtk2_ardour/icons/app-icon_tango.svg b/gtk2_ardour/icons/app-icon_tango.svg
new file mode 100644
index 0000000000..e85deeef3b
--- /dev/null
+++ b/gtk2_ardour/icons/app-icon_tango.svg
@@ -0,0 +1,2847 @@
+
+
+
+
diff --git a/gtk2_ardour/icons/ardour-app-icon_osx.png b/gtk2_ardour/icons/ardour-app-icon_osx.png
new file mode 100644
index 0000000000..98dc848ba7
Binary files /dev/null and b/gtk2_ardour/icons/ardour-app-icon_osx.png differ
diff --git a/gtk2_ardour/icons/ardour-app-icon_osx_mask.png b/gtk2_ardour/icons/ardour-app-icon_osx_mask.png
new file mode 100644
index 0000000000..e18a10c889
Binary files /dev/null and b/gtk2_ardour/icons/ardour-app-icon_osx_mask.png differ
diff --git a/gtk2_ardour/icons/ardour_icon_16px.png b/gtk2_ardour/icons/ardour_icon_16px.png
index 7f21711d4b..280ced6dac 100644
Binary files a/gtk2_ardour/icons/ardour_icon_16px.png and b/gtk2_ardour/icons/ardour_icon_16px.png differ
diff --git a/gtk2_ardour/icons/ardour_icon_22px.png b/gtk2_ardour/icons/ardour_icon_22px.png
index bdf723edbd..24f93d5682 100644
Binary files a/gtk2_ardour/icons/ardour_icon_22px.png and b/gtk2_ardour/icons/ardour_icon_22px.png differ
diff --git a/gtk2_ardour/icons/ardour_icon_256px.png b/gtk2_ardour/icons/ardour_icon_256px.png
new file mode 100644
index 0000000000..982257c4e2
Binary files /dev/null and b/gtk2_ardour/icons/ardour_icon_256px.png differ
diff --git a/gtk2_ardour/icons/ardour_icon_32px.png b/gtk2_ardour/icons/ardour_icon_32px.png
index d906f35d68..770860b4f9 100644
Binary files a/gtk2_ardour/icons/ardour_icon_32px.png and b/gtk2_ardour/icons/ardour_icon_32px.png differ
diff --git a/gtk2_ardour/icons/ardour_icon_48px.png b/gtk2_ardour/icons/ardour_icon_48px.png
index 298a56556a..dfb1899d61 100644
Binary files a/gtk2_ardour/icons/ardour_icon_48px.png and b/gtk2_ardour/icons/ardour_icon_48px.png differ
diff --git a/gtk2_ardour/icons/export_icons.sh b/gtk2_ardour/icons/export_icons.sh
new file mode 100755
index 0000000000..11e5c40cbe
--- /dev/null
+++ b/gtk2_ardour/icons/export_icons.sh
@@ -0,0 +1,14 @@
+#! /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/metronome.png b/gtk2_ardour/icons/metronome.png
index f0f304277c..656a3d428f 100644
Binary files a/gtk2_ardour/icons/metronome.png and b/gtk2_ardour/icons/metronome.png differ
diff --git a/gtk2_ardour/icons/metronome.svg b/gtk2_ardour/icons/metronome.svg
new file mode 100644
index 0000000000..ebdef5630c
--- /dev/null
+++ b/gtk2_ardour/icons/metronome.svg
@@ -0,0 +1,144 @@
+
+
+
+
diff --git a/gtk2_ardour/icons/midi_panic.png b/gtk2_ardour/icons/midi_panic.png
index 2628969246..91634678aa 100644
Binary files a/gtk2_ardour/icons/midi_panic.png and b/gtk2_ardour/icons/midi_panic.png differ
diff --git a/gtk2_ardour/icons/midi_panic.svg b/gtk2_ardour/icons/midi_panic.svg
new file mode 100644
index 0000000000..fc949cf288
--- /dev/null
+++ b/gtk2_ardour/icons/midi_panic.svg
@@ -0,0 +1,113 @@
+
+
+
+
diff --git a/gtk2_ardour/icons/move_cursor.png b/gtk2_ardour/icons/move_cursor.png
index 106385b596..25911ed6ff 100644
Binary files a/gtk2_ardour/icons/move_cursor.png and b/gtk2_ardour/icons/move_cursor.png differ
diff --git a/gtk2_ardour/icons/transport_end.png b/gtk2_ardour/icons/transport_end.png
index d764259bbc..ccba11809f 100644
Binary files a/gtk2_ardour/icons/transport_end.png and b/gtk2_ardour/icons/transport_end.png differ
diff --git a/gtk2_ardour/icons/transport_end.svg b/gtk2_ardour/icons/transport_end.svg
new file mode 100644
index 0000000000..c1f1f108f6
--- /dev/null
+++ b/gtk2_ardour/icons/transport_end.svg
@@ -0,0 +1,112 @@
+
+
+
+
diff --git a/gtk2_ardour/icons/transport_loop.png b/gtk2_ardour/icons/transport_loop.png
index 9666cc7dd1..c2831c1012 100644
Binary files a/gtk2_ardour/icons/transport_loop.png and b/gtk2_ardour/icons/transport_loop.png differ
diff --git a/gtk2_ardour/icons/transport_play.png b/gtk2_ardour/icons/transport_play.png
index b361b2f114..07e89695e5 100644
Binary files a/gtk2_ardour/icons/transport_play.png and b/gtk2_ardour/icons/transport_play.png differ
diff --git a/gtk2_ardour/icons/transport_play.svg b/gtk2_ardour/icons/transport_play.svg
new file mode 100644
index 0000000000..7d17a379f4
--- /dev/null
+++ b/gtk2_ardour/icons/transport_play.svg
@@ -0,0 +1,104 @@
+
+
+
+
diff --git a/gtk2_ardour/icons/transport_range.png b/gtk2_ardour/icons/transport_range.png
index c6d3b23aaa..bf4473be7d 100644
Binary files a/gtk2_ardour/icons/transport_range.png and b/gtk2_ardour/icons/transport_range.png differ
diff --git a/gtk2_ardour/icons/transport_range.svg b/gtk2_ardour/icons/transport_range.svg
new file mode 100644
index 0000000000..f751e27e75
--- /dev/null
+++ b/gtk2_ardour/icons/transport_range.svg
@@ -0,0 +1,127 @@
+
+
+
+
diff --git a/gtk2_ardour/icons/transport_record.png b/gtk2_ardour/icons/transport_record.png
index fa3972d9c5..f92b60730d 100644
Binary files a/gtk2_ardour/icons/transport_record.png and b/gtk2_ardour/icons/transport_record.png differ
diff --git a/gtk2_ardour/icons/transport_record.svg b/gtk2_ardour/icons/transport_record.svg
new file mode 100644
index 0000000000..3ed3d0281e
--- /dev/null
+++ b/gtk2_ardour/icons/transport_record.svg
@@ -0,0 +1,98 @@
+
+
+
+
diff --git a/gtk2_ardour/icons/transport_start.png b/gtk2_ardour/icons/transport_start.png
index 81616d9ecf..fe05dc2c39 100644
Binary files a/gtk2_ardour/icons/transport_start.png and b/gtk2_ardour/icons/transport_start.png differ
diff --git a/gtk2_ardour/icons/transport_start.svg b/gtk2_ardour/icons/transport_start.svg
new file mode 100644
index 0000000000..1aa7ec3404
--- /dev/null
+++ b/gtk2_ardour/icons/transport_start.svg
@@ -0,0 +1,107 @@
+
+
+
+
diff --git a/gtk2_ardour/icons/transport_stop.png b/gtk2_ardour/icons/transport_stop.png
index 9c19c591fa..05562b1060 100644
Binary files a/gtk2_ardour/icons/transport_stop.png and b/gtk2_ardour/icons/transport_stop.png differ
diff --git a/gtk2_ardour/icons/transport_stop.svg b/gtk2_ardour/icons/transport_stop.svg
new file mode 100644
index 0000000000..c83558bde2
--- /dev/null
+++ b/gtk2_ardour/icons/transport_stop.svg
@@ -0,0 +1,95 @@
+
+
+
+
diff --git a/gtk2_ardour/icons/zoom_full.png b/gtk2_ardour/icons/zoom_full.png
index dd16ef5403..f8a4eb724d 100644
Binary files a/gtk2_ardour/icons/zoom_full.png and b/gtk2_ardour/icons/zoom_full.png differ
diff --git a/gtk2_ardour/icons/zoom_in.png b/gtk2_ardour/icons/zoom_in.png
index e58ef62481..a290fe21f0 100644
Binary files a/gtk2_ardour/icons/zoom_in.png and b/gtk2_ardour/icons/zoom_in.png differ
diff --git a/gtk2_ardour/icons/zoom_out.png b/gtk2_ardour/icons/zoom_out.png
index ed72202267..e4fd222248 100644
Binary files a/gtk2_ardour/icons/zoom_out.png and b/gtk2_ardour/icons/zoom_out.png differ