diff --git a/gmusicbrowser.pl b/gmusicbrowser.pl
index dbaf30d3..340f89ff 100755
--- a/gmusicbrowser.pl
+++ b/gmusicbrowser.pl
@@ -1349,8 +1349,44 @@ sub keybinding_longname
 (	'gmb-queue0'	   => 'gmb-queue',
 	'gmb-queue-window' => 'gmb-queue',
 	'gmb-random-album' => 'gmb-random',
-	'gmb-view-fullscreen'=>'gtk-fullscreen',
-	#'gmb-media-skip-forward'=> 'media-skip-forward',
+	'gmb-view-fullscreen'=>'view-fullscreen',
+	# gtk2 stock icon names to freedesktop standard names, for icon themes that no longer provide the gtk-* names
+	'gtk-add'		=> 'list-add',
+	'gtk-apply'		=> 'emblem-default',
+	'gtk-cancel'		=> 'process-stop',
+	'gtk-clear'		=> 'edit-clear',
+	'gtk-close'		=> 'window-close',
+	'gtk-copy'		=> 'edit-copy',
+	'gtk-delete'		=> 'edit-delete',
+	'gtk-edit'		=> 'document-properties',
+	'gtk-find'		=> 'edit-find',
+	'gtk-fullscreen'	=> 'view-fullscreen',
+	'gtk-go-back'		=> 'go-previous',
+	'gtk-go-down'		=> 'go-down',
+	'gtk-go-forward'	=> 'go-next',
+	'gtk-go-up'		=> 'go-up',
+	'gtk-goto-bottom'	=> 'go-bottom',
+	'gtk-goto-top'		=> 'go-top',
+	'gtk-info'		=> 'dialog-information',
+	'gtk-jump-to'		=> 'go-jump',
+	'gtk-leave-fullscreen'	=> 'view-restore',
+	'gtk-media-next'	=> 'media-skip-forward',
+	'gtk-media-pause'	=> 'media-playback-pause',
+	'gtk-media-play'	=> 'media-playback-start',
+	'gtk-media-previous'	=> 'media-skip-backward',
+	'gtk-media-stop'	=> 'media-playback-stop',
+	'gtk-new'		=> 'document-new',
+	'gtk-ok'		=> 'emblem-default',
+	'gtk-open'		=> 'document-open',
+	'gtk-preferences'	=> 'preferences-system',
+	'gtk-quit'		=> 'application-exit',
+	'gtk-refresh'		=> 'view-refresh',
+	'gtk-remove'		=> 'list-remove',
+	'gtk-save'		=> 'document-save',
+	'gtk-save-as'		=> 'document-save-as',
+	'gtk-sort-ascending'	=> 'view-sort-ascending',
+	'gtk-sort-descending'	=> 'view-sort-descending',
+	'gtk-stop'		=> 'process-stop',
 );
 our %IconsFallbacksCache;
 sub check_icon_name
diff --git a/gmusicbrowser_list.pm b/gmusicbrowser_list.pm
index 368ead5d..385b2f43 100644
--- a/gmusicbrowser_list.pm
+++ b/gmusicbrowser_list.pm
@@ -3638,8 +3638,8 @@ sub new
 	$self->set_max_width_chars($opt->{minwidthchar}) if $opt->{minwidthchar};
 	$self->set_max_width_chars($opt->{maxwidthchar}) if $opt->{maxwidthchar};
 	unless ($opt->{noselector})
-	{	$self->set_icon_from_stock('primary','gtk-find');
-		$self->set_icon_from_stock('secondary','gtk-clear');
+	{	$self->set_icon_from_icon_name( 'primary',   ::check_icon_name('gtk-find')  || 'edit-find' );
+		$self->set_icon_from_icon_name( 'secondary', ::check_icon_name('gtk-clear') || 'edit-clear' );
 		$self->set_icon_activatable($_,1) for qw/primary secondary/;
 		$self->set_icon_tooltip_text('primary',_"Search options");
 		$self->set_icon_tooltip_text('secondary',_"Reset filter");