diff --git a/src/makefile.am b/src/makefile.am
index 1a7e3d3..701edfb 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -40,7 +40,7 @@ tokentool_UIFILES = ui_tokentool.hxx
 
 ## list all %.qrc resource files as qrc_%.cxx
 ## note: if there exists a directory %, the file %.qrc is generated from that
-tokentool_RESOURCES =  qrc_languages.cxx # qrc_resources.cxx
+tokentool_RESOURCES =  qrc_languages.cxx qrc_resources.cxx
 
 ## list all final translation files, list all supported languages here
 tokentool_TRANSLATIONS = ${LANGUAGE_FILE_BASE}_en.qm	\
diff --git a/src/resources.qrc b/src/resources.qrc
index d593f4c..2b8acb6 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -1,6 +1,7 @@
- <!DOCTYPE RCC>
- <RCC version="1.0">
-   <qresource>
-   </qresource>
- </RCC>
- 
\ No newline at end of file
+<RCC>
+  <qresource>
+    <file>resources/tokentool.png</file>
+    <file>resources/tokentool-logo.png</file>
+    <file>resources/tokentool-icon.png</file>
+  </qresource>
+</RCC>
diff --git a/src/resources/tokentool-icon.png b/src/resources/tokentool-icon.png
index cea3a3d..469778e 100644
Binary files a/src/resources/tokentool-icon.png and b/src/resources/tokentool-icon.png differ
diff --git a/src/resources/tokentool-logo.png b/src/resources/tokentool-logo.png
new file mode 100644
index 0000000..6e3e8fa
Binary files /dev/null and b/src/resources/tokentool-logo.png differ
diff --git a/src/tokentool.ui b/src/tokentool.ui
index d204afd..52ab3e0 100644
--- a/src/tokentool.ui
+++ b/src/tokentool.ui
@@ -7,11 +7,15 @@
     <x>0</x>
     <y>0</y>
     <width>640</width>
-    <height>428</height>
+    <height>481</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>Tokentool</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="resources.qrc">
+    <normaloff>:/resources/tokentool-icon.png</normaloff>:/resources/tokentool-icon.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout_2">
@@ -20,7 +24,7 @@
       <property name="currentIndex">
        <number>1</number>
       </property>
-      <widget class="QWidget" name="">
+      <widget class="QWidget" name="widget">
        <attribute name="title">
         <string>Certificates</string>
        </attribute>
@@ -110,7 +114,7 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="">
+      <widget class="QWidget" name="widget">
        <attribute name="title">
         <string>Hardware</string>
        </attribute>
@@ -1295,7 +1299,7 @@
      <x>0</x>
      <y>0</y>
      <width>640</width>
-     <height>23</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="_slots">
@@ -1317,9 +1321,16 @@
     <addaction name="separator"/>
     <addaction name="actionQuit"/>
    </widget>
+   <widget class="QMenu" name="menu_Help">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="action_About"/>
+   </widget>
    <addaction name="menuFile"/>
    <addaction name="menuEdit"/>
    <addaction name="_slots"/>
+   <addaction name="menu_Help"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <action name="actionDeleteSelectedCertificate">
@@ -1355,8 +1366,15 @@
     <enum>QAction::QuitRole</enum>
    </property>
   </action>
+  <action name="action_About">
+   <property name="text">
+    <string>&amp;About</string>
+   </property>
+  </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="resources.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>actionQuit</sender>
diff --git a/tokentool-icon.png b/tokentool-icon.png
index cea3a3d..469778e 100644
Binary files a/tokentool-icon.png and b/tokentool-icon.png differ
diff --git a/tokentool-icon.xcf b/tokentool-icon.xcf
index b1dc23b..a45d214 100644
Binary files a/tokentool-icon.xcf and b/tokentool-icon.xcf differ
diff --git a/tokentool-logo.png b/tokentool-logo.png
new file mode 100644
index 0000000..6e3e8fa
Binary files /dev/null and b/tokentool-logo.png differ