Index: branches/5.0.x/core/admin_templates/incs/cms.css
===================================================================
diff -u -r12375 -r12382
--- branches/5.0.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 12375)
+++ branches/5.0.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 12382)
@@ -33,12 +33,32 @@
 	margin-top: -10px;
 }
 
+div.cms-edit-design-btn-container {
+	position: absolute;
+	margin-left: -10px;
+	margin-top: -10px;
+	display: none;
+}
+
+div.cms-edit-design-btn-container div.cms-edit-block-btn, div.cms-edit-design-btn-container div.cms-edit-design-btn {
+	float: left;
+	display: block;
+	position: relative;
+	margin: 0px;
+}
+
+div.cms-edit-design-btn-container div.cms-edit-design-btn {
+	margin-left: 4px;
+}
+
 /* === Styles for "Section Properties" button === */
 div.cms-section-properties-btn {
 	float: right;
 	position: relative;
 	border: 2px solid #A1D0A1;
 	background-color: #CCFF00;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
 }
 
 div.cms-section-properties-btn-container {
@@ -70,8 +90,6 @@
 	margin-left: -10px;
 	border: 2px solid #A1D0A1;
 	background-color: #CCFF00;
-	/*opacity: 0.5;
-	filter: alpha(opacity=50);*/
 	display: none;
 }
 
@@ -91,17 +109,21 @@
 	width: auto;
 	color: black;
 	cursor: pointer;
+	/*opacity: 0.5;
+	filter: alpha(opacity=50);*/
 	-moz-border-radius: 10px;
 }
 
 div.cms-save-layout-btn {
-	border: 2px solid #A1D0A1;
-	background-color: #CCFF00;
+	color: white;
+	border: 2px solid #1C960C;
+	background-color: #24B30D;
 }
 
 div.cms-cancel-layout-btn {
-	border: 2px solid #FF0000;
-	background-color: #FF6A5D;
+	color: white;
+	border: 2px solid #C81900;
+	background-color: #DE2A00;
 }
 
 div.cms-cancel-layout-btn {
@@ -113,13 +135,13 @@
 	border: 1px dashed transparent;
 }
 
-div.block-edit-block-btn-container-over {
+div.block-edit-block-btn-container-over, div.block-edit-design-btn-container-over {
 	border-color: #FF6E00;
 }
 
-div.block-edit-design-btn-container-over {
+/*div.block-edit-design-btn-container-over {
 	border-color: #A1D0A1;
-}
+}*/
 
 /* === Styles for element moving/sorting in theme === */
 div.movable-area {
@@ -150,5 +172,5 @@
 span[name='cms-translate-phrase'] .cms-edit-btn {
 	display: none;
 	opacity: 1;
-	filter: alpha(opacity=0);
+	filter: alpha(opacity=100);
 }
\ No newline at end of file