Index: branches/5.2.x/core/admin_templates/js/template_manager.js
===================================================================
diff -u -N -r14856 -r15257
--- branches/5.2.x/core/admin_templates/js/template_manager.js	(.../template_manager.js)	(revision 14856)
+++ branches/5.2.x/core/admin_templates/js/template_manager.js	(.../template_manager.js)	(revision 15257)
@@ -47,12 +47,13 @@
 
 			if ($template_manager.editingMode > 1) {
 				// all modes except for "Browse Mode"
-				$hover_effect.push('div.cms-section-properties-btn:first');
+//				$hover_effect.push('div.cms-section-properties-btn:first');
 			}
 
 			if ($template_manager.editingMode == 2) {
 				// Content Mode
-				$hover_effect.push('div.cms-edit-btn');
+//				$hover_effect.push('div.cms-edit-btn');
+//				$hover_effect.push('div.admin-edit-btn');
 
 				// make all spans with phrases clickable
 				$template_manager.setupEditTranslationButtons(document);
@@ -104,17 +105,19 @@
 			}
 
 			// make requested elements fully visible on mouseover
-			$($hover_effect.join(', '))
-			.mouseover(
-				function(e) {
-					$(this).css('opacity', 1);
-				}
-			)
-			.mouseout(
-				function(e) {
-					$(this).css('opacity', 0.5);
-				}
-			);
+			if ( $hover_effect.length ) {
+				$($hover_effect.join(', '))
+				.mouseover(
+					function(e) {
+						$(this).css('opacity', 1);
+					}
+				)
+				.mouseout(
+					function(e) {
+						$(this).css('opacity', 0.5);
+					}
+				);
+			}
 
 			// related to content revision control toolbar
 			$('#cms-toggle-revision-toolbar').click(
@@ -456,12 +459,12 @@
 			$button_group.show();
 		}
 		else {
-			$('div.cms-edit-design-btn:first', $element).show();
+			$('.cms-edit-design-btn:first', $element).show();
 		}
 	}
 	else {
 		$($element).addClass('block-edit-block-btn-container-over');
-		$('div.cms-edit-block-btn:first', $element).show();
+		$('.cms-edit-block-btn:first', $element).show();
 	}
 
 	$e.stopPropagation();
@@ -482,12 +485,12 @@
 			$button_group.hide();
 		}
 		else {
-			$('div.cms-edit-design-btn:first', $element).hide();
+			$('.cms-edit-design-btn:first', $element).hide();
 		}
 	}
 	else {
 		$($element).removeClass('block-edit-block-btn-container-over');
-		$('div.cms-edit-block-btn:first', $element).hide();
+		$('.cms-edit-block-btn:first', $element).hide();
 	}
 
 	$e.stopPropagation();
@@ -505,8 +508,8 @@
 				$block_containers = $block_containers.not($block_container);
 
 				// place "Edit Block" button near "Edit Design" button
-				var $edit_design_btn = $('div.cms-edit-design-btn:first', this);
-				var $edit_block_btn = $('div.cms-edit-block-btn:first', $block_container);
+				var $edit_design_btn = $('.cms-edit-design-btn:first', this);
+				var $edit_block_btn = $('.cms-edit-block-btn:first', $block_container);
 
 				$edit_design_btn
 				.wrap('<div class="cms-edit-design-btn-container"></div>')