diff --git a/dev/Styles/User/Filter.less b/dev/Styles/User/Filter.less
index b0914440a..0839819fe 100644
--- a/dev/Styles/User/Filter.less
+++ b/dev/Styles/User/Filter.less
@@ -1,6 +1,6 @@
 .b-filter-content {
 
-	width: 750px;
+	max-width: 750px;
 
 	.button-delete {
 		cursor: pointer;
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index dfac28c64..f77b54e00 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -194,7 +194,7 @@
 					<div class="messageListItem" data-bind="css: lineAsCss()">
 						<div class="checkboxMessage fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
 
-						<div class="flagParent fontastic"><!-- ☆★⚐⚑ --></div>
+						<div class="flagParent fontastic"></div>
 
 						<div class="senderParent actionHandle" data-bind="attr: {'title': senderClearEmailsString}">
 							<!-- ko if: isAnswered --><i class="replyFlag fontastic">←</i><!-- /ko -->
diff --git a/vendors/bootstrap/less/button-groups.less b/vendors/bootstrap/less/button-groups.less
index 9e9abdaf3..124031758 100644
--- a/vendors/bootstrap/less/button-groups.less
+++ b/vendors/bootstrap/less/button-groups.less
@@ -67,34 +67,6 @@
   z-index: 2;
 }
 
-// Split button dropdowns
-// ----------------------
-
-.btn-group.open {
-
-  // The clickable button for toggling the menu
-  // Remove the gradient and set the same inset shadow as the :active state
-  .dropdown-toggle {
-    background-image: none;
-    box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-  }
-
-  // Keep the hover's background when dropdown is open
-  .btn.dropdown-toggle {
-    background-color: @btnBackgroundHighlight;
-  }
-  .btn-warning.dropdown-toggle {
-    background-color: @btnWarningBackgroundHighlight;
-  }
-  .btn-danger.dropdown-toggle {
-    background-color: @btnDangerBackgroundHighlight;
-  }
-  .btn-success.dropdown-toggle {
-    background-color: @btnSuccessBackgroundHighlight;
-  }
-}
-
-
 // Reposition the caret
 .btn .caret {
   margin-top: 8px;
diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less
index 131b9e2df..f9b4b83c7 100644
--- a/vendors/bootstrap/less/forms.less
+++ b/vendors/bootstrap/less/forms.less
@@ -66,7 +66,6 @@ input {
   display: inline-block;
   height: @baseLineHeight + 10;
   padding: 4px 6px;
-  margin-bottom: 9px;
   color: @gray;
   border-radius: @inputBorderRadius;
 }
@@ -231,10 +230,6 @@ input[type="checkbox"][readonly] {
     margin-bottom: 0;
     vertical-align: middle;
   }
-  // Re-hide hidden elements due to specifity
-  .hide {
-    display: none;
-  }
 }
 .form-inline label,
 .form-inline .btn-group {
diff --git a/vendors/bootstrap/less/mixins.less b/vendors/bootstrap/less/mixins.less
index 3f1c24509..840c47dc8 100644
--- a/vendors/bootstrap/less/mixins.less
+++ b/vendors/bootstrap/less/mixins.less
@@ -73,11 +73,6 @@
 // Grid System
 // -----------
 
-// Table columns
-.tableColumns(@columnSpan: 1) {
-  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells
-}
-
 // The Grid
 #grid {
 
diff --git a/vendors/bootstrap/less/tables.less b/vendors/bootstrap/less/tables.less
index 6d5e09a45..3cc6408d0 100644
--- a/vendors/bootstrap/less/tables.less
+++ b/vendors/bootstrap/less/tables.less
@@ -122,25 +122,3 @@
     }
   }
 }
-
-
-// TABLE CELL SIZING
-// -----------------
-
-// Reset default grid behavior
-table [class*=span] {
-  display: table-cell;
-  margin-left: 0; // undo default grid column styles
-}
-
-// Change the column widths to account for td/th padding
-table {
-  .span1     { .tableColumns(1); }
-  .span2     { .tableColumns(2); }
-  .span3     { .tableColumns(3); }
-  .span4     { .tableColumns(4); }
-  .span5     { .tableColumns(5); }
-  .span6     { .tableColumns(6); }
-  .span8     { .tableColumns(8); }
-  .span10    { .tableColumns(10); }
-}