diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index c4f984c01f..e353d609cc 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -693,6 +693,9 @@ ARDOUR_UI_UTILS::get_icon_path (const char* cname, string icon_set, bool is_imag
 		spath.add_subdirectory_to_paths ("icons");
 		spath.add_subdirectory_to_paths (icon_set);
 		
+		find_file (spath, name, data_file_path);
+	} else {
+		spath.add_subdirectory_to_paths ("icons");
 		find_file (spath, name, data_file_path);
 	}