diff --git a/src/components/AdminSettings/SignalingServer.vue b/src/components/AdminSettings/SignalingServer.vue
index feeee24c365..fa94c68e2d3 100644
--- a/src/components/AdminSettings/SignalingServer.vue
+++ b/src/components/AdminSettings/SignalingServer.vue
@@ -47,12 +47,24 @@
 			</template>
 		</NcButton>
 
-		<span v-if="server">{{ connectionState }}</span>
+		<div v-if="server">
+			<div class="testing-icon">
+				<NcLoadingIcon v-if="!checked" :size="20" />
+				<AlertCircle v-else-if="errorMessage" :size="20" :fill-color="'#E9322D'" />
+				<Check v-else :size="20" :fill-color="'#46BA61'" />
+			</div>
+			<div class="testing-label">
+				{{ connectionState }}
+			</div>
+		</div>
 	</div>
 </template>
 
 <script>
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
+import AlertCircle from 'vue-material-design-icons/AlertCircle.vue'
+import Check from 'vue-material-design-icons/Check.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
 import { getWelcomeMessage } from '../../services/signalingService.js'
 
@@ -61,6 +73,9 @@ export default {
 
 	components: {
 		NcButton,
+		NcLoadingIcon,
+		AlertCircle,
+		Check,
 		Delete,
 	},
 
@@ -175,5 +190,19 @@ export default {
 		margin: 0 20px;
 		display: inline-block;
 	}
+
+	.testing-icon{
+		display: inline-block;
+		height: 20px;
+		line-height: 44px;
+		vertical-align: middle;
+	}
+
+	.testing-label {
+		display: inline-block;
+		height: 44px;
+		line-height: 44px;
+		vertical-align: middle;
+	}
 }
 </style>
diff --git a/src/components/AdminSettings/StunServer.vue b/src/components/AdminSettings/StunServer.vue
index 3f1bd39b900..0c902da3a06 100644
--- a/src/components/AdminSettings/StunServer.vue
+++ b/src/components/AdminSettings/StunServer.vue
@@ -36,7 +36,7 @@
 			type="tertiary-no-background"
 			:aria-label="t('spreed', 'The server address is invalid')">
 			<template #icon>
-				<AlertCircle />
+				<AlertCircle :fill-color="'#E9322D'" />
 			</template>
 		</NcButton>
 		<NcButton v-show="!loading"
diff --git a/src/components/AdminSettings/TurnServer.vue b/src/components/AdminSettings/TurnServer.vue
index 7bb3a05ae1c..ef566925b93 100644
--- a/src/components/AdminSettings/TurnServer.vue
+++ b/src/components/AdminSettings/TurnServer.vue
@@ -79,8 +79,8 @@
 			@click="testServer">
 			<template #icon>
 				<span v-if="testing" class="icon icon-loading-small" />
-				<AlertCircle v-else-if="testingError" />
-				<Check v-else-if="testingSuccess" />
+				<AlertCircle v-else-if="testingError" :fill-color="'#E9322D'" />
+				<Check v-else-if="testingSuccess" :fill-color="'#46BA61'" />
 				<CategoryMonitoring v-else />
 			</template>
 		</NcButton>