diff --git a/pace-gui/images/Makefile.am b/pace-gui/images/Makefile.am
index 4001139..827c09f 100644
--- a/pace-gui/images/Makefile.am
+++ b/pace-gui/images/Makefile.am
@@ -1,7 +1,7 @@
-pixmapsdir = $(datadir)/pixmaps
+pixmapsdir = $(datadir)/pace-gui/
 pixmaps_DATA = \
-		OpenPACElogo.png \
-		apply.png
+	OpenPACElogo.png \
+	apply.png
 
-EXTRA_DIST =  			\
+EXTRA_DIST = \
 	$(pixmaps_DATA)
diff --git a/pace-gui/src/Makefile.am b/pace-gui/src/Makefile.am
index 50460f7..fd7af73 100644
--- a/pace-gui/src/Makefile.am
+++ b/pace-gui/src/Makefile.am
@@ -5,7 +5,7 @@ paceguidir = $(prefix)/bin
 pacegui_PYTHON = 		\
 	pace_gui_globals.py
 
-uidir = $(datadir)/pinpad
+uidir = $(datadir)/pace-gui
 ui_DATA = pinpad.glade
 
 appdir = $(datadir)/applications/
diff --git a/pace-gui/src/pace-gui.desktop.in b/pace-gui/src/pace-gui.desktop.in
index 65db1d6..8d24edf 100644
--- a/pace-gui/src/pace-gui.desktop.in
+++ b/pace-gui/src/pace-gui.desktop.in
@@ -4,7 +4,7 @@ Encoding=UTF-8
 Name=PACE-GUI
 Comment=GUI zur Eingabe einer PIN/CAN/PUK fuer pace-tool
 Exec=pace-gui.py
-Icon=@prefix@/share/pixmaps/OpenPACElogo.png
+Icon=@prefix@/share/pace-gui/OpenPACElogo.png
 Terminal=false
 Type=Application
 Categories=Utility
diff --git a/pace-gui/src/pace_gui_globals.py.in b/pace-gui/src/pace_gui_globals.py.in
index adba30d..2454947 100644
--- a/pace-gui/src/pace_gui_globals.py.in
+++ b/pace-gui/src/pace_gui_globals.py.in
@@ -1,4 +1,4 @@
-name = "pinpad"
+name = "pace-gui"
 version = "@VERSION@"
 image_dir = "@prefix@/share/pixmaps"
 glade_dir = "@prefix@/share/" + name