diff --git a/interface/resources/qml/controls-uit/Action.qml b/interface/resources/qml/controls-uit/Action.qml
new file mode 100644
index 0000000000..5dbfa3914b
--- /dev/null
+++ b/interface/resources/qml/controls-uit/Action.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.7
+
+Shortcut {
+    id: root
+    property string text
+    property alias shortcut: root.sequence
+    signal triggered()
+}
diff --git a/interface/resources/qml/controls-uit/Button.qml b/interface/resources/qml/controls-uit/Button.qml
index 165de98878..7d1607caa9 100644
--- a/interface/resources/qml/controls-uit/Button.qml
+++ b/interface/resources/qml/controls-uit/Button.qml
@@ -21,8 +21,7 @@ Original.Button {
     property int colorScheme: hifi.colorSchemes.light
     property string buttonGlyph: "";
 
-    //TODO: add real Action item. Backport from Qt 5.10
-    property Shortcut action: null
+    property Action action: null
 
     width: 120
     height: hifi.dimensions.controlLineHeight
@@ -35,10 +34,16 @@ Original.Button {
         }
     }
 
+    onActionChanged: {
+        if (action !== null && action.text !== "") {
+            control.text = action.text
+        }
+    }
+
     onClicked: {
         tabletInterface.playSound(TabletEnums.ButtonClick);
         if (action !== null) {
-            action.activated()
+            action.triggered()
         }
     }
 
diff --git a/interface/resources/qml/controls-uit/GlyphButton.qml b/interface/resources/qml/controls-uit/GlyphButton.qml
index bc7bc636fe..2c715ea29c 100644
--- a/interface/resources/qml/controls-uit/GlyphButton.qml
+++ b/interface/resources/qml/controls-uit/GlyphButton.qml
@@ -8,15 +8,14 @@
 //  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.7
+import QtQuick.Controls 2.2 as Original
 import TabletScriptingInterface 1.0
 
 import "../styles-uit"
 
 Original.Button {
+    id: control
     property int color: 0
     property int colorScheme: hifi.colorSchemes.light
     property string glyph: ""
@@ -25,65 +24,68 @@ Original.Button {
     width: 120
     height: 28
 
+    property Action action: null
+
     onHoveredChanged: {
         if (hovered) {
             tabletInterface.playSound(TabletEnums.ButtonHover);
         }
     }
+    onActionChanged: {
+        if (action !== null && action.text !== "") {
+            control.text = action.text
+        }
+    }
 
     onClicked: {
         tabletInterface.playSound(TabletEnums.ButtonClick);
+        if (action !== null) {
+            action.triggered()
+        }
     }
 
-    style: ButtonStyle {
+    background: Rectangle {
+        radius: hifi.buttons.radius
 
-        background: Rectangle {
-            radius: hifi.buttons.radius
-
-            gradient: Gradient {
-                GradientStop {
-                    position: 0.2
-                    color: {
-                        if (!control.enabled) {
-                            hifi.buttons.disabledColorStart[control.colorScheme]
-                        } else if (control.pressed) {
-                            hifi.buttons.pressedColor[control.color]
-                        } else if (control.hovered) {
-                            hifi.buttons.hoveredColor[control.color]
-                        } else {
-                            hifi.buttons.colorStart[control.color]
-                        }
+        gradient: Gradient {
+            GradientStop {
+                position: 0.2
+                color: {
+                    if (!control.enabled) {
+                        hifi.buttons.disabledColorStart[control.colorScheme]
+                    } else if (control.pressed) {
+                        hifi.buttons.pressedColor[control.color]
+                    } else if (control.hovered) {
+                        hifi.buttons.hoveredColor[control.color]
+                    } else {
+                        hifi.buttons.colorStart[control.color]
                     }
                 }
-                GradientStop {
-                    position: 1.0
-                    color: {
-                        if (!control.enabled) {
-                            hifi.buttons.disabledColorFinish[control.colorScheme]
-                        } else if (control.pressed) {
-                            hifi.buttons.pressedColor[control.color]
-                        } else if (control.hovered) {
-                            hifi.buttons.hoveredColor[control.color]
-                        } else {
-                            hifi.buttons.colorFinish[control.color]
-                        }
+            }
+            GradientStop {
+                position: 1.0
+                color: {
+                    if (!control.enabled) {
+                        hifi.buttons.disabledColorFinish[control.colorScheme]
+                    } else if (control.pressed) {
+                        hifi.buttons.pressedColor[control.color]
+                    } else if (control.hovered) {
+                        hifi.buttons.hoveredColor[control.color]
+                    } else {
+                        hifi.buttons.colorFinish[control.color]
                     }
                 }
             }
         }
+    }
 
-        label: HiFiGlyphs {
-            color: enabled ? hifi.buttons.textColor[control.color]
-                           : hifi.buttons.disabledTextColor[control.colorScheme]
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            anchors {
-                // Tweak horizontal alignment so that it looks right.
-                left: parent.left
-                leftMargin: -0.5
-            }
-            text: control.glyph
-            size: control.size
-        }
+    contentItem: HiFiGlyphs {
+        color: enabled ? hifi.buttons.textColor[control.color]
+                       : hifi.buttons.disabledTextColor[control.colorScheme]
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        text: control.glyph
+        size: control.size
     }
 }
+
diff --git a/interface/resources/qml/controls/Button.qml b/interface/resources/qml/controls/Button.qml
index ac3c2d32d4..6cbdec5644 100644
--- a/interface/resources/qml/controls/Button.qml
+++ b/interface/resources/qml/controls/Button.qml
@@ -3,9 +3,20 @@ import QtQuick.Controls 2.2 as Original
 
 import "."
 import "../styles"
+import "../controls-uit"
 
 Original.Button {
+    id: control
+
     HifiConstants { id: hifi }
+    property Action action: null
+
+    onActionChanged: {
+        if (action !== null && action.text !== "") {
+            control.text = action.text
+        }
+    }
+
     padding {
         top: 8
         left: 12
diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml
index b9633104d5..26530bf633 100644
--- a/interface/resources/qml/dialogs/FileDialog.qml
+++ b/interface/resources/qml/dialogs/FileDialog.qml
@@ -8,12 +8,11 @@
 //  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 Qt.labs.folderlistmodel 2.1
 import Qt.labs.settings 1.0
-import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
+import QtQuick.Controls 1.4 as QQC1
 
 import ".."
 import "../controls-uit"
@@ -543,7 +542,7 @@ ModalWindow {
                 }
             }
 
-            TableViewColumn {
+            QQC1.TableViewColumn {
                 id: fileNameColumn
                 role: "fileName"
                 title: "Name"
@@ -551,7 +550,7 @@ ModalWindow {
                 movable: false
                 resizable: true
             }
-            TableViewColumn {
+            QQC1.TableViewColumn {
                 id: fileMofifiedColumn
                 role: "fileModified"
                 title: "Date"
@@ -560,7 +559,7 @@ ModalWindow {
                 resizable: true
                 visible: !selectDirectory
             }
-            TableViewColumn {
+            QQC1.TableViewColumn {
                 role: "fileSize"
                 title: "Size"
                 width: fileTableView.width - fileNameColumn.width - fileMofifiedColumn.width
diff --git a/interface/resources/qml/dialogs/QueryDialog.qml b/interface/resources/qml/dialogs/QueryDialog.qml
index 159e5a1801..889bcda768 100644
--- a/interface/resources/qml/dialogs/QueryDialog.qml
+++ b/interface/resources/qml/dialogs/QueryDialog.qml
@@ -9,8 +9,6 @@
 //
 
 import QtQuick 2.5
-import QtQuick.Controls 2.2
-import QtQuick.Dialogs 1.2 as OriginalDialogs
 
 import "../controls-uit"
 import "../styles-uit"
@@ -147,28 +145,28 @@ ModalWindow {
             }
             Button {
                 action: cancelAction;
-                text: qsTr("Cancel");
             }
 
             Button {
                 action: acceptAction
-                text: qsTr("OK");
             }
         }
 
-        Shortcut {
+        Action {
             id: cancelAction
+            text: qsTr("Cancel");
             sequence: Qt.Key_Escape
-            onActivated: {
+            onTriggered: {
                 root.canceled();
                 root.destroy();
             }
         }
 
-        Shortcut {
+        Action {
             id: acceptAction
+            text: qsTr("OK");
             sequence: Qt.Key_Return
-            onActivated: {
+            onTriggered: {
                 root.result = items ? comboBox.currentText : textResult.text
                 root.selected(root.result);
                 root.destroy();
diff --git a/interface/resources/qml/dialogs/TabletFileDialog.qml b/interface/resources/qml/dialogs/TabletFileDialog.qml
index d3b738469e..a03e0d02f3 100644
--- a/interface/resources/qml/dialogs/TabletFileDialog.qml
+++ b/interface/resources/qml/dialogs/TabletFileDialog.qml
@@ -8,12 +8,11 @@
 //  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 Qt.labs.folderlistmodel 2.1
 import Qt.labs.settings 1.0
-import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
+import QtQuick.Controls 1.4 as QQC1
 
 import ".."
 import "../controls-uit"
@@ -541,7 +540,7 @@ TabletModalWindow {
                 }
             }
 
-            TableViewColumn {
+            QQC1.TableViewColumn {
                 id: fileNameColumn
                 role: "fileName"
                 title: "Name"
@@ -549,7 +548,7 @@ TabletModalWindow {
                 movable: false
                 resizable: true
             }
-            TableViewColumn {
+            QQC1.TableViewColumn {
                 id: fileMofifiedColumn
                 role: "fileModified"
                 title: "Date"
@@ -558,7 +557,7 @@ TabletModalWindow {
                 resizable: true
                 visible: !selectDirectory
             }
-            TableViewColumn {
+            QQC1.TableViewColumn {
                 role: "fileSize"
                 title: "Size"
                 width: fileTableView.width - fileNameColumn.width - fileMofifiedColumn.width