diff --git a/css/firstrunwizard.scss b/css/firstrunwizard.scss
index cbf9eedf4..f8245d205 100644
--- a/css/firstrunwizard.scss
+++ b/css/firstrunwizard.scss
@@ -1,6 +1,7 @@
 @import 'colorbox.scss';
 
 #cboxLoadedContent {
+	background-color: var(--color-main-background) !important;
 	border-radius: var(--border-radius-large);
 	overflow: hidden !important;
 }
@@ -39,13 +40,6 @@
 	padding: 0;
 }
 
-.clientslinks .appsmall {
-	height: 32px;
-	width: 32px;
-	position: relative;
-	opacity: .5;
-	vertical-align: middle;
-}
 .clientslinks .button {
 	display: inline-block;
 	padding: 8px;
@@ -232,11 +226,8 @@
 	text-align: center;
 }
 
-.icon-source {
-	background-image: url('../img/source.svg');
-}
 .icon-world {
-	background-image: url('../img/world.svg');
+	background-image: var(--icon-link-000);
 }
 
 @media only screen and (max-width: 680px) {
diff --git a/templates/page.clients.php b/templates/page.clients.php
index 379bfcce3..d96e29bb1 100644
--- a/templates/page.clients.php
+++ b/templates/page.clients.php
@@ -52,17 +52,17 @@
 			<h3><?php p($l->t('Connect your desktop apps to %s', array($theme->getName()))); ?></h3>
 			<a target="_blank" class="button"
 			   href="<?php p(link_to_docs('user-sync-calendars')) ?>" rel="noreferrer noopener">
-				<span class="icon icon-calendar-dark"></span>
+				<span class="icon-calendar-dark"></span>
 				<?php p($l->t('Connect your calendar')); ?>
 			</a>
 			<a target="_blank" class="button"
 			   href="<?php p(link_to_docs('user-sync-contacts')) ?>" rel="noreferrer noopener">
-				<span class="icon icon-contacts-dark"></span>
+				<span class="icon-contacts-dark"></span>
 				<?php p($l->t('Connect your contacts')); ?>
 			</a>
 			<a target="_blank" class="button"
 			   href="<?php p(link_to_docs('user-webdav')); ?>" rel="noreferrer noopener">
-				<span class="icon icon-files-dark"></span>
+				<span class="icon-files-dark"></span>
 				<?php p($l->t('Access files via WebDAV')); ?>
 			</a>
 		</div>
diff --git a/templates/personal-settings.php b/templates/personal-settings.php
index 0defd4b6e..87d73b3ce 100644
--- a/templates/personal-settings.php
+++ b/templates/personal-settings.php
@@ -58,18 +58,15 @@
 
 	<div class="clientslinks">
 		<a target="_blank" class="button" href="<?php p(link_to_docs('user-sync-calendars')) ?>" rel="noreferrer noopener">
-			<img class="appsmall appsmall-calendar svg" alt=""
-				 src="<?php p(image_path('core', 'places/calendar.svg')); ?>" />
+			<span class="icon-calendar-dark"></span>
 			<?php p($l->t('Connect your calendar'));?>
 		</a>
 		<a target="_blank" class="button" href="<?php p(link_to_docs('user-sync-contacts')) ?>" rel="noreferrer noopener">
-			<img class="appsmall appsmall-contacts svg" alt=""
-				 src="<?php p(image_path('core', 'places/contacts.svg')); ?>" />
+			<span class="icon-contacts-dark"></span>
 			<?php p($l->t('Connect your contacts'));?>
 		</a>
 		<a target="_blank" class="button" href="<?php p(link_to_docs('user-webdav')); ?>" rel="noreferrer noopener">
-			<img class="appsmall svg" alt=""
-				 src="<?php p(image_path('files', 'folder.svg')); ?>" />
+			<span class="icon-files-dark"></span>
 			<?php p($l->t('Access files via WebDAV'));?>
 		</a>
 	</div>