diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml
index 247df4b025..3a6b6c8741 100644
--- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml
+++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml
@@ -72,6 +72,7 @@ Window
                     right: parent.right
                 }
                 text: catalog.i18nc("@text:window", "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:")
+                color: UM.Theme.getColor("text")
                 wrapMode: Text.WordWrap
                 renderType: Text.NativeRendering
             }
diff --git a/plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml b/plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml
index c37bb099d0..dd0237eada 100644
--- a/plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml
+++ b/plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml
@@ -4,12 +4,10 @@
 import QtQuick 2.10
 import QtQuick.Dialogs 1.1
 import QtQuick.Window 2.2
-import QtQuick.Controls 1.4
+import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 import QtQuick.Controls.Styles 1.4
 
-// TODO: Switch to QtQuick.Controls 2.x and remove QtQuick.Controls.Styles
-
 import UM 1.1 as UM
 import Cura 1.6 as Cura
 
@@ -36,6 +34,7 @@ UM.Dialog
             id: licenseHeader
             Layout.fillWidth: true
             text: catalog.i18nc("@label", "You need to accept the license to install the package")
+            color: UM.Theme.getColor("text")
             wrapMode: Text.Wrap
             renderType: Text.NativeRendering
         }
@@ -63,6 +62,7 @@ UM.Dialog
             {
                 id: packageName
                 text: licenseModel.packageName
+                color: UM.Theme.getColor("text")
                 font.bold: true
                 anchors.verticalCenter: icon.verticalCenter
                 height: contentHeight
@@ -73,15 +73,17 @@ UM.Dialog
 
         }
 
-        TextArea
+        Cura.ScrollableTextArea
         {
-            id: licenseText
+
             Layout.fillWidth: true
             Layout.fillHeight: true
             anchors.topMargin: UM.Theme.getSize("default_margin").height
-            readOnly: true
-            text: licenseModel.licenseText
+
+            textArea.text: licenseModel.licenseText
+            textArea.readOnly: true
         }
+
     }
     rightButtons:
     [
diff --git a/resources/qml/Widgets/ScrollableTextArea.qml b/resources/qml/Widgets/ScrollableTextArea.qml
index b806087f9a..48a7f49255 100644
--- a/resources/qml/Widgets/ScrollableTextArea.qml
+++ b/resources/qml/Widgets/ScrollableTextArea.qml
@@ -1,36 +1,36 @@
-// Copyright (c) 2019 Ultimaker B.V.
-// Cura is released under the terms of the LGPLv3 or higher.
-
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-
-import UM 1.3 as UM
-import Cura 1.1 as Cura
-
-
-//
-// Cura-style TextArea with scrolls
-//
-ScrollView
-{
-    property alias textArea: _textArea
-
-    clip: true
-
-    background: Rectangle  // Border
-    {
-        color: UM.Theme.getColor("main_background")
-        border.color: UM.Theme.getColor("lining")
-        border.width: UM.Theme.getSize("default_lining").width
-    }
-
-    TextArea
-    {
-        id: _textArea
-        font: UM.Theme.getFont("default")
-        color: UM.Theme.getColor("text")
-        textFormat: TextEdit.PlainText
-        renderType: Text.NativeRendering
-        selectByMouse: true
-    }
-}
+// Copyright (c) 2019 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+
+import UM 1.3 as UM
+import Cura 1.1 as Cura
+
+
+//
+// Cura-style TextArea with scrolls
+//
+ScrollView
+{
+    property alias textArea: _textArea
+
+    clip: true
+
+    background: Rectangle  // Border
+    {
+        color: UM.Theme.getColor("main_background")
+        border.color: UM.Theme.getColor("thick_lining")
+        border.width: UM.Theme.getSize("default_lining").width
+    }
+
+    TextArea
+    {
+        id: _textArea
+        font: UM.Theme.getFont("default")
+        color: UM.Theme.getColor("text")
+        textFormat: TextEdit.PlainText
+        renderType: Text.NativeRendering
+        selectByMouse: true
+    }
+}
diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json
index 282004c3a9..9db024397a 100644
--- a/resources/themes/cura-dark/theme.json
+++ b/resources/themes/cura-dark/theme.json
@@ -8,7 +8,7 @@
         "main_background": [39, 44, 48, 255],
         "message_background": [39, 44, 48, 255],
         "wide_lining": [31, 36, 39, 255],
-        "thick_lining": [255, 255, 255, 30],
+        "thick_lining": [255, 255, 255, 60],
         "lining": [64, 69, 72, 255],
         "viewport_overlay": [30, 36, 39, 255],
 
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index de4c9ccb42..225e0db569 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -149,7 +149,7 @@
 
         "main_background": [255, 255, 255, 255],
         "wide_lining": [245, 245, 245, 255],
-        "thick_lining": [127, 127, 127, 255],
+        "thick_lining": [180, 180, 180, 255],
         "lining": [192, 193, 194, 255],
         "viewport_overlay": [246, 246, 246, 255],