diff --git a/gtk2_ardour/icons/grabber_edit_point.png b/gtk2_ardour/icons/grabber_edit_point.png
index 7bbfe03828..002674bf6a 100644
Binary files a/gtk2_ardour/icons/grabber_edit_point.png and b/gtk2_ardour/icons/grabber_edit_point.png differ
diff --git a/gtk2_ardour/icons/zoom_in_cursor.png b/gtk2_ardour/icons/zoom_in_cursor.png
index 160e1c2409..64a6f313f1 100644
Binary files a/gtk2_ardour/icons/zoom_in_cursor.png and b/gtk2_ardour/icons/zoom_in_cursor.png differ
diff --git a/gtk2_ardour/icons/zoom_out_cursor.png b/gtk2_ardour/icons/zoom_out_cursor.png
index 38074a1d58..ac9f72ac28 100644
Binary files a/gtk2_ardour/icons/zoom_out_cursor.png and b/gtk2_ardour/icons/zoom_out_cursor.png differ
diff --git a/gtk2_ardour/waves_dropdown.cc b/gtk2_ardour/waves_dropdown.cc
index 751986eb81..b07a3d95e2 100644
--- a/gtk2_ardour/waves_dropdown.cc
+++ b/gtk2_ardour/waves_dropdown.cc
@@ -52,16 +52,15 @@ WavesDropdown::_on_menu_item (void* cookie)
 void
 WavesDropdown::_on_popup_menu_position (int& x, int& y, bool& push_in)
 {
-	Gtk::Container *toplevel = get_toplevel ();
-	if (toplevel) {
-		translate_coordinates (*toplevel, 0, 0, x, y);
-		Gtk::Allocation a = get_allocation ();
-		x += a.get_x ();
-		y += a.get_y ();
-		int xo;
-		int yo;
-		get_window ()->get_origin (xo, yo);
-		x += xo;
-		y += yo;
-	}
+    if (get_window ()) {
+        Gtk::Allocation a = get_allocation ();
+
+        int xo;
+        int yo;
+        
+        get_window ()->get_origin (xo, yo);
+        
+        x = xo;
+        y = yo + a.get_height ();
+    }
 }