diff --git a/dev/Styles/Admin.less b/dev/Styles/Admin.less
index 5f91e98fe..e166a3cc5 100644
--- a/dev/Styles/Admin.less
+++ b/dev/Styles/Admin.less
@@ -55,7 +55,7 @@
 		z-index: 2;
 
 		background-color: #fff;
-		border: @rlMainBorderSize solid @rlMainDarkColor;
+		border: 1px solid @rlMainDarkColor;
 
 		box-shadow: @rlMainShadow;
 		border-radius: @rlMainBorderRadius;
diff --git a/dev/Styles/EmailAddresses.less b/dev/Styles/EmailAddresses.less
index 2ded694fe..7770ec42a 100644
--- a/dev/Styles/EmailAddresses.less
+++ b/dev/Styles/EmailAddresses.less
@@ -14,7 +14,7 @@
 
 .emailaddresses.emailaddresses-focused {
 	background-color: #fff;
-	border: @rlInputBorderSize solid darken(@inputBorder, 20%);
+	border: 1px solid darken(@inputBorder, 20%);
 	box-shadow: none;
 }
 
diff --git a/dev/Styles/Layout.less b/dev/Styles/Layout.less
index 94e549ea6..75d81edd8 100644
--- a/dev/Styles/Layout.less
+++ b/dev/Styles/Layout.less
@@ -243,7 +243,7 @@ html:not(.rl-left-panel-disabled) #rl-left.resizable > .resizer,
 }
 
 .btn-group > .btn.single {
-	border-radius: @btnBorderRadius !important;
+	border-radius: 3px !important;
 }
 
 /* desktop */
diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less
index 51ce71cb9..9de6b18e9 100644
--- a/dev/Styles/MessageList.less
+++ b/dev/Styles/MessageList.less
@@ -19,7 +19,7 @@ html.rl-no-preview-pane {
 		right: 0;
 		left: 0;
 		height: 30px;
-		padding: 10px @rlMainBorderSize;
+		padding: 10px 1px;
 		z-index: 102;
 		white-space: nowrap;
 	}
@@ -64,7 +64,7 @@ html.rl-no-preview-pane {
 		left: 0;
 		bottom: @rlBottomMargin;
 
-		border: @rlMainBorderSize solid @rlMainDarkColor;
+		border: 1px solid @rlMainDarkColor;
 
 		box-shadow: @rlMainShadow;
 		border-radius: @rlMainBorderRadius;
diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less
index 0787a50c4..2da9f6dc6 100644
--- a/dev/Styles/MessageView.less
+++ b/dev/Styles/MessageView.less
@@ -1,4 +1,3 @@
-
 .g-ui-min-height-300 {
 	min-height: 300px;
 }
@@ -24,9 +23,9 @@
 		right: @rlLowMargin;
 		left: -2px;
 		/*overflow: hidden;*/
-		border: @rlLowBorderSize solid @rlMainDarkColor;
+		border: 1px solid @rlMainDarkColor;
 
-		border-radius: @rlLowBorderRadius;
+		border-radius: @rlMainBorderRadius;
 
 		background-color: #fff;
 
@@ -92,11 +91,8 @@
 
 		padding: 10px;
 		background-color: #f8f8f8;
-		border-top: 0;
 		border-bottom: 1px solid #ddd;
-		border-top-right-radius: 5px;
-		border-top-left-radius: 5px;
-		z-index: 1;
+		border-radius: @rlMainBorderRadius @rlMainBorderRadius 0 0;
 
 		.subjectParent {
 			font-size: 18px;
@@ -105,9 +101,6 @@
 			overflow: hidden;
 			white-space: nowrap;
 			margin-bottom: 8px;
-			line-height: 100%;
-			height: 22px;
-			vertical-align: middle;
 		}
 
 		.messageButtons {
@@ -186,7 +179,6 @@
 		left: 0;
 		right: 0;
 		overflow: auto;
-		border-radius: @rlLowBorderRadius;
 		scroll-behavior: smooth;
 
 		.buttonFull {
@@ -289,13 +281,10 @@
 		}
 
 		.rlBlockquoteSwitcher {
-
-			background-color: #eee;
 			border: 1px solid #999;
 			display: block;
-			width: 30px;
-			height: 14px;
-			line-height: 14px;
+			width: 3em;
+			line-height: 1em;
 			text-align: center;
 			cursor: pointer;
 			margin: 2em 0 10px;
@@ -306,10 +295,6 @@
 			}
 		}
 
-		.bodySubHeader {
-			z-index: 2;
-		}
-
 		.b-text-part {
 
 			height: 100%;
@@ -474,7 +459,6 @@
 	&.message-focused .b-content {
 		z-index: 101;
 		box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
-		border-radius: @rlLowBorderRadius;
 		border-color: darken(@rlMainDarkColor, 5%);
 	}
 
@@ -523,7 +507,7 @@ html.rl-no-preview-pane .messageView {
 	}
 
 	.toolbar {
-		padding-left: @rlMainBorderSize;
+		padding-left: 1px;
 	}
 
 	.b-content {
@@ -531,9 +515,8 @@ html.rl-no-preview-pane .messageView {
 		left: 0;
 		bottom: @rlBottomMargin;
 		right: @rlBottomMargin;
-		border: @rlMainBorderSize solid @rlMainDarkColor;
+		border: 1px solid @rlMainDarkColor;
 		box-shadow: @rlMainShadow;
-		border-radius: @rlMainBorderRadius;
 	}
 }
 
@@ -572,8 +555,7 @@ html.rl-message-fullscreen {
 		right: 0 !important;
 		bottom: 0 !important;
 		z-index: 10000 !important;
-		border: @rlLowBorderSize solid @rlMainDarkColor  !important;
-		border-radius: @rlLowBorderRadius  !important;
+		border: 1px solid @rlMainDarkColor  !important;
 	}
 }
 
diff --git a/dev/Styles/Settings.less b/dev/Styles/Settings.less
index d2d0883ef..e35d9bbd3 100644
--- a/dev/Styles/Settings.less
+++ b/dev/Styles/Settings.less
@@ -69,7 +69,7 @@
 		scroll-behavior: smooth;
 
 		background-color: #fff;
-		border: @rlMainBorderSize solid @rlMainDarkColor;
+		border: 1px solid @rlMainDarkColor;
 		box-shadow: @rlMainShadow;
 		border-radius: @rlMainBorderRadius;
 	}
diff --git a/dev/Styles/_Values.less b/dev/Styles/_Values.less
index d1c7e48c2..75f0faf08 100644
--- a/dev/Styles/_Values.less
+++ b/dev/Styles/_Values.less
@@ -1,11 +1,7 @@
 
 @rlLeftWidth: 200px;
-@rlInputBorderSize: 1px;
-@rlMainBorderSize: 1px;
-@rlLowBorderSize: 1px;
 
 @rlMainBorderRadius: 5px;
-@rlLowBorderRadius: 3px;
 
 @rlMainShadow: 0 2px 8px rgba(0, 0, 0, 0.2);
 
@@ -13,6 +9,3 @@
 @rlBottomMargin: 5px;
 
 @rlMainDarkColor: #aaa;
-
-// bootstart
-@btnBorderRadius: 3px;