diff --git a/app/build.gradle b/app/build.gradle
index 43f79a8b53..6c07f551d3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -246,7 +246,6 @@ android {
     buildTypes {
         release {
             signingConfig signingConfigs.release
-            debuggable true
             minifyEnabled false
         }
         debug {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
index 130c63d8c8..9b56dbb0b4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
@@ -90,6 +90,11 @@ class WebRtcCallActivity: PassphraseRequiredActionBarActivity() {
             wantsToAnswer = true
         }
 
+        microphoneButton.setOnClickListener {
+            val audioEnabledIntent = WebRtcCallService.microphoneIntent(this, !viewModel.microphoneEnabled)
+            startService(audioEnabledIntent)
+        }
+
         speakerPhoneButton.setOnClickListener {
             val command = AudioManagerCommand.SetUserDevice( if (viewModel.isSpeaker) EARPIECE else SPEAKER_PHONE)
             WebRtcCallService.sendAudioManagerCommand(this, command)
@@ -200,6 +205,15 @@ class WebRtcCallActivity: PassphraseRequiredActionBarActivity() {
                 }
             }
 
+            launch {
+                viewModel.localAudioEnabledState.collect { isEnabled ->
+                    microphoneButton.setImageResource(
+                        if (isEnabled) R.drawable.ic_baseline_mic_off_24
+                        else R.drawable.ic_baseline_mic_24
+                    )
+                }
+            }
+
             launch {
                 viewModel.localVideoEnabledState.collect { isEnabled ->
                     local_renderer.removeAllViews()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.kt b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.kt
index b8a34782ef..5d6d0319fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.kt
@@ -92,8 +92,9 @@ class WebRtcCallService: Service(), CallManager.WebRtcListener {
         fun acceptCallIntent(context: Context) = Intent(context, WebRtcCallService::class.java)
                 .setAction(ACTION_ANSWER_CALL)
 
-        fun speakerIntent(context: Context, enable: Boolean) = Intent(context, WebRtcCallService::class.java)
-                .setAction(ACTION_UPDATE_AUDIO)
+        fun microphoneIntent(context: Context, enabled: Boolean) = Intent(context, WebRtcCallService::class.java)
+            .setAction(ACTION_SET_MUTE_AUDIO)
+            .putExtra(EXTRA_MUTE, !enabled)
 
         fun createCall(context: Context, recipient: Recipient) = Intent(context, WebRtcCallService::class.java)
                 .setAction(ACTION_OUTGOING_CALL)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallViewModel.kt
index a9fd8ec6da..f1265fee40 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallViewModel.kt
@@ -22,6 +22,11 @@ class CallViewModel @Inject constructor(private val callManager: CallManager): V
     val videoEnabled: Boolean
         get() = _videoEnabled
 
+    private var _microphoneEnabled: Boolean = true
+
+    val microphoneEnabled: Boolean
+        get() = _microphoneEnabled
+
     private var _isSpeaker: Boolean = false
     val isSpeaker: Boolean
         get() = _isSpeaker
@@ -52,6 +57,7 @@ class CallViewModel @Inject constructor(private val callManager: CallManager): V
 
     val localAudioEnabledState
         get() = callManager.audioEvents.map { it.isEnabled }
+            .onEach { _microphoneEnabled = it }
 
     val localVideoEnabledState
         get() = callManager.videoEvents
diff --git a/app/src/main/res/drawable/ic_baseline_mic_off_24.xml b/app/src/main/res/drawable/ic_baseline_mic_off_24.xml
new file mode 100644
index 0000000000..8e199f115a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_mic_off_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,11h-1.7c0,0.74 -0.16,1.43 -0.43,2.05l1.23,1.23c0.56,-0.98 0.9,-2.09 0.9,-3.28zM14.98,11.17c0,-0.06 0.02,-0.11 0.02,-0.17L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v0.18l5.98,5.99zM4.27,3L3,4.27l6.01,6.01L9.01,11c0,1.66 1.33,3 2.99,3 0.22,0 0.44,-0.03 0.65,-0.08l1.66,1.66c-0.71,0.33 -1.5,0.52 -2.31,0.52 -2.76,0 -5.3,-2.1 -5.3,-5.1L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c0.91,-0.13 1.77,-0.45 2.54,-0.9L19.73,21 21,19.73 4.27,3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_mic_none_24.xml b/app/src/main/res/drawable/ic_outline_mic_none_24.xml
new file mode 100644
index 0000000000..2810bc9a2e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_mic_none_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,14c1.66,0 3,-1.34 3,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v6c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1L11,5zM17,11c0,2.76 -2.24,5 -5,5s-5,-2.24 -5,-5L5,11c0,3.53 2.61,6.43 6,6.92L11,21h2v-3.08c3.39,-0.49 6,-3.39 6,-6.92h-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_mic_off_24.xml b/app/src/main/res/drawable/ic_outline_mic_off_24.xml
new file mode 100644
index 0000000000..631ced9615
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_mic_off_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10.8,4.9c0,-0.66 0.54,-1.2 1.2,-1.2s1.2,0.54 1.2,1.2l-0.01,3.91L15,10.6V5c0,-1.66 -1.34,-3 -3,-3 -1.54,0 -2.79,1.16 -2.96,2.65l1.76,1.76V4.9zM19,11h-1.7c0,0.58 -0.1,1.13 -0.27,1.64l1.27,1.27c0.44,-0.88 0.7,-1.87 0.7,-2.91zM4.41,2.86L3,4.27l6,6V11c0,1.66 1.34,3 3,3 0.23,0 0.44,-0.03 0.65,-0.08l1.66,1.66c-0.71,0.33 -1.5,0.52 -2.31,0.52 -2.76,0 -5.3,-2.1 -5.3,-5.1H5c0,3.41 2.72,6.23 6,6.72V21h2v-3.28c0.91,-0.13 1.77,-0.45 2.55,-0.9l4.2,4.2 1.41,-1.41L4.41,2.86z"/>
+</vector>