Index: lams_monitoring/web/includes/javascript/monitorLesson5.js
===================================================================
diff -u -rf11663c9b27c276fae910e6c3fa5561a3e2af781 -rb2aa055ead5b7c5d78af474af49cf1d3bccca313
--- lams_monitoring/web/includes/javascript/monitorLesson5.js	(.../monitorLesson5.js)	(revision f11663c9b27c276fae910e6c3fa5561a3e2af781)
+++ lams_monitoring/web/includes/javascript/monitorLesson5.js	(.../monitorLesson5.js)	(revision b2aa055ead5b7c5d78af474af49cf1d3bccca313)
@@ -203,11 +203,11 @@
 	        	return response.msg; //msg will be shown in editable form
 	        }
 	    }
-    //hide and show pencil on showing and hiding editing widget
-	}).on('shown', function(e, editable) {
-		$(this).nextAll('i.fa-pencil').hide();
-	}).on('hidden', function(e, reason) {
-		$(this).nextAll('i.fa-pencil').show();
+	})
+	
+	$('#editLessonNameButton').click(function(e) {
+	    e.stopPropagation();
+	    $('#lesson-name').editable('toggle');
 	});
 	
 	new tempusDominus.TempusDominus(document.getElementById('scheduleDatetimeField'), tempusDominusDefaultOptions)
Index: lams_monitoring/web/monitor5.jsp
===================================================================
diff -u -rf11663c9b27c276fae910e6c3fa5561a3e2af781 -rb2aa055ead5b7c5d78af474af49cf1d3bccca313
--- lams_monitoring/web/monitor5.jsp	(.../monitor5.jsp)	(revision f11663c9b27c276fae910e6c3fa5561a3e2af781)
+++ lams_monitoring/web/monitor5.jsp	(.../monitor5.jsp)	(revision b2aa055ead5b7c5d78af474af49cf1d3bccca313)
@@ -322,8 +322,15 @@
 					<dt><fmt:message key="lesson.manage"/>:</dt>
 					<dd>
 						<div>
+							<button id="editLessonNameButton" class="btn btn-sm btn-primary"
+									type="button"
+									title='Edit lesson name'>
+								<i class="fa fa-pencil"></i>
+								<span class="hidden-xs">Edit lesson name</span>
+							</button>
+							
 							<button id="viewLearnersButton" class="btn btn-sm btn-primary"
-									type="button"onClick="javascript:showLessonLearnersDialog()"
+									type="button" onClick="javascript:showLessonLearnersDialog()"
 									title='<fmt:message key="button.view.learners.tooltip"/>'>
 								<i class="fa fa-users"></i>
 								<span class="hidden-xs"><fmt:message key="button.view.learners"/></span>