diff --git a/configure.ac b/configure.ac
index f2b8ce2..6acda10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,8 @@ AC_CONFIG_FILES([
     src/pam_panic_pw/man/Makefile
     src/pam_panic_config/Makefile
     src/pam_panic_config/applications/Makefile
-    src/pam_panic_config/icons/Makefile
+    src/pam_panic_config/icons/48x48/Makefile
+    src/pam_panic_config/icons/scalable/Makefile
     test/Makefile
 ])
 
diff --git a/src/pam_panic_config/Makefile.am b/src/pam_panic_config/Makefile.am
index 0dd48d1..960a872 100644
--- a/src/pam_panic_config/Makefile.am
+++ b/src/pam_panic_config/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = applications icons
+SUBDIRS = applications icons/48x48 icons/scalable
 bin_SCRIPTS = pam_panic_config
diff --git a/src/pam_panic_config/applications/Makefile.am b/src/pam_panic_config/applications/Makefile.am
index 05af694..17d21c0 100644
--- a/src/pam_panic_config/applications/Makefile.am
+++ b/src/pam_panic_config/applications/Makefile.am
@@ -1,4 +1,4 @@
 desktopdir = $(datadir)/applications
-desktop_in_files = pam_panic_config.desktop.in
+desktop_in_files = pampanic-config.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
diff --git a/src/pam_panic_config/applications/pam_panic_config.desktop b/src/pam_panic_config/applications/pampanic-config.desktop
similarity index 95%
rename from src/pam_panic_config/applications/pam_panic_config.desktop
rename to src/pam_panic_config/applications/pampanic-config.desktop
index 1e390e0..0493db1 100644
--- a/src/pam_panic_config/applications/pam_panic_config.desktop
+++ b/src/pam_panic_config/applications/pampanic-config.desktop
@@ -16,9 +16,9 @@ Keywords[de]=PAM;Sicherheit;Passwort;Authentifizierung;USB;
 Keywords[fr]=PAM;sécurité;mot de passe;authentification;usb;
 Keywords[es]=PAM;seguridad;contraseña;autenticación;usb;
 Keywords[jp]=PAM;セキュリティ;パスワード;認証;USB;
-Exec=gksu pam_panic_config
+Exec=sudo pam_panic_config
 TryExec=pam_panic_config
-Icon=pam_panic
+Icon=pampanic
 Terminal=true
 Categories=Settings;Security;ConsoleOnly;
 StartupNotify=false
diff --git a/src/pam_panic_config/icons/48x48/Makefile.am b/src/pam_panic_config/icons/48x48/Makefile.am
new file mode 100644
index 0000000..9fe0d3e
--- /dev/null
+++ b/src/pam_panic_config/icons/48x48/Makefile.am
@@ -0,0 +1,2 @@
+appicondir=$(datadir)/icons/hicolor/48x48/apps
+appicon_DATA=pampanic.png
diff --git a/src/pam_panic_config/icons/48x48/pampanic.png b/src/pam_panic_config/icons/48x48/pampanic.png
new file mode 100644
index 0000000..3eb96b3
Binary files /dev/null and b/src/pam_panic_config/icons/48x48/pampanic.png differ
diff --git a/src/pam_panic_config/icons/Makefile.am b/src/pam_panic_config/icons/scalable/Makefile.am
similarity index 64%
rename from src/pam_panic_config/icons/Makefile.am
rename to src/pam_panic_config/icons/scalable/Makefile.am
index 3dcd888..fcad5e6 100644
--- a/src/pam_panic_config/icons/Makefile.am
+++ b/src/pam_panic_config/icons/scalable/Makefile.am
@@ -1,2 +1,2 @@
 appicondir=$(datadir)/icons/hicolor/scalable/apps
-appicon_DATA=pam_panic.svg
+appicon_DATA=pampanic.svg
diff --git a/src/pam_panic_config/icons/pam_panic.svg b/src/pam_panic_config/icons/scalable/pampanic.svg
similarity index 100%
rename from src/pam_panic_config/icons/pam_panic.svg
rename to src/pam_panic_config/icons/scalable/pampanic.svg