Index: lams_tool_survey/web/pages/authoring/conditionList.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r12c8b71dda68893eb03aa635192d44e47a512616
--- lams_tool_survey/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 12c8b71dda68893eb03aa635192d44e47a512616)
@@ -41,13 +41,11 @@
 				<td class="arrows" style="width:5%">
 					<!-- Don't display up icon if first line -->
 					<c:if test="${not status.first}">
-						<c:set var="title"><fmt:message key='label.authoring.up'/></c:set>
-		 				<lams:Arrow state="up" title="${title}" onclick="upCondition(${status.index},'${sessionMapID}')"/>
+		 				<lams:Arrow state="up" titleKey="label.up" onclick="upCondition(${status.index},'${sessionMapID}')"/>
 		 			</c:if>
 					<!-- Don't display down icon if last line -->
 					<c:if test="${not status.last}">
-					<c:set var="title"><fmt:message key='label.authoring.down'/></c:set>
-						<lams:Arrow state="down" title="${title}" onclick="downCondition(${status.index},'${sessionMapID}')"/>
+						<lams:Arrow state="down" titleKey="label.down" onclick="downCondition(${status.index},'${sessionMapID}')"/>
 		 			</c:if>
 				</td>
 				
Index: lams_tool_survey/web/pages/authoring/parts/instructions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r12c8b71dda68893eb03aa635192d44e47a512616
--- lams_tool_survey/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 12c8b71dda68893eb03aa635192d44e47a512616)
@@ -24,12 +24,10 @@
 
 					<td class="arrows" style="width:5%">
 						<c:if test="${not status.first}">
-							<c:set var="title"><fmt:message key="label.up"/></c:set>
-							<lams:Arrow state="up" title="${title}" onclick="upItem('${status.index}')"/>
+							<lams:Arrow state="up" titleKey="label.up" onclick="upItem('${status.index}')"/>
 						</c:if>
 						<c:if test="${not status.last}">
-							<c:set var="title"><fmt:message key="label.down"/></c:set>
-							<lams:Arrow state="down" title="${title}" onclick="downItem('${status.index}')"/>
+							<lams:Arrow state="down" titleKey="label.down" onclick="downItem('${status.index}')"/>
 						</c:if>
 					</td>
 					<td class="text-center" style="width:5%"><i class="fa fa-times"	title="<fmt:message key="label.delete"/>"
Index: lams_tool_survey/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r12c8b71dda68893eb03aa635192d44e47a512616
--- lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 12c8b71dda68893eb03aa635192d44e47a512616)
@@ -38,12 +38,10 @@
 
 				<td class="arrows" style="width:5%">
 					<c:if test="${not status.first}">
-						<c:set var="title"><fmt:message key="label.up"/></c:set>
-						<lams:Arrow state="up" title="${title}" onclick="upQuestion(${status.index},'${sessionMapID}')"/>
+						<lams:Arrow state="up" titleKey="label.up" onclick="upQuestion(${status.index},'${sessionMapID}')"/>
 					</c:if>
 					<c:if test="${not status.last}">
-						<c:set var="title"><fmt:message key="label.down"/></c:set>
-						<lams:Arrow state="down" title="${title}" onclick="downQuestion(${status.index},'${sessionMapID}')"/>
+						<lams:Arrow state="down" titleKey="label.down" onclick="downQuestion(${status.index},'${sessionMapID}')"/>
 					</c:if>
 				</td>