diff --git a/dev/Styles/User/Contacts.less b/dev/Styles/User/Contacts.less
index 605d0354e..7c8f1c4c1 100644
--- a/dev/Styles/User/Contacts.less
+++ b/dev/Styles/User/Contacts.less
@@ -1,7 +1,7 @@
 
-@contacts-popup-left-width: 220px;
+@contacts-popup-left-width: 25%;
 
-.b-contacts-content {
+.RL-PopupsContacts {
 
 	.control-group {
 		.control-label {
@@ -10,11 +10,8 @@
 		}
 	}
 
-	&.modal {
-		position: absolute;
-		right: 0;
+	.modal {
 		bottom: 0;
-		left: 0;
 		width: auto;
 		min-width: 550px;
 		max-width: 900px;
@@ -36,8 +33,8 @@
 		border-bottom: 1px solid rgba(128,128,128,0.4);
 
 		.e-search {
-			margin-top: 7px;
-			width: @contacts-popup-left-width - 20;
+			margin: 7px 0 0;
+			width: calc(100% - 20px);
 		}
 	}
 
@@ -268,18 +265,3 @@
 		}
 	}
 }
-
-
-@media screen and (max-width: 700px) {
-	.b-contacts-content {
-		.b-list-content, .b-list-toolbar, .b-list-footer-toolbar {
-			width: 170px;
-		}
-		.b-list-toolbar .e-search {
-			width: 150px;
-		}
-		.b-view-content-toolbar, .b-view-content {
-			left: 170px;
-		}
-	}
-}
diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less
index b7d120736..956cda713 100644
--- a/dev/Styles/_BootstrapFix.less
+++ b/dev/Styles/_BootstrapFix.less
@@ -12,7 +12,7 @@ label.inline, span.inline {
 	line-height: @baseLineHeight * 2;
 	color: @grayDark;
 	border: 0;
-	border-bottom: 1px solid #e5e5e5;
+	border-bottom: 1px solid @dropdownDividerTop;
 
 	small {
 		font-size: @baseLineHeight * .75;
@@ -40,15 +40,15 @@ label.inline, span.inline {
 
 .alert a {
 	text-decoration: underline;
-	color: #c09853;
+	color: @warningText;
 }
 
 .alert.alert-info a {
-	color: #3a87ad;
+	color: @infoText;
 }
 
 .alert.alert-error a {
-	color: #b94a48;
+	color: @errorText;
 }
 
 /* mobile and tablet */
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
index c1bea9e03..455552bda 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
@@ -1,4 +1,4 @@
-<div class="modal fade b-contacts-content" data-bind="modal: modalVisibility">
+<div class="modal fade">
 	<div class="modal-header b-header-toolbar g-ui-user-select-none">
 
 		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
@@ -48,7 +48,7 @@
 	</div>
 	<div class="modal-body">
 		<div class="b-list-toolbar">
-			<input type="search" class="span3 e-search" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="value: search" />
+			<input type="search" class="e-search" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="value: search" />
 		</div>
 		<div class="b-list-content g-ui-user-select-none" data-bind="css: {'hideContactListCheckbox': !useCheckboxesInList()}">
 			<div class="content">
diff --git a/vendors/bootstrap/less/button-groups.less b/vendors/bootstrap/less/button-groups.less
index c17b30b2b..9e9abdaf3 100644
--- a/vendors/bootstrap/less/button-groups.less
+++ b/vendors/bootstrap/less/button-groups.less
@@ -45,9 +45,6 @@
 .btn-group > .btn-small {
   font-size: 12px;
 }
-.btn-group > .btn-large {
-  font-size: 16px;
-}
 
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group > .btn:first-child {
@@ -61,17 +58,6 @@
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
 }
-// Reset corners for large buttons
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  border-top-left-radius: 6px;
-  border-bottom-left-radius: 6px;
-}
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  border-top-right-radius: 6px;
-  border-bottom-right-radius: 6px;
-}
 
 // On hover/focus/active, bring the proper btn to front
 .btn-group > .btn:hover,
@@ -84,17 +70,6 @@
 // Split button dropdowns
 // ----------------------
 
-// Give the line between buttons some depth
-.btn-group > .btn + .dropdown-toggle {
-  padding-left: 8px;
-  padding-right: 8px;
-  box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-}
-.btn-group > .btn-large + .dropdown-toggle {
-  padding-left: 12px;
-  padding-right: 12px;
-}
-
 .btn-group.open {
 
   // The clickable button for toggling the menu
diff --git a/vendors/bootstrap/less/buttons.less b/vendors/bootstrap/less/buttons.less
index 03e6f4822..56bb8de24 100644
--- a/vendors/bootstrap/less/buttons.less
+++ b/vendors/bootstrap/less/buttons.less
@@ -65,9 +65,6 @@
   line-height: normal;
   border-radius: 5px;
 }
-.btn-large [class^="icon-"] {
-  margin-top: 2px;
-}
 
 // Small
 .btn-small {
@@ -75,9 +72,6 @@
   font-size: @baseFontSize - 2px;
   line-height: @baseLineHeight - 2px;
 }
-.btn-small [class^="icon-"] {
-  margin-top: 0;
-}
 
 // Block button
 .btn-block {
@@ -87,9 +81,6 @@
   padding-right: 0;
   box-sizing: border-box;
 }
-.btn-block + .btn-block {
-  margin-top: 5px;
-}
 
 
 // Alternate buttons
diff --git a/vendors/bootstrap/less/dropdowns.less b/vendors/bootstrap/less/dropdowns.less
index 8154a6bc8..d74ca8f2f 100644
--- a/vendors/bootstrap/less/dropdowns.less
+++ b/vendors/bootstrap/less/dropdowns.less
@@ -92,11 +92,3 @@
   background-color: transparent;
   cursor: default;
 }
-
-// Open state for the dropdown
-// ---------------------------
-.open {
-  & > .dropdown-menu {
-    display: block;
-  }
-}
diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less
index fe643998a..4b57af11b 100644
--- a/vendors/bootstrap/less/forms.less
+++ b/vendors/bootstrap/less/forms.less
@@ -29,12 +29,6 @@ legend {
   color: @grayDark;
   border: 0;
   border-bottom: 1px solid #e5e5e5;
-
-  // Small
-  small {
-    font-size: @baseLineHeight * .75;
-    color: @grayLight;
-  }
 }
 
 // Identify controls by their labels
diff --git a/vendors/bootstrap/less/mixins.less b/vendors/bootstrap/less/mixins.less
index 0acc7292d..3f1c24509 100644
--- a/vendors/bootstrap/less/mixins.less
+++ b/vendors/bootstrap/less/mixins.less
@@ -104,9 +104,6 @@
       vertical-align: top;
     }
 
-    // Set the container width
-    .container { .span(@gridColumns); }
-
     // generate .spanX
     .spanX (@gridColumns);
   }
diff --git a/vendors/bootstrap/less/modals.less b/vendors/bootstrap/less/modals.less
index 91ea86aaa..46d3cd59a 100644
--- a/vendors/bootstrap/less/modals.less
+++ b/vendors/bootstrap/less/modals.less
@@ -5,7 +5,7 @@
 
 // Base modal
 .modal {
-  position: relative;
+  position: absolute;
   z-index: @zindexModal;
   overflow: hidden;
   width: calc(100% - 20px);
@@ -17,6 +17,8 @@
   box-shadow: 0 5px 80px rgba(0,0,0,0.3);
   background-clip: padding-box;
   top: 0;
+  left: 0;
+  right: 0;
 }
 
 .modal-header {
diff --git a/vendors/bootstrap/less/tables.less b/vendors/bootstrap/less/tables.less
index 3f4203c43..b70946911 100644
--- a/vendors/bootstrap/less/tables.less
+++ b/vendors/bootstrap/less/tables.less
@@ -12,12 +12,6 @@
   background-color: @tableBackground;
   border-collapse: collapse;
   border-spacing: 0;
-}
-
-// BASELINE STYLES
-// ---------------
-
-.table {
   width: 100%;
   margin-bottom: @baseLineHeight;
   // Cells