Fix missing icons on GTK3 with custom icon theme

6 files changed, 9 insertions, 9 deletions

diff --git a/accessx-status/applet.c b/accessx-status/applet.c
index de75004b..6bb1d77c 100644
--- a/accessx-status/applet.c
+++ b/accessx-status/applet.c
@@ -61,7 +61,7 @@ typedef struct {
 } AppletStockIcon;
 
 static AppletStockIcon stock_icons[] = {
-	{ACCESSX_APPLET, "ax-applet.png", GTK_STATE_NORMAL, True},
+	{ACCESSX_APPLET, "mate-ax-applet.png", GTK_STATE_NORMAL, True},
 	{ACCESSX_BASE_ICON, "ax-key-base.png", GTK_STATE_NORMAL, True},
 	{ACCESSX_BASE_ICON, "ax-key-none.png", GTK_STATE_INSENSITIVE, False},
 	{ACCESSX_BASE_ICON, "ax-key-inverse.png", GTK_STATE_SELECTED, False},
@@ -149,7 +149,7 @@ static void about_cb(GtkAction* action, AccessxStatusApplet* sapplet)
 		"authors", authors,
 		"documenters", documenters,
 		"translator-credits", _("translator-credits"),
-		"logo-icon-name", "ax-applet",
+		"logo-icon-name", "mate-ax-applet",
 		NULL);
 }
 
diff --git a/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in b/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in
index 3b6d3091..72b507d5 100644
--- a/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in
+++ b/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in
@@ -7,7 +7,7 @@ _Description=Keyboard Accessibility Status Applet Factory
 [AccessxStatusApplet]
 _Name=Keyboard Accessibility Status
 _Description=Shows the status of keyboard accessibility features
-Icon=ax-applet
+Icon=mate-ax-applet
 MateComponentId=OAFIID:MATE_AccessxStatusApplet
 X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=mate-applets
diff --git a/accessx-status/pixmaps/Makefile.am b/accessx-status/pixmaps/Makefile.am
index 5b2e91f0..f5c18e0a 100644
--- a/accessx-status/pixmaps/Makefile.am
+++ b/accessx-status/pixmaps/Makefile.am
@@ -1,9 +1,9 @@
-accessx_status_iconsdir = $(iconsdir)/mate/48x48/apps
-accessx_status_icons_DATA = ax-applet.png
+accessx_status_iconsdir = $(iconsdir)/hicolor/48x48/apps
+accessx_status_icons_DATA = mate-ax-applet.png
 
 accessx_status_pixmapsdir  = $(pixmapsdir)/mate-accessx-status-applet
 accessx_status_pixmaps_DATA =	\
-	ax-applet.png			\
+	mate-ax-applet.png		\
 	ax-key-base.png			\
 	ax-key-inverse.png		\
 	ax-key-none.png			\
@@ -40,7 +40,7 @@ accessx_status_pixmaps_DATA =	\
 	ax-slowkeys-no.png		\
 	ax-bouncekeys.png
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir)/mate
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir)/hicolor
 install-data-hook: update-icon-cache
 uninstall-hook: update-icon-cache
 update-icon-cache:
diff --git a/accessx-status/pixmaps/ax-applet.png b/accessx-status/pixmaps/mate-ax-applet.png
index 75084f8d..75084f8d 100644
--- a/accessx-status/pixmaps/ax-applet.png
+++ b/accessx-status/pixmaps/mate-ax-applet.png
diff --git a/command/command.c b/command/command.c
index 414e0970..23531a74 100644
--- a/command/command.c
+++ b/command/command.c
@@ -33,7 +33,7 @@
 #include <mate-panel-applet-gsettings.h>
 
 /* Applet constants */
-#define APPLET_ICON    "terminal"
+#define APPLET_ICON    "utilities-terminal"
 #define ERROR_OUTPUT   "#"
 
 /* GSettings constants */
diff --git a/command/org.mate.applets.CommandApplet.mate-panel-applet.in.in b/command/org.mate.applets.CommandApplet.mate-panel-applet.in.in
index 41783517..1e860ce2 100644
--- a/command/org.mate.applets.CommandApplet.mate-panel-applet.in.in
+++ b/command/org.mate.applets.CommandApplet.mate-panel-applet.in.in
@@ -7,4 +7,4 @@ _Description=Command Factory
 [CommandApplet]
 _Name=Command
 _Description=Shows the output of a command
-Icon=terminal
+Icon=utilities-terminal