diff --git a/src/lib/autofill/autofillnotification.ui b/src/lib/autofill/autofillnotification.ui
index 5dc1e0dd2..c68e341ef 100644
--- a/src/lib/autofill/autofillnotification.ui
+++ b/src/lib/autofill/autofillnotification.ui
@@ -44,7 +44,7 @@
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap resource="../data/icons.qrc">:/icons/other/keys.png</pixmap>
+      <pixmap resource="../data/icons.qrc">:/icons/other/login.png</pixmap>
      </property>
     </widget>
    </item>
diff --git a/src/lib/autofill/autofillwidget.cpp b/src/lib/autofill/autofillwidget.cpp
index 2478d3c99..0fa980a38 100644
--- a/src/lib/autofill/autofillwidget.cpp
+++ b/src/lib/autofill/autofillwidget.cpp
@@ -44,14 +44,13 @@ void AutoFillWidget::setFormData(const QVector<PasswordEntry> &data)
         }
 
         QPushButton* button = new QPushButton(this);
-        button->setText(tr("Login"));
-        button->setToolTip(d.username);
+        button->setIcon(QIcon(":icons/other/login.png"));
+        button->setStyleSheet("text-align:left;font-weight:bold;");
+        button->setText(d.username);
         button->setProperty("data-index", i);
-        QLabel* label = new QLabel(this);
-        label->setText(tr("Login as <b>%1</b>").arg(d.username));
+        button->setFlat(true);
 
-        ui->gridLayout->addWidget(label, i, 0);
-        ui->gridLayout->addWidget(button, i, 1);
+        ui->gridLayout->addWidget(button, i, 0);
         connect(button, SIGNAL(clicked()), this, SLOT(loginToPage()));
     }
 }
diff --git a/src/lib/autofill/autofillwidget.ui b/src/lib/autofill/autofillwidget.ui
index 8c8c6a7a1..2b23c73f5 100644
--- a/src/lib/autofill/autofillwidget.ui
+++ b/src/lib/autofill/autofillwidget.ui
@@ -2,91 +2,26 @@
 <ui version="4.0">
  <class>AutoFillWidget</class>
  <widget class="QWidget" name="AutoFillWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>211</width>
-    <height>54</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="Frame" name="frame">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="spacing">
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="../data/icons.qrc">:/icons/other/keys.png</pixmap>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="label_2">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Choose username to login</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QGridLayout" name="gridLayout">
-        <property name="leftMargin">
-         <number>10</number>
-        </property>
-        <property name="horizontalSpacing">
-         <number>6</number>
-        </property>
-        <property name="verticalSpacing">
-         <number>0</number>
-        </property>
-       </layout>
-      </item>
-     </layout>
-    </widget>
+  <layout class="QGridLayout" name="gridLayout1">
+   <item row="0" column="0">
+    <layout class="QGridLayout" name="gridLayout2">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Login as:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <layout class="QGridLayout" name="gridLayout"/>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>Frame</class>
-   <extends>QFrame</extends>
-   <header>frame.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="../data/icons.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/src/lib/data/icons.qrc b/src/lib/data/icons.qrc
index 1d3b0351b..92f489868 100644
--- a/src/lib/data/icons.qrc
+++ b/src/lib/data/icons.qrc
@@ -33,7 +33,7 @@
         <file>icons/locationbar/visit1.png</file>
         <file>icons/locationbar/visit2.png</file>
         <file>icons/locationbar/visit3.png</file>
-        <file>icons/other/keys.png</file>
+        <file>icons/other/login.png</file>
         <file>icons/preferences/applications-fonts.png</file>
         <file>icons/preferences/applications-graphics.png</file>
         <file>icons/preferences/document-properties.png</file>
diff --git a/src/lib/data/icons/other/keys.png b/src/lib/data/icons/other/keys.png
deleted file mode 100644
index 19e0da92e..000000000
Binary files a/src/lib/data/icons/other/keys.png and /dev/null differ
diff --git a/src/lib/data/icons/other/login.png b/src/lib/data/icons/other/login.png
new file mode 100644
index 000000000..a01677f46
Binary files /dev/null and b/src/lib/data/icons/other/login.png differ