diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml
index e9303dde0..4b89c7bf4 100644
--- a/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml
+++ b/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml
@@ -112,6 +112,7 @@ Item {
         Item {
             anchors.fill: parent
             property alias margins: surface.margins
+            property alias surfaceOpacity: surface.opacity
             Private.ButtonShadow {
                 id: shadow
                 anchors.fill: parent
@@ -140,6 +141,7 @@ Item {
             id: roundButtonDelegate
             parent: delegate
             anchors.fill: parent
+            property alias surfaceOpacity: buttonItem.opacity
             property QtObject margins: QtObject {
                 property int left: delegate.width/8
                 property int top: delegate.width/8
@@ -218,7 +220,7 @@ Item {
             font.underline: theme.defaultFont.underline
             font.weight: theme.defaultFont.weight
             font.wordSpacing: theme.defaultFont.wordSpacing
-            color: surface.opacity == 1 ? theme.buttonTextColor : theme.textColor
+            color: delegate.item.surfaceOpacity > 0.5 ? theme.buttonTextColor : theme.textColor
             horizontalAlignment: icon.valid ? Text.AlignLeft : Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
         }
diff --git a/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml b/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml
index a6986d0ae..ca8e7af4e 100644
--- a/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml
+++ b/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml
@@ -39,6 +39,11 @@ PlasmaCore.FrameSvgItem {
         }
     }
 
+    PlasmaCore.Svg {
+        id: scrollbarSvg
+        imagePath: "widgets/scrollbar"
+    }
+
     property Item handle: handle
 
     property Item contents: contents