diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index de7dce1500..a92f0b8db3 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1290,14 +1290,6 @@ ARDOUR_UI::start_engine ()
 			*/
 			session->save_state ("");
 		}
-
-		/* there is too much going on, in too many threads, for us to 
-		   end up with a clean session. So wait 1 second after loading,
-		   and fix it up. its ugly, but until i come across a better
-		   solution, its what we have.
-		*/
-
-		Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::make_session_clean), 1000);
 	}
 
 	return FALSE;
diff --git a/gtk2_ardour/editor_xpms b/gtk2_ardour/editor_xpms
index cb63e2403a..95a51a8213 100644
--- a/gtk2_ardour/editor_xpms
+++ b/gtk2_ardour/editor_xpms
@@ -63,3 +63,55 @@ static const gchar speaker_cursor_mask_bits[] = {
    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x3f, 0xff,
    0xff, 0xff, 0xff, 0xff, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xf0, 0x00, 0xf0,
    0x00, 0xc0, 0x00, 0xc0 };
+
+#define cursor_audition_width 13
+#define cursor_audition_height 16
+#define cursor_audition_x_hot 0
+#define cursor_audition_y_hot 7
+static const short cursor_audition_bits[] = {
+   0x1000, 0x1800, 0x1400, 0x1200, 0x11f0, 0x1110, 0x111f, 0x1111, 0x1112,
+   0x111e, 0x1110, 0x11f0, 0x1200, 0x1400, 0x1800, 0x1000 };
+
+#define cursor_audition_mask_width 13
+#define cursor_audition_mask_height 16
+#define cursor_audition_mask_x_hot 0
+#define cursor_audition_mask_y_hot 7
+static const short cursor_audition_mask_bits[] = {
+   0x1000, 0x1800, 0x1c00, 0x1e00, 0x1ff0, 0x1ff0, 0x1fff, 0x1fff, 0x1ffe,
+   0x1ffe, 0x1ff0, 0x1ff0, 0x1e00, 0x1c00, 0x1800, 0x1000 };
+
+#define cursor_timestretch_width 15
+#define cursor_timestretch_height 16
+#define cursor_timestretch_x_hot 7
+#define cursor_timestretch_y_hot 8
+static const short cursor_timestretch_bits[] = {
+   0x01c0, 0x0140, 0x0140, 0x0140, 0x0540, 0x0d40, 0x1548, 0x274c, 0x417e,
+   0x274c, 0x1548, 0x0d40, 0x0540, 0x0140, 0x0140, 0x01c0 };
+
+#define cursor_timestretch_mask_width 15
+#define cursor_timestretch_mask_height 16
+#define cursor_timestretch_mask_x_hot 7
+#define cursor_timestretch_mask_y_hot 8
+static const short cursor_timestretch_mask_bits[] = {
+   0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x05d0, 0x0dd8, 0x1ddc, 0x3ffe, 0x7fff,
+   0x3ffe, 0x1ddc, 0x0dd8, 0x05d0, 0x01c0, 0x01c0, 0x01c0 };
+
+#define cursor_zoom_width 17
+#define cursor_zoom_height 16
+#define cursor_zoom_x_hot 6
+#define cursor_zoom_y_hot 6
+static const short cursor_zoom_bits[] = {
+   0x00e0, 0x0000, 0x03b8, 0x0000, 0x0604, 0x0000, 0x0806, 0x0000, 0x0842,
+   0x0000, 0x1843, 0x0000, 0x11f1, 0x0000, 0x1843, 0x0000, 0x0842, 0x0000,
+   0x1806, 0x0000, 0x2604, 0x0000, 0x4758, 0x0000, 0x88e0, 0x0000, 0x1000,
+   0x0001, 0x2000, 0x0001, 0xc000, 0x0000 };
+
+#define cursor_zoom_mask_width 17
+#define cursor_zoom_mask_height 16
+#define cursor_zoom_mask_x_hot 6
+#define cursor_zoom_mask_y_hot 6
+static const short cursor_zoom_mask_bits[] = {
+   0x00e0, 0x0000, 0x03f8, 0x0000, 0x07fc, 0x0000, 0x0ffe, 0x0000, 0x0ffe,
+   0x0000, 0x1fff, 0x0000, 0x1fff, 0x0000, 0x1fff, 0x0000, 0x0ffe, 0x0000,
+   0x1ffe, 0x0000, 0x3ffc, 0x0000, 0x7ff8, 0x0000, 0xf8e0, 0x0000, 0xf000,
+   0x0001, 0xe000, 0x0001, 0xc000, 0x0000 };