Index: lams_tool_lamc/conf/language/ApplicationResources.properties
===================================================================
diff -u -r235d53050c59d1196af7127b2bf05fe0027ce55e -ree02a0db59fc540812423b629c5e2e7b6162e743
--- lams_tool_lamc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 235d53050c59d1196af7127b2bf05fe0027ce55e)
+++ lams_tool_lamc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ee02a0db59fc540812423b629c5e2e7b6162e743)
@@ -253,5 +253,11 @@
 label.report.title.col  =Report Title:
 label.report.endLearningMessage.col  =End of Activity Message
 
+label.tip.moveQuestionDown =Moves question down
+label.tip.moveQuestionUp =Moves question up 
+label.tip.editOptions =Enables editing of candidate answers
+label.tip.removeQuestion =Removes question
+label.tip.removeCandidateAnswer =Removes candidate answer
 
+
 #======= End labels: Exported 236 labels for en AU =====
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -ra396ea2b749c1c978c3e9cfe05e427581dc6a1f7 -ree02a0db59fc540812423b629c5e2e7b6162e743
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision a396ea2b749c1c978c3e9cfe05e427581dc6a1f7)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision ee02a0db59fc540812423b629c5e2e7b6162e743)
@@ -119,16 +119,24 @@
 	
 								  	<td NOWRAP bgcolor="#EEEEEE"   align=center valign=top>			
 									 		<c:if test="${sessionScope.queIndex == 1}"> 		
-				   								  <img src="<c:out value="${tool}"/>images/down.gif" align=left onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');"> 
+												<a title="<bean:message key='label.tip.moveQuestionDown'/>" href="javascript:;" onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
+			                                                <img src="<c:out value="${tool}"/>images/down.gif" border="0">
+												</a> 
 			   								</c:if> 			
 			   								
 							  				<c:if test="${(sessionScope.maxQuestionIndex == sessionScope.queIndex) && (sessionScope.queIndex != 1)}"> 			
-			     								  <img src="<c:out value="${tool}"/>images/up.gif" align=left onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');"> 
+												<a title="<bean:message key='label.tip.moveQuestionUp'/>" href="javascript:;" onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">
+			                                                <img src="<c:out value="${tool}"/>images/up.gif" border="0">
+												</a> 
 			     							</c:if> 	    
 											
 			 				  				<c:if test="${(sessionScope.maxQuestionIndex != sessionScope.queIndex) && (sessionScope.queIndex != 1)}"> 			
-				   								    <img src="<c:out value="${tool}"/>images/down.gif" align=left onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">		  	   								 
-				       								<img src="<c:out value="${tool}"/>images/up.gif" align=left onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">		  	
+												<a title="<bean:message key='label.tip.moveQuestionDown'/>" href="javascript:;" onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
+			                                                <img src="<c:out value="${tool}"/>images/down.gif" border="0">
+												</a> 
+												<a title="<bean:message key='label.tip.moveQuestionUp'/>" href="javascript:;" onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">
+			                                                <img src="<c:out value="${tool}"/>images/up.gif" border="0">
+												</a> 
 											</c:if>
 	                                </td>
 	
@@ -143,8 +151,13 @@
 	                                    </td>
 																						
 	                                   <td NOWRAP bgcolor="#EEEEEE"  valign=top>								
-												<img src="<c:out value="${tool}"/>images/edit.gif" align=left onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','editOptions');">	
-												<img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','removeQuestion');">	
+												<a title="<bean:message key='label.tip.editOptions'/>" href="javascript:;" onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','editOptions');">
+			                                                <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
+												</a> 
+
+												<a title="<bean:message key='label.tip.removeQuestion'/>" href="javascript:;" onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','removeQuestion');">
+			                                                <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
+												</a> 
 									  	</td>
 								  </tr>
 							</c:if> 																		  								  
Index: lams_tool_lamc/web/authoring/OptionsContent.jsp
===================================================================
diff -u -r33a828c4cef478536cf95e7c69422e6708c4a265 -ree02a0db59fc540812423b629c5e2e7b6162e743
--- lams_tool_lamc/web/authoring/OptionsContent.jsp	(.../OptionsContent.jsp)	(revision 33a828c4cef478536cf95e7c69422e6708c4a265)
+++ lams_tool_lamc/web/authoring/OptionsContent.jsp	(.../OptionsContent.jsp)	(revision ee02a0db59fc540812423b629c5e2e7b6162e743)
@@ -99,7 +99,9 @@
 										</td>
 	
 										<td bgcolor="#EEEEEE"  valign=top>
-		       								    <img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:deleteOption(1,'removeOption');">
+											<a title="<bean:message key='label.tip.removeCandidateAnswer'/>" href="javascript:;" onclick="javascript:deleteOption(1,'removeOption');">
+		                                                <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
+											</a> 
 									  	</td>
 							 </tr>
 							</c:if>