Index: branches/5.2.x/core/admin_templates/incs/cms.css
===================================================================
diff -u -N -r15317 -r15331
--- branches/5.2.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 15317)
+++ branches/5.2.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 15331)
@@ -251,14 +251,22 @@
 }
 
 .toolbar-button, .toolbar-button-disabled, .toolbar-button-over {
-    color: #006F99;
-    float: left;
-    font-size: 8pt;
-    padding: 5px;
-    text-align: center;
-    vertical-align: middle;
+	float: left;
+	text-align: center;
+	font-size: 8pt;
+	padding: 5px;
+	vertical-align: middle;
+	color: #006F99;
 }
 
+.toolbar-button-over {
+	color: #000;
+}
+
+.toolbar-button-disabled {
+	color: #444;
+}
+
 a#cms-toggle-revision-toolbar {
 	display: block;
 	background: url(@templates_base@/img/top_frame/revision_control/button_vp_right.png) top right no-repeat;
@@ -301,7 +309,7 @@
 /* === Revision Editing Notice === */
 #cms-editing-notice {
 	width: 230px;
-	position: absolute;
+	position: fixed;
 	z-index: 101;
 	margin-top: 50px;
 	margin-left: 10px;
@@ -336,7 +344,7 @@
 /* === Revision Dropdown === */
 #cms-revision-dropdown {
 	width: 240px;
-	position: absolute;
+	position: fixed;
 	margin-left: 260px;
 	margin-top: 30px;
 	z-index: 102;
Index: branches/5.2.x/core/admin_templates/js/template_manager.js
===================================================================
diff -u -N -r15257 -r15331
--- branches/5.2.x/core/admin_templates/js/template_manager.js	(.../template_manager.js)	(revision 15257)
+++ branches/5.2.x/core/admin_templates/js/template_manager.js	(.../template_manager.js)	(revision 15331)
@@ -64,7 +64,7 @@
 						var $target = $($e.target),
 							$id = $target.attr('id');
 
-						if ( $id && ($id == 'tool_history' || $id == 'div_history') ) {
+						if ( $id && ($id == 'div_history' || $target.parent().attr('id') == 'div_history') ) {
 							return ;
 						}