diff --git a/interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml b/interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml
index 22e9dc07a2..50df4dedbc 100644
--- a/interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml
@@ -8,8 +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
+import QtQuick 2.7
+import QtQuick.Controls 2.2
 import Hifi 1.0 as Hifi
 
 import "../../styles-uit"
@@ -69,9 +69,8 @@ Rectangle {
         id: textArea
         width: parent.width
         height: parent.height
-        backgroundVisible: false
-        textColor: hifi.colors.white
+        background: Item {}
+        color: hifi.colors.white
         text:""
     }
-
 }
diff --git a/interface/resources/qml/windows/ScrollingWindow.qml b/interface/resources/qml/windows/ScrollingWindow.qml
index 1f9b59d2b4..cf44927941 100644
--- a/interface/resources/qml/windows/ScrollingWindow.qml
+++ b/interface/resources/qml/windows/ScrollingWindow.qml
@@ -10,8 +10,7 @@
 //
 
 import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
+import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
 
 import "."
@@ -78,17 +77,21 @@ Window {
         ScrollView {
             id: scrollView
             contentItem: content
-            horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-            verticalScrollBarPolicy: Qt.ScrollBarAsNeeded
+            clip: true
+            ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
             anchors.fill: parent
             anchors.rightMargin: parent.isScrolling ? 1 : 0
             anchors.bottomMargin: footerPane.height
 
-            style: ScrollViewStyle {
-
-                padding.right: -7  // Move to right away from content.
-
-                handle: Item {
+            ScrollBar.vertical: ScrollBar {
+                parent: scrollView
+                policy: ScrollBar.AsNeeded
+                orientation: Qt.Vertical
+                x: scrollView.mirrored ? 0 : scrollView.width - width
+                y: scrollView.topPadding
+                height: scrollView.availableHeight
+                active: scrollView.ScrollBar.horizontal.active
+                contentItem: Item {
                     implicitWidth: 8
                     Rectangle {
                         radius: 4
@@ -101,30 +104,24 @@ Window {
                         }
                     }
                 }
+            }
 
-                scrollBarBackground: Item {
-                    implicitWidth: 10
-                    Rectangle {
-                        color: hifi.colors.darkGray30
-                        radius: 4
-                        anchors {
-                            fill: parent
-                            topMargin: -1  // Finesse size
-                            bottomMargin: -2
-                        }
+            background: Item {
+                implicitWidth: 10
+                Rectangle {
+                    color: hifi.colors.darkGray30
+                    radius: 4
+                    anchors {
+                        fill: parent
+                        topMargin: -1  // Finesse size
+                        bottomMargin: -2
                     }
                 }
-
-                incrementControl: Item {
-                    visible: false
-                }
-
-                decrementControl: Item {
-                    visible: false
-                }
             }
+
         }
 
+
         function scrollBy(delta) {
             scrollView.flickableItem.contentY += delta;
         }