diff --git a/Makefile.am b/Makefile.am
index 058c4518f..401e92c66 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,8 @@
 
 kpathsea = kpathsea/kpathsea.a
 
-# this 10 paths are KDE specific. Use them:
-# kde_htmldir       Where your docs should go to. (contains lang subdirs)
-# kde_appsdir       Where your application file (.desktop) should go to. 
-# kde_icondir       Where your icon should go to.
-# kde_minidir       Where your mini icon should go to.
-# kde_datadir       Where you install application data. (Use a subdir)
-# kde_locale        Where translation files should go to.(contains lang subdirs)
-# kde_cgidir        Where cgi-bin executables should go to.
-# kde_confdir       Where config files should go to.
-# kde_mimedir       Where mimetypes should go to.
-# kde_toolbardir    Where general toolbar icons should go to.
-# kde_wallpaperdir  Where general wallpapers should go to.
-
 # just set the variable
-APPSDIR = $(kde_appsdir)/Graphics
+appsdir = $(kde_appsdir)/Graphics
 # set the include path for X, qt and KDE
 INCLUDES= $(all_includes) -Ikpathsea
 # claim, which subdirectories you want to install
@@ -58,24 +45,7 @@ CLEANFILES = $(BUILT_SOURCES)
 messages:
 	$(XGETTEXT) -C -ki18n -x $(includedir)/kde.pot *.cpp && mv messages.po ../po/kdvi.pot
 
-# just install datas here. Use install-exec-data for scripts and etc.
-# the binary itself is already installed from automake
-# use mkinstalldirs, not "install -d"
-# don't install a list of file. Just one file per install.
-# if you have more of them, create a subdirectory with an extra Makefile 
-install-data-local: 
-	$(mkinstalldirs) $(APPSDIR)
-	$(INSTALL_DATA) $(srcdir)/kdvi.desktop $(APPSDIR)
-	$(mkinstalldirs) $(kde_icondir)
-	$(INSTALL_DATA) $(srcdir)/pix/kdvi.xpm $(kde_icondir)
-	$(mkinstalldirs) $(kde_minidir)
-	$(INSTALL_DATA) $(srcdir)/pix/mini-kdvi.xpm $(kde_minidir)/kdvi.xpm
-
-# remove ALL you have installed in install-data-local or install-exec-local
-uninstall-local:
-	-rm -f $(APPSDIR)/kdvi.desktop
-	-rm -f $(kde_icondir)/kdvi.xpm
-	-rm -f $(kde_minidir)/kdvi.xpm
+apps_DATA = kdvi.desktop
 
 $(srcdir)/psheader.c: psheader.txt squeeze $(kpathsea)
 	./squeeze $(srcdir)/psheader.txt $@
diff --git a/pix/Makefile.am b/pix/Makefile.am
index 3ad341504..a1fa94665 100644
--- a/pix/Makefile.am
+++ b/pix/Makefile.am
@@ -2,9 +2,11 @@
 # add here all files
 data_DATA = forwpage.xpm largetext.xpm  smalltext.xpm 
 
-
 # this is the directory, where all datas are installed
 # you have given the datas in data_DATA
 datadir = $(kde_datadir)/kdvi/toolbar
 
-EXTRA_DIST = $(data_DATA) kdvi.xpm mini-kdvi.xpm
+EXTRA_DIST = $(data_DATA) 
+
+KDE_ICON = kdvi
+
diff --git a/pix/kdvi.xpm b/pix/kdvi.xpm
deleted file mode 100644
index e251781ac..000000000
--- a/pix/kdvi.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-/* Drawn for the K Desktop Environment */
-/* See http://www.kde.org */
-static char*kdvi[]={
-"32 32 7 1",
-"# c #000000",
-"c c #a0a0a4",
-"a c #ffffff",
-"d c #585858",
-"e c #000080",
-"b c #c0c0c0",
-". c None",
-"..######################........",
-".#a#baaaaaaaaaaaaaaaaaa#........",
-"#aa#baaaaaaaaaaaaaaaaaa#........",
-"####baaaaaaaaaaaaaaaaaa####.....",
-"#bbbbaaaaaaaaaaaaaaaaaa#ca#.....",
-"#aaabbabbbbabbabbbbaaaa#ca#.....",
-"#aaaaaaaaaaaaaaaaaaaaaa#ca#.....",
-"#aaababbbaabd###dbaaaaa#ca#.....",
-"#aaaaaaaaa#########aaaa#ca#.....",
-"#aaabbbaa###cbbbb###aaa#ca#.....",
-"#aaaaaaa###aaaaaaa###aa#ca#.....",
-"#aaabaab##aaa##aaab##ba#ca#.....",
-"#aaaaaad#caa#aaaaaac#da#ca#.....",
-"#aaaaaa##aaaaaaaaaab##a#ca#.....",
-"#aaabaa##aaaaabaaaab##a#ca#.....",
-"#aaabba##aaaabbbbbab##a#ca#.....",
-"#aaaaaad#caaaaaaaaac#da#ca#.....",
-"#aaabbab##aaaaaaaaa##ca#ca#.....",
-"#aaaaaac###aaaaaaa###ca#ca#.....",
-"#aaabbaac###caaac#####a#ca#.....",
-"#aaaaaaaac##########ca##ca#.....",
-"#aaeeeeaa#######dcc#dca#ca#.....",
-"#aaeaaaeaeac#c#ccbcc#dca#a#.....",
-"#aaeaaaeaeaaeaeaaaacc#dca##.....",
-"#aaeaaaeaeaaebebbbaacc#dca#.....",
-"#aaeaaaeaeaeaaeaaaaaacc#dca#....",
-"#aaeeeeaaaeaaaeaaaaaaac##dca#...",
-"#aaaaaaaaaaaaaaaaaaaaaa#c#dca#..",
-"########################cc#dca#.",
-"...#cccccccccccccccccccccc##dca#",
-"...#aaaaaaaaaaaaaaaaaaaaaa#.####",
-"...########################..##b"};
-
diff --git a/pix/lo-kdvi.png b/pix/lo-kdvi.png
new file mode 100644
index 000000000..64fa099b2
Binary files /dev/null and b/pix/lo-kdvi.png differ
diff --git a/pix/mini-kdvi.png b/pix/mini-kdvi.png
new file mode 100644
index 000000000..ecdbcf338
Binary files /dev/null and b/pix/mini-kdvi.png differ
diff --git a/pix/mini-kdvi.xpm b/pix/mini-kdvi.xpm
deleted file mode 100644
index 231bc649e..000000000
--- a/pix/mini-kdvi.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-/* Drawn for the K Desktop Environment */
-/* See http://www.kde.org */
-static char*kghostview[]={
-"16 16 5 1",
-"# c #000000",
-"b c #c0c0c0",
-"a c #ffffff",
-"c c #c0c0c0",
-". c None",
-".###########....",
-"#aaaaaaaaaaa#...",
-"#abbbbabbbaa#...",
-"#aaaaaaaaaaa#...",
-"#abaab###baa#...",
-"#aaab#aaa#ba#...",
-"#aba#aabaa#a#...",
-"#aaa#aabba#a#...",
-"#aaa#aaaaa#a#...",
-"#aaab#aaa##a#...",
-"#ccacb####a##...",
-"#cacccaaaa#a#...",
-"#ccaacaaaaa#a#..",
-"#caccaaaaaaa#a#.",
-".###########.#a#",
-"..............#."};
-