diff --git a/core/templates/403.php b/core/templates/403.php
index 6e910fd2e8..a19009c354 100644
--- a/core/templates/403.php
+++ b/core/templates/403.php
@@ -9,7 +9,7 @@ if(!isset($_)) {//also provide standalone error page
 ?>
 <ul>
 	<li class='error'>
-		<?php p($l->t( 'Access forbidden' )); ?><br/>
+		<?php p($l->t( 'Access forbidden' )); ?><br>
 		<p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p>
 	</li>
 </ul>
diff --git a/core/templates/404.php b/core/templates/404.php
index 90912844ef..c8d16e3e8f 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -14,7 +14,7 @@ if(!isset($_)) {//also provide standalone error page
 <?php else: ?>
 	<ul>
 		<li class="error">
-			<?php p($l->t('File not found')); ?><br/>
+			<?php p($l->t('File not found')); ?><br>
 			<p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></p>
 			<p class="hint"><a href="<?php p(OC_Helper::linkTo('', 'index.php')) ?>"><?php p($l->t('You can click here to return to %s.', array($theme->getName()))); ?></a></p>
 		</li>
diff --git a/core/templates/error.php b/core/templates/error.php
index 030fbf07fc..6e044b7241 100644
--- a/core/templates/error.php
+++ b/core/templates/error.php
@@ -1,7 +1,7 @@
 <ul class="error-wide">
 	<?php foreach($_["errors"] as $error):?>
 		<li class='error'>
-			<?php p($error['error']) ?><br/>
+			<?php p($error['error']) ?><br>
 			<?php if(isset($error['hint']) && $error['hint']): ?>
 				<p class='hint'><?php print_unescaped($error['hint']) ?></p>
 			<?php endif;?>
diff --git a/core/templates/installation.php b/core/templates/installation.php
index f8311fed00..54c490c544 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -42,18 +42,18 @@ script('core', [
 			<input type="text" name="adminlogin" id="adminlogin"
 				placeholder="<?php p($l->t( 'Username' )); ?>"
 				value="<?php p($_['adminlogin']); ?>"
-				autocomplete="off" autocapitalize="off" autocorrect="off" autofocus required />
+				autocomplete="off" autocapitalize="off" autocorrect="off" autofocus required>
 			<label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label>
-			<img class="svg" src="<?php p(image_path('', 'actions/user.svg')); ?>" alt="" />
+			<img class="svg" src="<?php p(image_path('', 'actions/user.svg')); ?>" alt="">
 		</p>
 		<p class="groupbottom">
 			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass"
 				placeholder="<?php p($l->t( 'Password' )); ?>"
 				value="<?php p($_['adminpass']); ?>"
-				autocomplete="off" autocapitalize="off" autocorrect="off" required />
+				autocomplete="off" autocapitalize="off" autocorrect="off" required>
 			<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
-			<img class="svg" id="adminpass-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt="" />
-			<input type="checkbox" id="show" name="show" />
+			<img class="svg" id="adminpass-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt="">
+			<input type="checkbox" id="show" name="show">
 			<label for="show"></label>
 			<div class="strengthify-wrapper"></div>
 		</p>
@@ -72,7 +72,7 @@ script('core', [
 			<input type="text" name="directory" id="directory"
 				placeholder="<?php p(OC::$SERVERROOT.'/data'); ?>"
 				value="<?php p($_['directory']); ?>"
-				autocomplete="off" autocapitalize="off" autocorrect="off" />
+				autocomplete="off" autocapitalize="off" autocorrect="off">
 		</div>
 	</fieldset>
 	<?php endif; ?>
@@ -86,7 +86,7 @@ script('core', [
 		<?php foreach($_['databases'] as $type => $label): ?>
 		<?php if(count($_['databases']) === 1): ?>
 		<p class="info"><?php p($l->t( 'Only %s is available.', array($label) )); ?>.</p>
-		<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>" />
+		<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>">
 		<?php else: ?>
 		<input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>"
 			<?php print_unescaped($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/>
@@ -104,15 +104,15 @@ script('core', [
 				<input type="text" name="dbuser" id="dbuser"
 					placeholder="<?php p($l->t( 'Database user' )); ?>"
 					value="<?php p($_['dbuser']); ?>"
-					autocomplete="off" autocapitalize="off" autocorrect="off" />
+					autocomplete="off" autocapitalize="off" autocorrect="off">
 			</p>
 			<p class="groupmiddle">
 				<input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword"
 					placeholder="<?php p($l->t( 'Database password' )); ?>"
 					value="<?php p($_['dbpass']); ?>"
-					autocomplete="off" autocapitalize="off" autocorrect="off" />
+					autocomplete="off" autocapitalize="off" autocorrect="off">
 				<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
-				<input type="checkbox" id="dbpassword" name="dbpassword" />
+				<input type="checkbox" id="dbpassword" name="dbpassword">
 				<label for="dbpassword"></label>
 			</p>
 			<p class="groupmiddle">
@@ -121,7 +121,7 @@ script('core', [
 					placeholder="<?php p($l->t( 'Database name' )); ?>"
 					value="<?php p($_['dbname']); ?>"
 					autocomplete="off" autocapitalize="off" autocorrect="off"
-					pattern="[0-9a-zA-Z$_-]+" />
+					pattern="[0-9a-zA-Z$_-]+">
 			</p>
 			<?php if($_['hasOracle']): ?>
 			<div id="use_oracle_db">
@@ -130,7 +130,7 @@ script('core', [
 					<input type="text" name="dbtablespace" id="dbtablespace"
 						placeholder="<?php p($l->t( 'Database tablespace' )); ?>"
 						value="<?php p($_['dbtablespace']); ?>"
-						autocomplete="off" autocapitalize="off" autocorrect="off" />
+						autocomplete="off" autocapitalize="off" autocorrect="off">
 				</p>
 			</div>
 			<?php endif; ?>
@@ -139,7 +139,7 @@ script('core', [
 				<input type="text" name="dbhost" id="dbhost"
 					placeholder="<?php p($l->t( 'Database host' )); ?>"
 					value="<?php p($_['dbhost']); ?>"
-					autocomplete="off" autocapitalize="off" autocorrect="off" />
+					autocomplete="off" autocapitalize="off" autocorrect="off">
 			</p>
 		</div>
 		</fieldset>
@@ -157,5 +157,5 @@ script('core', [
 		</fieldset>
 	<?php endif ?>
 
-	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div>
+	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>"></div>
 </form>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 7069c0c263..a5336b1585 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -1,25 +1,21 @@
 <!DOCTYPE html>
-<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]-->
-<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
-<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if lte IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
 <!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
-<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
-<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
-
+<!--[if (gt IE 9)|!(IE)]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
 	<head data-requesttoken="<?php p($_['requesttoken']); ?>">
+		<meta charset="utf-8">
 		<title>
 		<?php p($theme->getTitle()); ?>
 		</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
-		<link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
-		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
+		<link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>">
+		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>">
 		<?php foreach ($_['cssfiles'] as $cssfile): ?>
-			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" />
+			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="screen">
 		<?php endforeach; ?>
 		<?php foreach ($_['jsfiles'] as $jsfile): ?>
-			<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
+			<script src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 8deda443d9..c494e32a7f 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -1,26 +1,22 @@
 <!DOCTYPE html>
-<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]-->
-<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
-<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if lte IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
 <!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
-<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
-<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
-
+<!--[if (gt IE 9)|!(IE)]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
 	<head data-requesttoken="<?php p($_['requesttoken']); ?>">
+		<meta charset="utf-8">
 		<title>
 		<?php p($theme->getTitle()); ?>
 		</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
 		<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
-		<link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
-		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
+		<link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>">
+		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>">
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
-			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" />
+			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="screen">
 		<?php endforeach; ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
-			<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
+			<script src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
@@ -44,7 +40,6 @@
 				<div class="push"></div><!-- for sticky footer -->
 			</div>
 		</div>
-
 		<footer>
 			<p class="info">
 				<?php print_unescaped($theme->getLongFooter()); ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 7ae4b2e3df..9667aa72dd 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,33 +1,29 @@
 <!DOCTYPE html>
-<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]-->
-<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
-<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if lte IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
 <!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
-<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
-<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
-
+<!--[if (gt IE 9)|!(IE)]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
 	<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
+		<meta charset="utf-8">
 		<title>
 			<?php
 				p(!empty($_['application'])?$_['application'].' - ':'');
 				p($theme->getTitle());
 			?>
 		</title>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
 		<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:'ownCloud'); ?>">
 		<meta name="mobile-web-app-capable" content="yes">
-		<link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" />
-		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" />
+		<link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>">
+		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
-			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" />
+			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="screen">
 		<?php endforeach; ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
-			<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
+			<script src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
@@ -89,7 +85,7 @@
 				<?php endforeach; ?>
 					<li>
 						<a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>>
-							<img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg')); ?>" />
+							<img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg')); ?>">
 							<?php p($l->t('Log out'));?>
 						</a>
 					</li>
diff --git a/core/templates/login.php b/core/templates/login.php
index f10a810218..0ef7882d4b 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -11,7 +11,7 @@ script('core', [
 <form method="post" name="login">
 	<fieldset>
 	<?php if (!empty($_['redirect_url'])) {
-		print_unescaped('<input type="hidden" name="redirect_url" value="' . OC_Util::sanitizeHTML($_['redirect_url']) . '" />');
+		print_unescaped('<input type="hidden" name="redirect_url" value="' . OC_Util::sanitizeHTML($_['redirect_url']) . '">');
 	} ?>
 		<?php if (isset($_['apacheauthfailed']) && ($_['apacheauthfailed'])): ?>
 			<div class="warning">
@@ -26,7 +26,7 @@ script('core', [
 		<?php endforeach; ?>
 		<p id="message" class="hidden">
 			<img class="float-spinner" alt=""
-				src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>" />
+				src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>">
 			<span id="messageText"></span>
 			<!-- the following div ensures that the spinner is always inside the #message div -->
 			<div style="clear: both;"></div>
@@ -36,7 +36,7 @@ script('core', [
 				placeholder="<?php p($l->t('Username')); ?>"
 				value="<?php p($_['username']); ?>"
 				<?php p($_['user_autofocus'] ? 'autofocus' : ''); ?>
-				autocomplete="on" autocapitalize="off" autocorrect="off" required />
+				autocomplete="on" autocapitalize="off" autocorrect="off" required>
 			<label for="user" class="infield"><?php p($l->t('Username')); ?></label>
 			<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
 		</p>
@@ -45,7 +45,7 @@ script('core', [
 			<input type="password" name="password" id="password" value=""
 				placeholder="<?php p($l->t('Password')); ?>"
 				<?php p($_['user_autofocus'] ? '' : 'autofocus'); ?>
-				autocomplete="on" autocapitalize="off" autocorrect="off" required />
+				autocomplete="on" autocapitalize="off" autocorrect="off" required>
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
 			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
 		</p>
@@ -56,12 +56,12 @@ script('core', [
 		</a>
 		<?php endif; ?>
 		<?php if ($_['rememberLoginAllowed'] === true) : ?>
-		<input type="checkbox" name="remember_login" value="1" id="remember_login" />
+		<input type="checkbox" name="remember_login" value="1" id="remember_login">
 		<label for="remember_login"><?php p($l->t('remember')); ?></label>
 		<?php endif; ?>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
 		<input type="hidden" name="timezone" id="timezone"/>
-		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
+		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>">
 		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>" disabled="disabled"/>
 	</fieldset>
 </form>
diff --git a/core/templates/singleuser.user.php b/core/templates/singleuser.user.php
index a5f56f6e2c..bf076eb8d6 100644
--- a/core/templates/singleuser.user.php
+++ b/core/templates/singleuser.user.php
@@ -1,10 +1,10 @@
 <ul>
 	<li class='update'>
-		<?php p($l->t('This ownCloud instance is currently in single user mode.')) ?><br /><br />
-		<?php p($l->t('This means only administrators can use the instance.')) ?><br /><br />
+		<?php p($l->t('This ownCloud instance is currently in single user mode.')) ?><br><br>
+		<?php p($l->t('This means only administrators can use the instance.')) ?><br><br>
 		<?php p($l->t('Contact your system administrator if this message persists or appeared unexpectedly.')) ?>
-		<br /><br />
-		<?php p($l->t('Thank you for your patience.')); ?><br /><br />
+		<br><br>
+		<?php p($l->t('Thank you for your patience.')); ?><br><br>
 		<a class="button" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>><?php p($l->t('Log out')); ?></a>
 	</li>
 </ul>
diff --git a/core/templates/tags.html b/core/templates/tags.html
index ae3d072b38..a7125027a2 100644
--- a/core/templates/tags.html
+++ b/core/templates/tags.html
@@ -2,13 +2,13 @@
 	<div class="content">
 		<div class="scrollarea">
 			<ul class="taglist">
-				<li><input type="checkbox" name="ids[]" id="tag_{id}" value="{name}" />
+				<li><input type="checkbox" name="ids[]" id="tag_{id}" value="{name}">
 					<label for="tag_{id}">{name}</label>
 				</li>
 			</ul>
 		</div>
 		<div class="bottombuttons">
-			<input type="text" class="addinput" name="tag" placeholder="{addText}" />
+			<input type="text" class="addinput" name="tag" placeholder="{addText}">
 		</div>
 	</div>
 </div>
diff --git a/core/templates/untrustedDomain.php b/core/templates/untrustedDomain.php
index b661834318..3197916ceb 100644
--- a/core/templates/untrustedDomain.php
+++ b/core/templates/untrustedDomain.php
@@ -2,13 +2,13 @@
 
 <ul class="error-wide">
 	<li class='error'>
-		<?php p($l->t('You are accessing the server from an untrusted domain.')); ?><br/>
+		<?php p($l->t('You are accessing the server from an untrusted domain.')); ?><br>
 
 		<p class='hint'>
 			<?php p($l->t('Please contact your administrator. If you are an administrator of this instance, configure the "trusted_domain" setting in config/config.php. An example configuration is provided in config/config.sample.php.')); ?>
-			<br/>
+			<br>
 			<?php p($l->t('Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.')); ?>
-			<br/><br/>
+			<br><br>
 			<p style="text-align:center;">
 				<a href="<?php print_unescaped(OC_Helper::makeURLAbsolute(\OCP\Util::linkToRoute('settings_admin'))); ?>?trustDomain=<?php p($_['domain']); ?>" class="button">
 					<?php p($l->t('Add "%s" as trusted domain', array($_['domain']))); ?>
diff --git a/core/templates/update.user.php b/core/templates/update.user.php
index be332f24f3..bc6936188e 100644
--- a/core/templates/update.user.php
+++ b/core/templates/update.user.php
@@ -1,8 +1,8 @@
 <ul>
 	<li class='update'>
-		<?php p($l->t('This %s instance is currently in maintenance mode, which may take a while.', array($theme->getName()))) ?><br/><br/>
-		<?php p($l->t('This page will refresh itself when the %s instance is available again.', array($theme->getName()))) ?><br/><br/>
-		<?php p($l->t('Contact your system administrator if this message persists or appeared unexpectedly.')) ?><br/><br/>
-		<?php p($l->t('Thank you for your patience.')); ?><br/><br/>
+		<?php p($l->t('This %s instance is currently in maintenance mode, which may take a while.', array($theme->getName()))) ?><br><br>
+		<?php p($l->t('This page will refresh itself when the %s instance is available again.', array($theme->getName()))) ?><br><br>
+		<?php p($l->t('Contact your system administrator if this message persists or appeared unexpectedly.')) ?><br><br>
+		<?php p($l->t('Thank you for your patience.')); ?><br><br>
 	</li>
 </ul>