diff --git a/core/css/guest.css b/core/css/guest.css
index 5d1e164a4f..4645e97910 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -33,15 +33,20 @@ body {
 }
 
 /* Various fonts settings */
-p.info a,
+#body-login a {
+	color: #fff;
+	font-weight: 600;
+}
+#body-login a:not(.button):hover,
+#body-login a:not(.button):focus {
+	text-decoration: underline;
+	text-decoration-skip-ink: auto;
+}
+
 #showAdvanced {
 	color: #fff;
 }
-#remember_login:hover+label,
-#forgot-password:hover,
-p.info a:hover {
-	opacity: .6;
-}
+
 em {
 	font-style: normal;
 	opacity: .5;
@@ -182,9 +187,10 @@ input[type='submit'].icon-confirm,
 input[type='button'],
 button, .button,
 select {
+	display: inline-block;
 	width: auto;
 	min-width: 25px;
-	padding: 5px;
+	padding: 12px;
 	background-color: white;
 	font-weight: 600;
 	color: #555;
@@ -227,6 +233,7 @@ input.update-continue {
 .updateAnyways a.updateAnywaysButton:hover {
 	color: #222 !important;
 }
+
 input.primary,
 button.primary {
 	border: 1px solid #fff;
@@ -234,6 +241,13 @@ button.primary {
 	color: #fff;
 }
 
+input.primary:not(:disabled):hover,
+input.primary:not(:disabled):focus,
+button.primary:not(:disabled):hover,
+button.primary:not(:disabled):focus {
+	background-color: #17adff;
+}
+
 /* Checkboxes - white only for login */
 input[type='checkbox'].checkbox {
 	position: absolute;
@@ -300,7 +314,7 @@ label.infield {
 	left: 5px;
 	top: -20px;
 	width: 269px;
-	border-radius: 0 0 2px 2px;
+	border-radius: 0 0 3px 3px;
 	overflow: hidden;
 	height: 3px;
 }
@@ -438,9 +452,11 @@ form .warning input[type='checkbox']+label {
 .lost-password-container #lost-password,
 .lost-password-container #lost-password-back {
 	display: inline-block;
+	font-weight: 300;
 	padding: 12px;
 	margin-top: -6px;
 	color: #fff;
+	cursor: pointer;
 }
 #forgot-password {
 	padding: 11px;
@@ -543,12 +559,12 @@ form #selectDbType label.ui-state-active {
 .update,
 .error {
 	display: block;
-	padding: 10px;
+	padding: 15px;
 	background-color: rgba(0,0,0,.3);
 	color: #fff;
 	text-align: left;
 	word-wrap: break-word;
-	border-radius: 3px;
+	border-radius: 10px;
 	cursor: default;
 	-moz-user-select: text;
 	-webkit-user-select: text;
@@ -608,7 +624,10 @@ fieldset.update legend + p {
 
 /* Various paragraph styles */
 .infogroup {
-	margin-bottom: 15px;
+	margin: 8px 0;
+}
+.infogroup:last-child {
+	margin-bottom: 0;
 }
 p.info {
 	margin: 20px auto;
@@ -633,13 +652,6 @@ p.info {
 .update img.float-spinner {
 	float: left;
 }
-.update h2 {
-	margin: 0 0 20px;
-}
-.update a {
-	color: #fff;
-	border-bottom: 1px solid #aaa;
-}
 .update a.update-show-detailed {
 	border-bottom: inherit;
 }
diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php
index 2ad1511732..e8087b297e 100644
--- a/core/templates/update.admin.php
+++ b/core/templates/update.admin.php
@@ -34,7 +34,7 @@
 		<div class="infogroup bold">
 			<?php p($l->t('Please make sure that the database, the config folder and the data folder have been backed up before proceeding.')) ?>
 		</div>
-		<input class="updateButton" type="button" value="<?php p($l->t('Start update')) ?>">
+		<input class="updateButton primary" type="button" value="<?php p($l->t('Start update')) ?>">
 		<div class="infogroup">
 			<em>
 			<?php p($l->t('To avoid timeouts with larger installations, you can instead run the following command from your installation directory:')) ?>