diff --git a/plugins/welcomepage/qml/Link.qml b/plugins/welcomepage/qml/Link.qml
index 0a3fa05d8..773011660 100644
--- a/plugins/welcomepage/qml/Link.qml
+++ b/plugins/welcomepage/qml/Link.qml
@@ -1,27 +1,44 @@
 /* KDevelop
  *
  * Copyright 2011 Aleix Pol <aleixpol@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
  *
  * 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 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.Layouts 1.2
 import QtQuick.Controls 1.3
 import QtQuick.Controls.Styles 1.3
 
-ToolButton {
+Label {
+    id: root
+
+    signal clicked
+
+    elide: Text.ElideRight
+    opacity: mouseArea.containsMouse ? 0.8 : 1
+
+    MouseArea {
+        id: mouseArea
+
+        anchors.fill: parent
+
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+        onClicked: root.clicked()
+    }
+
 }
diff --git a/plugins/welcomepage/qml/StandardBackground.qml b/plugins/welcomepage/qml/StandardBackground.qml
index 34ce45d50..d39742692 100644
--- a/plugins/welcomepage/qml/StandardBackground.qml
+++ b/plugins/welcomepage/qml/StandardBackground.qml
@@ -1,56 +1,59 @@
 /* KDevelop
  *
  * Copyright 2011 Aleix Pol <aleixpol@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
  *
  * 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 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.0
 import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.2
 
 GroupBox
 {
     id: bg
     property alias tools: toolsLoader.sourceComponent
     property string pageIcon
     readonly property real marginLeft: toolsLoader.x + toolsLoader.width
     property real margins: 5
 
     Loader {
         id: toolsLoader
 
-        width: bg.width/5
+        width: bg.width/4
 
         anchors {
             top: parent.top
+            topMargin: 15
             left: parent.left
+            leftMargin: 15
             bottom: parent.bottom
+            bottomMargin: 15
         }
     }
 
     Image {
         id: theIcon
         anchors {
             bottom: parent.bottom
             left: parent.left
             margins: bg.margins
         }
         source: bg.pageIcon !== "" ? "image://icon/" + bg.pageIcon : ""
         width: 64
         height: width
     }
 }
diff --git a/plugins/welcomepage/qml/area_code.qml b/plugins/welcomepage/qml/area_code.qml
index f539cb3d1..007b4d40c 100644
--- a/plugins/welcomepage/qml/area_code.qml
+++ b/plugins/welcomepage/qml/area_code.qml
@@ -1,105 +1,101 @@
 /* KDevelop
  *
  * Copyright 2011 Aleix Pol <aleixpol@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
  *
  * 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 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.0
 import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.2
 
 StandardBackground {
     id: root
     
     state: "develop"
 
     tools: ColumnLayout {
         spacing: 10
 
-        RowLayout {
+        Row {
             Layout.fillWidth: true
-            Layout.preferredHeight: parent.width/4
-            Layout.maximumHeight: parent.width/4
+            spacing: 5
 
             Image {
                 id: icon
-                Layout.fillHeight: true
-                Layout.alignment: Qt.AlignHCenter
+
                 horizontalAlignment: Image.AlignHCenter
                 verticalAlignment: Image.AlignVCenter
 
                 source: "image://icon/kdevelop"
                 smooth: true
                 fillMode: Image.PreserveAspectFit
             }
             Label {
-                Layout.fillWidth: true
-                Layout.fillHeight: true
                 verticalAlignment: Text.AlignVCenter
+                height: icon.height
                 text: "KDevelop"
-                fontSizeMode: Text.Fit
                 font {
                     pointSize: 20
                     weight: Font.ExtraLight
                 }
             }
         }
 
         Item {
             Layout.fillWidth: true
             Layout.fillHeight: true
         }
 
-        ColumnLayout {
-            Layout.fillWidth: true
-            Heading {
-                Layout.fillWidth: true
-                text: i18n("Need Help?")
-            }
+        Heading {
+            text: i18n("Need Help?")
+        }
+
+        Column {
+            spacing: 10
 
             Link {
+                x: 10
                 text: i18n("KDevelop.org")
-                iconName: "applications-webbrowsers"
                 onClicked: {
                     Qt.openUrlExternally("https://kdevelop.org")
                 }
             }
             Link {
+                x: 10
                 text: i18n("Learn about KDevelop")
-                iconName: "applications-webbrowsers"
                 onClicked: Qt.openUrlExternally("https://userbase.kde.org/KDevelop")
             }
             Link {
+                x: 10
                 text: i18n("Join KDevelop's team!")
-                iconName: "applications-webbrowsers"
                 onClicked: Qt.openUrlExternally("https://kdevelop.org/contribute-kdevelop")
             }
             Link {
+                x: 10
                 text: i18n("Handbook")
-                iconName: "applications-webbrowsers"
                 onClicked: kdev.retrieveMenuAction("help/help_contents").trigger()
             }
         }
     }
 
     Develop {
         anchors {
             fill: parent
             leftMargin: root.marginLeft+root.margins
         }
     }
 }