diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml
index 7f9d638dc5..c19e16cd36 100644
--- a/interface/resources/qml/AddressBarDialog.qml
+++ b/interface/resources/qml/AddressBarDialog.qml
@@ -187,9 +187,6 @@ Window {
             ToolbarButton {
                 id: homeButton
                 imageURL: "../images/home.svg"
-                buttonState: 1
-                defaultState: 1
-                hoverState: 2
                 onClicked: {
                     addressBarDialog.loadHome();
                     root.shown = false;
@@ -204,9 +201,6 @@ Window {
             ToolbarButton {
                 id: backArrow;
                 imageURL: "../images/backward.svg";
-                hoverState: addressBarDialog.backEnabled ? 2 : 0;
-                defaultState: addressBarDialog.backEnabled ? 1 : 0;
-                buttonState: addressBarDialog.backEnabled ? 1 : 0;
                 onClicked: addressBarDialog.loadBack();
                 anchors {
                     left: homeButton.right
@@ -216,9 +210,6 @@ Window {
             ToolbarButton {
                 id: forwardArrow;
                 imageURL: "../images/forward.svg";
-                hoverState: addressBarDialog.forwardEnabled ? 2 : 0;
-                defaultState: addressBarDialog.forwardEnabled ? 1 : 0;
-                buttonState: addressBarDialog.forwardEnabled ? 1 : 0;
                 onClicked: addressBarDialog.loadForward();
                 anchors {
                     left: backArrow.right
diff --git a/scripts/system/hmd.js b/scripts/system/hmd.js
index 794e348fd3..61667d6ecc 100644
--- a/scripts/system/hmd.js
+++ b/scripts/system/hmd.js
@@ -50,23 +50,17 @@ if (Settings.getValue("HUDUIEnabled")) {
 // Disable them in hmd.
 var desktopOnlyViews = ['Mirror', 'Independent Mode', 'Entity Mode'];
 function onHmdChanged(isHmd) {
-    if (Settings.getValue("HUDUIEnabled")) {
-        button.writeProperty('buttonState', isHmd ? 0 : 1);
-        button.writeProperty('defaultState', isHmd ? 0 : 1);
-        button.writeProperty('hoverState', isHmd ? 2 : 3);
+    //TODO change button icon when the hmd changes
+    if (isHmd) {
+        button.editProperties({
+            icon: "icons/tablet-icons/switch-a.svg",
+            text: "DESKTOP"
+        });
     } else {
-        //TODO change button icon when the hmd changes
-        if (isHmd) {
-            button.editProperties({
-                icon: "icons/tablet-icons/switch-a.svg",
-                text: "DESKTOP"
-            });
-        } else {
-            button.editProperties({
-                icon: "icons/tablet-icons/switch-i.svg",
-                text: "VR"
-            });
-        }
+        button.editProperties({
+            icon: "icons/tablet-icons/switch-i.svg",
+            text: "VR"
+        });
     }
     desktopOnlyViews.forEach(function (view) {
         Menu.setMenuEnabled("View>" + view, !isHmd);
diff --git a/scripts/system/users.js b/scripts/system/users.js
index 369d1399eb..869413e35a 100644
--- a/scripts/system/users.js
+++ b/scripts/system/users.js
@@ -26,9 +26,6 @@ if (Settings.getValue("HUDUIEnabled")) {
         objectName: buttonName,
         imageURL: Script.resolvePath("assets/images/tools/people.svg"),
         visible: true,
-        buttonState: 1,
-        defaultState: 1,
-        hoverState: 3,
         alpha: 0.9
     });
 } else {
diff --git a/unpublishedScripts/steam.js b/unpublishedScripts/steam.js
index a80f0072ac..8ff3d83d86 100644
--- a/unpublishedScripts/steam.js
+++ b/unpublishedScripts/steam.js
@@ -16,9 +16,6 @@ var steamInviteButton = toolBar.addButton({
     objectName: "steamInvite",
     imageURL: Script.resolvePath("assets/images/tools/steam-invite.svg"),
     visible: Steam.isRunning,
-    buttonState: 1,
-    defaultState: 1,
-    hoverState: 3,
     alpha: 0.9
 });
 
@@ -28,4 +25,4 @@ steamInviteButton.clicked.connect(function(){
 
 Script.scriptEnding.connect(function () {
     toolBar.removeButton("steamInvite");
-});
\ No newline at end of file
+});