diff --git a/services/web/public/stylesheets/app/editor/toolbar.less b/services/web/public/stylesheets/app/editor/toolbar.less
index 30bc95aaaa..0bbb1d705d 100644
--- a/services/web/public/stylesheets/app/editor/toolbar.less
+++ b/services/web/public/stylesheets/app/editor/toolbar.less
@@ -2,7 +2,7 @@
 	height: 40px;
 	border-bottom: 1px solid @toolbar-border-color;
 
-	a {
+	> a, .toolbar-right > a {
 		position: relative;
 		.label {
 			position: absolute;
@@ -13,7 +13,7 @@
 		}
 	}
 
-	a:not(.btn) {
+	> a:not(.btn), .toolbar-right > a:not(.btn) {
 		display: inline-block;
 		color: @gray-light;
 		padding: 4px 10px 5px;
@@ -90,27 +90,36 @@
 
 	&.toolbar-small {
 		height: 32px;
-		a {
+		> a, .toolbar-right > a {
 			padding: 4px 2px 2px;
 			margin: 0;
+		}
+		> a {
 			margin-left: 6px;
 		}
-		.toolbar-right {
-			a {
-				margin-left: 0;
-				margin-right: 6px;
-			}
+		.toolbar-right > a {
+			margin-left: 0;
+			margin-right: 6px;
 		}
 	}
 
 	&.toolbar-tall {
 		height: 58px;
 		padding-top: 10px;
-		a.btn {
+		> a, .toolbar-right > a {
+			padding: 4px 10px 5px;
+		}
+		> a.btn, .toolbar-right > a.btn {
 			margin: 0 (@line-height-computed / 2);
 		}
-		a {
-			padding: 4px 10px 5px;
+		.btn-group {
+			margin: 0 (@line-height-computed / 2);
+			> a {
+				margin: 0;
+			}
+			> .btn-group {
+				margin: 0;
+			}
 		}
 	}
 
@@ -135,7 +144,7 @@
 		&.toolbar-header {
 			box-shadow: none;
 		}
-		a:not(.btn) {
+		> a:not(.btn) {
 			color: @gray;
 			&:hover {
 				color: @gray-light;