Index: branches/5.3.x/core/admin_templates/incs/cms.css
===================================================================
diff -u -N -r15677 -r15946
--- branches/5.3.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 15677)
+++ branches/5.3.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 15946)
@@ -14,6 +14,7 @@
 
 div.cms-btn-content {
 	padding: 5px;
+	min-height: 15px;
 }
 
 .cms-edit-btn {
@@ -94,9 +95,34 @@
 }
 
 div.cms-edit-btn-container {
+	position: relative;
 	border: 1px dashed #FF6E00;
 }
 
+.cms-edit-btn-container[data-content-id] .cms-btn-content { padding: 0; min-height: 25px; }
+.cms-edit-btn-container .inline-edit-layer, .cms-edit-btn-container .inline-saving-layer { display: none; }
+
+.cms-edit-btn-container.mode-inline-edit .inline-edit-layer { display: block; }
+
+.cms-edit-btn-container .inline-edit-layer {
+	position: absolute;
+	background: url(@templates_base@/img/top_frame/icons/content_mode.png) center no-repeat;
+	width: 20px;
+	height: 20px;
+	top: 0px;
+	right: 0px;
+}
+
+.cms-edit-btn-container.mode-inline-saving .inline-saving-layer { display: block; }
+
+.cms-edit-btn-container .inline-saving-layer {
+	position: absolute;
+	background: url(@templates_base@/img/top_frame/icons/saving_indicator.gif) no-repeat 100% 0px rgba(255, 255, 255, .9);
+	width: 100%;
+	top: 0px;
+	bottom: 0px;
+}
+
 div.cms-edit-btn {
 	border: 2px solid #FF6E00;
 }