Index: lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp
===================================================================
diff -u -r2206a0e278b26581a3a3c7d266e184551367851f -r59e74fb801aacae4e94a0fdf57350ec75a15cde0
--- lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp	(.../addcommoncartridge.jsp)	(revision 2206a0e278b26581a3a3c7d266e184551367851f)
+++ lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp	(.../addcommoncartridge.jsp)	(revision 59e74fb801aacae4e94a0fdf57350ec75a15cde0)
@@ -28,6 +28,7 @@
 					return false;
 				}
 			}
+			showBusy("itemAttachmentArea");
 			return true;
 		}
 	</script>
@@ -42,6 +43,7 @@
 		<lams:Page title="${title}" type="learner">
 
 			<%@ include file="/common/messages.jsp"%>
+							
 			<html:hidden property="sessionMapID" />
 			<input type="hidden" name="itemType" id="itemType" value="2" />
 			<html:hidden property="itemIndex" />
@@ -52,12 +54,12 @@
 				</div>
 			</div>		
 		
-			<div class="voffset10">
+			<div class="pull-right voffset10">
 				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" /> 
 				</a>
 				<a href="#nogo" onclick="javascript:submitCommonCartridgeItem();" onmousedown="self.focus();" class="btn btn-sm btn-primary">
-					<i class="fa fa-upload"></i> <fmt:message key="button.upload" />
+					<fmt:message key="button.upload" />
 				</a>
 			</div>
 			
Index: lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp
===================================================================
diff -u -r2206a0e278b26581a3a3c7d266e184551367851f -r59e74fb801aacae4e94a0fdf57350ec75a15cde0
--- lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision 2206a0e278b26581a3a3c7d266e184551367851f)
+++ lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision 59e74fb801aacae4e94a0fdf57350ec75a15cde0)
@@ -15,18 +15,12 @@
 						<fmt:message key="label.delete" />
 					</a>
 				</td>
-				<td>
-					<i class="fa fa-refresh fa-spin fa-1x fa-fw" style="display:none" id="itemAttachmentArea_Busy"></i>
-				</td>
 			</tr>
 		</table>
 	</c:when>
 	
 	<c:otherwise>
-		<div class="input-group" id="addfile">
-			<input type="file" name="file" id="file" />
-		</div>
-		<p class="help-block"><fmt:message key="label.upload.info"><fmt:param>${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}</fmt:param></fmt:message></p>					
-		<div id="file-error-msg" class="text-danger" style="display:none"></div>			
+		<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.authoring.basic.resource.file" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
 	</c:otherwise>
 </c:choose>
+<lams:WaitingSpinner  id="itemAttachmentArea_Busy"/>