diff --git a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
index fd93e64658bcdd5a86ec076d6345ffc6715c3a17..1665ba14d22763412387e00b009f445090e78d4b 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
@@ -8,6 +8,7 @@ $wb['searchterm_is_empty'] = 'Suchbegriff ist leer.';
 $wb['source_txt'] = 'Quelle';
 $wb['target_error_regex'] = 'Das Ziel darf nur die folgenden Zeichen enthalten: a-z, 0-9, -, ., _, und {space}';
 $wb['limit_mailfilter_txt'] = 'Die max. Anzahl an E-Mailfiltern ist erreicht.';
+$wb['mailbox_filter_txt'] = 'E-Mailfilter';
 $wb['subject_txt'] = 'Betreff';
 $wb['from_txt'] = 'Von';
 $wb['to_txt'] = 'An';
diff --git a/interface/web/mailuser/lib/lang/en_mail_user_filter.lng b/interface/web/mailuser/lib/lang/en_mail_user_filter.lng
index 296a47ec579fa2003a3614b0f3545623480524ce..23451b74dba6d02a5e79cd6029f6b430713e87b7 100644
--- a/interface/web/mailuser/lib/lang/en_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/en_mail_user_filter.lng
@@ -8,6 +8,7 @@ $wb["searchterm_is_empty"] = 'Search term is empty.';
 $wb["source_txt"] = 'Source';
 $wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
 $wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
+$wb['mailbox_filter_txt'] = 'Mailbox filter';
 $wb['subject_txt'] = 'Subject';
 $wb['from_txt'] = 'From';
 $wb['to_txt'] = 'To';
diff --git a/interface/web/mailuser/templates/index.htm b/interface/web/mailuser/templates/index.htm
index e9ac8ad0ec5382ef0bf77f924ac69a5eaf5da83a..8f870355622b3680149e263d6c8368cb75d07fab 100644
--- a/interface/web/mailuser/templates/index.htm
+++ b/interface/web/mailuser/templates/index.htm
@@ -9,23 +9,23 @@
     
         <div class="form-group">
             <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
-            <p class="value">{tmpl_var name='email'}</p>
+            <div class="col-sm-9"><div class="checkbox">{tmpl_var name='email'}</div></div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">{tmpl_var name='login_txt'}</label>
-            <p class="value">{tmpl_var name='login'}</p>
+            <div class="col-sm-9"><div class="checkbox">{tmpl_var name='login'}</div></div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">{tmpl_var name='server_address_txt'}</label>
-            <p class="value">{tmpl_var name='server_name'}</p>
+            <div class="col-sm-9"><div class="checkbox">{tmpl_var name='server_name'}</div></div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">{tmpl_var name='quota_txt'}</label>
-            <p class="value">{tmpl_var name='quota'}</p>
+            <div class="col-sm-9"><div class="checkbox">{tmpl_var name='quota'}</div></div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>
-            <p class="value">{tmpl_var name='cc'}</p>
+            <div class="col-sm-9"><div class="checkbox">{tmpl_var name='cc'}</div></div>
         </div>
         <div class="clear"><div class="right">
             &nbsp;
diff --git a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
index d450f67622a5cd15755435700f831b59d1738841..c5fc584c09f961d8c899500845f5511746ae348c 100644
--- a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
@@ -14,19 +14,20 @@
             </div>
             <div class="form-group">
                 <label for="autoresponder" class="col-sm-3 control-label">{tmpl_var name='autoresponder_active'}</label>
-                <div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} /></div></div>
+                <div class="col-sm-9"><input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} /></div>
+			</div>
             <div class="form-group">
                 <label for="autoresponder_start_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_start_date_txt'}</label>
-                {tmpl_var name='autoresponder_start_date'}&nbsp;
-                <a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
+                <div class="col-sm-9">{tmpl_var name='autoresponder_start_date'}</div>
             </div>
             <div class="form-group">
                 <label for="autoresponder_end_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_end_date_txt'}</label>
-                {tmpl_var name='autoresponder_end_date'}
+                <div class="col-sm-9">{tmpl_var name='autoresponder_end_date'}</div>
             </div>
         
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
         <div class="clear"><div class="right">
-            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mailuser/mail_user_autoresponder_edit.php">{tmpl_var name='btn_save_txt'}</button>
-            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mailuser/index.php">{tmpl_var name='btn_cancel_txt'}</button>
+            <button class="btn btn-default formbutton-success" type="button"
+                    value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_user_edit.php">{tmpl_var name='btn_save_txt'}</button>
+            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php">{tmpl_var name='btn_cancel_txt'}</button>
         </div></div>
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_cc_edit.htm b/interface/web/mailuser/templates/mail_user_cc_edit.htm
index b622390a5433ba2c3b656b1104aee6ba6a7cbf52..7c59fadf11a271286ab84a0b6c478762ce9b9536 100644
--- a/interface/web/mailuser/templates/mail_user_cc_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_cc_edit.htm
@@ -7,7 +7,7 @@
         
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
-                <p class="value">{tmpl_var name='email'}</p>
+                <div class="col-sm-9"><div class="checkbox">{tmpl_var name='email'}</div></div>
             </div>
             <div class="form-group">
                 <label for="name" class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>
diff --git a/interface/web/mailuser/templates/mail_user_filter_edit.htm b/interface/web/mailuser/templates/mail_user_filter_edit.htm
index d4ffced3fc38b119a901459cdbd20f69de01e955..b09874263b59a86e2b70602f5d92b8d7f240cf24 100644
--- a/interface/web/mailuser/templates/mail_user_filter_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_filter_edit.htm
@@ -10,16 +10,16 @@
                 <div class="col-sm-9"><input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" class="form-control"></div></div>
             <div class="form-group">
                 <label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
-                <div class="col-sm-9"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
-                <div class="col-sm-9"><select id="op" name="op" class="form-control">{tmpl_var name='op'}</select></div>
-                <div class="col-sm-9"><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" class="form-control"></div></div>
+                <div class="col-sm-3"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
+                <div class="col-sm-3"><select id="op" name="op" class="form-control">{tmpl_var name='op'}</select></div>
+                <div class="col-sm-3"><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" class="form-control"></div></div>
             <div class="form-group">
                 <label for="action" class="col-sm-3 control-label">{tmpl_var name='action_txt'}</label>
-                <div class="col-sm-9"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></div>
-                <div class="col-sm-9"><input type="text" id="target" name="target" value="{tmpl_var name='target'}" class="form-control"></div></div>
+                <div class="col-sm-3"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></div>
+                <div class="col-sm-3"><input type="text" id="target" name="target" value="{tmpl_var name='target'}" class="form-control"></div></div>
             <div class="form-group">
                 <label for="active" class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
-                <span class="">{tmpl_var name='active'}</span>
+                <div class="col-sm-9"><div class="checkbox"><label>{tmpl_var name='active'}</label></div></div>
             </div>
         
 
diff --git a/interface/web/mailuser/templates/mail_user_filter_list.htm b/interface/web/mailuser/templates/mail_user_filter_list.htm
index 8b9ea17c50511d9eb4cbd94b7b94e7c475d89e22..32d093844ed05e9ddd6787b7a4a9b82d5e914e45 100644
--- a/interface/web/mailuser/templates/mail_user_filter_list.htm
+++ b/interface/web/mailuser/templates/mail_user_filter_list.htm
@@ -43,7 +43,7 @@
 
                 <tfoot>
                 <tr>
-                    <td colspan="3"><tmpl_var name="paging"></td>
+                    <td colspan="2"><tmpl_var name="paging"></td>
                 </tr>
                 </tfoot>
             </table>
diff --git a/interface/web/mailuser/templates/mail_user_password_edit.htm b/interface/web/mailuser/templates/mail_user_password_edit.htm
index d1e04fac88440019f24e4a749a5a4b5edb88cf0e..b42618c7c9d00c09d699bc4cdf7600f6fbaab968 100644
--- a/interface/web/mailuser/templates/mail_user_password_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_password_edit.htm
@@ -7,11 +7,20 @@
         
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
-                <p class="value">{tmpl_var name='email'}</p>
+                <div class="col-sm-9">
+					<div class="checkbox">{tmpl_var name='email'}</div>
+				</div>
             </div>
             <div class="form-group">
                 <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
-                <div class="col-sm-6"><input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /></div><div class="col-sm-3 input-sm">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
+                <div class="col-sm-9">
+				<div class="input-group">
+					<input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />
+					<span class="input-group-btn">
+						<button class="btn btn-default" type="button" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
+					</span>
+				</div>
+				</div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
@@ -23,7 +32,6 @@
                 <div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
             <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
             <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
-        
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
diff --git a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
index 9e5360fc0548ad616ae848661bb209fe4c2f5d3a..3528daead1c38c8edb096291551636e826658516 100644
--- a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
@@ -7,7 +7,9 @@
         
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
-                <p class="value">{tmpl_var name='email'}</p>
+                <div class="col-sm-9">
+					<div class="checkbox">{tmpl_var name='email'}</div>
+				</div>
             </div>
             <div class="form-group">
                 <label for="policy" class="col-sm-3 control-label">{tmpl_var name='policy_txt'}</label>
diff --git a/interface/web/sites/templates/web_vhost_domain_advanced.htm b/interface/web/sites/templates/web_vhost_domain_advanced.htm
index 04825cb0b59cacfc7e09ed3b0699fc79dc2a26ba..2ef8c7daf47d95db61f38b1e6771cdd2cb572b98 100644
--- a/interface/web/sites/templates/web_vhost_domain_advanced.htm
+++ b/interface/web/sites/templates/web_vhost_domain_advanced.htm
@@ -23,12 +23,16 @@
                 <div class="col-sm-9"><input type="text" name="added_by" id="added_by" value="{tmpl_var name='added_by'}" class="form-control" /></div></div>
 			<div class="form-group">
                 <label for="system_user" class="col-sm-3 control-label">{tmpl_var name='system_user_txt'}</label>
-                <p class="value">&nbsp; &nbsp;{tmpl_var name='system_user'}</p>
+                <div class="col-sm-9">
+                <div class="checkbox">&nbsp; &nbsp;{tmpl_var name='system_user'}</div>
+                </div>
                 <input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" type="hidden" />
             </div>
             <div class="form-group">
                 <label for="system_group" class="col-sm-3 control-label">{tmpl_var name='system_group_txt'}</label>
-                <p class="value">&nbsp; &nbsp;{tmpl_var name='system_group'}</p>
+                <div class="col-sm-9">
+                <div class="checkbox">&nbsp; &nbsp;{tmpl_var name='system_group'}</div>
+                </div>
                 <input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" type="hidden" />
             </div>
             <div class="form-group apache">
diff --git a/interface/web/themes/default/assets/stylesheets/fonts.css b/interface/web/themes/default/assets/stylesheets/fonts.css
index f631bdaf10a9d7fc8f57b5514fbc3dac75c4b5a3..4218564963d12b3766af1e0c8008a68c513aeea6 100644
--- a/interface/web/themes/default/assets/stylesheets/fonts.css
+++ b/interface/web/themes/default/assets/stylesheets/fonts.css
@@ -62,7 +62,7 @@
 .icon-help:before {
 	content: "\e607";
 }
-.icon-mail:before {
+.icon-mail:before, .icon-mailuser:before {
 	content: "\e608";
 }
 .icon-dns:before {
diff --git a/interface/web/themes/default/assets/stylesheets/fonts.min.css b/interface/web/themes/default/assets/stylesheets/fonts.min.css
index 9d1c9d02bd0e81697682a5ba5227248b4f8b2738..98cf94f0e70bae2cccdcc0878f689f8204c99f38 100644
--- a/interface/web/themes/default/assets/stylesheets/fonts.min.css
+++ b/interface/web/themes/default/assets/stylesheets/fonts.min.css
@@ -1 +1 @@
-@font-face{font-family:'ispconfig';src:url('../fonts/ispconfig.eot?-drlkxz');src:url('../fonts/ispconfig.eot?#iefix-drlkxz') format('embedded-opentype'),url('../fonts/ispconfig.woff?-drlkxz') format('woff'),url('../fonts/ispconfig.ttf?-drlkxz') format('truetype'),url('../fonts/ispconfig.svg?-drlkxz#ispconfig') format('svg');font-weight:normal;font-style:normal}.icon{font-family:'ispconfig';speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon:before{vertical-align:middle}.icon-calendar:before{content:"\e60e"}.icon-billing:before{content:"\e60d"}.icon-lens:before{content:"\e60b"}.icon-bulb:before{content:"\e60c"}.icon-vm2:before{content:"\e600"}.icon-vm:before{content:"\e601"}.icon-tools:before{content:"\e602"}.icon-admin:before{content:"\e603"}.icon-sites:before{content:"\e604"}.icon-monitor:before{content:"\e605"}.icon-dashboard:before{content:"\e606"}.icon-help:before{content:"\e607"}.icon-mail:before{content:"\e608"}.icon-dns:before{content:"\e609"}.icon-client:before{content:"\e60a"}.icon-edit:before{content:"\e615"}.icon-filter:before{content:"\e614"}.icon-link:before{content:"\e60f"}.icon-action:before{content:"\e610"}.icon-dbadmin:before{content:"\e612"}.icon-loginas:before{content:"\e611"}.icon-delete:before{content:"\e613"}
\ No newline at end of file
+@font-face{font-family:'ispconfig';src:url('../fonts/ispconfig.eot?-drlkxz');src:url('../fonts/ispconfig.eot?#iefix-drlkxz') format('embedded-opentype'),url('../fonts/ispconfig.woff?-drlkxz') format('woff'),url('../fonts/ispconfig.ttf?-drlkxz') format('truetype'),url('../fonts/ispconfig.svg?-drlkxz#ispconfig') format('svg');font-weight:normal;font-style:normal}.icon{font-family:'ispconfig';speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon:before{vertical-align:middle}.icon-calendar:before{content:"\e60e"}.icon-billing:before{content:"\e60d"}.icon-lens:before{content:"\e60b"}.icon-bulb:before{content:"\e60c"}.icon-vm2:before{content:"\e600"}.icon-vm:before{content:"\e601"}.icon-tools:before{content:"\e602"}.icon-admin:before{content:"\e603"}.icon-sites:before{content:"\e604"}.icon-monitor:before{content:"\e605"}.icon-dashboard:before{content:"\e606"}.icon-help:before{content:"\e607"}.icon-mail:before,.icon-mailuser:before{content:"\e608"}.icon-dns:before{content:"\e609"}.icon-client:before{content:"\e60a"}.icon-edit:before{content:"\e615"}.icon-filter:before{content:"\e614"}.icon-link:before{content:"\e60f"}.icon-action:before{content:"\e610"}.icon-dbadmin:before{content:"\e612"}.icon-loginas:before{content:"\e611"}.icon-delete:before{content:"\e613"}
\ No newline at end of file