Index: gtk2_ardour/startup.cc
===================================================================
--- gtk2_ardour/startup.cc	(revision 7797)
+++ gtk2_ardour/startup.cc	(working copy)
@@ -39,6 +39,7 @@
 #include "opts.h"
 #include "engine_dialog.h"
 #include "i18n.h"
+#include "utils.h"
 
 using namespace std;
 using namespace Gtk;
@@ -93,20 +94,10 @@
 	set_position (WIN_POS_CENTER);
 	set_border_width (12);
 
-	sys::path icon_file;
-
-	if (!find_file_in_search_path (ardour_search_path() + system_data_search_path().add_subdirectory_to_paths("icons"), "ardour_icon_48px.png", icon_file)) {
+	if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == 0) {
 		throw failed_constructor();
 	}
 
-	try {
-		icon_pixbuf = Gdk::Pixbuf::create_from_file (icon_file.to_string());
-	}
-
-	catch (...) {
-		throw failed_constructor();
-	}
-
 	sys::path been_here_before = user_config_directory();
 	been_here_before /= ".a3"; // XXXX use more specific version so we can catch upgrades
 	new_user = !exists (been_here_before);