diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index 300bcd46f0..76b1e91066 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -170,7 +170,7 @@ Item {
             }
         }
 
-        CheckBoxQQC2 {
+        CheckBox {
             id: showPassword
             text: "Show password"
         }
diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controls-uit/CheckBox.qml
index 22b25671c3..86a7742d16 100644
--- a/interface/resources/qml/controls-uit/CheckBox.qml
+++ b/interface/resources/qml/controls-uit/CheckBox.qml
@@ -8,9 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.5
-import QtQuick.Controls 1.4 as Original
-import QtQuick.Controls.Styles 1.4
+import QtQuick 2.2
+import QtQuick.Controls 2.2 as Original
 
 import "../styles-uit"
 
@@ -28,85 +27,89 @@ Original.CheckBox {
     property bool wrap: true;
     readonly property int checkSize: Math.max(boxSize - 8, 10)
     readonly property int checkRadius: 2
-    activeFocusOnPress: true
+    focusPolicy: Qt.ClickFocus
+    hoverEnabled: true
 
     onClicked: {
         tabletInterface.playSound(TabletEnums.ButtonClick);
     }
 
-// TODO: doesnt works for QQC1. check with QQC2
-//    onHovered: {
-//        tabletInterface.playSound(TabletEnums.ButtonHover);
-//    }
+    onHoveredChanged: {
+        if (hovered) {
+            tabletInterface.playSound(TabletEnums.ButtonHover);
+        }
+    }
 
-    style: CheckBoxStyle {
-        indicator: Rectangle {
-            id: box
+
+    indicator: Rectangle {
+        id: box
+        width: boxSize
+        height: boxSize
+        radius: boxRadius
+        y: parent.height / 2 - height / 2
+        border.width: 1
+        border.color: pressed || hovered
+                      ? hifi.colors.checkboxCheckedBorder
+                      : (checkBox.isLightColorScheme ? hifi.colors.checkboxLightFinish : hifi.colors.checkboxDarkFinish)
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0.2
+                color: pressed || hovered
+                       ? (checkBox.isLightColorScheme ? hifi.colors.checkboxChecked : hifi.colors.checkboxLightStart)
+                       : (checkBox.isLightColorScheme ? hifi.colors.checkboxLightStart : hifi.colors.checkboxDarkStart)
+            }
+            GradientStop {
+                position: 1.0
+                color: pressed || hovered
+                       ? (checkBox.isLightColorScheme ? hifi.colors.checkboxChecked : hifi.colors.checkboxLightFinish)
+                       : (checkBox.isLightColorScheme ? hifi.colors.checkboxLightFinish : hifi.colors.checkboxDarkFinish)
+            }
+        }
+
+        Rectangle {
+            visible: pressed || hovered
+            anchors.centerIn: parent
+            id: innerBox
+            width: checkSize - 4
+            height: width
+            radius: checkRadius
+            color: hifi.colors.checkboxCheckedBorder
+        }
+
+        Rectangle {
+            id: check
+            width: checkSize
+            height: checkSize
+            radius: checkRadius
+            anchors.centerIn: parent
+            color: isRedCheck ? hifi.colors.checkboxCheckedRed : hifi.colors.checkboxChecked
+            border.width: 2
+            border.color: isRedCheck? hifi.colors.checkboxCheckedBorderRed : hifi.colors.checkboxCheckedBorder
+            visible: checked && !pressed || !checked && pressed
+        }
+
+        Rectangle {
+            id: disabledOverlay
+            visible: !enabled
             width: boxSize
             height: boxSize
             radius: boxRadius
             border.width: 1
-            border.color: pressed || hovered
-                          ? hifi.colors.checkboxCheckedBorder
-                          : (checkBox.isLightColorScheme ? hifi.colors.checkboxLightFinish : hifi.colors.checkboxDarkFinish)
-
-            gradient: Gradient {
-                GradientStop {
-                    position: 0.2
-                    color: pressed || hovered
-                           ? (checkBox.isLightColorScheme ? hifi.colors.checkboxChecked : hifi.colors.checkboxLightStart)
-                           : (checkBox.isLightColorScheme ? hifi.colors.checkboxLightStart : hifi.colors.checkboxDarkStart)
-                }
-                GradientStop {
-                    position: 1.0
-                    color: pressed || hovered
-                           ? (checkBox.isLightColorScheme ? hifi.colors.checkboxChecked : hifi.colors.checkboxLightFinish)
-                           : (checkBox.isLightColorScheme ? hifi.colors.checkboxLightFinish : hifi.colors.checkboxDarkFinish)
-                }
-            }
-
-            Rectangle {
-                visible: pressed || hovered
-                anchors.centerIn: parent
-                id: innerBox
-                width: checkSize - 4
-                height: width
-                radius: checkRadius
-                color: hifi.colors.checkboxCheckedBorder
-            }
-
-            Rectangle {
-                id: check
-                width: checkSize
-                height: checkSize
-                radius: checkRadius
-                anchors.centerIn: parent
-                color: isRedCheck ? hifi.colors.checkboxCheckedRed : hifi.colors.checkboxChecked
-                border.width: 2
-                border.color: isRedCheck? hifi.colors.checkboxCheckedBorderRed : hifi.colors.checkboxCheckedBorder
-                visible: checked && !pressed || !checked && pressed
-            }
-
-            Rectangle {
-                id: disabledOverlay
-                visible: !enabled
-                width: boxSize
-                height: boxSize
-                radius: boxRadius
-                border.width: 1
-                border.color: hifi.colors.baseGrayHighlight
-                color: hifi.colors.baseGrayHighlight
-                opacity: 0.5
-            }
-        }
-
-        label: Label {
-            text: control.text
-            color: control.color
-            x: 2
-            wrapMode: checkBox.wrap ? Text.Wrap : Text.NoWrap
-            elide: checkBox.wrap ? Text.ElideNone : Text.ElideRight
-            enabled: checkBox.enabled
+            border.color: hifi.colors.baseGrayHighlight
+            color: hifi.colors.baseGrayHighlight
+            opacity: 0.5
         }
     }
+
+    contentItem: Label {
+        text: checkBox.text
+        color: checkBox.color
+        x: 2
+        verticalAlignment: Text.AlignVCenter
+        wrapMode: checkBox.wrap ? Text.Wrap : Text.NoWrap
+        elide: checkBox.wrap ? Text.ElideNone : Text.ElideRight
+        enabled: checkBox.enabled
+        leftPadding: checkBox.indicator.width + checkBox.spacing
+    }
 }
diff --git a/interface/resources/qml/controls-uit/Label.qml b/interface/resources/qml/controls-uit/Label.qml
index 1dc3aa0dd4..4c7051b495 100644
--- a/interface/resources/qml/controls-uit/Label.qml
+++ b/interface/resources/qml/controls-uit/Label.qml
@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.5
+import QtQuick 2.7
 
 import "../styles-uit"
 
diff --git a/interface/resources/qml/styles-uit/RalewaySemiBold.qml b/interface/resources/qml/styles-uit/RalewaySemiBold.qml
index fe3a42dd6c..2d7a7f46a2 100644
--- a/interface/resources/qml/styles-uit/RalewaySemiBold.qml
+++ b/interface/resources/qml/styles-uit/RalewaySemiBold.qml
@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.5
+import QtQuick 2.7
 
 Text {
     id: root