diff --git a/po/fr.po b/po/fr.po
index 8d37d49..292089d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mixer 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 17:37+0100\n"
+"POT-Creation-Date: 2012-01-11 17:51+0100\n"
 "PO-Revision-Date: 2010-04-23 04:08+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: French\n"
@@ -84,30 +84,30 @@ msgstr "_Vue"
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/mixer.c:516
+#: ../src/mixer.c:519
 msgid "Bind"
 msgstr "Lier"
 
-#: ../src/mixer.c:642
+#: ../src/mixer.c:645
 msgid "translator-credits"
 msgstr "Pierre Pronchery <khorben@defora.org>"
 
-#: ../src/mixer.c:675
+#: ../src/mixer.c:678
 msgid "Mixer properties"
 msgstr "Propriétés du mixer"
 
-#: ../src/mixer.c:691
+#: ../src/mixer.c:694
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../src/mixer.c:701
+#: ../src/mixer.c:704
 msgid "Version: "
 msgstr "Version : "
 
-#: ../src/mixer.c:711
+#: ../src/mixer.c:714
 msgid "Device: "
 msgstr "Carte : "
 
-#: ../src/mixer.c:800 ../src/mixer.c:805
+#: ../src/mixer.c:803 ../src/mixer.c:808
 msgid "Error"
 msgstr "Erreur"
diff --git a/src/mixer.c b/src/mixer.c
index 92d20d0..75a7a61 100644
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -388,24 +388,27 @@ static GtkWidget * _new_frame_label(GdkPixbuf * pixbuf, char const * name,
 		{ "vol",	"audio-volume-high"	}
 	};
 	size_t i;
+	size_t len;
+	const int size = 16;
 
 	icontheme = gtk_icon_theme_get_default();
 	hbox = gtk_hbox_new(FALSE, 4);
 	for(i = 0; pixbuf == NULL && i < sizeof(icons) / sizeof(*icons); i++)
 		if(strncmp(icons[i].name, name, strlen(icons[i].name)) == 0)
 			pixbuf = gtk_icon_theme_load_icon(icontheme,
-					icons[i].icon, 16,
+					icons[i].icon, size,
 					GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
 	if(pixbuf == NULL)
 	{
+		len = strlen(name);
 		/* more generic fallbacks */
 		if(strstr(name, "sel") != NULL)
 			pixbuf = gtk_icon_theme_load_icon(icontheme,
-					"stock_line-in", 16,
+					"stock_line-in", size,
 					GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
-		else if(strstr(name, ".mute") != NULL)
+		else if(len > 5 && strcmp(&name[len - 5], ".mute") == 0)
 			pixbuf = gtk_icon_theme_load_icon(icontheme,
-					"audio-volume-muted", 16,
+					"audio-volume-muted", size,
 					GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
 	}
 	if(pixbuf != NULL)