diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less
index 48e9ee3b8..644c638f7 100644
--- a/dev/Styles/Login.less
+++ b/dev/Styles/Login.less
@@ -131,7 +131,7 @@
 
 	.language-buttons {
 		flex-grow: 1;
-		text-align: right;
+		text-align: var(--right, right);
 	}
 
 	.language-button {
diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less
index ba75cb7f7..e9bc2afa1 100644
--- a/dev/Styles/Main.less
+++ b/dev/Styles/Main.less
@@ -111,7 +111,7 @@ dialog .modal-body {
 dialog > footer {
 	padding: 9px 15px;
 	margin-bottom: 0;
-	text-align: right; // right align buttons
+	text-align: var(--right, right); // right align buttons
 	border-top: 1px solid var(--border-color, #ddd);
 	border-radius: 0 0 var(--dialog-border-radius, 6px) var(--dialog-border-radius, 6px);
 
diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less
index d3387f2aa..3e0d7fcd6 100644
--- a/dev/Styles/Ui.less
+++ b/dev/Styles/Ui.less
@@ -162,7 +162,7 @@ summary.legend {
 	.form-horizontal {
 		.control-group {
 			> label {
-				text-align: left;
+				text-align: var(--left, left);
 			}
 
 			// Move over all input controls and content
diff --git a/dev/Styles/User/Compose.less b/dev/Styles/User/Compose.less
index e6a290d91..604dbc4ac 100644
--- a/dev/Styles/User/Compose.less
+++ b/dev/Styles/User/Compose.less
@@ -91,7 +91,7 @@
 		}
 		td:first-child {
 			padding: 0 10px 0 0;
-			text-align: right;
+			text-align: var(--right, right);
 			white-space: nowrap;
 			width: 4em;
 		}
diff --git a/dev/Styles/User/Contacts.less b/dev/Styles/User/Contacts.less
index 67857248e..a7f57ccfe 100644
--- a/dev/Styles/User/Contacts.less
+++ b/dev/Styles/User/Contacts.less
@@ -42,7 +42,7 @@
 
 		.footer-pager {
 			padding: 8px 10px 0 0;
-			text-align: right;
+			text-align: var(--right, right);
 		}
 	}
 
@@ -79,10 +79,10 @@
 
 		margin: 0;
 		border-left: 6px solid #eee;
-		border-bottom: 1px solid var(--border-color, #ddd);
+		border-bottom: 1px solid var(--border-color, #ddd) !important;
 
 		&.focused {
-			border-left-color: #bbb;
+			border-color: #bbb;
 		}
 
 		&.deleted {
@@ -104,20 +104,20 @@
 		}
 
 		&.checked {
-			border-left-color: #69A8F5;
+			border-color: #69A8F5;
 
 			&.focused {
-				border-left-color: darken(#69A8F5, 5%);
+				border-color: darken(#69A8F5, 5%);
 			}
 		}
 
 		&.selected {
 
 			background-color: rgba(140, 200, 255, 0.3);
-			border-left-color: #398CF2;
+			border-color: #398CF2;
 
 			&.focused {
-				border-left-color: darken(#398CF2, 5%);
+				border-color: darken(#398CF2, 5%);
 			}
 		}
 	}
@@ -132,7 +132,7 @@
 	.b-view-content-toolbar {
 		border-top: 1px solid var(--border-color, #ddd);
 		padding: 7px;
-		text-align: right;
+		text-align: var(--right, right);
 
 		.dropdown-menu.right-edge {
 			top: auto;
diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index fdf4c6ce1..3f36ae8a2 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -9,7 +9,7 @@
 
 .focused .b-folders a.focused {
 	background-color: var(--folders-focused-bg-color, #333);
-	border-left-color: #fff;
+	border-color: #fff;
 	color: var(--folders-focused-color, #eee);
 }
 
@@ -23,11 +23,6 @@
 		margin: 0;
 	}
 
-	input {
-		margin-left: 4px;
-		width: calc(100% - 8px);
-	}
-
 	.move-action-content-wrapper {
 		z-index: -1;
 		position: fixed;
@@ -118,6 +113,7 @@
 			.e-collapsed-sign {
 				cursor: pointer;
 				font-size: 150%;
+				text-indent: 0;
 				vertical-align: inherit;
 			}
 		}
@@ -151,6 +147,7 @@
 		text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 		position: absolute;
 		right: 3px;
+		text-indent: 0;
 	}
 
 	.flag-icon {
@@ -173,16 +170,16 @@
 	}
 
 	li li a {
-		padding-left: @subPadding * 1 + @folderItemPadding;
+		text-indent: 1em;
 	}
 	li li li a {
-		padding-left: @subPadding * 2 + @folderItemPadding;
+		text-indent: 2em;
 	}
 	li li li li a {
-		padding-left: @subPadding * 3 + @folderItemPadding;
+		text-indent: 3em;
 	}
 	li li li li li a {
-		padding-left: @subPadding * 4 + @folderItemPadding;
+		text-indent: 4em;
 	}
 
 /**/
@@ -192,16 +189,16 @@
 
 	&.single-root-inbox {
 		li li a {
-			padding-left: @folderItemPadding;
+			text-indent: 0;
 		}
 		li li li a {
-			padding-left: @subPadding * 1 + @folderItemPadding;
+			text-indent: 1em;
 		}
 		li li li li a {
-			padding-left: @subPadding * 2 + @folderItemPadding;
+			text-indent: 2em;
 		}
 		li li li li li a {
-			padding-left: @subPadding * 3 + @folderItemPadding;
+			text-indent: 3em;
 		}
 	}
 /**/
diff --git a/dev/Styles/User/Layout.less b/dev/Styles/User/Layout.less
index 4f6bf4487..6e86bb9bf 100644
--- a/dev/Styles/User/Layout.less
+++ b/dev/Styles/User/Layout.less
@@ -87,7 +87,6 @@ html:not(.rl-left-panel-disabled) #rl-left {
 
 .search-input-wrp {
 	position: relative;
-	text-align: right;
 }
 .search-input-wrp a {
 	position: absolute;
@@ -103,7 +102,8 @@ html:not(.rl-left-panel-disabled) #rl-left {
 	}
 }
 #rl-left .search-input-wrp {
-	margin-right: 8px;
+	margin: 0 4px;
+	width: calc(100% - 8px);
 }
 
 html:not(.rl-ctrl-key-pressed) .visible-on-ctrl-btn,
diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index 4f51116e1..0273f0eb0 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -70,7 +70,7 @@
 
 	.b-footer nav {
 		flex-grow: 1;
-		text-align: right;
+		text-align: var(--right, right);
 	}
 
 	.btn.buttonMoreSearch {
@@ -226,11 +226,7 @@
 		font-size: 11px;
 		white-space: nowrap;
 		min-width: 3.5em;
-		text-align: right;
-	}
-
-	.attachmentParent {
-		margin: 0 10px 0 5px;
+		text-align: var(--right, right);
 	}
 
 	.senderParent, .subjectParent {
@@ -334,8 +330,9 @@
 		z-index: 101;
 	}
 
+	.attachmentParent,
 	.flagParent {
-		padding: 0 10px 0 5px;
+		margin: 0 10px 0 5px;
 	}
 	.flagParent::after {
 		content: '☆'; /*⚐*/
diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index 535aa0420..66ba601a3 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -187,7 +187,7 @@
 
 			td:first-child {
 				border-right: 1px solid #999;
-				text-align: right;
+				text-align: var(--right, right);
 				white-space: nowrap;
 				width: 1%;
 			}
diff --git a/dev/Styles/User/SettingsAccounts.less b/dev/Styles/User/SettingsAccounts.less
index b83ee1a3c..54e58c288 100644
--- a/dev/Styles/User/SettingsAccounts.less
+++ b/dev/Styles/User/SettingsAccounts.less
@@ -26,7 +26,7 @@
 	}
 
 	td + td + td {
-		text-align: right;
+		text-align: var(--right, right);
 	}
 	td:first-child,
 	td:last-child, {
diff --git a/dev/Styles/User/SquireUI.less b/dev/Styles/User/SquireUI.less
index 8ae742119..99e42b6e6 100644
--- a/dev/Styles/User/SquireUI.less
+++ b/dev/Styles/User/SquireUI.less
@@ -20,7 +20,7 @@
 .squire-toolbar select {
 	font-size: 12px;
 	padding: 4px 1.5em 4px 6px;
-	text-align: left;
+	text-align: var(--left, left);
 	vertical-align: middle;
 	width: 7em;
 }
diff --git a/dev/Styles/_End.less b/dev/Styles/_End.less
index ee0cb55a4..64f8d3605 100644
--- a/dev/Styles/_End.less
+++ b/dev/Styles/_End.less
@@ -13,7 +13,7 @@
 	opacity: 1;
 	padding: 0.25em;
 	position : absolute;
-	text-align: left;
+	text-align: var(--left, left);
 	top: 100%;
 	transition: opacity 0.2s ease-in-out;
 	white-space: nowrap;
diff --git a/plugins/avatars/style.css b/plugins/avatars/style.css
index 4b94432da..2cf69ccd0 100644
--- a/plugins/avatars/style.css
+++ b/plugins/avatars/style.css
@@ -18,6 +18,10 @@
 	height: 1.5em;
 	width: 1.5em;
 }
+[dir="rtl"] .messageView .fromPic {
+	float: right;
+	margin: 0 0 0 4px;
+}
 [dir="rtl"] .messageCheckbox .fromPic {
 	margin: 0 0.4em -0.4em -0.5em;
 }
diff --git a/vendors/bootstrap/less/close.less b/vendors/bootstrap/less/close.less
index 7afba005b..476946d23 100644
--- a/vendors/bootstrap/less/close.less
+++ b/vendors/bootstrap/less/close.less
@@ -4,7 +4,7 @@
 
 
 .close {
-  float: right;
+  float: var(--right, right);
   font-size: 143%;
   font-weight: bold;
   line-height: 1.43em;