diff --git a/src/components/TopBar/TopBarMenu.vue b/src/components/TopBar/TopBarMenu.vue
index 51523f2a3fe..fc6dc1aee1e 100644
--- a/src/components/TopBar/TopBarMenu.vue
+++ b/src/components/TopBar/TopBarMenu.vue
@@ -79,10 +79,13 @@
 		</NcActionButton>
 
 		<!-- Fullscreen -->
-		<NcActionButton :icon="iconFullscreen"
-			:aria-label="t('spreed', 'Toggle fullscreen')"
+		<NcActionButton :aria-label="t('spreed', 'Toggle full screen')"
 			:close-after-click="true"
 			@click="toggleFullscreen">
+			<template #icon>
+				<Fullscreen v-if="!isFullscreen" :size="20" />
+				<FullscreenExit v-else :size="20" />
+			</template>
 			{{ labelFullscreen }}
 		</NcActionButton>
 
@@ -147,6 +150,8 @@
 import Cog from 'vue-material-design-icons/Cog.vue'
 import DotsCircle from 'vue-material-design-icons/DotsCircle.vue'
 import DotsHorizontal from 'vue-material-design-icons/DotsHorizontal.vue'
+import Fullscreen from 'vue-material-design-icons/Fullscreen.vue'
+import FullscreenExit from 'vue-material-design-icons/FullscreenExit.vue'
 import HandBackLeft from 'vue-material-design-icons/HandBackLeft.vue'
 import MicrophoneOff from 'vue-material-design-icons/MicrophoneOff.vue'
 import RecordCircle from 'vue-material-design-icons/RecordCircle.vue'
@@ -182,6 +187,8 @@ export default {
 		PromotedView,
 		Cog,
 		DotsHorizontal,
+		Fullscreen,
+		FullscreenExit,
 		GridView,
 		HandBackLeft,
 		VideoIcon,
@@ -244,18 +251,11 @@ export default {
 			return this.$store.getters.isFullscreen()
 		},
 
-		iconFullscreen() {
-			if (this.isInCall) {
-				return 'forced-white icon-fullscreen'
-			}
-			return 'icon-fullscreen'
-		},
-
 		labelFullscreen() {
 			if (this.isFullscreen) {
-				return t('spreed', 'Exit fullscreen (F)')
+				return t('spreed', 'Exit full screen (F)')
 			}
-			return t('spreed', 'Fullscreen (F)')
+			return t('spreed', 'Full screen (F)')
 		},
 
 		isFileConversation() {