diff --git a/src/assets/variables.scss b/src/assets/variables.scss
index e7f1720755d..a6ffb3ea34e 100644
--- a/src/assets/variables.scss
+++ b/src/assets/variables.scss
@@ -70,8 +70,6 @@ $message-utils-width: 100px;
 //message form max height
 $message-form-max-height: 180px;
 
-$top-bar-height: 61px;
-
 $color-call-background: #444444;
 $color-guests-avatar: #ffffff;
 $color-background-guests-avatar: #b9b9b9;
diff --git a/src/components/CallView/shared/LocalMediaControls.vue b/src/components/CallView/shared/LocalMediaControls.vue
index ffc5d957cac..746be8f5f8c 100644
--- a/src/components/CallView/shared/LocalMediaControls.vue
+++ b/src/components/CallView/shared/LocalMediaControls.vue
@@ -885,6 +885,11 @@ export default {
 	border: none;
 	margin: 0;
 	padding: 0 12px;
+	width: $clickable-area;
+	height: $clickable-area;
+	&:active {
+		background: transparent;
+	}
 }
 
 .buttons-bar #screensharing-menu button {
diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index d209b29c4a0..a16b843d006 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -68,7 +68,7 @@
 			<!-- sidebar toggle -->
 			<Actions
 				v-shortkey.once="['f']"
-				class="top-bar__button forced-background"
+				class="top-bar__button"
 				menu-align="right"
 				:aria-label="t('spreed', 'Conversation actions')"
 				:container="container"
@@ -133,7 +133,7 @@
 				</ActionButton>
 			</Actions>
 			<Actions v-if="showOpenSidebarButton"
-				class="top-bar__button forced-background"
+				class="top-bar__button"
 				close-after-click="true"
 				:container="container">
 				<ActionButton
@@ -474,7 +474,6 @@ export default {
 @import '../../assets/variables';
 
 .top-bar {
-	height: $top-bar-height;
 	right: 12px; /* needed so we can still use the scrollbar */
 	display: flex;
 	z-index: 10;
@@ -491,10 +490,8 @@ export default {
 		top: 0;
 		left:0;
 		background-color: $color-call-background;
-		.forced-background {
-			background-color: rgba(0,0,0,0.1) !important;
-			border-radius: var(--border-radius-pill);
-		}
+		display: flex;
+		flex-wrap: wrap-reverse;
 	}
 
 	&__buttons {
@@ -562,4 +559,8 @@ export default {
 		color: var(--color-text-lighter);
 	}
 }
+
+.local-media-controls {
+	padding-left: $clickable-area;
+}
 </style>