diff --git a/deploy/qt/imports/QtQuick/Controls.2/Button.qml b/deploy/qt/imports/QtQuick/Controls.2/Button.qml
index 358fe220..24a28ea8 100644
--- a/deploy/qt/imports/QtQuick/Controls.2/Button.qml
+++ b/deploy/qt/imports/QtQuick/Controls.2/Button.qml
@@ -43,9 +43,9 @@ T.Button {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth,
-                            contentItem.implicitWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight,
-                             contentItem.implicitHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     padding: 6
     horizontalPadding: padding + 2
diff --git a/deploy/qt/imports/QtQuick/Controls.2/CheckDelegate.qml b/deploy/qt/imports/QtQuick/Controls.2/CheckDelegate.qml
index 1cb5bdd0..d1572e2e 100644
--- a/deploy/qt/imports/QtQuick/Controls.2/CheckDelegate.qml
+++ b/deploy/qt/imports/QtQuick/Controls.2/CheckDelegate.qml
@@ -43,9 +43,9 @@ T.CheckDelegate {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth,
-                            contentItem.implicitWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight,
-                             Math.max(contentItem.implicitHeight,
+                             Math.max(implicitContentHeight,
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
 
     padding: 12
diff --git a/deploy/qt/imports/QtQuick/Controls.2/ItemDelegate.qml b/deploy/qt/imports/QtQuick/Controls.2/ItemDelegate.qml
index b9770258..499c90a6 100644
--- a/deploy/qt/imports/QtQuick/Controls.2/ItemDelegate.qml
+++ b/deploy/qt/imports/QtQuick/Controls.2/ItemDelegate.qml
@@ -43,9 +43,9 @@ T.ItemDelegate {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth,
-                            contentItem.implicitWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight,
-                             Math.max(contentItem.implicitHeight,
+                             Math.max(implicitContentHeight,
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
 
     padding: 12
diff --git a/deploy/qt/imports/QtQuick/Controls.2/MenuBarItem.qml b/deploy/qt/imports/QtQuick/Controls.2/MenuBarItem.qml
index ca29f7e1..24c33b8e 100644
--- a/deploy/qt/imports/QtQuick/Controls.2/MenuBarItem.qml
+++ b/deploy/qt/imports/QtQuick/Controls.2/MenuBarItem.qml
@@ -43,9 +43,9 @@ T.MenuBarItem {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth,
-                            contentItem.implicitWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight,
-                             Math.max(contentItem.implicitHeight,
+                             Math.max(implicitContentHeight,
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
 
     spacing: 6
diff --git a/deploy/qt/imports/QtQuick/Controls.2/MenuItem.qml b/deploy/qt/imports/QtQuick/Controls.2/MenuItem.qml
index 602f9c7e..184f6751 100644
--- a/deploy/qt/imports/QtQuick/Controls.2/MenuItem.qml
+++ b/deploy/qt/imports/QtQuick/Controls.2/MenuItem.qml
@@ -43,9 +43,9 @@ T.MenuItem {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth,
-                            contentItem.implicitWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight,
-                             Math.max(contentItem.implicitHeight,
+                             Math.max(implicitContentHeight,
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
 
     padding: 6
diff --git a/deploy/qt/imports/QtQuick/Controls.2/RadioDelegate.qml b/deploy/qt/imports/QtQuick/Controls.2/RadioDelegate.qml
index 35ebdc3f..5f75f9aa 100644
--- a/deploy/qt/imports/QtQuick/Controls.2/RadioDelegate.qml
+++ b/deploy/qt/imports/QtQuick/Controls.2/RadioDelegate.qml
@@ -43,9 +43,9 @@ T.RadioDelegate {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth,
-                            contentItem.implicitWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight,
-                             Math.max(contentItem.implicitHeight,
+                             Math.max(implicitContentHeight,
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
 
     padding: 12
diff --git a/deploy/qt/imports/QtQuick/Controls.2/RoundButton.qml b/deploy/qt/imports/QtQuick/Controls.2/RoundButton.qml
index 296c651c..a79c3363 100644
--- a/deploy/qt/imports/QtQuick/Controls.2/RoundButton.qml
+++ b/deploy/qt/imports/QtQuick/Controls.2/RoundButton.qml
@@ -43,9 +43,9 @@ T.RoundButton {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth,
-                            contentItem.implicitWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight,
-                             contentItem.implicitHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     padding: 6
     spacing: 6
diff --git a/deploy/qt/imports/QtQuick/Controls.2/SwipeDelegate.qml b/deploy/qt/imports/QtQuick/Controls.2/SwipeDelegate.qml
index d66de533..89d45a2d 100644
--- a/deploy/qt/imports/QtQuick/Controls.2/SwipeDelegate.qml
+++ b/deploy/qt/imports/QtQuick/Controls.2/SwipeDelegate.qml
@@ -43,9 +43,9 @@ T.SwipeDelegate {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth,
-                            contentItem.implicitWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight,
-                             Math.max(contentItem.implicitHeight,
+                             Math.max(implicitContentHeight,
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
 
     padding: 12
diff --git a/deploy/qt/imports/QtQuick/Controls.2/SwitchDelegate.qml b/deploy/qt/imports/QtQuick/Controls.2/SwitchDelegate.qml
index 80f4f58c..9554e2d2 100644
--- a/deploy/qt/imports/QtQuick/Controls.2/SwitchDelegate.qml
+++ b/deploy/qt/imports/QtQuick/Controls.2/SwitchDelegate.qml
@@ -43,9 +43,9 @@ T.SwitchDelegate {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth,
-                            contentItem.implicitWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight,
-                             Math.max(contentItem.implicitHeight,
+                             Math.max(implicitContentHeight,
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
 
     padding: 12
diff --git a/deploy/qt/imports/QtQuick/Controls.2/TabButton.qml b/deploy/qt/imports/QtQuick/Controls.2/TabButton.qml
index 39bec9ba..55c21704 100644
--- a/deploy/qt/imports/QtQuick/Controls.2/TabButton.qml
+++ b/deploy/qt/imports/QtQuick/Controls.2/TabButton.qml
@@ -43,9 +43,9 @@ T.TabButton {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth,
-                            contentItem.implicitWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight,
-                             contentItem.implicitHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     padding: 6
     spacing: 6
diff --git a/deploy/qt/imports/QtQuick/Controls.2/ToolButton.qml b/deploy/qt/imports/QtQuick/Controls.2/ToolButton.qml
index 037eef13..106d726b 100644
--- a/deploy/qt/imports/QtQuick/Controls.2/ToolButton.qml
+++ b/deploy/qt/imports/QtQuick/Controls.2/ToolButton.qml
@@ -43,9 +43,9 @@ T.ToolButton {
     id: control
 
     implicitWidth: Math.max(implicitBackgroundWidth,
-                            contentItem.implicitWidth + leftPadding + rightPadding)
+                            implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight,
-                             contentItem.implicitHeight + topPadding + bottomPadding)
+                             implicitContentHeight + topPadding + bottomPadding)
 
     padding: 6
     spacing: 6