diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 01404ac..79bc715 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -167,14 +167,18 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AX_SUBST(BUILD_NUMBER)
   BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z")
   AX_SUBST(BUILD_DATE)
-  if test -f "${PROJECT_NAME}-logo.png"; then
-     PROJECT_LOGO="${PROJECT_NAME}-logo.png"
+  if test -f "${PACKAGE_NAME}.dektop.in"; then
+     PACKAGE_DESKTOP="${PACKAGE_NAME}.dektop"
   fi
-  AX_SUBST(PROJECT_LOGO)
-  if test -f "${PROJECT_NAME}-icon.png"; then
-     PROJECT_ICON="${PROJECT_NAME}-icon.png"
+  AX_SUBST(PACKAGE_DESKTOP)
+  if test -f "${PACKAGE_NAME}-logo.png"; then
+     PACKAGE_LOGO="${PACKAGE_NAME}-logo.png"
   fi
-  AX_SUBST(PROJECT_ICON)
+  AX_SUBST(PACKAGE_LOGO)
+  if test -f "${PACKAGE_NAME}-icon.png"; then
+     PACKAGE_ICON="${PACKAGE_NAME}-icon.png"
+  fi
+  AX_SUBST(PACKAGE_ICON)
 
   AC_ARG_ENABLE(pedantic,
     [AS_HELP_STRING([--enable-pedantic],
@@ -203,6 +207,10 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   else
     AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG"
   fi
+  
+  if test -f ${PACKAGE_NAME}.desktop.in; then
+    AC_CONFIG_FILES([${PACKAGE_NAME}.desktop])
+  fi
 
   AC_CONFIG_FILES([makefile])
   AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in])
diff --git a/bootstrap.sh b/bootstrap.sh
index fb14847..018166e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -706,10 +706,10 @@ namespace NAMESPACE {
     return README;
   }
   std::string logo() {
-    return PROJECT_LOGO;
+    return PACKAGE_LOGO;
   }
   std::string icon() {
-    return PROJECT_ICON;
+    return PACKAGE_ICON;
   }
   const std::string WHAT("#(@) " PACKAGE_STRING);
   const std::string IDENT("\$Id: " PACKAGE_STRING);
@@ -721,7 +721,7 @@ ${HEADER}dist_bin_SCRIPTS =
 MAINTAINERCLEANFILES = makefile.in
 EOF
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
-to --condition AX_BUILD_TEST test/runtests.sh < test/runtests.sh
+to --condition AX_BUILD_TEST test/runtests.sh < ${0%/*}/test/runtests.sh
 to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF
 ${HEADER}$(if testtag AX_USE_CXX; then
 cat <<EOF2
@@ -765,7 +765,7 @@ if testtag AX_USE_DOXYGEN; then
         doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
         doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@"
         doxyreplace PROJECT_BRIEF "@DESCRIPTION@"
-        doxyreplace PROJECT_LOGO "@PROJECT_LOGO@"
+        doxyreplace PROJECT_LOGO "@top_srcdir@/@PACKACE_LOGO@"
         doxyreplace INLINE_INHERITED_MEMB YES
         doxyreplace MULTILINE_CPP_IS_BRIEF YES
         doxyreplace TAB_SIZE 2
@@ -887,6 +887,17 @@ ${HEADER}%:
 EOF
     echo 7 | to debian/compat
 fi
+to ${PACKAGE_NAME}.desktop.in <<EOF
+[Desktop Entry]
+Type=Application
+Name=${PACKAGE_NAME}
+GenericName=${PACKAGE_NAME}
+Comment=@DESCRIPTION@
+Icon=@prefix@/share/@PACKAGE_NAME@/@PACKAGE_ICON@
+Exec=${PACKAGE_NAME} %u
+Terminal=false
+Categories=Qt;Utility;
+EOF
 to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
 Summary: @DESCRIPTION@
 Name: @PACKAGE_NAME@
@@ -960,6 +971,7 @@ $(if testtag AX_USE_LIBTOOL; then
 echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
 else
 echo '/usr/bin/*'
+echo '/usr/share/applications/*'
 fi)
 %doc
 $(if testtag AX_USE_LIBTOOL; then
@@ -1030,6 +1042,9 @@ done
 to makefile.am<<EOF
 ${HEADER}SUBDIRS =${SUBDIRS}
 
+desktopdir = ${datadir}/applications
+desktop_DATA = @PACKAGE_DESKTOP@
+pkgdata_DATA = @PACKAGE_ICON@
 doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 
 MAINTAINERCLEANFILES = makefile.in
diff --git a/makefile.am b/makefile.am
index 674dcde..af2429f 100644
--- a/makefile.am
+++ b/makefile.am
@@ -2,7 +2,7 @@
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
-##  -  on Wed, 11 November 2015 12:59:08 +0100
+##  -  on Wed, 11 November 2015 16:21:05 +0100
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8
@@ -10,6 +10,9 @@
 
 SUBDIRS = src doc
 
+desktopdir = /applications
+desktop_DATA = @PACKAGE_DESKTOP@
+pkgdata_DATA = @PACKAGE_ICON@
 doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 
 MAINTAINERCLEANFILES = makefile.in
diff --git a/src/languages.qrc b/src/languages.qrc
index db34436..d62865e 100644
--- a/src/languages.qrc
+++ b/src/languages.qrc
@@ -6,3 +6,4 @@
         <file>tokentool_en.qm</file>
     </qresource>
 </RCC>
+
diff --git a/src/resources/tokentool-icon.png b/src/resources/tokentool-icon.png
new file mode 100644
index 0000000..cea3a3d
Binary files /dev/null and b/src/resources/tokentool-icon.png differ
diff --git a/src/version.cxx b/src/version.cxx
index c87b294..03073bb 100644
--- a/src/version.cxx
+++ b/src/version.cxx
@@ -30,10 +30,10 @@ namespace NAMESPACE {
     return README;
   }
   std::string logo() {
-    return PROJECT_LOGO;
+    return PACKAGE_LOGO;
   }
   std::string icon() {
-    return PROJECT_ICON;
+    return PACKAGE_ICON;
   }
   const std::string WHAT("#(@) " PACKAGE_STRING);
   const std::string IDENT("$Id: " PACKAGE_STRING);
diff --git a/tokentool-icon.png b/tokentool-icon.png
new file mode 100644
index 0000000..cea3a3d
Binary files /dev/null and b/tokentool-icon.png differ
diff --git a/tokentool-icon.xcf b/tokentool-icon.xcf
new file mode 100644
index 0000000..b1dc23b
Binary files /dev/null and b/tokentool-icon.xcf differ
diff --git a/tokentool.desktop.in b/tokentool.desktop.in
new file mode 100644
index 0000000..7df72b5
--- /dev/null
+++ b/tokentool.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=tokentool
+GenericName=Token Tool
+Comment=@DESCRIPTION@
+Icon=@prefix@/share/@PACKAGE_NAME@/@PACKAGE_ICON@
+Exec=tokentool
+Terminal=false
+Categories=Qt;Utility;Viewer;Security;