diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9092d2833fd..10f19b8891e 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -43,35 +43,35 @@ if ($_['mail_smtpmode'] == 'qmail') {
 // is ssl working ?
 if (!$_['isConnectedViaHTTPS']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Security Warning'));?></h2>
 
 	<span class="securitywarning">
 		<?php p($l->t('You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead.', $theme->getTitle())); ?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 
 // is htaccess working ?
 if (!$_['htaccessworking']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Security Warning'));?></h2>
 
 	<span class="securitywarning">
 		<?php p($l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.')); ?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 
 // is WebDAV working ?
 if (!$_['isWebDavWorking']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Setup Warning'));?></h2>
 
 	<span class="securitywarning">
@@ -79,42 +79,42 @@ if (!$_['isWebDavWorking']) {
 		<?php print_unescaped($l->t('Please double check the <a href="%s">installation guides</a>.', link_to_docs('admin-install'))); ?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 
 // if module fileinfo available?
 if (!$_['has_fileinfo']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Module \'fileinfo\' missing'));?></h2>
 
 		<span class="connectionwarning">
 		<?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.')); ?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 
 // is PHP at least at 5.3.8?
 if ($_['old_php']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Your PHP version is outdated'));?></h2>
 
 		<span class="connectionwarning">
 		<?php p($l->t('Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly.')); ?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 
 // is locale working ?
 if (!$_['isLocaleWorking']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Locale not working'));?></h2>
 
 		<span class="connectionwarning">
@@ -132,21 +132,21 @@ if (!$_['isLocaleWorking']) {
 			?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 
 // is internet connection working ?
 if (!$_['internetconnectionworking']) {
 	?>
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Internet connection not working'));?></h2>
 
 		<span class="connectionwarning">
 		<?php p($l->t('This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.')); ?>
 	</span>
 
-</fieldset>
+</div>
 <?php
 }
 ?>
@@ -156,7 +156,7 @@ if (!$_['internetconnectionworking']) {
 }
 ;?>
 
-<fieldset class="personalblock" id="backgroundjobs">
+<div class="section" id="backgroundjobs">
 	<h2 class="inlineblock"><?php p($l->t('Cron'));?></h2>
 	<?php if ($_['cron_log']): ?>
 	<p class="cronlog inlineblock">
@@ -199,9 +199,9 @@ if (!$_['internetconnectionworking']) {
 				<label for="backgroundjobs_cron">Cron</label><br/>
 				<em><?php p($l->t("Use systems cron service to call the cron.php file every 15 minutes.")); ?></em>
 	</p>
-</fieldset>
+</div>
 
-<fieldset class="personalblock" id="shareAPI">
+<div class="section" id="shareAPI">
 	<h2><?php p($l->t('Sharing'));?></h2>
 	<table class="shareAPI">
 		<tr>
@@ -255,9 +255,9 @@ if (!$_['internetconnectionworking']) {
 			</td>
 		</tr>
 	</table>
-</fieldset>
+</div>
 
-<fieldset class="personalblock" id="security">
+<div class="section" id="security">
 	<h2><?php p($l->t('Security'));?></h2>
 	<table>
 		<tr>
@@ -288,9 +288,9 @@ if (!$_['internetconnectionworking']) {
 			</td>
 		</tr>
 	</table>
-</fieldset>
+</div>
 
-<fieldset id="mail_settings" class="personalblock">
+<div id="mail_settings" class="section">
 	<h2><?php p($l->t('Email Server'));?> <span id="mail_settings_msg" class="msg"></span></h2>
 
 	<p><?php p($l->t('This is used for sending out notifications.')); ?></p>
@@ -370,9 +370,9 @@ if (!$_['internetconnectionworking']) {
 	<em><?php p($l->t( 'Test email settings' )); ?></em>
 	<input type="submit" name="sendtestemail" id="sendtestemail" value="<?php p($l->t( 'Send email' )); ?>"/>
 	<span id="sendtestmail_msg" class="msg"></span>
-</fieldset>
+</div>
 
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Log'));?></h2>
 	<?php p($l->t('Log level'));?> <select name='loglevel' id='loglevel'>
 <?php for ($i = 0; $i < 5; $i++):
@@ -410,9 +410,9 @@ if (!$_['internetconnectionworking']) {
 	<input id="lessLog" type="button" value="<?php p($l->t('Less'));?>...">
 	<?php endif; ?>
 
-</fieldset>
+</div>
 
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Version'));?></h2>
 	<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?>
 <?php if (OC_Util::getEditionString() === ''): ?>
@@ -420,9 +420,8 @@ if (!$_['internetconnectionworking']) {
 		<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
 	</p>
 <?php endif; ?>
-</fieldset>
-<fieldset class="personalblock credits-footer">
-<p>
-	<?php print_unescaped($theme->getShortFooter()); ?>
-</p>
-</fieldset>
+</div>
+
+<div class="section credits-footer">
+	<p><?php print_unescaped($theme->getShortFooter()); ?></p>
+</div>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 9024f435657..cc1fce88c9f 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -21,7 +21,7 @@
 </div>
 
 
-<div id="quota" class="personalblock">
+<div id="quota" class="section">
 	<div style="width:<?php p($_['usage_relative']);?>%;">
 		<p id="quotatext">
 			<?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>',
@@ -34,23 +34,21 @@
 <?php
 if($_['passwordChangeSupported']) {
 ?>
-<form id="passwordform">
-	<fieldset class="personalblock">
-		<h2><?php p($l->t('Password'));?></h2>
-		<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
-		<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
-		<input type="password" id="pass1" name="oldpassword"
-			placeholder="<?php echo $l->t('Current password');?>"
-			autocomplete="off" autocapitalize="off" autocorrect="off" />
-		<input type="password" id="pass2" name="personal-password"
-			placeholder="<?php echo $l->t('New password');?>"
-			data-typetoggle="#personal-show"
-			autocomplete="off" autocapitalize="off" autocorrect="off" />
-		<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
-		<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
-		<br/>
-		<div class="strengthify-wrapper"></div>
-	</fieldset>
+<form id="passwordform" class="section">
+	<h2><?php p($l->t('Password'));?></h2>
+	<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
+	<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
+	<input type="password" id="pass1" name="oldpassword"
+		placeholder="<?php echo $l->t('Current password');?>"
+		autocomplete="off" autocapitalize="off" autocorrect="off" />
+	<input type="password" id="pass2" name="personal-password"
+		placeholder="<?php echo $l->t('New password');?>"
+		data-typetoggle="#personal-show"
+		autocomplete="off" autocapitalize="off" autocorrect="off" />
+	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
+	<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
+	<br/>
+	<div class="strengthify-wrapper"></div>
 </form>
 <?php
 }
@@ -59,15 +57,13 @@ if($_['passwordChangeSupported']) {
 <?php
 if($_['displayNameChangeSupported']) {
 ?>
-<form id="displaynameform">
-	<fieldset class="personalblock">
-		<h2><?php echo $l->t('Full Name');?></h2>
-		<input type="text" id="displayName" name="displayName"
-			value="<?php p($_['displayName'])?>"
-			autocomplete="on" autocapitalize="off" autocorrect="off" />
-        <span class="msg"></span>
-		<input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" />
-	</fieldset>
+<form id="displaynameform" class="section">
+	<h2><?php echo $l->t('Full Name');?></h2>
+	<input type="text" id="displayName" name="displayName"
+		value="<?php p($_['displayName'])?>"
+		autocomplete="on" autocapitalize="off" autocorrect="off" />
+    <span class="msg"></span>
+	<input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" />
 </form>
 <?php
 }
@@ -76,85 +72,79 @@ if($_['displayNameChangeSupported']) {
 <?php
 if($_['passwordChangeSupported']) {
 ?>
-<form id="lostpassword">
-	<fieldset class="personalblock">
-		<h2><?php p($l->t('Email'));?></h2>
-		<input type="text" name="email" id="email" value="<?php p($_['email']); ?>"
-			placeholder="<?php p($l->t('Your email address'));?>"
-			autocomplete="on" autocapitalize="off" autocorrect="off" />
-		<span class="msg"></span><br />
-		<em><?php p($l->t('Fill in an email address to enable password recovery and receive notifications'));?></em>
-	</fieldset>
+<form id="lostpassword" class="section">
+	<h2><?php p($l->t('Email'));?></h2>
+	<input type="text" name="email" id="email" value="<?php p($_['email']); ?>"
+		placeholder="<?php p($l->t('Your email address'));?>"
+		autocomplete="on" autocapitalize="off" autocorrect="off" />
+	<span class="msg"></span><br />
+	<em><?php p($l->t('Fill in an email address to enable password recovery and receive notifications'));?></em>
 </form>
 <?php
 }
 ?>
 
 <?php if ($_['enableAvatars']): ?>
-<form id="avatar" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>">
-	<fieldset class="personalblock">
-		<h2><?php p($l->t('Profile picture')); ?></h2>
-		<div id="displayavatar">
-			<div class="avatardiv"></div><br>
-			<div class="warning hidden"></div>
-			<?php if ($_['avatarChangeSupported']): ?>
-			<div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div>
-			<input type="file" class="hidden" name="files[]" id="uploadavatar">
-			<div class="inlineblock button" id="selectavatar"><?php p($l->t('Select new from Files')); ?></div>
-			<div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div><br>
-			<?php p($l->t('Either png or jpg. Ideally square but you will be able to crop it.')); ?>
-			<?php else: ?>
-			<?php p($l->t('Your avatar is provided by your original account.')); ?>
-			<?php endif; ?>
-		</div>
-		<div id="cropper" class="hidden">
-			<div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Cancel')); ?></div>
-			<div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile image')); ?></div>
-		</div>
-	</fieldset>
+<form id="avatar" class="section" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>">
+	<h2><?php p($l->t('Profile picture')); ?></h2>
+	<div id="displayavatar">
+		<div class="avatardiv"></div><br>
+		<div class="warning hidden"></div>
+		<?php if ($_['avatarChangeSupported']): ?>
+		<div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div>
+		<input type="file" class="hidden" name="files[]" id="uploadavatar">
+		<div class="inlineblock button" id="selectavatar"><?php p($l->t('Select new from Files')); ?></div>
+		<div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div><br>
+		<?php p($l->t('Either png or jpg. Ideally square but you will be able to crop it.')); ?>
+		<?php else: ?>
+		<?php p($l->t('Your avatar is provided by your original account.')); ?>
+		<?php endif; ?>
+	</div>
+	<div id="cropper" class="hidden">
+		<div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Cancel')); ?></div>
+		<div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile image')); ?></div>
+	</div>
 </form>
 <?php endif; ?>
 
-<form>
-	<fieldset class="personalblock">
-		<h2><?php p($l->t('Language'));?></h2>
-		<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
-			<option value="<?php p($_['activelanguage']['code']);?>">
-				<?php p($_['activelanguage']['name']);?>
+<form class="section">
+	<h2><?php p($l->t('Language'));?></h2>
+	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
+		<option value="<?php p($_['activelanguage']['code']);?>">
+			<?php p($_['activelanguage']['name']);?>
+		</option>
+		<?php foreach($_['commonlanguages'] as $language):?>
+			<option value="<?php p($language['code']);?>">
+				<?php p($language['name']);?>
 			</option>
-			<?php foreach($_['commonlanguages'] as $language):?>
-				<option value="<?php p($language['code']);?>">
-					<?php p($language['name']);?>
-				</option>
-			<?php endforeach;?>
-			<optgroup label="––––––––––"></optgroup>
-			<?php foreach($_['languages'] as $language):?>
-				<option value="<?php p($language['code']);?>">
-					<?php p($language['name']);?>
-				</option>
-			<?php endforeach;?>
-		</select>
-		<?php if (OC_Util::getEditionString() === ''): ?>
-		<a href="https://www.transifex.com/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
-			target="_blank">
-			<em><?php p($l->t('Help translate'));?></em>
-		</a>
-		<?php endif; ?>
-	</fieldset>
+		<?php endforeach;?>
+		<optgroup label="––––––––––"></optgroup>
+		<?php foreach($_['languages'] as $language):?>
+			<option value="<?php p($language['code']);?>">
+				<?php p($language['name']);?>
+			</option>
+		<?php endforeach;?>
+	</select>
+	<?php if (OC_Util::getEditionString() === ''): ?>
+	<a href="https://www.transifex.com/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
+		target="_blank">
+		<em><?php p($l->t('Help translate'));?></em>
+	</a>
+	<?php endif; ?>
 </form>
 
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('WebDAV'));?></h2>
 	<code><?php print_unescaped(OC_Helper::linkToRemote('webdav')); ?></code><br />
 	<em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank">access your Files via WebDAV</a>', array(link_to_docs('user-webdav'))));?></em>
-</fieldset>
+</div>
 
 <?php foreach($_['forms'] as $form) {
 	print_unescaped($form);
 };?>
 
 <?php if($_['enableDecryptAll']): ?>
-<fieldset class="personalblock" id="decryptAll">
+<div class="section" id="decryptAll">
 	<h2>
 		<?php p( $l->t( 'Encryption' ) ); ?>
 	</h2>
@@ -174,18 +164,17 @@ if($_['passwordChangeSupported']) {
 		<span class="msg"></span>
 	</p>
 	<br />
-</fieldset>
+</div>
 <?php endif; ?>
 
-<fieldset class="personalblock">
+<div class="section">
 	<h2><?php p($l->t('Version'));?></h2>
 	<strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?><br />
 <?php if (OC_Util::getEditionString() === ''): ?>
 	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
 <?php endif; ?>
-</fieldset>
-<fieldset class="personalblock credits-footer">
-<p>
-	<?php print_unescaped($theme->getShortFooter()); ?>
-</p>
-</fieldset>
+</div>
+
+<div class="section credits-footer">
+	<p><?php print_unescaped($theme->getShortFooter()); ?></p>
+</div>