Index: lams_central/web/qb/collection.jsp
===================================================================
diff -u -r08f85fe9a34494878883237ae71aade40cc74baa -red8294a75d0120b103b4b3ed187bc34b00f6ee37
--- lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision 08f85fe9a34494878883237ae71aade40cc74baa)
+++ lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision ed8294a75d0120b103b4b3ed187bc34b00f6ee37)
@@ -164,8 +164,9 @@
 			var cellhtml = "<i class='fa fa-bar-chart' onClick='javascript:window.open(\"<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=" + cellvalue 
 					+ "\", \"_blank\")' title='Show stats'></i>";
 
-			cellhtml += "<a href='<c:url value='/qb/edit/editQuestion.do'/>?qbQuestionUid=" + cellvalue + "&collectionUid=${collection.uid}&KeepThis=true&TB_iframe=true' class='thickbox'>"; 
-			cellhtml += 	"<i class='fa fa-pencil' title='<fmt:message key='label.edit' />'></i>";
+			cellhtml += "<a  title='<fmt:message key='label.edit' />' href='<c:url value='/qb/edit/editQuestion.do'/>?qbQuestionUid=" 
+						+ cellvalue + "&collectionUid=${collection.uid}&KeepThis=true&TB_iframe=true' class='thickbox'>"; 
+			cellhtml += 	"<i class='fa fa-pencil'></i>";
 			cellhtml += "</a>";
 
 			return cellhtml;
@@ -337,22 +338,22 @@
 			<c:if test="${not empty collection.userId and not collection.personal}">
 				<div class="btn-group-xs pull-right loffset10">
 					<c:if test="${not hasQuestions}">
-						<button class="btn btn-default" onClick="javascript:removeCollection()">
-							<i class="fa fa-trash" title="Remove collection"></i>
+						<button class="btn btn-default" onClick="javascript:removeCollection()" title="Remove collection">
+							<i class="fa fa-trash"></i>
 							Remove collection
 						</button>
 					</c:if>
 				</div>
 			</c:if>
 			
 			<div class="btn-group btn-group-xs loffset10 pull-right" role="group">
-				<a href="#nogo" onClick="javascript:importQTI()" class="btn btn-default">
-					<i class="fa fa-upload" title="<fmt:message key='label.import.qti'/>"></i>
+				<a href="#nogo" onClick="javascript:importQTI()" class="btn btn-default" title="<fmt:message key='label.import.qti'/>">
+					<i class="fa fa-upload"></i>
 				</a>
 				
 				<c:if test="${isQtiExportEnabled && hasQuestions}">
-					<a href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default">
-						<i class="fa fa-download" title="<fmt:message key='label.export.qti'/>"></i>
+					<a href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default" title="<fmt:message key='label.export.qti'/>">
+						<i class="fa fa-download"></i>
 					</a>
 				</c:if>
 			</div>