diff --git a/Makefile b/Makefile
index afc6af6..25af3d8 100644
--- a/Makefile
+++ b/Makefile
@@ -7,22 +7,26 @@ ifeq ($(SINGLE_USER),false)
 	BIN_PATH          = $(BASE_PATH)/bin
 	LIB_PATH          = $(BASE_PATH)/lib
 	APP_SHORTCUT_PATH = $(BASE_PATH)/share/applications
-	ICON_PATH         = $(BASE_PATH)/share/icons
+	ICON_PATH         = $(BASE_PATH)/share
 else
 	BIN_PATH          = $(LOCAL_PATH)/syncplay
 	LIB_PATH          = $(LOCAL_PATH)/syncplay
 	APP_SHORTCUT_PATH = $(LOCAL_PATH)/share/applications
-	ICON_PATH         = $(LOCAL_PATH)/share/icons
+	ICON_PATH         = $(LOCAL_PATH)/share
 endif
 
 common:
 	mkdir -p $(LIB_PATH)/syncplay/
 	cp -r syncplay $(LIB_PATH)/syncplay/
-	cp resources/icon.ico $(ICON_PATH)/
+	cp -r resources/hicolor $(ICON_PATH)/icons/
+	cp resources/hicolor/48x48/apps/syncplay.png $(ICON_PATH)/app-install/icons/
+	cp resources/hicolor/48x48/apps/syncplay.png $(ICON_PATH)/pixmaps/
 
 u-common:
 	rm -rf $(LIB_PATH)/syncplay
-	rm $(ICON_PATH)/icon.ico
+	rm $(ICON_PATH)/icons/hicolor/*/apps/syncplay.png
+	rm $(ICON_PATH)/app-install/icons/syncplay.png
+	rm $(ICON_PATH)/pixmaps/syncplay.png
 
 client:
 	mkdir -p $(BIN_PATH)
diff --git a/resources/syncplay-server.desktop b/resources/syncplay-server.desktop
index 6a7986e..b5de0a4 100644
--- a/resources/syncplay-server.desktop
+++ b/resources/syncplay-server.desktop
@@ -5,5 +5,5 @@ Comment=Synchronize video playback over network
 Exec=/usr/bin/syncplay-server %u
 Terminal=true
 Type=Application
-Icon=/usr/share/icons/icon.ico
+Icon=syncplay
 Categories=AudioVideo;Audio;Video;
diff --git a/resources/syncplay.desktop b/resources/syncplay.desktop
index 37e9667..0c0bdff 100644
--- a/resources/syncplay.desktop
+++ b/resources/syncplay.desktop
@@ -5,7 +5,7 @@ Comment=Synchronize video playback over network
 Exec=/usr/bin/syncplay %u
 Terminal=true
 Type=Application
-Icon=/usr/share/icons/icon.ico
+Icon=syncplay
 Categories=AudioVideo;Audio;Video;Player;Network;
 MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;
 NoDisplay=true