diff --git a/interface/resources/qml/controls/CheckBox.qml b/interface/resources/qml/controls/CheckBox.qml
index fe836a0e89..91586299a7 100644
--- a/interface/resources/qml/controls/CheckBox.qml
+++ b/interface/resources/qml/controls/CheckBox.qml
@@ -10,7 +10,8 @@ Original.CheckBox {
         }
         label: Text {
             text: control.text
+            renderType: Text.QtRendering
         }
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/interface/resources/qml/controls/TextField.qml b/interface/resources/qml/controls/TextField.qml
new file mode 100644
index 0000000000..df536a1de5
--- /dev/null
+++ b/interface/resources/qml/controls/TextField.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
+
+TextField {
+    style:  TextFieldStyle { renderType: Text.QtRendering }
+}
diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml
index 96a0c95e88..3a26c3ca27 100644
--- a/interface/resources/qml/dialogs/FileDialog.qml
+++ b/interface/resources/qml/dialogs/FileDialog.qml
@@ -2,6 +2,7 @@ import QtQuick 2.0
 import QtQuick.Controls 1.4
 import Qt.labs.folderlistmodel 2.1
 import Qt.labs.settings 1.0
+import QtQuick.Controls.Styles 1.4
 
 import ".."
 import "../windows"
@@ -82,6 +83,7 @@ ModalWindow {
         TextField {
             id: currentDirectory
             height: homeButton.height
+            style:  TextFieldStyle { renderType: Text.QtRendering }
             anchors { left: navControls.right; right: parent.right; top: parent.top; margins: 8 }
             property var lastValidFolder: helper.urlToPath(model.folder)
             onLastValidFolderChanged: text = lastValidFolder;
@@ -181,6 +183,7 @@ ModalWindow {
 
         TextField {
             id: currentSelection
+            style:  TextFieldStyle { renderType: Text.QtRendering }
             anchors { right: root.selectDirectory ? parent.right : selectionType.left; rightMargin: 8; left: parent.left; leftMargin: 8; top: selectionType.top }
             readOnly: true
             activeFocusOnTab: false
diff --git a/interface/resources/qml/dialogs/QueryDialog.qml b/interface/resources/qml/dialogs/QueryDialog.qml
index fecd69a4c6..948bbb1295 100644
--- a/interface/resources/qml/dialogs/QueryDialog.qml
+++ b/interface/resources/qml/dialogs/QueryDialog.qml
@@ -62,7 +62,7 @@ ModalWindow {
         Item {
             anchors { top: mainTextContainer.bottom; bottom: buttons.top; left: parent.left; right: parent.right; margins: d.spacing }
             // FIXME make a text field type that can be bound to a history for autocompletion
-            TextField {
+            VrControls.TextField {
                 id: textResult
                 focus: items ? false : true
                 visible: items ? false : true
diff --git a/interface/resources/qml/dialogs/RunningScripts.qml b/interface/resources/qml/dialogs/RunningScripts.qml
index 8b148c6bef..c9c9062bbd 100644
--- a/interface/resources/qml/dialogs/RunningScripts.qml
+++ b/interface/resources/qml/dialogs/RunningScripts.qml
@@ -219,7 +219,7 @@ Window {
                 }
             }
 
-            TextField {
+            HifiControls.TextField {
                 id: filterEdit
                 anchors.left: parent.left
                 anchors.right: parent.right
@@ -252,7 +252,7 @@ Window {
                 TableViewColumn { title: "Name"; role: "display"; }
             }
 
-            TextField {
+            HifiControls.TextField {
                 id: selectedScript
                 readOnly: true
                 anchors.left: parent.left
diff --git a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
index 1375fc392a..a92392799d 100644
--- a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
 
 Preference {
     id: root
@@ -50,6 +51,7 @@ Preference {
         id: dataTextField
         placeholderText: root.placeholderText
         text: preference.value
+	    style:  TextFieldStyle { renderType: Text.QtRendering }
         anchors {
             top: labelText.bottom
             left: parent.left
diff --git a/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml b/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
index 7d310be468..637cc6c02c 100644
--- a/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
+++ b/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
 
 import "../../dialogs"
 
@@ -30,6 +31,7 @@ Preference {
         id: dataTextField
         placeholderText: root.placeholderText
         text: preference.value
+        style:  TextFieldStyle { renderType: Text.QtRendering }
         anchors {
             top: labelText.bottom
             left: parent.left
diff --git a/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml b/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
index ab37f30427..f28f3ab90b 100644
--- a/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import "../../controls"
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/EditablePreference.qml b/interface/resources/qml/dialogs/preferences/EditablePreference.qml
index 53dc7ed5d0..ddd5600bca 100644
--- a/interface/resources/qml/dialogs/preferences/EditablePreference.qml
+++ b/interface/resources/qml/dialogs/preferences/EditablePreference.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
 
 Preference {
     id: root
@@ -24,6 +25,7 @@ Preference {
     TextField {
         id: dataTextField
         placeholderText: preference.placeholderText
+        style:  TextFieldStyle { renderType: Text.QtRendering }
         anchors {
             top: labelText.bottom
             left: parent.left
diff --git a/interface/resources/qml/hifi/dialogs/AvatarAttachmentsDialog.qml b/interface/resources/qml/hifi/dialogs/AvatarAttachmentsDialog.qml
index 252e4c629e..5de0864df5 100644
--- a/interface/resources/qml/hifi/dialogs/AvatarAttachmentsDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/AvatarAttachmentsDialog.qml
@@ -1,6 +1,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.XmlListModel 2.0
+import QtQuick.Controls.Styles 1.4
 
 import "../../windows"
 import "../../js/Utils.js" as Utils
@@ -27,6 +28,7 @@ ModalWindow {
             TextField {
                 id: filterEdit
                 anchors { left: parent.left; right: parent.right; top: parent.top }
+                style:  TextFieldStyle { renderType: Text.QtRendering }
                 placeholderText: "filter"
                 onTextChanged: tableView.model.filter = text
             }
diff --git a/interface/resources/qml/hifi/dialogs/ModelBrowserDialog.qml b/interface/resources/qml/hifi/dialogs/ModelBrowserDialog.qml
index 252e4c629e..b103279d4c 100644
--- a/interface/resources/qml/hifi/dialogs/ModelBrowserDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/ModelBrowserDialog.qml
@@ -1,6 +1,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.XmlListModel 2.0
+import QtQuick.Controls.Styles 1.4
 
 import "../../windows"
 import "../../js/Utils.js" as Utils
@@ -26,6 +27,7 @@ ModalWindow {
 
             TextField {
                 id: filterEdit
+                style:  TextFieldStyle { renderType: Text.QtRendering }
                 anchors { left: parent.left; right: parent.right; top: parent.top }
                 placeholderText: "filter"
                 onTextChanged: tableView.model.filter = text
diff --git a/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml b/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml
index 31a1895e58..8dc5d8ba4b 100644
--- a/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml
+++ b/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
 
 import "../../../windows"
 import "../../../controls" as VrControls
@@ -31,7 +32,7 @@ Item {
             height: modelChooserButton.height
             anchors { left: parent.left; right: parent.right; }
             Text { id: urlLabel; text: "Model URL:"; width: 80; anchors.verticalCenter: modelUrl.verticalCenter }
-            TextField {
+            VrControls.TextField {
                 id: modelUrl;
                 height:  jointChooser.height;
                 anchors { left: urlLabel.right; leftMargin: 8; rightMargin: 8; right: modelChooserButton.left }