diff --git a/share/qtcreator/welcomescreen/widgets/SideBar.qml b/share/qtcreator/welcomescreen/widgets/SideBar.qml
index 321912e0d17..4b2dc90c43e 100644
--- a/share/qtcreator/welcomescreen/widgets/SideBar.qml
+++ b/share/qtcreator/welcomescreen/widgets/SideBar.qml
@@ -53,9 +53,9 @@ ColumnLayout {
         }
 
         Tabs {
-            anchors.centerIn: parent
+            anchors.verticalCenter: parent.verticalCenter
+            x: 16
             id: tabs
-
         }
 
         Rectangle {
@@ -109,20 +109,26 @@ ColumnLayout {
                 font.bold: false
             }
 
-            NativeText {
-                text: qsTr("Learn how to develop your own applications and explore Qt Creator.")
-                font.pixelSize: 12
-                wrapMode: Text.WordWrap
-                Layout.maximumWidth: Screen.pixelDensity * 60
+            Item {
+                NativeText {
+                    id: gettingStartedText
+                    anchors.fill: parent
+                    anchors.rightMargin: 24
+                    text: qsTr("Learn how to develop your own applications and explore Qt Creator.")
+                    font.pixelSize: 12
+                    wrapMode: Text.WordWrap
+                }
+                height: gettingStartedText.implicitHeight
+                implicitWidth: parent.width
             }
 
             Item {
-                height: 8
+                height: 24
                 width: parent.width
             }
 
             Item {
-                width: gettingStartedButton.width + 24
+                width: gettingStartedButton.width + 28
                 Button {
                     x: 4
                     id: gettingStartedButton
@@ -137,7 +143,6 @@ ColumnLayout {
             }
 
             ColumnLayout {
-                x: 14
                 spacing: 16
                 IconAndLink {
                     iconSource: "images/icons/qt_account.png"
diff --git a/share/qtcreator/welcomescreen/widgets/Tabs.qml b/share/qtcreator/welcomescreen/widgets/Tabs.qml
index 5074f504626..2c1a047299f 100644
--- a/share/qtcreator/welcomescreen/widgets/Tabs.qml
+++ b/share/qtcreator/welcomescreen/widgets/Tabs.qml
@@ -29,8 +29,9 @@
 
 import QtQuick 2.1
 import QtQuick.Controls 1.1 as QQControls
+import QtQuick.Layouts 1.1
 
-Column {
+ColumnLayout {
     id: customTab
     property alias model: repeater.model
     spacing: 16
@@ -48,6 +49,7 @@ Column {
         id: repeater
 
         Button {
+            Layout.fillWidth: true
             text: title
             checkable: true
             exclusiveGroup: group