diff --git a/TODO b/TODO
deleted file mode 100644
index e69de29..0000000
diff --git a/kshowmail/kshowmail.desktop b/kshowmail/kshowmail.desktop
index 54c5651..be3bf7d 100644
--- a/kshowmail/kshowmail.desktop
+++ b/kshowmail/kshowmail.desktop
@@ -1,6 +1,6 @@
-# KDE Config File
-[KDE Desktop Entry]
-Name=Kshowmail
+[Desktop Entry]
+Name=KShowmail
+GenericName=Mail viewer
 Encoding=UTF-8
 Type=Application
 Exec=kshowmail
diff --git a/pics/Makefile.am b/pics/Makefile.am
index c6acc8c..9d60519 100644
--- a/pics/Makefile.am
+++ b/pics/Makefile.am
@@ -1,3 +1,5 @@
+KDE_ICON = kshowmail
+kde_icon_KDEICON = cr16-app-kshowmail.png
+
 picsdir = $(kde_datadir)/kshowmail/pics
-pics_DATA = eraser.png kshowmail24.png kshowmail.png letter-closed.png\
-	letter-open.png ok.png tool.png
+pics_DATA = eraser.png kshowmail24.png kshowmail.png letter-closed.png letter-open.png ok.png tool.png
diff --git a/pics/kshowmail16.png b/pics/cr16-app-kshowmail.png
similarity index 100%
rename from pics/kshowmail16.png
rename to pics/cr16-app-kshowmail.png