diff --git a/src/declarativeimports/plasmacomponents3/Button.qml b/src/declarativeimports/plasmacomponents3/Button.qml
--- a/src/declarativeimports/plasmacomponents3/Button.qml
+++ b/src/declarativeimports/plasmacomponents3/Button.qml
@@ -25,9 +25,9 @@
 T.Button {
     id: control
 
-    implicitWidth: Math.max(background ? background.implicitWidth : 0,
+    implicitWidth: Math.max(background.implicitWidth,
                             contentItem.implicitWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(units.gridUnit * 1.6, contentItem.implicitHeight + topPadding + bottomPadding)
+    implicitHeight: Math.max(background.implicitHeight, contentItem.implicitHeight + topPadding + bottomPadding)
 
     leftPadding: surfaceNormal.margins.left
     topPadding: surfaceNormal.margins.top
@@ -49,6 +49,7 @@
     background: Item {
         //retrocompatibility with old controls
         implicitWidth: units.gridUnit * 6
+        implicitHeight: units.gridUnit * 1.6
         Private.ButtonShadow {
             anchors.fill: parent
             state: {
diff --git a/src/declarativeimports/plasmacomponents3/CheckIndicator.qml b/src/declarativeimports/plasmacomponents3/CheckIndicator.qml
--- a/src/declarativeimports/plasmacomponents3/CheckIndicator.qml
+++ b/src/declarativeimports/plasmacomponents3/CheckIndicator.qml
@@ -29,16 +29,15 @@
     implicitWidth: units.gridUnit
     implicitHeight: units.gridUnit
     opacity: control.enabled ? 1 : 0.6
-    property int checkState: control.checkState
 
     PlasmaCore.SvgItem {
         svg: PlasmaCore.Svg {
             id: checkmarkSvg
             imagePath: "widgets/checkmarks"
         }
         elementId: "checkbox"
         opacity: {
-            switch (root.checkState) {
+            switch (control.checkState) {
             case Qt.Checked:
                 return 1;
             case Qt.PartiallyChecked:
diff --git a/src/declarativeimports/plasmacomponents3/ToolButton.qml b/src/declarativeimports/plasmacomponents3/ToolButton.qml
--- a/src/declarativeimports/plasmacomponents3/ToolButton.qml
+++ b/src/declarativeimports/plasmacomponents3/ToolButton.qml
@@ -25,8 +25,9 @@
 T.ToolButton {
     id: control
 
-    implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
-    implicitHeight: Math.max(units.gridUnit * 1.6, contentItem.implicitHeight + topPadding + bottomPadding)
+    implicitWidth: Math.max(background.implicitWidth,
+                            contentItem.implicitWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(background.implicitHeight, contentItem.implicitHeight + topPadding + bottomPadding)
 
     leftPadding: surfaceNormal.margins.left
     topPadding: surfaceNormal.margins.top
@@ -50,6 +51,7 @@
     background: Item {
         //retrocompatibility with old controls
         implicitWidth: units.gridUnit * 6
+        implicitHeight: units.gridUnit * 1.6
         Private.ButtonShadow {
             anchors.fill: parent
             visible: (!control.flat || control.hovered) && (!control.pressed || !control.checked)
diff --git a/src/declarativeimports/plasmacomponents3/qmldir b/src/declarativeimports/plasmacomponents3/qmldir
--- a/src/declarativeimports/plasmacomponents3/qmldir
+++ b/src/declarativeimports/plasmacomponents3/qmldir
@@ -4,7 +4,6 @@
 Button 3.0 Button.qml
 CheckBox 3.0 CheckBox.qml
 CheckDelegate 3.0 CheckDelegate.qml
-CheckIndicator 3.0 CheckIndicator.qml
 ComboBox 3.0 ComboBox.qml
 Container 3.0 Container.qml
 Control 3.0 Control.qml
@@ -22,13 +21,11 @@
 ProgressBar 3.0 ProgressBar.qml
 RadioButton 3.0 RadioButton.qml
 RadioDelegate 3.0 RadioDelegate.qml
-RadioIndicator 3.0 RadioIndicator.qml
 RangeSlider 3.0 RangeSlider.qml
 ScrollBar 3.0 ScrollBar.qml
 Slider 3.0 Slider.qml
 SpinBox 3.0 SpinBox.qml
 SwitchDelegate 3.0 SwitchDelegate.qml
-SwitchIndicator 3.0 SwitchIndicator.qml
 Switch 3.0 Switch.qml
 TabBar 3.0 TabBar.qml
 TabButton 3.0 TabButton.qml