diff --git a/core/css/styles.css b/core/css/styles.css
index 428688060b74be01a6420d6881eaff9e04e9a48f..8a8bc852f3ee1ce92dc7d1da6cbcb665a2e8b2fb 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -32,10 +32,17 @@ body {
 	background-size: cover;
 }
 
+.two-factor-header {
+	text-align: center;
+}
+
 .two-factor-provider {
 	text-align: center;
-	width: 100%;
+	width: 258px !important;
 	display: inline-block;
+	margin-bottom: 0 !important;
+	background-color: rgba(0,0,0,0.3) !important;
+	border: none !important;
 }
 
 a.two-factor-cancel {
diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php
index 4209beac4e69e1bbe1f1f58d471aa6b4518e7598..1948499e604dac2e529984f31dbbd233a906d03c 100644
--- a/core/templates/twofactorselectchallenge.php
+++ b/core/templates/twofactorselectchallenge.php
@@ -1,22 +1,22 @@
-<fieldset class="warning">
-		<legend><strong><?php p($l->t('Two-step verification')) ?></strong></legend>
-		<p><?php p($l->t('Enhanced security has been enabled for your account. Please authenticate using a second factor.')) ?></p>
-</fieldset>
-<fieldset class="warning">
-<ul>
-<?php foreach ($_['providers'] as $provider): ?>
-	<li>
-		<a class="two-factor-provider"
-		   href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
-							[
-								'challengeProviderId' => $provider->getId(),
-								'redirect_url' => $_['redirect_url'],
-							]
-						)) ?>">
-			<?php p($provider->getDescription()) ?>
-		</a>
-	</li>
-<?php endforeach; ?>
-</ul>
-</fieldset>
-<a class="two-factor-cancel" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel login')) ?></a>
+<div class="warning">
+	<h2 class="two-factor-header"><?php p($l->t('Two-factor authentication')) ?></h2>
+	<p><?php p($l->t('Enhanced security is enabled for your account. Please authenticate using a second factor.')) ?></p>
+	<p>
+		<ul>
+			<?php foreach ($_['providers'] as $provider): ?>
+				<li>
+					<a class="button two-factor-provider"
+					   href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
+										[
+											'challengeProviderId' => $provider->getId(),
+											'redirect_url' => $_['redirect_url'],
+										]
+									)) ?>">
+						<?php p($provider->getDescription()) ?>
+					</a>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</p>
+</div>
+<a class="two-factor-cancel" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel log in')) ?></a>
diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php
index c5ee9aca4b4282ee2a39a2477712ac0f3384fac3..fb161921675cd1afc556d6d9289102bb0adb3908 100644
--- a/core/templates/twofactorshowchallenge.php
+++ b/core/templates/twofactorshowchallenge.php
@@ -9,12 +9,11 @@ $provider = $_['provider'];
 $template = $_['template'];
 ?>
 
-<fieldset class="warning">
-		<legend><strong><?php p($provider->getDisplayName()); ?></strong></legend>
-		<p><?php p($l->t('Please authenticate using the selected factor.')) ?></p>
-</fieldset>
-<?php if ($error): ?>
-<span class="warning"><?php p($l->t('An error occured while verifying the token')); ?></span>
-<?php endif; ?>
-<?php print_unescaped($template); ?>
-<a class="two-factor-cancel" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel login')) ?></a>
+<div class="warning">
+		<h2 class="two-factor-header"><?php p($provider->getDisplayName()); ?></h2>
+		<?php if ($error): ?>
+		<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>
+		<?php endif; ?>
+		<?php print_unescaped($template); ?>
+</div>
+<a class="two-factor-cancel" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel log in')) ?></a>