diff --git a/src/components/AvatarWrapper/AvatarWrapper.vue b/src/components/AvatarWrapper/AvatarWrapper.vue
index e68839ede8d..308a436b165 100644
--- a/src/components/AvatarWrapper/AvatarWrapper.vue
+++ b/src/components/AvatarWrapper/AvatarWrapper.vue
@@ -38,6 +38,9 @@
 			:aria-label="t('spreed', 'Federated user')">
 			<WebIcon :size="14" />
 		</span>
+		<NcLoadingIcon v-if="loading"
+			:size="size"
+			class="loading" />
 	</div>
 </template>
 
@@ -47,6 +50,7 @@ import WebIcon from 'vue-material-design-icons/Web.vue'
 import { t } from '@nextcloud/l10n'
 
 import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
+import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
 
 import { ATTENDEE, AVATAR } from '../../constants.js'
 import { getUserProxyAvatarOcsUrl } from '../../services/avatarService.ts'
@@ -59,6 +63,7 @@ export default {
 	components: {
 		NcAvatar,
 		WebIcon,
+		NcLoadingIcon,
 	},
 
 	props: {
@@ -122,6 +127,11 @@ export default {
 			type: String,
 			default: undefined,
 		},
+
+		loading: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	computed: {
 		// Determines which icon is displayed
@@ -279,4 +289,9 @@ export default {
 	}
 }
 
+.loading {
+	position: absolute;
+	top: 0;
+}
+
 </style>
diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue
index 9b76e6dd30c..a7a10b1e0f2 100644
--- a/src/components/CallView/CallView.vue
+++ b/src/components/CallView/CallView.vue
@@ -720,37 +720,26 @@ export default {
 <style lang="scss" scoped>
 @import '../../assets/variables';
 
-.call-view {
-	width: 100%;
-	height: 100%;
-	overflow: hidden;
-	background-color: $color-call-background;
-}
-
 #call-container {
 	width: 100%;
 	height: 100%;
 	background-color: $color-call-background;
 	backdrop-filter: var(--filter-background-blur);
+	--grid-gap: calc(var(--default-grid-baseline) * 2);
 }
 
 #videos {
 	position: absolute;
 	width: 100%;
-	height: calc(100% - 50px);
-	top: 50px;
+	height: calc(100% - 51px);
+	top: 51px; // TopBar height
 	overflow: hidden;
-	display: -webkit-box;
-	display: -moz-box;
-	display: -ms-flexbox;
-	display: -webkit-flex;
 	display: flex;
-	-webkit-justify-content: space-around;
 	justify-content: space-around;
-	-webkit-align-items: flex-end;
 	align-items: flex-end;
 	flex-direction: column;
-	padding: 0 8px 8px 8px;
+	padding: calc(var(--default-grid-baseline) * 2);
+	padding-block-start: 0;
 }
 
 .video__promoted {
@@ -793,102 +782,12 @@ export default {
 	vertical-align: top; /* fix white line below video */
 }
 
-#videos .videoContainer :deep(.avatardiv) {
+#videos :deep(.avatardiv) {
 	box-shadow: 0 0 15px var(--color-box-shadow);
 }
 
-.participants-1 #videos .videoContainer :deep(video),
-.participants-2 #videos .videoContainer :deep(video) {
+#videos :deep(video) {
 	padding: 0;
 }
 
-.videoContainer :deep(.avatar-container .avatardiv) {
-	display: block;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-.videoContainer.promoted :deep(.avatar-container) {
-	top: 30%;
-}
-
-.videoContainer.promoted :deep(.avatar-container + .nameIndicator) {
-	display: none;
-}
-
-.videoContainer.promoted :deep(.mediaIndicator) {
-	display: none !important;
-}
-
-@media only screen and (max-width: 768px) {
-	.participants-1 .videoView,
-	.participants-2 .videoView {
-		max-height: 35%;
-	}
-}
-
-.participants-1 .videoView :deep(video),
-.participants-2 .videoView :deep(video) {
-	position: absolute;
-	max-height: 100% !important;
-	bottom: 0;
-	border-top-right-radius: 3px;
-	right: 0;
-}
-
-:deep(.nameIndicator) {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	padding: 12px;
-	color: #fff;
-	text-shadow: 3px 3px 10px rgba(0, 0, 0, .5), 3px -3px 10px rgba(0, 0, 0, .5), -3px 3px 10px rgba(0, 0, 0, .5), -3px -3px 10px rgba(0, 0, 0, .5);
-	width: 100%;
-	text-align: center;
-	font-size: 20px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-:deep(.videoView .nameIndicator) {
-	padding: 0;
-	overflow: visible;
-}
-
-.participants-1 .videoView :deep(.nameIndicator),
-.participants-2 .videoView :deep(.nameIndicator) {
-	left: initial;
-	right: 0;
-}
-
-.participants-1 .videoView :deep(.avatar-container),
-.participants-2 .videoView :deep(.avatar-container) {
-	left: initial;
-	right: 0;
-}
-
-/* ellipsize name in 1on1 calls */
-.participants-2 :deep(.videoContainer.promoted + .videoContainer-dummy .nameIndicator) {
-	padding: 12px 35%;
-}
-
-#videos .videoContainer.speaking:not(.videoView) :deep(.nameIndicator),
-#videos .videoContainer.videoView.speaking :deep(.nameIndicator .microphone-icon) {
-	animation: pulse 1s;
-	animation-iteration-count: infinite;
-}
-
-@keyframes pulse {
-	0% {
-		opacity: 1;
-	}
-	50% {
-		opacity: .3;
-	}
-	100% {
-		opacity: 1;
-	}
-}
-
 </style>
diff --git a/src/components/CallView/Grid/Grid.vue b/src/components/CallView/Grid/Grid.vue
index c80a867ad54..c42e1366860 100644
--- a/src/components/CallView/Grid/Grid.vue
+++ b/src/components/CallView/Grid/Grid.vue
@@ -985,6 +985,7 @@ export default {
 
 <style lang="scss" scoped>
 .grid-main-wrapper {
+	--navigation-position: calc(var(--default-grid-baseline) * 2);
 	position: relative;
 	width: 100%;
 }
@@ -1010,19 +1011,14 @@ export default {
 	height: 100%;
 	width: 100%;
 
-	grid-row-gap: 8px;
-	grid-column-gap: 8px;
+	grid-row-gap: var(--grid-gap);
+	grid-column-gap: var(--grid-gap);
 
 	&.stripe {
-		padding: 8px 8px 0 0;
+		padding: var(--grid-gap) var(--grid-gap) 0 0;
 	}
 }
 
-.empty-call-view {
-	position: relative;
-	padding: 16px;
-}
-
 .grid-wrapper {
 	width: 100%;
 	min-width: 0;
@@ -1103,32 +1099,32 @@ export default {
 		top: calc(50% - var(--default-clickable-area) / 2);
 
 		&__previous {
-			left: 8px;
+			left: calc(var(--default-grid-baseline) * 2);
 		}
 
 		&__next {
-			right: 8px;
+			right: calc(var(--default-grid-baseline) * 2);
 		}
 	}
 
 	.stripe-wrapper & {
 		position: absolute;
-		top: 16px;
+		top: calc(var(--navigation-position) + var(--grid-gap));
 
 		&__previous {
-			left: 8px;
+			left: var(--navigation-position);
 		}
 
 		&__next {
-			right: 16px;
+			right: calc(var(--navigation-position) + var(--grid-gap));
 		}
 	}
 }
 
 .stripe--collapse {
 	position: absolute !important;
-	top: calc(-1 * var(--default-clickable-area));
-	right: 0;
+	top: calc(-1 * (var(--default-clickable-area) + var(--navigation-position) / 2));
+	right: calc(var(--navigation-position) / 2) ;
 }
 
 .stripe--collapse,
diff --git a/src/components/CallView/shared/LocalVideo.vue b/src/components/CallView/shared/LocalVideo.vue
index b91bbde97db..1e08fd95866 100644
--- a/src/components/CallView/shared/LocalVideo.vue
+++ b/src/components/CallView/shared/LocalVideo.vue
@@ -5,13 +5,12 @@
 
 <template>
 	<div ref="videoContainer"
-		class="localVideoContainer videoContainer videoView"
+		class="localVideoContainer"
 		:class="videoContainerClass"
 		@mouseover="mouseover = true"
 		@mouseleave="mouseover = false"
 		@click="$emit('click-video')">
 		<div v-show="localMediaModel.attributes.videoEnabled"
-			:class="videoWrapperClass"
 			class="videoWrapper"
 			:style="videoWrapperStyle">
 			<video id="localVideo"
@@ -20,6 +19,9 @@
 				:class="fitVideo ? 'video--fit' : 'video--fill'"
 				class="video"
 				@playing="updateVideoAspectRatio" />
+			<NcLoadingIcon v-if="isNotConnected"
+				:size="avatarSize"
+				class="video-loading" />
 		</div>
 		<div v-if="!localMediaModel.attributes.videoEnabled && !isSidebar" class="avatar-container">
 			<VideoBackground v-if="isGrid || isStripe"
@@ -30,9 +32,9 @@
 				:name="displayName"
 				:source="actorType"
 				:size="avatarSize"
+				:loading="isNotConnected"
 				disable-menu
-				disable-tooltip
-				:class="avatarClass" />
+				disable-tooltip />
 		</div>
 
 		<div class="bottom-bar">
@@ -54,6 +56,7 @@ import { showError, showInfo, TOAST_PERMANENT_TIMEOUT } from '@nextcloud/dialogs
 import { t } from '@nextcloud/l10n'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
 
 import VideoBackground from './VideoBackground.vue'
 import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
@@ -71,6 +74,7 @@ export default {
 		AvatarWrapper,
 		NcButton,
 		VideoBackground,
+		NcLoadingIcon,
 	},
 
 	props: {
@@ -194,12 +198,6 @@ export default {
 			)
 		},
 
-		videoWrapperClass() {
-			return {
-				'icon-loading': this.isNotConnected,
-			}
-		},
-
 		avatarSize() {
 			if (this.isStripe || (!this.isBig && !this.isGrid)) {
 				return AVATAR.SIZE.LARGE
@@ -210,12 +208,6 @@ export default {
 			}
 		},
 
-		avatarClass() {
-			return {
-				'icon-loading': this.isNotConnected,
-			}
-		},
-
 		localStreamVideoError() {
 			return this.localMediaModel.attributes.localStream && this.localMediaModel.attributes.localStreamRequestVideoError
 		},
@@ -387,8 +379,8 @@ export default {
 
 .video-container-big {
 	position: absolute;
-	width: calc(100% - 16px);
-	height: calc(100% - 8px);
+	width: calc(100% - var(--grid-gap) * 2);
+	height: calc(100% - var(--grid-gap));
 	display: flex;
 	flex-direction: column;
 
@@ -407,10 +399,12 @@ export default {
 	width: 100%;
 }
 
-.videoWrapper.icon-loading:after {
-	height: 60px;
-	width: 60px;
-	margin: -32px 0 0 -32px;
+.video-loading {
+	position: absolute;
+	top: 0;
+	right: 0;
+	height: 100%;
+	width: 100%;
 }
 
 .video--fit {
diff --git a/src/components/CallView/shared/VideoBottomBar.vue b/src/components/CallView/shared/VideoBottomBar.vue
index a77d7701d26..17ece3951a6 100644
--- a/src/components/CallView/shared/VideoBottomBar.vue
+++ b/src/components/CallView/shared/VideoBottomBar.vue
@@ -307,7 +307,7 @@ export default {
 		width: calc(100% - var(--default-clickable-area) * 2);
 		& .bottom-bar {
 			width: unset;
-			padding: calc(var(--default-grid-baseline) * 2);
+			padding: var(--default-grid-baseline);
 
 			&:hover {
 				background-color: rgba(0, 0, 0, 0.2);
diff --git a/src/components/CallView/shared/VideoVue.spec.js b/src/components/CallView/shared/VideoVue.spec.js
index 21249e2d9da..ee69021e948 100644
--- a/src/components/CallView/shared/VideoVue.spec.js
+++ b/src/components/CallView/shared/VideoVue.spec.js
@@ -141,7 +141,7 @@ describe('VideoVue.vue', () => {
 		 * @param {boolean} expected Whether the loading icon is shown
 		 */
 		function assertLoadingIconIsShown(expected) {
-			const loadingIcon = wrapper.find('.icon-loading')
+			const loadingIcon = wrapper.findComponent({ name: 'NcLoadingIcon' })
 			expect(loadingIcon.exists()).toBe(expected)
 		}
 
diff --git a/src/components/CallView/shared/VideoVue.vue b/src/components/CallView/shared/VideoVue.vue
index a36263536b5..808b2d895a2 100644
--- a/src/components/CallView/shared/VideoVue.vue
+++ b/src/components/CallView/shared/VideoVue.vue
@@ -28,6 +28,9 @@
 					:title="t('spreed', 'Hide presenter video')"
 					:size="32"
 					@click="$emit('click-presenter')" />
+				<NcLoadingIcon v-if="isLoading"
+					:size="avatarSize"
+					class="video-loading" />
 			</div>
 		</TransitionWrapper>
 		<TransitionWrapper name="fade">
@@ -47,9 +50,9 @@
 					:name="participantName"
 					:source="participantActorType"
 					:size="avatarSize"
+					:loading="isLoading"
 					disable-menu
-					disable-tooltip
-					:class="avatarClass" />
+					disable-tooltip />
 			</div>
 		</TransitionWrapper>
 		<TransitionWrapper name="fade">
@@ -82,6 +85,8 @@ import AccountOff from 'vue-material-design-icons/AccountOff.vue'
 
 import { t } from '@nextcloud/l10n'
 
+import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
+
 import Screen from './Screen.vue'
 import VideoBackground from './VideoBackground.vue'
 import VideoBottomBar from './VideoBottomBar.vue'
@@ -104,6 +109,7 @@ export default {
 		VideoBackground,
 		Screen,
 		VideoBottomBar,
+		NcLoadingIcon,
 		// icons
 		AccountCircle,
 		AccountOff,
@@ -303,7 +309,6 @@ export default {
 
 		videoWrapperClass() {
 			return {
-				'icon-loading': this.isLoading,
 				'presenter-overlay': this.isPresenterOverlay
 			}
 		},
@@ -318,12 +323,6 @@ export default {
 			}
 		},
 
-		avatarClass() {
-			return {
-				'icon-loading': this.isLoading,
-			}
-		},
-
 		connectionMessageClass() {
 			return {
 				'below-avatar': this.showBackgroundAndAvatar,
@@ -605,10 +604,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.forced-white {
-	filter: drop-shadow(1px 1px 4px var(--color-box-shadow));
-}
-
 .not-connected {
 	video,
 	.avatar-container {
@@ -630,8 +625,8 @@ export default {
 	position: absolute;
 
 	&.one-to-one {
-		width: calc(100% - 16px);
-		height: calc(100% - 8px);
+		width: calc(100% - var(--grid-gap) * 2);
+		height: calc(100% - var(--grid-gap));
 	}
 
 	& .videoWrapper {
@@ -670,10 +665,12 @@ export default {
 	border-radius: 50%;
 }
 
-.videoWrapper.icon-loading:after {
-	height: 60px;
-	width: 60px;
-	margin: -32px 0 0 -32px;
+.video-loading {
+	position: absolute;
+	top: 0;
+	right: 0;
+	height: 100%;
+	width: 100%;
 }
 
 .video--fit {
@@ -698,10 +695,10 @@ export default {
 
 	color: white;
 	filter: drop-shadow(1px 1px 4px var(--color-box-shadow));
-}
 
-.connection-message.below-avatar {
-	top: calc(50% + 80px);
+	&.below-avatar {
+		top: calc(50% + 80px);
+	}
 }
 
 .video-container::after {