Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -rf918fdc6084f1815d7d4b58172158767fba9a214 -r94eef8f866e4ddba51fb48818aa11a3afed42afb
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision f918fdc6084f1815d7d4b58172158767fba9a214)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 94eef8f866e4ddba51fb48818aa11a3afed42afb)
@@ -414,7 +414,12 @@
 							 	style="display: none"
 							 </c:if>
 							 >
-							<div><c:out value="${tool.toolDisplayName}" /></div>
+							<div class="media">
+  								<div class="media-left img-${tool.learningLibraryId}"></div>
+  								<div class="media-body media-middle" id="toolDisplayName">
+									<c:out value="${tool.toolDisplayName}" />
+								</div>
+							</div>
 						</div>
 						</div>
 					</c:forEach>
Index: lams_central/web/css/authoring.css
===================================================================
diff -u -rf918fdc6084f1815d7d4b58172158767fba9a214 -r94eef8f866e4ddba51fb48818aa11a3afed42afb
--- lams_central/web/css/authoring.css	(.../authoring.css)	(revision f918fdc6084f1815d7d4b58172158767fba9a214)
+++ lams_central/web/css/authoring.css	(.../authoring.css)	(revision 94eef8f866e4ddba51fb48818aa11a3afed42afb)
@@ -351,26 +351,21 @@
 }
 
 div.template {
-	height: 45px;
+	min-height: 45px;
 	border-bottom: 0.5px solid #a9a9a9;
 	cursor: pointer;
 }
 
-.tooltemplate {
-}
-
 .tooltemplate :hover {
 	background-color: #EDEDED;
 }
 
-div.template img {
-	margin: 8px 0 5px 5px;
+.tooltemplate .media {
+	margin-top: 0px;
+	padding: 8px 0px 5px 5px;
 }
 
-div.template div {
-	float: right;
-	width: 130px;
-	padding-top: 12px;
+.media #toolDisplayName {
 }
 
 td#canvasContainerCell {
Index: lams_central/web/css/jquery-ui-bootstrap-theme.css
===================================================================
diff -u -r64d328ea0d7c6839143a522755843fb3c5b50382 -r94eef8f866e4ddba51fb48818aa11a3afed42afb
--- lams_central/web/css/jquery-ui-bootstrap-theme.css	(.../jquery-ui-bootstrap-theme.css)	(revision 64d328ea0d7c6839143a522755843fb3c5b50382)
+++ lams_central/web/css/jquery-ui-bootstrap-theme.css	(.../jquery-ui-bootstrap-theme.css)	(revision 94eef8f866e4ddba51fb48818aa11a3afed42afb)
@@ -1375,7 +1375,7 @@
   padding: 4px;
   font-size: 13px;
   line-height: 18px;
-  color: #808080;
+  color: #555;
   border: 1px solid #ccc;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -rf918fdc6084f1815d7d4b58172158767fba9a214 -r94eef8f866e4ddba51fb48818aa11a3afed42afb
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision f918fdc6084f1815d7d4b58172158767fba9a214)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 94eef8f866e4ddba51fb48818aa11a3afed42afb)
@@ -162,7 +162,7 @@
 			// assign icons' data uris to their learning library IDs instead of labels
 			ActivityIcons[learningLibraryID] = ActivityIcons[learningLibraryTitle];
 			delete ActivityIcons[learningLibraryTitle];
-			$('<img />').attr('src', ActivityIcons[learningLibraryID]).appendTo(this);
+			$('<img />').attr('src', ActivityIcons[learningLibraryID]).appendTo(".img-"+learningLibraryID);
 			// register tool properties so they are later easily accessible
 			layout.toolMetadata[learningLibraryID] = {
 				'iconPath'				  : $(this).attr('iconPath'),
@@ -172,14 +172,6 @@
 				'parallelChildActivityDefs' : parallelChildActivityDefs
 			};
 			
-			if (!isReadOnlyMode) {
-				// if a tool's name is too long and gets broken into two lines
-				// make some adjustments to layout
-				var toolName = $('div', this);
-				if (toolName.text().length > 17){
-					toolName.css('padding-top', '2px');
-				}
-			}
 		});
 		
 		if (!isReadOnlyMode){
@@ -264,22 +256,22 @@
 							activityCategoryID = +draggable.draggable.attr('activityCategoryId'),
 					    	x = draggable.offset.left  + canvas.scrollLeft() - canvas.offset().left,
 					    	y = draggable.offset.top   + canvas.scrollTop()  - canvas.offset().top,
-					    	label = $('div', draggable.draggable).text(),
+					    	label = $('#toolDisplayName', draggable.draggable).text().trim(),
 					    	activity = null,
 					    	translatedEvent = GeneralLib.translateEventOnCanvas(event),
 							eventX = translatedEvent[0],
 							eventY = translatedEvent[1];
-										    
+
 					    if (activityCategoryID == 5) {
 					    	// construct child activities out of previously referenced HTML templates
 					    	var childActivities = [];
 					    	layout.toolMetadata[learningLibraryID].parallelChildActivityDefs.each(function(){
 					    		var childLearningLibraryID = +$(this).attr('learningLibraryId'),
 					    			childToolID = +$(this).attr('toolId'),
-					    			toolLabel = $('div', this).text(),
+					    			toolLabel = $('#toolDisplayName', this).text().trim(),
 					    			childActivity = new ActivityDefs.ToolActivity(null, null, null,
 					    					childToolID, childLearningLibraryID, null, x, y, toolLabel);
-					    		
+					    	
 					    		layout.activities.push(childActivity);
 					    		childActivities.push(childActivity);
 					    	});
@@ -1949,7 +1941,7 @@
 		$('.templateContainer').height(windowHeight - 81);
 		$('#canvas').height(windowHeight - 75)
 		// width of window minus templates on the left; minimum is toolbar width so it does not collapse
-					.width(Math.max($('#toolbar').width() - 160, $(window).width() - 170));
+					.width(Math.max($('#toolbar').width() - 180, $(window).width() - 190));
 		
 		if (!width || !height) {
 			var width = 0,