diff --git a/interface/resources/qml/hifi/tablet/TabletButton.qml b/interface/resources/qml/hifi/tablet/TabletButton.qml
index 5dfef31112..636b6dbebc 100644
--- a/interface/resources/qml/hifi/tablet/TabletButton.qml
+++ b/interface/resources/qml/hifi/tablet/TabletButton.qml
@@ -6,6 +6,8 @@ Item {
     property var uuid;
     property string text: "EDIT"
     property string icon: "icons/edit-icon.svg"
+    property string activeText: tabletButton.text
+    property string activeIcon: tabletButton.icon
     property bool isActive: false
     property bool inDebugMode: false
     property bool isEntered: false
@@ -170,12 +172,18 @@ Item {
             PropertyChanges {
                 target: text
                 color: "#333333"
+                text: tabletButton.activeText
             }
 
             PropertyChanges {
                 target: iconColorOverlay
                 color: "#333333"
             }
+
+            PropertyChanges {
+                target: icon
+                source: "../../../" + tabletButton.activeIcon
+            }
         },
         State {
             name: "hover active state"
diff --git a/scripts/system/mute.js b/scripts/system/mute.js
index 97a00fb0b2..03e0d784f1 100644
--- a/scripts/system/mute.js
+++ b/scripts/system/mute.js
@@ -15,16 +15,15 @@
 
 var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 
-function muteURL() {
-    return "icons/tablet-icons/" + (AudioDevice.getMuted() ? "mic-a.svg" : "mic-i.svg"); 
-}
 var button = tablet.addButton({
     icon: "icons/tablet-icons/mic-a.svg",
-    text: "MUTE"
+    text: "MUTE",
+    activeIcon: "icons/tablet-icons/mic-i.svg",
+    activeText: "UNMUTE"
 });
 
 function onMuteToggled() {
-    button.editProperties({icon: muteURL()});
+    button.editProperties({isActive: AudioDevice.getMuted()});
 }
 onMuteToggled();
 function onClicked(){