Index: branches/5.0.x/core/admin_templates/incs/cms.css
===================================================================
diff -u -r12298 -r12313
--- branches/5.0.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 12298)
+++ branches/5.0.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 12313)
@@ -26,17 +26,17 @@
 	color: black;
 	cursor: pointer;
 	-moz-border-radius: 10px;
+	z-index: 99;
+}
 
+div.cms-edit-btn, div.cms-edit-block-btn, div.cms-edit-design-btn {
 	margin-top: -10px;
-	z-index: 99;
 }
 
 /* === Styles for "Section Properties" button === */
 div.cms-section-properties-btn {
 	float: right;
 	position: relative;
-
-	margin-right: -10px;
 	border: 2px solid #A1D0A1;
 	background-color: #CCFF00;
 }
@@ -78,8 +78,6 @@
 /* === Styles for "Save" and "Cancel" buttons (for layout) === */
 div.cms-layout-btn-container {
 	position: absolute;
-	margin-top: -10px;
-	margin-left: -10px;
 	display: none;
 	z-index: 99;
 }