diff --git a/view/templates/settings/connectors.tpl b/view/templates/settings/connectors.tpl
index 53b4beaad3..08452b124f 100644
--- a/view/templates/settings/connectors.tpl
+++ b/view/templates/settings/connectors.tpl
@@ -1,59 +1,60 @@
-
 <h1>{{$title}}</h1>
 
 <div class="connector_statusmsg">{{$diasp_enabled}}</div>
 <div class="connector_statusmsg">{{$ostat_enabled}}</div>
 
 <form action="settings/connectors" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+	<h2 class="settings-heading">
+		<a onclick="openClose('settings_general_expanded'); openClose('settings_general_inflated');">{{$general_settings}}</a>
+	</h2>
 
-	<h3 class="settings-heading"><a onclick="openClose('settings_general_expanded'); openClose('settings_general_inflated');">{{$general_settings}}</a></h3>
+	<div id="settings_general_expanded" class="settings-block" style="display: none;">
 
-<div id="settings_general_expanded" class="settings-block" style="display: none;">
+		{{include file="field_checkbox.tpl" field=$accept_only_sharer}}
+		{{include file="field_checkbox.tpl" field=$disable_cw}}
+		{{include file="field_checkbox.tpl" field=$no_intelligent_shortening}}
+		{{include file="field_checkbox.tpl" field=$attach_link_title}}
+		{{include file="field_checkbox.tpl" field=$ostatus_autofriend}}
+		{{$default_group nofilter}}
+		{{include file="field_input.tpl" field=$legacy_contact}}
 
-	{{include file="field_checkbox.tpl" field=$accept_only_sharer}}
-	{{include file="field_checkbox.tpl" field=$disable_cw}}
-	{{include file="field_checkbox.tpl" field=$no_intelligent_shortening}}
-	{{include file="field_checkbox.tpl" field=$attach_link_title}}
-	{{include file="field_checkbox.tpl" field=$ostatus_autofriend}}
-	{{$default_group nofilter}}
-	{{include file="field_input.tpl" field=$legacy_contact}}
+		<p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
 
-	<p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
+		<div class="settings-submit-wrapper">
+			<input type="submit" id="general-submit" name="general-submit" class="settings-submit" value="{{$submit}}"/>
+		</div>
+	</div>
+	<div class="clear"></div>
 
-	<div class="settings-submit-wrapper" ><input type="submit" id="general-submit" name="general-submit" class="settings-submit" value="{{$submit}}" /></div>
-</div>
-<div class="clear"></div>
+	{{$settings_connectors nofilter}}
 
-{{$settings_connectors nofilter}}
+	{{if $mail_disabled}}
 
-{{if $mail_disabled}}
-
-{{else}}
-	<span id="settings_mail_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
-		<img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
+	{{else}}
+		<span id="settings_mail_inflated" class="settings-block fakelink" style="display: block;"
+		      onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
+		<img class="connector" src="images/mail.png"/><h3 class="settings-heading connector">{{$h_imap}}</h3>
 	</span>
-	<div id="settings_mail_expanded" class="settings-block" style="display: none;">
+		<div id="settings_mail_expanded" class="settings-block" style="display: none;">
 	<span class="fakelink" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
-		<img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
+		<img class="connector" src="images/mail.png"/><h3 class="settings-heading connector">{{$h_imap}}</h3>
 	</span>
-	<p>{{$imap_desc nofilter}}</p>
-	{{include file="field_custom.tpl" field=$imap_lastcheck}}
-	{{include file="field_input.tpl" field=$mail_server}}
-	{{include file="field_input.tpl" field=$mail_port}}
-	{{include file="field_select.tpl" field=$mail_ssl}}
-	{{include file="field_input.tpl" field=$mail_user}}
-	{{include file="field_password.tpl" field=$mail_pass}}
-	{{include file="field_input.tpl" field=$mail_replyto}}
-	{{include file="field_checkbox.tpl" field=$mail_pubmail}}
-	{{include file="field_select.tpl" field=$mail_action}}
-	{{include file="field_input.tpl" field=$mail_movetofolder}}
-
-	<div class="settings-submit-wrapper" >
-		<input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" />
-	</div>
-	</div>
-{{/if}}
+			<p>{{$imap_desc nofilter}}</p>
+			{{include file="field_custom.tpl" field=$imap_lastcheck}}
+			{{include file="field_input.tpl" field=$mail_server}}
+			{{include file="field_input.tpl" field=$mail_port}}
+			{{include file="field_select.tpl" field=$mail_ssl}}
+			{{include file="field_input.tpl" field=$mail_user}}
+			{{include file="field_password.tpl" field=$mail_pass}}
+			{{include file="field_input.tpl" field=$mail_replyto}}
+			{{include file="field_checkbox.tpl" field=$mail_pubmail}}
+			{{include file="field_select.tpl" field=$mail_action}}
+			{{include file="field_input.tpl" field=$mail_movetofolder}}
 
+			<div class="settings-submit-wrapper">
+				<input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}"/>
+			</div>
+		</div>
+	{{/if}}
 </form>
-
diff --git a/view/theme/frio/templates/settings/connectors.tpl b/view/theme/frio/templates/settings/connectors.tpl
index 92d2ed861e..2f3564c94b 100644
--- a/view/theme/frio/templates/settings/connectors.tpl
+++ b/view/theme/frio/templates/settings/connectors.tpl
@@ -1,25 +1,23 @@
 <div class="generic-page-wrapper">
-	{{* include the title template for the settings title *}}
-	{{include file="section_title.tpl" title=$title}}
+	<h1>{{$title}}</h1>
 
 	<p class="connector_statusmsg">{{$diasp_enabled}}</p>
 	<p class="connector_statusmsg">{{$ostat_enabled}}</p>
 
 	<form action="settings/connectors" method="post" autocomplete="off">
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 
 		<div class="panel-group panel-group-settings" id="settings" role="tablist" aria-multiselectable="true">
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="content-settings-title">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="false" aria-controls="content-settings-content">
 							{{$general_settings}}
 						</a>
-					</h4>
+					</h2>
 				</div>
 				<div id="content-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="content-settings">
-					<div class="section-content-wrapper">
-
+					<div class="panel-body">
 						{{include file="field_checkbox.tpl" field=$accept_only_sharer}}
 
 						{{include file="field_checkbox.tpl" field=$disable_cw}}
@@ -35,11 +33,9 @@
 						{{include file="field_input.tpl" field=$legacy_contact}}
 
 						<p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
-
-						<div class="form-group pull-right settings-submit-wrapper" >
-							<button type="submit" id="general-submit" name="general-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-						</div>
-						<div class="clear"></div>
+					</div>
+					<div class="panel-footer">
+						<button type="submit" id="general-submit" name="general-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
 					</div>
 				</div>
 			</div>