diff --git a/gtk/main.c b/gtk/main.c
index 5a03ac033..f9bc2722d 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -2124,17 +2124,6 @@ int main(int argc, char *argv[]){
 	/*for pulseaudio:*/
 	g_setenv("PULSE_PROP_media.role", "phone", TRUE);
 #endif
-	
-	/* Add the data directory of Linphone to XDG_DATA_DIRS to enable GTK+ to find
-	   the Linphone specific icons */
-	tmp = g_getenv("XDG_DATA_DIRS");
-	if(tmp && strlen(tmp) > 0) {
-		char *xdg_data_dirs = g_strdup_printf("%s:%s", tmp, PACKAGE_DATA_DIR "/linphone");
-		g_setenv("XDG_DATA_DIRS", xdg_data_dirs, TRUE);
-		g_free(xdg_data_dirs);
-	} else {
-		g_setenv("XDG_DATA_DIRS", PACKAGE_DATA_DIR "/linphone", FALSE);
-	}
 
 	lang=linphone_gtk_get_lang(config_file);
 	if (lang == NULL || lang[0]=='\0'){
diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt
index cae9128b7..595130e14 100644
--- a/pixmaps/CMakeLists.txt
+++ b/pixmaps/CMakeLists.txt
@@ -20,7 +20,7 @@
 #
 ############################################################################
 
-set(ICONS_INSTALL_DIR ${PACKAGE_DATA_DIR}/linphone/icons/hicolor)
+set(ICONS_INSTALL_DIR ${PACKAGE_DATA_DIR}/icons/hicolor)
 
 file(GLOB PIXMAPS "*.png" "linphone.icns")
 
@@ -37,7 +37,15 @@ install(FILES svg/linphone-micro-muted.svg
 	PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
 )
 
+install(FILES linphone-micro-muted.png
+	linphone-speaker-muted.png
+	linphone-micro-enabled.png
+	linphone-speaker-enabled.png
+	DESTINATION ${ICONS_INSTALL_DIR}/48x48/status
+	PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+)
+
 install(FILES linphone.png
-	DESTINATION ${PACKAGE_DATA_DIR}/icons/hicolor/48x48/apps
+	DESTINATION ${ICONS_INSTALL_DIR}/48x48/apps
 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
 )
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 708ce8587..5fc6a5a52 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -17,12 +17,21 @@ dist_pixmap_DATA= \
 	dialer.png \
 	notok.png
 
-appicondir=$(datadir)/icons/hicolor/48x48/apps
-dist_appicon_DATA= linphone.png
+iconsdir=$(datadir)/icons/hicolor
+appiconsdir=$(iconsdir)/48x48/apps
+dist_appicons_DATA= linphone.png
 
-statusiconsdir=$(datadir)/linphone/icons/hicolor/scalable/status
+sacalable-status-iconsdir=$(iconsdir)/scalable/status
 dist_statusicons_DATA= \
 	svg/linphone-micro-muted.svg \
 	svg/linphone-speaker-muted.svg \
 	svg/linphone-micro-enabled.svg \
 	svg/linphone-speaker-enabled.svg
+
+status-iconsdir=$(iconsdir)/48x48/status
+dist_status-icons_DATA= \
+	svg/linphone-micro-muted.png \
+	svg/linphone-speaker-muted.png \
+	svg/linphone-micro-enabled.png \
+	svg/linphone-speaker-enabled.png
+	
\ No newline at end of file
diff --git a/pixmaps/linphone-micro-enabled.png b/pixmaps/linphone-micro-enabled.png
new file mode 100644
index 000000000..44ba551af
Binary files /dev/null and b/pixmaps/linphone-micro-enabled.png differ
diff --git a/pixmaps/linphone-micro-muted.png b/pixmaps/linphone-micro-muted.png
new file mode 100644
index 000000000..cf666ebd0
Binary files /dev/null and b/pixmaps/linphone-micro-muted.png differ
diff --git a/pixmaps/linphone-speaker-enabled.png b/pixmaps/linphone-speaker-enabled.png
new file mode 100644
index 000000000..0c8d7a951
Binary files /dev/null and b/pixmaps/linphone-speaker-enabled.png differ
diff --git a/pixmaps/linphone-speaker-muted.png b/pixmaps/linphone-speaker-muted.png
new file mode 100644
index 000000000..91e96eddb
Binary files /dev/null and b/pixmaps/linphone-speaker-muted.png differ