diff --git a/Makefile b/Makefile
index 31fe9e5..62eb3dc 100644
--- a/Makefile
+++ b/Makefile
@@ -34,13 +34,19 @@ install:
 	install -d -v         $(datadir)/xplanet
 	install -d -v         $(datadir)/voice_keyer
 	install -d -v         $(datadir)/zipcodes
-	install -d -v         $(datadir)/images 
-	install -d -v         $(datadir)/images/icon/32x32 
-	install -d -v         $(datadir)/images/icon/64x64
-	install -d -v         $(datadir)/images/icon/128x128 
-	install -d -v         $(datadir)/images/icon/256x256 
-	install -d -v         $(sharedir)/pixmaps/cqrlog
-	install -d -v         $(sharedir)/icons/cqrlog
+	install -d -v         $(datadir)/images
+#	install -d -v         $(datadir)/images/icon/32x32
+#	install -d -v         $(datadir)/images/icon/48x48
+#	install -d -v         $(datadir)/images/icon/64x64
+#	install -d -v         $(datadir)/images/icon/128x128
+#	install -d -v         $(datadir)/images/icon/256x256
+#	install -d -v         $(sharedir)/pixmaps
+	install -d -v         $(sharedir)/icons
+	install -d -v         $(sharedir)/icons/hicolor/32x32/apps
+	install -d -v         $(sharedir)/icons/hicolor/48x48/apps
+	install -d -v         $(sharedir)/icons/hicolor/64x64/apps
+	install -d -v         $(sharedir)/icons/hicolor/128x128/apps
+	install -d -v         $(sharedir)/icons/hicolor/256x256/apps
 	install -d -v         $(sharedir)/applications
 	install -d -v         $(sharedir)/metainfo
 	install -d -v         $(sharedir)/man/man1
@@ -55,19 +61,21 @@ install:
 	install    -v -m 0644 voice_keyer/README $(datadir)/voice_keyer/README
 	install    -v -m 0644 voice_keyer/F10.mp3 $(datadir)/voice_keyer/F10.mp3
 	install    -v -m 0644 zipcodes/* $(datadir)/zipcodes/
-#	install -v -m 0644 -t images/*   $(datadir)/images/
-	cp -v -R images/* $(datadir)/images
-	cp -v -R images/icon/* $(sharedir)/icons/cqrlog
-	cp -v -R images/icon/* $(sharedir)/pixmaps/cqrlog
+#	install    -v -m 0644 images/*   $(datadir)/images/
+	cp -v -R images/* $(datadir)/images/
 #	install    -v -m 0644 images/icon/32x32/*   $(datadir)/images/icon/32x32/
+#	install    -v -m 0644 images/icon/48x48/*   $(datadir)/images/icon/48x48/
 #	install    -v -m 0644 images/icon/64x64/*   $(datadir)/images/icon/64x64/
 #	install    -v -m 0644 images/icon/128x128/*   $(datadir)/images/icon/128x128/
 #	install    -v -m 0644 images/icon/256x256/*   $(datadir)/images/icon/256x256/
-#	install    -v -m 0644 images/*   $(datadir)/images/
 	install    -v -m 0644 tools/cqrlog.desktop $(sharedir)/applications/cqrlog.desktop
 	install    -v -m 0644 tools/com.cqrlog.cqrlog.appdata.xml $(sharedir)/metainfo/com.cqrlog.cqrlog.appdata.xml
-	install    -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png
-	install    -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/cqrlog.png
+#	install    -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog.png
+	install    -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/icons/hicolor/32x32/apps/cqrlog.png
+	install    -v -m 0644 images/icon/48x48/cqrlog.png $(sharedir)/icons/hicolor/48x48/apps/cqrlog.png
+	install    -v -m 0644 images/icon/64x64/cqrlog.png $(sharedir)/icons/hicolor/64x64/apps/cqrlog.png
+	install    -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/hicolor/128x128/apps/cqrlog.png
+	install    -v -m 0644 images/icon/256x256/cqrlog.png $(sharedir)/icons/hicolor/256x256/apps/cqrlog.png
 	install    -v -m 0644 src/changelog.html $(datadir)/changelog.html
 	install    -v -m 0644 tools/cqrlog.1.gz $(sharedir)/man/man1/cqrlog.1.gz
 deb: