diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
index b716b993..0269570a 100644
--- a/src/gui/AboutDialog.cpp
+++ b/src/gui/AboutDialog.cpp
@@ -19,18 +19,22 @@
 #include "ui_AboutDialog.h"
 
 #include "config-keepassx.h"
+#include "core/DataPath.h"
 
 AboutDialog::AboutDialog(QWidget* parent)
     : QDialog(parent)
     , m_ui(new Ui::AboutDialog())
 {
     m_ui->setupUi(this);
+
     m_ui->nameLabel->setText(m_ui->nameLabel->text() + " " + KEEPASSX_VERSION);
     QFont nameLabelFont = m_ui->nameLabel->font();
     nameLabelFont.setBold(true);
     nameLabelFont.setPointSize(nameLabelFont.pointSize() + 4);
     m_ui->nameLabel->setFont(nameLabelFont);
 
+    m_ui->iconLabel->setPixmap(dataPath()->applicationIcon().pixmap(48));
+
     setAttribute(Qt::WA_DeleteOnClose);
     connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
 }
diff --git a/src/gui/AboutDialog.ui b/src/gui/AboutDialog.ui
index aa0f2033..57a8070b 100644
--- a/src/gui/AboutDialog.ui
+++ b/src/gui/AboutDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>392</width>
-    <height>208</height>
+    <width>366</width>
+    <height>210</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,11 +15,24 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QLabel" name="nameLabel">
-     <property name="text">
-      <string>KeePassX</string>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="iconLabel"/>
+     </item>
+     <item>
+      <widget class="QLabel" name="nameLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>  KeePassX</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <widget class="QLabel" name="label_2">