diff --git a/YACReader.desktop b/YACReader.desktop
index 32d5caf3..196a8d3d 100644
--- a/YACReader.desktop
+++ b/YACReader.desktop
@@ -3,7 +3,7 @@ Name=YACReader
 GenericName=Yet Another Comic Reader
 Comment=A comic reader with support for .cb*, .pdf and whole directories.
 Exec=YACReader %f
-Icon=/usr/share/yacreader/icon.png
+Icon=YACReader
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
index f6412b5b..0b0e1338 100644
--- a/YACReader/YACReader.pro
+++ b/YACReader/YACReader.pro
@@ -245,15 +245,12 @@ docs.path = $$DATADIR/doc/yacreader
 docs.extra = cp ../README.txt ../README
 docs.files = ../README ../CHANGELOG.md
 
-icon.path = $$DATADIR/yacreader
-icon.files = ../images/icon.png
+icon.path = $$DATADIR/icons/hicolor/48x48/apps
+icon.files = ../YACReader.png
 
 desktop.path = $$DATADIR/applications
-desktop.extra = desktop-file-edit --set-icon=$$DATADIR/yacreader/icon.png ../YACReader.desktop
 desktop.files = ../YACReader.desktop
 
-#TODO: icons should be located at /usr/share/icons and have the same basename as their application
-
 translation.path = $$DATADIR/yacreader/languages
 translation.files = ../release/languages/yacreader_*
 
diff --git a/YACReaderLibrary.desktop b/YACReaderLibrary.desktop
index 75f7a4a3..0bdf35d4 100644
--- a/YACReaderLibrary.desktop
+++ b/YACReaderLibrary.desktop
@@ -3,7 +3,7 @@ Name=YACReader Library
 GenericName=Yet Another Comic Reader - Library
 Comment=A comic library management application with server mode.
 Exec=YACReaderLibrary %f
-Icon=/usr/share/yacreader/iconLibrary.png
+Icon=YACReaderLibrary
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
index fa1f7a7e..274e1b0c 100644
--- a/YACReaderLibrary/YACReaderLibrary.pro
+++ b/YACReaderLibrary/YACReaderLibrary.pro
@@ -40,7 +40,7 @@ win32 {
     } else {
         LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32
     }
-    
+
     QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL
     QMAKE_LFLAGS_RELEASE += /LTCG
     CONFIG -= embed_manifest_exe
@@ -156,7 +156,7 @@ HEADERS += comic_flow.h \
         HEADERS += ../common/gl/yacreader_flow_gl.h
     }
 }
-		   
+
 SOURCES += comic_flow.cpp \
 		create_library_dialog.cpp \
 		library_creator.cpp \
@@ -231,7 +231,7 @@ SOURCES += comic_flow.cpp \
     }
 }
 
-				   
+
 include(./server/server.pri)
 include(../custom_widgets/custom_widgets_yacreaderlibrary.pri)
 CONFIG(7zip){
@@ -257,7 +257,7 @@ macx {
 	ICON = YACReaderLibrary.icns
 }
 
-TRANSLATIONS    = yacreaderlibrary_es.ts \ 
+TRANSLATIONS    = yacreaderlibrary_es.ts \
 									yacreaderlibrary_ru.ts \
 									yacreaderlibrary_pt.ts \
 									yacreaderlibrary_fr.ts \
@@ -313,11 +313,10 @@ isEmpty(DESTDIR) {
 server.path = $$DATADIR/yacreader
 server.files = ../release/server
 
-icon.path = $$DATADIR/yacreader
-icon.files = ../images/iconLibrary.png ../images/db.png ../images/coversPackage.png
+icon.path = $$DATADIR/icons/hicolor/48x48/apps
+icon.files = ../YACReaderLibrary.png
 
 desktop.path = $$DATADIR/applications
-desktop.extra = desktop-file-edit --set-icon=$$DATADIR/yacreader/iconLibrary.png $$PWD/../YACReaderLibrary.desktop
 desktop.files = ../YACReaderLibrary.desktop
 #TODO: icons should be located at /usr/share/icons and have the same basename as their application
 
diff --git a/images/YACReader.png b/images/YACReader.png
new file mode 100644
index 00000000..32e007a3
Binary files /dev/null and b/images/YACReader.png differ
diff --git a/images/YACReaderLibrary.png b/images/YACReaderLibrary.png
new file mode 100644
index 00000000..f52e5dea
Binary files /dev/null and b/images/YACReaderLibrary.png differ