Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r8a75eb668795994f1dfd92ff5d33e9375937c12f -r1a0c05dd0bcc660b51742c96e0f7d671104cbf8a
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8a75eb668795994f1dfd92ff5d33e9375937c12f)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1a0c05dd0bcc660b51742c96e0f7d671104cbf8a)
@@ -636,6 +636,8 @@
 authoring.fla.tool.category.4 = Content
 authoring.fla.tool.category.5 = Combined
 authoring.fla.tool.category.6 = Reflective
+authoring.fla.tool.category.expand = Expand / collapse all activity categories
+authoring.fla.tool.bar.expand = Hide / show activity toolbar
 ckeditor.math.math = Math
 ckeditor.math.functions = Functions
 ckeditor.math.greek = Greek
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -ra8f119a356469d400e7971e06e19fa6ab5a51b34 -r1a0c05dd0bcc660b51742c96e0f7d671104cbf8a
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision a8f119a356469d400e7971e06e19fa6ab5a51b34)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a0c05dd0bcc660b51742c96e0f7d671104cbf8a)
@@ -435,8 +435,12 @@
 		<tr>
 			<td id="templateContainerCell">
 				<div id="template-container-collapse">
-					<i id="template-container-collapse-button" class="fa fa-arrow-circle-o-left" onClick="javascript:MenuLib.toggleTemplateContainer()"></i>
-					<i id="template-categories-collapse-button" class="fa fa-arrow-circle-o-down" onClick="javascript:MenuLib.toggleExpandTemplateCategories()"></i>
+					<i id="template-container-collapse-button" class="fa fa-chevron-circle-left" 
+					   title="<fmt:message key='authoring.fla.tool.bar.expand' />"	
+					   onClick="javascript:MenuLib.toggleTemplateContainer()"></i>
+					<i id="template-categories-collapse-button" class="fa fa-chevron-circle-down"
+					   title="<fmt:message key='authoring.fla.tool.category.expand' />"	
+					   onClick="javascript:MenuLib.toggleExpandTemplateCategories()"></i>
 				</div>
 				<div id="template-container-panel-group" class="templateContainer scrollable panel-group" role="tablist" aria-multiselectable="true">
 				
Index: lams_central/web/css/_authoring_base.scss
===================================================================
diff -u -r3510bf9db75009af42fcd5d0f64959dab092fa8f -r1a0c05dd0bcc660b51742c96e0f7d671104cbf8a
--- lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision 3510bf9db75009af42fcd5d0f64959dab092fa8f)
+++ lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision 1a0c05dd0bcc660b51742c96e0f7d671104cbf8a)
@@ -460,13 +460,13 @@
 }
 
 td#templateContainerCell #template-container-collapse {
-	padding-left: 5px;
-	border-bottom: thin solid #cecdcd;
+  padding: 1px 0 1px 5px;
+  border-bottom: thin solid #cecdcd;
 }
 
 td#templateContainerCell #template-container-collapse i.fa {
-	font-size: 20px;
-	cursor: pointer;
+  color: #6f6e6e;
+  cursor: pointer;
 }
    
 td#templateContainerCell #template-categories-collapse-button {
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -ra8f119a356469d400e7971e06e19fa6ab5a51b34 -r1a0c05dd0bcc660b51742c96e0f7d671104cbf8a
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision a8f119a356469d400e7971e06e19fa6ab5a51b34)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 1a0c05dd0bcc660b51742c96e0f7d671104cbf8a)
@@ -594,9 +594,9 @@
 	 */
 	toggleExpandTemplateCategories : function(){
 		var collapseCategoriesButton = $('#template-container-collapse #template-categories-collapse-button'),
-			isExpanded = collapseCategoriesButton.hasClass('fa-arrow-circle-o-up');
+			isExpanded = collapseCategoriesButton.hasClass('fa-chevron-circle-up');
 		$('#template-container-panel-group .collapse').collapse(isExpanded ? 'hide' : 'show');
-		collapseCategoriesButton.toggleClass('fa-arrow-circle-o-down fa-arrow-circle-o-up');
+		collapseCategoriesButton.toggleClass('fa-chevron-circle-down fa-chevron-circle-up');
 	},
 	
 	/**
@@ -613,7 +613,7 @@
 		templateContainerCell.animate({
 			'width': isExpanded > 0 ? 0 : 200
 		}, function(){
-			$('#template-container-collapse #template-container-collapse-button', templateContainerCell).toggleClass('fa-arrow-circle-o-left fa-arrow-circle-o-right');
+			$('#template-container-collapse #template-container-collapse-button', templateContainerCell).toggleClass('fa-chevron-circle-left fa-chevron-circle-right');
 			if (!isExpanded) {
 				$('#template-container-collapse #template-categories-collapse-button', templateContainerCell).show();
 			}