diff --git a/react/features/participants-pane/components/ParticipantQuickAction.js b/react/features/participants-pane/components/ParticipantQuickAction.js
index 1c5990a4a..6ccf3e62f 100644
--- a/react/features/participants-pane/components/ParticipantQuickAction.js
+++ b/react/features/participants-pane/components/ParticipantQuickAction.js
@@ -57,6 +57,7 @@ export default function ParticipantQuickAction({
     case QUICK_ACTION_BUTTON.MUTE: {
         return (
             <QuickActionButton
+                aria-label = { `mute-${participantID}` }
                 onClick = { muteAudio(participantID) }
                 primary = { true }>
                 { muteParticipantButtonText }
diff --git a/react/features/participants-pane/components/web/MeetingParticipantItem.js b/react/features/participants-pane/components/web/MeetingParticipantItem.js
index 1dec1d95e..47cdfafe1 100644
--- a/react/features/participants-pane/components/web/MeetingParticipantItem.js
+++ b/react/features/participants-pane/components/web/MeetingParticipantItem.js
@@ -235,7 +235,9 @@ function MeetingParticipantItem({
     }
 
     const buttonType = _isModerationSupported
-        ? _localModerator ? QUICK_ACTION_BUTTON.ASK_TO_UNMUTE : _quickActionButtonType
+        ? _localModerator && _audioMediaState !== MEDIA_STATE.UNMUTED
+            ? QUICK_ACTION_BUTTON.ASK_TO_UNMUTE
+            : _quickActionButtonType
         : '';
 
     return (
diff --git a/react/features/video-menu/components/web/MuteVideoButton.js b/react/features/video-menu/components/web/MuteVideoButton.js
index 1de21b2b9..21976fd35 100644
--- a/react/features/video-menu/components/web/MuteVideoButton.js
+++ b/react/features/video-menu/components/web/MuteVideoButton.js
@@ -44,10 +44,10 @@ class MuteVideoButton extends AbstractMuteVideoButton {
         const { _videoTrackMuted, participantID, t } = this.props;
         const muteConfig = _videoTrackMuted ? {
             translationKey: 'videothumbnail.videoMuted',
-            muteClassName: 'mutelink disabled'
+            muteClassName: 'mutevideolink disabled'
         } : {
             translationKey: 'videothumbnail.domuteVideo',
-            muteClassName: 'mutelink'
+            muteClassName: 'mutevideolink'
         };
 
         return (