Index: branches/5.2.x/core/admin_templates/incs/cms.css
===================================================================
diff -u -N -r14856 -r15257
--- branches/5.2.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 14856)
+++ branches/5.2.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 15257)
@@ -16,21 +16,25 @@
 	padding: 5px;
 }
 
-div.cms-section-properties-btn, div.cms-edit-btn, div.cms-edit-block-btn, div.cms-edit-design-btn {
+.cms-edit-btn {
 	padding: 2px 5px;
 	font-family: Arial, Verdana;
 	font-size: 13px;
 	font-weight: normal;
-	width: auto;
-	position: absolute;
 	color: black;
 	cursor: pointer;
+	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
+}
+
+.cms-section-properties-btn, .cms-edit-btn, .cms-edit-block-btn, .cms-edit-design-btn {
+	width: auto;
+	position: absolute;
 	z-index: 99;
 }
 
-div.cms-edit-btn, div.cms-edit-block-btn, div.cms-edit-design-btn {
+.cms-edit-btn, .cms-edit-block-btn, .cms-edit-design-btn {
 	margin-top: -10px;
 }
 
@@ -41,25 +45,23 @@
 	display: none;
 }
 
-div.cms-edit-design-btn-container div.cms-edit-block-btn, div.cms-edit-design-btn-container div.cms-edit-design-btn {
+div.cms-edit-design-btn-container .cms-edit-block-btn, div.cms-edit-design-btn-container .cms-edit-design-btn {
 	float: left;
 	display: block;
 	position: relative;
 	margin: 0px;
 }
 
-div.cms-edit-design-btn-container div.cms-edit-design-btn {
+div.cms-edit-design-btn-container .cms-edit-design-btn {
 	margin-left: 4px;
 }
 
 /* === Styles for "Section Properties" button === */
-div.cms-section-properties-btn {
+.cms-section-properties-btn {
 	float: right;
 	position: relative;
-	border: 2px solid #A1D0A1;
+	border-color: #A1D0A1;
 	background-color: #CCFF00;
-	opacity: 0.5;
-	filter: alpha(opacity=50);
 }
 
 div.cms-section-properties-btn-container {
@@ -68,67 +70,85 @@
 }
 
 /* === Styles for "Edit" button === */
+.cms-btn-new {
+	cursor: pointer;
+	background: url(@templates_base@/img/top_frame/icons/content_mode.png) #CCFF00 3px center no-repeat;
+	padding: 2px 2px 2px 17px;
+
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	border: 2px solid #A1D0A1;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+
+	color: black;
+	font-family: Arial, Verdana;
+	font-size: 13px;
+	font-weight: normal;
+}
+
+.cms-btn-new:hover {
+	opacity: 1;
+	filter: alpha(opacity=100);
+}
+
 div.cms-edit-btn-container {
 	border: 1px dashed #FF6E00;
 }
 
 div.cms-edit-btn {
-	margin-left: -10px;
 	border: 2px solid #FF6E00;
-	background-color: #FFCC00;
-	opacity: 0.5;
-	filter: alpha(opacity=50);
 }
 
-div.cms-edit-block-btn {
+.cms-edit-btn {
 	margin-left: -10px;
-	border: 2px solid #FF6E00;
+	border-color: #FF6E00;
 	background-color: #FFCC00;
+}
+
+.cms-edit-block-btn {
+	border-color: #FF6E00;
+	background-color: #FFCC00;
 	display: none;
 }
 
-div.cms-edit-design-btn {
-	margin-left: -10px;
-	border: 2px solid #A1D0A1;
+.cms-edit-design-btn {
+	border-color: #A1D0A1;
 	background-color: #CCFF00;
 	display: none;
 }
 
+.admin-edit-btn {
+	border-color: #A1D0A1;
+	background-color: #CCFF00;
+}
+
 /* === Styles for "Save" and "Cancel" buttons (for layout) === */
 div.cms-layout-btn-container {
 	position: absolute;
 	display: none;
 	z-index: 99;
 }
 
-div.cms-save-layout-btn, div.cms-cancel-layout-btn {
+.cms-save-layout-btn, .cms-cancel-layout-btn {
 	float: left;
-	padding: 2px 5px;
-	font-family: Arial, Verdana;
-	font-size: 13px;
-	font-weight: normal;
 	width: auto;
-	color: black;
-	cursor: pointer;
-	/*opacity: 0.5;
-	filter: alpha(opacity=50);*/
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
 }
 
-div.cms-save-layout-btn {
+.cms-save-layout-btn {
 	color: white;
-	border: 2px solid #1C960C;
+	border-color: #1C960C;
 	background-color: #24B30D;
 }
 
-div.cms-cancel-layout-btn {
+.cms-cancel-layout-btn {
 	color: white;
-	border: 2px solid #C81900;
+	border-color: #C81900;
 	background-color: #DE2A00;
 }
 
-div.cms-cancel-layout-btn {
+.cms-cancel-layout-btn {
 	margin-left: 4px;
 }
 
@@ -137,6 +157,11 @@
 	border: 1px dashed transparent;
 }
 
+div.block-edit-block-btn-container .cms-btn-new, div.block-edit-design-btn-container .cms-btn-new {
+	opacity: 1;
+	filter: alpha(opacity = 100);
+}
+
 div.block-edit-block-btn-container-over, div.block-edit-design-btn-container-over {
 	border-color: #FF6E00;
 }
@@ -171,7 +196,7 @@
 	font-size: 9px;
 }
 
-span[name='cms-translate-phrase'] .cms-edit-btn {
+span[name='cms-translate-phrase'] .cms-edit-btn, span[name='cms-translate-phrase'] .admin-edit-btn {
 	display: none;
 	opacity: 1;
 	filter: alpha(opacity=100);