diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less
index 5c44d72e7..a1568c47a 100644
--- a/dev/Styles/Main.less
+++ b/dev/Styles/Main.less
@@ -12,7 +12,7 @@ html, body {
 
 body {
 	-webkit-touch-callout: none;
-
+	font-size: @baseFontSize;
 	position: fixed;
 	top: 0;
 	left: 0;
diff --git a/dev/Styles/User/Contacts.less b/dev/Styles/User/Contacts.less
index a14f54deb..620cf5b2f 100644
--- a/dev/Styles/User/Contacts.less
+++ b/dev/Styles/User/Contacts.less
@@ -64,7 +64,6 @@
 		.listClear {
 			text-align: center;
 			padding: 10px;
-			font-size: 14px;
 			line-height: 13px;
 			box-shadow: inset 0 -1px 0 #ccc;
 		}
diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index 92b322453..97d8372bf 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -74,7 +74,6 @@
 			background-color: transparent;
 			vertical-align: middle;
 			color: var(--folders-disabled-color, #666);
-			font-size: 14px;
 			border-left: 3px solid transparent;
 
 			padding: 0 2em 0 @folderItemPadding;
diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index ca9742e31..d1e7312f2 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -115,7 +115,6 @@ html.rl-no-preview-pane {
 		.listClear {
 			text-align: center;
 			padding: 10px;
-			font-size: 14px;
 			line-height: 13px;
 		}
 
diff --git a/dev/Styles/User/SquireUI.less b/dev/Styles/User/SquireUI.less
index 9425a7659..ee4976d5f 100644
--- a/dev/Styles/User/SquireUI.less
+++ b/dev/Styles/User/SquireUI.less
@@ -100,7 +100,6 @@
 
 	blockquote p {
 		margin: 0 0 10px;
-		font-size: 14px;
 		line-height: 20px;
 	}
 
diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less
index 0827a9847..e2c0b51d1 100644
--- a/dev/Styles/_BootstrapFix.less
+++ b/dev/Styles/_BootstrapFix.less
@@ -15,11 +15,6 @@ summary.legend {
 	cursor: pointer;
 }
 
-.btn-small.btn-small-small {
-	font-size: 11px;
-	line-height: 11px;
-}
-
 .btn.btn-thin {
 	padding: 4px 9px;
 }
diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less
index dc4518231..92a7645b3 100644
--- a/dev/Styles/_FontasticToBoot.less
+++ b/dev/Styles/_FontasticToBoot.less
@@ -9,7 +9,6 @@
 [class*=" icon-"] {
 	display: inline-block;
 	width: 1em;
-	height: 1em;
 	vertical-align: text-top;
 
 	.disabled &,
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
index 0063622a0..87ee6052b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
@@ -39,13 +39,7 @@
 			<label data-i18n="TAB_CONTACTS/LABEL_STORAGE_DSN"></label>
 			<div>
 				<input type="text" class="span6" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-					data-bind="value: pdoDsn, saveTrigger: pdoDsnTrigger" />
-				<blockquote style="margin: 0">
-					<p class="muted">
-host=127.0.0.1;port=3306;dbname=snappymail<br />
-host=127.0.0.1;port=5432;dbname=snappymail
-					</p>
-				</blockquote>
+					data-bind="value: pdoDsn, saveTrigger: pdoDsnTrigger" placeholder="mysql:host=127.0.0.1;port=3306;dbname=snappymail"/>
 			</div>
 		</div>
 		<div class="control-group">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
index 8fd3f7626..764474de2 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
@@ -7,9 +7,7 @@
 <a class="btn" data-bind="click: createDomainAlias" data-icon="✚" data-i18n="TAB_DOMAINS/BUTTON_ADD_ALIAS"></a>
 <br />
 <br />
-<blockquote>
-	<p class="muted" data-i18n="[html]TAB_DOMAINS/HTML_DOMAINS_HELPER"></p>
-</blockquote>
+<p data-i18n="[html]TAB_DOMAINS/HTML_DOMAINS_HELPER"></p>
 <table class="table table-hover b-admin-domains-list-table" data-bind="i18nUpdate: domains">
 	<colgroup>
 		<col />
@@ -24,7 +22,7 @@
 				<span class="domain-alias" data-bind="if: alias">(alias)</span>
 			</td>
 			<td>
-				<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: function(oDomain) { $root.deleteDomain(oDomain); }"
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: function(oDomain) { $root.deleteDomain(oDomain); }"
 					data-i18n="TAB_DOMAINS/DELETE_ARE_YOU_SURE"></a>
 			</td>
 			<td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
index ded4c22ea..1c6ab6ab0 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
@@ -49,7 +49,7 @@
 						<span class="filter-sub-name" data-bind="text: nameSub()"></span>
 					</td>
 					<td>
-						<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: function(oFilter) { $root.deleteFilter(oFilter); }"
+						<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: function(oFilter) { $root.deleteFilter(oFilter); }"
 							data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 					</td>
 					<td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
index 511e64d64..c32d7a485 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
@@ -23,7 +23,7 @@
 					<span class="account-name" data-bind="text: email"></span>
 				</td>
 				<td>
-					<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete}, click: function(oAccount) { $root.deleteAccount(oAccount); }"
+					<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete}, click: function(oAccount) { $root.deleteAccount(oAccount); }"
 						data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 				</td>
 				<td>
@@ -52,7 +52,7 @@
 					<span class="identity-default" data-bind="visible: 0 === $index()" data-i18n="SETTINGS_ACCOUNTS/DEFAULT_IDENTITY_LABEL"></span>
 				</td>
 				<td>
-					<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="visible: canBeDeleted, css: {'delete-access': askDelete}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }"
+					<a class="btn btn-small btn-danger button-confirm-delete" data-bind="visible: canBeDeleted, css: {'delete-access': askDelete}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }"
 						data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 				</td>
 				<td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
index 4d297a3ae..dbaf9abb1 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
@@ -21,7 +21,7 @@
 			</td>
 			<td class="e-action" class="script-name" data-bind="text: name()"></td>
 			<td>
-				<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: function(oScript) { $root.deleteScript(oScript); }"
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: function(oScript) { $root.deleteScript(oScript); }"
 					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 			</td>
 			<td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
index 7e72b7ed5..9710f5904 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
@@ -10,7 +10,7 @@
 		<span class="folder-system-name" data-bind="text: manageFolderSystemName, visible: isSystemFolder"></span>
 	</td>
 	<td data-i18n="[title]SETTINGS_FOLDERS/HELP_DELETE_FOLDER">
-		<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: $root.deleteFolder"
+		<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: $root.deleteFolder"
 			data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 		<span class="e-action fontastic" data-bind="visible: canBeDeleted() && !askDelete(), click: $root.folderForDeletion">🗑</span>
 	</td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
index 16a7f7f44..fe1236113 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
@@ -34,7 +34,7 @@
 				<!-- /ko -->
 			</td>
 			<td>
-				<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
 					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 			</td>
 			<td>
@@ -54,7 +54,7 @@
 				<!-- /ko -->
 			</td>
 			<td>
-				<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
 					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 			</td>
 			<td>
@@ -81,7 +81,7 @@
 				<!-- /ko -->
 			</td>
 			<td>
-				<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
 					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 			</td>
 			<td>
@@ -100,7 +100,7 @@
 				<!-- /ko -->
 			</td>
 			<td>
-				<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
 					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 			</td>
 			<td>
diff --git a/vendors/bootstrap/less/button-groups.less b/vendors/bootstrap/less/button-groups.less
index 124031758..662717884 100644
--- a/vendors/bootstrap/less/button-groups.less
+++ b/vendors/bootstrap/less/button-groups.less
@@ -6,7 +6,6 @@
 // Make the div behave like a button
 .btn-group {
   position: relative;
-  font-size: 0; // remove as part 1 of font-size inline-block hack
   white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
 }
 
@@ -16,9 +15,6 @@
 
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
-  font-size: 0; // Hack to remove whitespace that results from using inline-block
-  margin-top: 0;
-  margin-bottom: 0;
   .btn-group {
     display: inline-block;
   }
@@ -37,14 +33,6 @@
 .btn-group > .btn + .btn {
   margin-left: -1px;
 }
-.btn-group > .dropdown-menu {
-  font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
-}
-
-// Reset fonts for other sizes
-.btn-group > .btn-small {
-  font-size: 12px;
-}
 
 // 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 {
diff --git a/vendors/bootstrap/less/buttons.less b/vendors/bootstrap/less/buttons.less
index b3084e6c4..3ca61afae 100644
--- a/vendors/bootstrap/less/buttons.less
+++ b/vendors/bootstrap/less/buttons.less
@@ -12,7 +12,6 @@
 
   display: inline-block;
   padding: 4px 13px;
-  font-size: @baseFontSize;
   line-height: @baseLineHeight;
   text-align: center;
   vertical-align: middle;
@@ -60,7 +59,7 @@
 // Large
 .btn-large {
   padding: 9px 14px;
-  font-size: @baseFontSize + 3px;
+  font-size: 121%;
   line-height: normal;
   border-radius: 5px;
 }
@@ -68,8 +67,8 @@
 // Small
 .btn-small {
   padding: 3px 9px;
-  font-size: (@baseFontSize * 0.85);
-  line-height: (@baseLineHeight * 0.85);
+  font-size: 80%;
+  line-height: 1;
 }
 
 // Block button
diff --git a/vendors/bootstrap/less/close.less b/vendors/bootstrap/less/close.less
index ba07e895f..d782c271b 100644
--- a/vendors/bootstrap/less/close.less
+++ b/vendors/bootstrap/less/close.less
@@ -5,7 +5,7 @@
 
 .close {
   float: right;
-  font-size: 20px;
+  font-size: 143%;
   font-weight: bold;
   line-height: @baseLineHeight;
   color: inherit;
diff --git a/vendors/bootstrap/less/code.less b/vendors/bootstrap/less/code.less
index 57c418e0b..2b805dca3 100644
--- a/vendors/bootstrap/less/code.less
+++ b/vendors/bootstrap/less/code.less
@@ -10,10 +10,6 @@ samp,
 pre {
   padding: 0 3px 2px;
   font-family: var(--fontMono);
-  font-size: @baseFontSize;
-  font-weight: normal;
-  line-height: @baseLineHeight;
-  font-size: @baseFontSize - 2;
   border-radius: 3px;
 }
 
@@ -28,8 +24,6 @@ pre {
   display: block;
   padding: (@baseLineHeight / 2);
   margin: 0 0 (@baseLineHeight / 2);
-  font-size: @baseFontSize - 1; // 14px to 13px
-  line-height: @baseLineHeight;
   white-space: pre-wrap;
   border: 1px solid rgba(0,0,0,.15);
   border-radius: 4px;
diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less
index 2ddc89227..0924c61ce 100644
--- a/vendors/bootstrap/less/forms.less
+++ b/vendors/bootstrap/less/forms.less
@@ -14,7 +14,6 @@ form {
 // Identify controls by their labels
 label {
   display: block;
-  font-size: @baseFontSize;
   font-weight: normal;
   line-height: @baseLineHeight;
   margin-bottom: 5px;
diff --git a/vendors/bootstrap/less/type.less b/vendors/bootstrap/less/type.less
index 38c47f4e2..aa77999a7 100644
--- a/vendors/bootstrap/less/type.less
+++ b/vendors/bootstrap/less/type.less
@@ -26,9 +26,6 @@ em {
 cite {
   font-style: normal;
 }
-.muted {
-  color: @grayLight;
-}
 
 
 // Headings
diff --git a/vendors/fontastic/styles.css b/vendors/fontastic/styles.css
index a0e224821..3096bd5ef 100644
--- a/vendors/fontastic/styles.css
+++ b/vendors/fontastic/styles.css
@@ -20,13 +20,11 @@
   text-transform: none !important;
   speak: never;
   -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
 }
 
 [data-icon]::before {
 	content: attr(data-icon);
 	display: inline-block;
-	height: 1em;
 	margin-right: 0.5em;
 	min-width: 1em;
 }