diff --git a/discover/qml/AddSourceDialog.qml b/discover/qml/AddSourceDialog.qml
index f31ae6c3..b54d9a57 100644
--- a/discover/qml/AddSourceDialog.qml
+++ b/discover/qml/AddSourceDialog.qml
@@ -1,89 +1,91 @@
 /*
  *   Copyright (C) 2014 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library/Lesser General Public License
  *   version 2, or (at your option) any later version, as published by the
  *   Free Software Foundation
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details
  *
  *   You should have received a copy of the GNU Library/Lesser General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.1
 import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import org.kde.kirigami 2.2 as Kirigami
 
 Popup
 {
     id: newSourceDialog
     parent: applicationWindow().overlay
     modal: true
+    focus: true
 
     x: (parent.width - width)/2
     y: (parent.height - height)/2
 
     property string displayName
     property QtObject source
 
     ColumnLayout {
         id: info
         anchors {
             left: parent.left
             right: parent.right
         }
 
-        Kirigami.Icon {
-            Layout.alignment: Qt.AlignRight
-            visible: !Kirigami.Settings.isMobile
-            width: Kirigami.Units.iconSizes.smallMedium
-            height: width
-            source: "dialog-close"
-            MouseArea {
-                anchors.fill: parent
-                onClicked: newSourceDialog.close();
-            }
-        }
-
         Kirigami.Heading {
-            level: 4
+            level: 3
             Layout.fillWidth: true
-            text: i18n("Specify the new source for %1", displayName)
+            text: i18n("Add a new %1 repository", displayName)
         }
         Label {
             id: description
             Layout.fillWidth: true
             Layout.fillHeight: true
             wrapMode: Text.WordWrap
             textFormat: Text.PlainText
             text: source.idDescription
         }
 
         TextField {
             id: repository
             Layout.fillWidth: true
-            Keys.onEnterPressed: newSourceDialog.accept()
+            onAccepted: okButton.clicked()
             focus: true
             onTextChanged: color = Kirigami.Theme.textColor
         }
 
         DialogButtonBox {
             Layout.fillWidth: true
-            standardButtons: DialogButtonBox.Ok | DialogButtonBox.Close
 
-            onAccepted: if (source.addSource(repository.text)) {
-                newSourceDialog.visible = false
-            } else {
-                repository.color = Kirigami.Theme.negativeTextColor
+            Button {
+                id: okButton
+                DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
+                text: i18n("Add")
+                icon.name: "list-add"
+                onClicked: if (source.addSource(repository.text)) {
+                    newSourceDialog.close()
+                } else {
+                    repository.color = Kirigami.Theme.negativeTextColor
+                }
+            }
+
+            Button {
+                id: cancelButton
+                DialogButtonBox.buttonRole: DialogButtonBox.DestructiveRole
+                text: i18n("Cancel")
+                icon.name: "dialog-cancel"
+                onClicked: newSourceDialog.close()
             }
         }
     }
 }