diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 5e9b7a177..10ad6856c 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,25 +1,29 @@
-
-
 pixmapdir=$(datadir)/pixmaps/linphone
 
 pixmap_DATA= \
-hold_on.png hold_off.png \
-mic_muted.png mic_active.png \
-linphone.png linphone-banner.png \
-status-green.png \
-status-orange.png \
-status-red.png \
-status-offline.png \
-call.png \
-chat.png active_chat.png composing_chat.png composing_active_chat.png\
-chat_message_inprogress.png chat_message_delivered.png chat_message_not_delivered.png\
-contact-orange.png dialer-orange.png history-orange.png\
-startcall-green.png startcall-small.png stopcall-red.png stopcall-small.png addcall-green.png linphone.icns \
-contact_starred.png contact_unstarred.png \
-speaker.png \
-call_status_incoming.png call_status_outgoing.png \
-ok.png \
-dialer.png \
-notok.png
+	hold_on.png hold_off.png \
+	mic_muted.png mic_active.png \
+	linphone.png linphone-banner.png \
+	status-green.png \
+	status-orange.png \
+	status-red.png \
+	status-offline.png \
+	call.png \
+	chat.png active_chat.png composing_chat.png composing_active_chat.png\
+	chat_message_inprogress.png chat_message_delivered.png chat_message_not_delivered.png\
+	contact-orange.png dialer-orange.png history-orange.png\
+	startcall-green.png startcall-small.png stopcall-red.png stopcall-small.png addcall-green.png linphone.icns \
+	contact_starred.png contact_unstarred.png \
+	speaker.png \
+	call_status_incoming.png call_status_outgoing.png \
+	ok.png \
+	dialer.png \
+	notok.png
 
-EXTRA_DIST=$(pixmap_DATA)
+
+iconsdir=$(datadir)/icons/hicolor/48x48/apps
+
+icons_DATA= linphone.png
+
+
+EXTRA_DIST=$(pixmap_DATA) $(icons_DATA)
diff --git a/pixmaps/linphone.png b/pixmaps/linphone.png
index 722593e65..4031d7205 100644
Binary files a/pixmaps/linphone.png and b/pixmaps/linphone.png differ
diff --git a/share/audio-assistant.desktop.in b/share/audio-assistant.desktop.in
index 72c871521..7f107545d 100644
--- a/share/audio-assistant.desktop.in
+++ b/share/audio-assistant.desktop.in
@@ -7,6 +7,6 @@ Comment[fr]=Assistant audio de Linphone.
 Comment[ru]=Помощник аудио Linphone
 Type=Application
 Exec=linphone --run-audio-assistant
-Icon=@prefix@/share/pixmaps/linphone/linphone.png
+Icon=linphone
 Terminal=false
 Categories=Network;Telephony;
diff --git a/share/linphone.desktop.in b/share/linphone.desktop.in
index 748076ecf..656897a48 100644
--- a/share/linphone.desktop.in
+++ b/share/linphone.desktop.in
@@ -4,7 +4,7 @@ GenericName=Web-phone
 Comment=Linphone is a web-phone
 Type=Application
 Exec=linphone
-Icon=@prefix@/share/pixmaps/linphone/linphone.png
+Icon=linphone
 Terminal=false
 Categories=Network;Telephony;