diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index 32f29cec3f..c2db14f826 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -228,10 +228,11 @@ input[type="button"] {
     padding: 15px 50px;
     font-size: 16px;
     border: none;
-    background: @turquoise;
+    background: @green;
     color: white;
+    font-weight: bold;
       &:hover {
-        background: @turquoise-d1;
+        background: @green-d1;
 		}
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 8a439b215e..314035f1ae 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -168,8 +168,8 @@
 @btnSuccessBackground:              @green;
 @btnSuccessBackgroundHighlight:     @green;
 
-@btnWarningBackground:              @orange;
-@btnWarningBackgroundHighlight:     @orange;
+@btnWarningBackground:              @red-l1;
+@btnWarningBackgroundHighlight:     @red-l1;
 
 @btnDangerBackground:               @red-l1;
 @btnDangerBackgroundHighlight:      @red-l1;
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html
index d5b0d8b568..912cdbfcc1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html
@@ -24,7 +24,7 @@
                     <div ng-show="indexer.showTools && indexer.isLuceneIndex">
                         <div>
                             <br />
-                            <div ng-show="!indexer.isProcessing && (!indexer.processingAttempts || indexer.processingAttempts < 100)" class="btn-group">
+                            <div ng-show="!indexer.isProcessing && (!indexer.processingAttempts || indexer.processingAttempts < 100)">
 
                                 <button type="button" class="btn btn-warning" ng-click="rebuildIndex(indexer)">Rebuild index</button>
                                 <button type="button" class="btn btn-warning" ng-click="optimizeIndex(indexer)" ng-show="indexer.documentCount > 0">Optimize index</button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
index 978ae63ece..a902385956 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
@@ -13,7 +13,7 @@
 
 <ul class="unstyled list-icons" ng-show="multipicker || renderModel.length === 0">	
 	<li>
-		<i class="icon icon-add blue"></i>
+		<i class="icon icon-add turquoise"></i>
 		<a href ng-click="openContentPicker()" prevent-default>
 			<localize key="general_add">Add</localize>
 		</a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
index fc7a388cc1..1ffa878818 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
@@ -13,7 +13,7 @@
 
 	<ul class="unstyled list-icons" ng-show="multipicker || renderModel.length === 0">	
 		<li>
-			<i class="icon icon-add blue"></i>
+			<i class="icon icon-add turquoise"></i>
 			<a href ng-click="openContentPicker()" prevent-default>
 				<localize key="general_add">Add</localize>
 			</a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
index 08bd4913f6..29e3880801 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
@@ -21,7 +21,7 @@
 		<span ng-hide="showSearch || model.value.query">
 			<ul class="unstyled list-icons">	
 				<li>	
-					<i class="icon icon-add blue"></i>
+					<i class="icon icon-add turquoise"></i>
 					<a href ng-click="openContentPicker()" prevent-default>
 						<localize key="general_choose">Choose a root node</localize>...
 					</a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
index eaffa56d14..ca422000c3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
@@ -122,7 +122,7 @@
 
             <ul class="unstyled list-icons">
                 <li>
-                    <i class="icon icon-add blue"></i>
+                    <i class="icon icon-add turquoise"></i>
 
                     <a href="#" ng-click="editConfig()" prevent-default>
                         <localize key="general_edit" />
@@ -152,7 +152,7 @@
 
             <ul class="unstyled list-icons">
                 <li>
-                    <i class="icon icon-add blue"></i>
+                    <i class="icon icon-add turquoise"></i>
                     <a href="#" ng-click="editStyles()" prevent-default>
                         <localize key="general_edit" />
                     </a>