diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index 0ff764d32ef9a..2ba0188d82d27 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -520,6 +520,7 @@ table.nostyle {
 		width: 16px;
 		height: 16px;
 		vertical-align: sub;
+		display: inline-block;
 	}
 }
 
diff --git a/settings/templates/settings/personal/security.php b/settings/templates/settings/personal/security.php
index ab69f36a00f8a..4d83f024ab71b 100644
--- a/settings/templates/settings/personal/security.php
+++ b/settings/templates/settings/personal/security.php
@@ -76,15 +76,15 @@
 			/** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
 			$provider = $data['provider'];
 			if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
-				$icon = $provider->getDarkIcon();
+				$icon = sprintf('icon-twofactor_%s', $provider->getId());
 			} else {
-				$icon = image_path('core', 'actions/password.svg');
+				$icon = 'icon-password';
 			}
 			/** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
 			$settings = $data['settings'];
 			?>
 			<h3>
-				<img class="two-factor-provider-settings-icon" src="<?php p($icon) ?>" alt="">
+				<div class="two-factor-provider-settings-icon <?php p($icon) ?>"></div>
 				<?php p($provider->getDisplayName()) ?>
 			</h3>
 			<?php print_unescaped($settings->getBody()->fetchPage()) ?>