diff --git a/interface/resources/qml/controls-uit/TextField.qml b/interface/resources/qml/controls-uit/TextField.qml
index 3fcdf30d2d..f94541897b 100644
--- a/interface/resources/qml/controls-uit/TextField.qml
+++ b/interface/resources/qml/controls-uit/TextField.qml
@@ -8,8 +8,9 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.7
-import QtQuick.Controls 2.2
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
 
 import "../styles-uit"
 import "../controls-uit" as HifiControls
@@ -28,17 +29,11 @@ TextField {
     property int roundedBorderRadius: 4
     property bool error: false;
     property bool hasClearButton: false;
-    property alias textColor: textField.color
     property string leftPermanentGlyph: "";
     property string centerPlaceholderGlyph: "";
 
     placeholderText: textField.placeholderText
 
-    property bool rightAnchorSet: false;
-    anchors.onRightChanged: {
-        rightAnchorSet = true;
-    }
-
     font.family: "Fira Sans"
     font.pixelSize: hifi.fontSizes.textFieldInput
     height: implicitHeight + 3  // Make surrounding box higher so that highlight is vertically centered.
@@ -49,56 +44,42 @@ TextField {
     // workaround for https://bugreports.qt.io/browse/QTBUG-49297
     Keys.onPressed: {
         switch (event.key) {
-        case Qt.Key_Return:
-        case Qt.Key_Enter:
-            event.accepted = true;
+            case Qt.Key_Return: 
+            case Qt.Key_Enter: 
+                event.accepted = true;
 
-            // emit accepted signal manually
-            if (acceptableInput) {
-                accepted();
-            }
+                // emit accepted signal manually
+                if (acceptableInput) {
+                    accepted();
+                }
         }
     }
 
-    Text {
-        id: placeholder
-        x: textField.leftPadding
-        y: textField.topPadding
-        width: textField.width - (textField.leftPadding + textField.rightPadding)
-        height: textField.height - (textField.topPadding + textField.bottomPadding)
-
-        text: textField.placeholderText
-        font: textField.font
-        color: textField.placeholderTextColor
-        verticalAlignment: textField.verticalAlignment
-        visible: !textField.length && !textField.preeditText && (!textField.activeFocus || textField.horizontalAlignment !== Qt.AlignHCenter)
-        elide: Text.ElideRight
-    }
-
-    color: {
-        if (isLightColorScheme) {
-            if (textField.activeFocus) {
-                hifi.colors.black
+    style: TextFieldStyle {
+        id: style;
+        textColor: {
+            if (isLightColorScheme) {
+                if (textField.activeFocus) {
+                    hifi.colors.black
+                } else {
+                    hifi.colors.lightGray
+                }
+            } else if (isFaintGrayColorScheme) {
+                if (textField.activeFocus) {
+                    hifi.colors.black
+                } else {
+                    hifi.colors.lightGray
+                }
             } else {
-                hifi.colors.lightGray
-            }
-        } else if (isFaintGrayColorScheme) {
-            if (textField.activeFocus) {
-                hifi.colors.black
-            } else {
-                hifi.colors.lightGray
-            }
-        } else {
-            if (textField.activeFocus) {
-                hifi.colors.white
-            } else {
-                hifi.colors.lightGrayText
+                if (textField.activeFocus) {
+                    hifi.colors.white
+                } else {
+                    hifi.colors.lightGrayText
+                }
             }
         }
-    }
-
-    background: Rectangle {
-        color: {
+        background: Rectangle {
+            color: {
             if (isLightColorScheme) {
                 if (textField.activeFocus) {
                     hifi.colors.white
@@ -119,22 +100,22 @@ TextField {
                 }
             }
         }
-        border.color: textField.error ? hifi.colors.redHighlight :
+            border.color: textField.error ? hifi.colors.redHighlight :
             (textField.activeFocus ? hifi.colors.primaryHighlight : (hasDefocusedBorder ? (isFaintGrayColorScheme ? hifi.colors.lightGrayText : hifi.colors.lightGray) : color))
-        border.width: textField.activeFocus || hasRoundedBorder || textField.error ? 1 : 0
+            border.width: textField.activeFocus || hasRoundedBorder || textField.error ? 1 : 0
             radius: isSearchField ? textField.height / 2 : (hasRoundedBorder ? roundedBorderRadius : 0)
 
-        HiFiGlyphs {
+            HiFiGlyphs {
                 text: textField.leftPermanentGlyph;
-            color: textColor;
-            size: hifi.fontSizes.textFieldSearchIcon;
-            anchors.left: parent.left;
-            anchors.verticalCenter: parent.verticalCenter;
-            anchors.leftMargin: hifi.dimensions.textPadding - 2;
-            visible: text;
-        }
+                color: textColor;
+                size: hifi.fontSizes.textFieldSearchIcon;
+                anchors.left: parent.left;
+                anchors.verticalCenter: parent.verticalCenter;
+                anchors.leftMargin: hifi.dimensions.textPadding - 2;
+                visible: text;
+            }
 
-        HiFiGlyphs {
+            HiFiGlyphs {
                 text: textField.centerPlaceholderGlyph;
                 color: textColor;
                 size: parent.height;
@@ -144,57 +125,48 @@ TextField {
             }
 
             HiFiGlyphs {
-            text: hifi.glyphs.search
-            color: textColor
-            size: hifi.fontSizes.textFieldSearchIcon
-            anchors.left: parent.left
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.leftMargin: hifi.dimensions.textPadding - 2
-            visible: isSearchField
-        }
+                text: hifi.glyphs.search
+                color: textColor
+                size: hifi.fontSizes.textFieldSearchIcon
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: hifi.dimensions.textPadding - 2
+                visible: isSearchField
+            }
 
-        HiFiGlyphs {
-            text: hifi.glyphs.error
-            color: textColor
-            size: 40
-            anchors.right: parent.right
-            anchors.rightMargin: hifi.dimensions.textPadding - 2
-            anchors.verticalCenter: parent.verticalCenter
-            visible: hasClearButton && textField.text !== "";
+            HiFiGlyphs {
+                text: hifi.glyphs.error
+                color: textColor
+                size: 40
+                anchors.right: parent.right
+                anchors.rightMargin: hifi.dimensions.textPadding - 2
+                anchors.verticalCenter: parent.verticalCenter
+                visible: hasClearButton && textField.text !== "";
 
-            MouseArea {
-                anchors.fill: parent;
-                onClicked: {
-                    textField.text = "";
+                MouseArea {
+                    anchors.fill: parent;
+                    onClicked: {
+                        textField.text = "";
+                    }
                 }
             }
         }
+        placeholderTextColor: isFaintGrayColorScheme ? hifi.colors.lightGrayText : hifi.colors.lightGray
+        selectedTextColor: hifi.colors.black
+        selectionColor: hifi.colors.primaryHighlight
+        padding.left: hasRoundedBorder ? textField.height / 2 : ((isSearchField || textField.leftPermanentGlyph !== "") ? textField.height - 2 : 0) + hifi.dimensions.textPadding
+        padding.right: (hasClearButton ? textField.height - 2 : 0) + hifi.dimensions.textPadding
     }
 
-    property color placeholderTextColor: isFaintGrayColorScheme ? hifi.colors.lightGrayText : hifi.colors.lightGray
-    selectedTextColor: hifi.colors.black
-    selectionColor: hifi.colors.primaryHighlight
-    leftPadding: hasRoundedBorder ? textField.height / 2 : ((isSearchField || textField.leftPermanentGlyph !== "") ? textField.height - 2 : 0) + hifi.dimensions.textPadding
-    rightPadding: (hasClearButton ? textField.height - 2 : 0) + hifi.dimensions.textPadding
-
-
     HifiControls.Label {
         id: textFieldLabel
         text: textField.label
         colorScheme: textField.colorScheme
         anchors.left: parent.left
-
-        Binding on anchors.right {
-            when: rightAnchorSet
-            value: textField.right
-        }
-        Binding on wrapMode {
-            when: rightAnchorSet
-            value: Text.WordWrap
-        }
-
+        anchors.right: parent.right
         anchors.bottom: parent.top
         anchors.bottomMargin: 3
+        wrapMode: Text.WordWrap
         visible: label != ""
     }
 }