diff --git a/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml b/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml
index e84f1e0982..d07bb50b11 100644
--- a/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml
+++ b/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml
@@ -11,7 +11,7 @@ ColumnLayout
 {
     id: backupDetails
     width: parent.width
-    spacing: 10 * screenScaleFactor
+    spacing: UM.Theme.getSize("default_margin").width
     property var backupDetailsData
 
     // Cura version
diff --git a/plugins/CuraDrive/src/qml/components/BackupListItemDetailsRow.qml b/plugins/CuraDrive/src/qml/components/BackupListItemDetailsRow.qml
index d1c8dd33d2..550bdaefab 100644
--- a/plugins/CuraDrive/src/qml/components/BackupListItemDetailsRow.qml
+++ b/plugins/CuraDrive/src/qml/components/BackupListItemDetailsRow.qml
@@ -13,9 +13,9 @@ RowLayout
     width: parent.width
     height: 40 * screenScaleFactor
 
-    property var iconSource
-    property var label
-    property var value
+    property alias iconSource: icon.source
+    property alias label: detailName.text
+    property alias value: detailValue.text
 
     // Spacing.
     Item
@@ -23,16 +23,18 @@ RowLayout
         width: 40 * screenScaleFactor
     }
 
-    Icon
+    UM.RecolorImage
     {
+        id: icon
         width: 18 * screenScaleFactor
-        iconSource: detailsRow.iconSource
+        height: width
+        source: ""
         color: UM.Theme.getColor("text")
     }
 
     Label
     {
-        text: detailsRow.label
+        id: detailName
         color: UM.Theme.getColor("text")
         elide: Text.ElideRight
         Layout.minimumWidth: 50 * screenScaleFactor
@@ -43,7 +45,7 @@ RowLayout
 
     Label
     {
-        text: detailsRow.value
+        id: detailValue
         color: UM.Theme.getColor("text")
         elide: Text.ElideRight
         Layout.minimumWidth: 50 * screenScaleFactor
diff --git a/plugins/CuraDrive/src/qml/components/Icon.qml b/plugins/CuraDrive/src/qml/components/Icon.qml
deleted file mode 100644
index 8d559bc2b4..0000000000
--- a/plugins/CuraDrive/src/qml/components/Icon.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2018 Ultimaker B.V.
-// Cura is released under the terms of the LGPLv3 or higher.
-
-import QtQuick 2.7
-import QtQuick.Controls 2.1
-import QtGraphicalEffects 1.0
-
-Item
-{
-    id: icon
-    width: parent.height
-    height: width
-    property var color: "transparent"
-    property var iconSource
-    property bool animated: false
-
-    Image
-    {
-        id: iconImage
-        width: parent.height
-        height: width
-        smooth: true
-        source: icon.iconSource
-        sourceSize.width: width
-        sourceSize.height: height
-        antialiasing: true
-        visible: !icon.animated
-    }
-
-    AnimatedImage
-    {
-        id: animatedIconImage
-        width: parent.height
-        height: width
-        smooth: true
-        antialiasing: true
-        source: "../images/loading.gif"
-        visible: icon.animated
-    }
-
-    ColorOverlay
-    {
-        anchors.fill: iconImage
-        source: iconImage
-        color: icon.color
-        antialiasing: true
-        visible: !icon.animated
-    }
-
-    ColorOverlay
-    {
-        anchors.fill: animatedIconImage
-        source: animatedIconImage
-        color: icon.color
-        antialiasing: true
-        visible: icon.animated
-    }
-}
diff --git a/plugins/CuraDrive/src/qml/main.qml b/plugins/CuraDrive/src/qml/main.qml
index e8a49a49e5..48bf3b6ea4 100644
--- a/plugins/CuraDrive/src/qml/main.qml
+++ b/plugins/CuraDrive/src/qml/main.qml
@@ -27,7 +27,7 @@ Window
     UM.I18nCatalog
     {
         id: catalog
-        name: "cura_drive"
+        name: "cura"
     }
 
     WelcomePage
diff --git a/plugins/CuraDrive/src/qml/pages/BackupsPage.qml b/plugins/CuraDrive/src/qml/pages/BackupsPage.qml
index 0a7b00d2cb..3b905a4a39 100644
--- a/plugins/CuraDrive/src/qml/pages/BackupsPage.qml
+++ b/plugins/CuraDrive/src/qml/pages/BackupsPage.qml
@@ -18,7 +18,7 @@ Item
 
     ColumnLayout
     {
-        spacing: UM.Theme.getSize("default_margin").height * 2
+        spacing: UM.Theme.getSize("wide_margin").height
         width: parent.width
         anchors.fill: parent
 
diff --git a/plugins/CuraDrive/src/qml/pages/WelcomePage.qml b/plugins/CuraDrive/src/qml/pages/WelcomePage.qml
index 19eecedf28..0b207bc170 100644
--- a/plugins/CuraDrive/src/qml/pages/WelcomePage.qml
+++ b/plugins/CuraDrive/src/qml/pages/WelcomePage.qml
@@ -10,12 +10,14 @@ import Cura 1.1 as Cura
 
 import "../components"
 
+
 Column
 {
     id: welcomePage
     spacing: UM.Theme.getSize("wide_margin").height
     width: parent.width
-    topPadding: 150 * screenScaleFactor
+    height: childrenRect.height
+    anchors.centerIn: parent
 
     Image
     {
@@ -51,3 +53,4 @@ Column
         fixedWidthMode: true
     }
 }
+