Index: lams_admin/web/import/importGroups.jsp
===================================================================
diff -u -rbc66c534c18e8e49ce8ed510418400cbc56fd605 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision bc66c534c18e8e49ce8ed510418400cbc56fd605)
+++ lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -20,6 +20,7 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	<link href="<lams:LAMSURL/>css/uppy.min.css" rel="stylesheet" type="text/css" />
+	<link href="<lams:LAMSURL/>css/uppy.custom.css" rel="stylesheet" type="text/css" />
 
 	<lams:css/>
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
Index: lams_admin/web/import/importexcel.jsp
===================================================================
diff -u -rbc66c534c18e8e49ce8ed510418400cbc56fd605 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision bc66c534c18e8e49ce8ed510418400cbc56fd605)
+++ lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -25,6 +25,7 @@
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
 	<link rel="shortcut icon" href="<lams:LAMSURL/>favicon.ico" type="image/x-icon" />
 	<link href="<lams:LAMSURL/>css/uppy.min.css" rel="stylesheet" type="text/css" />
+	<link href="<lams:LAMSURL/>css/uppy.custom.css" rel="stylesheet" type="text/css" />
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/uppy/uppy.min.js"></script>
Index: lams_central/web/css/uppy.custom.css
===================================================================
diff -u
--- lams_central/web/css/uppy.custom.css	(revision 0)
+++ lams_central/web/css/uppy.custom.css	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -0,0 +1,4 @@
+.uppy-Dashboard-AddFiles-title {
+	font-size: 20px !important;
+	font-weight: normal !important;
+}
\ No newline at end of file
Index: lams_central/web/qb/importQuestionsXml.jsp
===================================================================
diff -u -rbc66c534c18e8e49ce8ed510418400cbc56fd605 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_central/web/qb/importQuestionsXml.jsp	(.../importQuestionsXml.jsp)	(revision bc66c534c18e8e49ce8ed510418400cbc56fd605)
+++ lams_central/web/qb/importQuestionsXml.jsp	(.../importQuestionsXml.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -6,12 +6,14 @@
 <%@ page import="org.lamsfoundation.lams.util.FileUtil" %>
 <c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
 <c:set var="tmpFileUploadId"><%=FileUtil.generateTmpFileUploadId()%></c:set>
+<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 
 <lams:html>
 <lams:head>
 	<title>x</title>
 	<lams:css/>
 	<link href="/lams/css/uppy.min.css" rel="stylesheet" type="text/css" />
+	<link href="/lams/css/uppy.custom.css" rel="stylesheet" type="text/css" />
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
Index: lams_central/web/questions/questionFile.jsp
===================================================================
diff -u -r3e28959f6da1a6b9ecb25e48ae70dd9fd7187a45 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 3e28959f6da1a6b9ecb25e48ae70dd9fd7187a45)
+++ lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -5,6 +5,7 @@
 <%@ page import="org.lamsfoundation.lams.util.FileUtil" %>
 <c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
 <c:set var="tmpFileUploadId"><%=FileUtil.generateTmpFileUploadId()%></c:set>
+<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 <c:set var="title" scope="request">
 	<c:choose>
 		<c:when test="${param.importType == 'word'}">
@@ -22,6 +23,7 @@
 
 	<lams:css />
 	<link href="/lams/css/uppy.min.css" rel="stylesheet" type="text/css" />
+	<link href="/lams/css/uppy.custom.css" rel="stylesheet" type="text/css" />
 	<style type="text/css">
 		.button {
 			float: right;
Index: lams_central/web/toolcontent/import.jsp
===================================================================
diff -u -rbc66c534c18e8e49ce8ed510418400cbc56fd605 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_central/web/toolcontent/import.jsp	(.../import.jsp)	(revision bc66c534c18e8e49ce8ed510418400cbc56fd605)
+++ lams_central/web/toolcontent/import.jsp	(.../import.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -13,6 +13,7 @@
 		
 		<lams:css />
 		<link href="/lams/css/uppy.min.css" rel="stylesheet" type="text/css" />
+		<link href="/lams/css/uppy.custom.css" rel="stylesheet" type="text/css" />
 		
 		<script type="text/javascript" src="/lams/includes/javascript/uppy/uppy.min.js"></script>
 		<c:choose>
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -r2075221a1ded34dce20b0793bf4bec55ec2ef628 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 2075221a1ded34dce20b0793bf4bec55ec2ef628)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -14,6 +14,7 @@
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/tabbedheader.jsp"%>
 		<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
+		<link href="${lams}css/uppy.custom.css" rel="stylesheet" type="text/css" />
 		
 		<script type="text/javascript" src="${lams}includes/javascript/uppy/uppy.min.js"></script>
 		<c:choose>
Index: lams_tool_forum/web/jsps/learning/create.jsp
===================================================================
diff -u -re9d4a85d791909ce45b65fce7d83830f07d472a5 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_tool_forum/web/jsps/learning/create.jsp	(.../create.jsp)	(revision e9d4a85d791909ce45b65fce7d83830f07d472a5)
+++ lams_tool_forum/web/jsps/learning/create.jsp	(.../create.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -19,6 +19,7 @@
 
 		<lams:css />
 		<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
+		<link href="${lams}css/uppy.custom.css" rel="stylesheet" type="text/css" />
 		
 		<style media="screen,projection" type="text/css">
 			.info {
Index: lams_tool_forum/web/jsps/learning/edit.jsp
===================================================================
diff -u -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_tool_forum/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
+++ lams_tool_forum/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -18,6 +18,7 @@
 		<!-- ********************  CSS ********************** -->
 		<lams:css />
 		<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
+		<link href="${lams}css/uppy.custom.css" rel="stylesheet" type="text/css" />
 		<style media="screen,projection" type="text/css">
 			.info {
 				margin: 10px;
Index: lams_tool_forum/web/jsps/learning/reply.jsp
===================================================================
diff -u -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
+++ lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -19,6 +19,7 @@
 
 		<lams:css />
 		<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
+		<link href="${lams}css/uppy.custom.css" rel="stylesheet" type="text/css" />
 		<style media="screen,projection" type="text/css">
 			.info {
 				margin: 10px;
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
+++ lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -15,6 +15,7 @@
 	<%@ include file="/common/tabbedheader.jsp"%>
 	<link href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />
 	<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
+	<link href="${lams}css/uppy.custom.css" rel="stylesheet" type="text/css" />
 
 	<script type="text/javascript">
 		<%-- used for  imageGalleryitem.js --%>
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -34,6 +34,7 @@
 	<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 	<c:set var="mediumImageDimensions" value="${sessionMap.mediumImageDimensions}" />
 	<c:set var="thumbnailImageDimensions" value="${empty sessionMap.thumbnailImageDimensions ? 100 : sessionMap.thumbnailImageDimensions}" />
+	<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 
 	<link rel="stylesheet" type="text/css" href="<lams:WebAppURL/>/includes/css/fotorama.css"/>
 	<link href="<lams:WebAppURL/>includes/css/imageGallery.css" rel="stylesheet" type="text/css">
@@ -42,6 +43,7 @@
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css">
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.pager.css">
 	<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
+	<link href="${lams}css/uppy.custom.css" rel="stylesheet" type="text/css" />
     
     <script type="text/javascript">
 		<%-- used for  imageGalleryitem.js --%>
Index: lams_tool_images/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
+++ lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -29,6 +29,7 @@
 		<link href="${lams}css/jquery.tablesorter.theme.bootstrap.css" rel="stylesheet" >
 		<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 		<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
+		<link href="${lams}css/uppy.custom.css" rel="stylesheet" type="text/css" />
 		<style media="screen,projection" type="text/css">
 			.tablesorter,.tablesorter tr {
 				border: 1px solid #ddd;
Index: lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp
===================================================================
diff -u -r326782acda142b33013dcb8a4b57ef62a5669914 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp	(.../addheader.jsp)	(revision 326782acda142b33013dcb8a4b57ef62a5669914)
+++ lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp	(.../addheader.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -14,6 +14,7 @@
  	<!-- ********************  CSS ********************** -->
 	<lams:css />
 	<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
+	<link href="${lams}css/uppy.custom.css" rel="stylesheet" type="text/css" />
 
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rf6744774b93b61f2dd2b6c15b5b53d4f10e0060c -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision f6744774b93b61f2dd2b6c15b5b53d4f10e0060c)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -11,6 +11,7 @@
 	
 	<lams:css suffix="jquery.jRating"/>
 	<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
+	<link href="${lams}css/uppy.custom.css" rel="stylesheet" type="text/css" />
 	<style media="screen,projection" type="text/css">
 	 	.item-panel {
 	 		margin: 15px;
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra74bc79078f642f3dfb7b086242478d71d7abe41 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a74bc79078f642f3dfb7b086242478d71d7abe41)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -145,7 +145,7 @@
 errors.required = {0} is required.
 errors.maxfilesize = Uploaded file exceeded maximum size: {0}
 label.add = Complete upload
-label.add.hint = Fill details above and click this button
+label.add.tip = Fill details above and click this button to finish adding a file
 label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity.
 label.users.from.group = Other learners in your group:
 label.refresh = Refresh
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -ra74bc79078f642f3dfb7b086242478d71d7abe41 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a74bc79078f642f3dfb7b086242478d71d7abe41)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -145,7 +145,7 @@
 errors.required = {0} is required.
 errors.maxfilesize = Uploaded file exceeded maximum size: {0}
 label.add = Complete upload
-label.add.hint = Fill details above and click this button
+label.add.tip = Fill details above and click this button to finish adding a file
 label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity.
 label.users.from.group = Other learners in your group:
 label.refresh = Refresh
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -ra74bc79078f642f3dfb7b086242478d71d7abe41 -r51902e5ec7e5e92493bdd4c6e58e211142b5f42e
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision a74bc79078f642f3dfb7b086242478d71d7abe41)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 51902e5ec7e5e92493bdd4c6e58e211142b5f42e)
@@ -8,13 +8,15 @@
 <c:set var="isUserLeader" value="${sessionMap.isUserLeader}"/>
 <c:set var="isLeadershipEnabled" value="${sessionMap.useSelectLeaderToolOuput}"/>
 <c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
+<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 <lams:html>
 <lams:head>
 		
 	<title><fmt:message key="tool.display.name" /></title>
 	<%@ include file="/common/header.jsp"%>
 	
-	<link href="/lams/css/uppy.min.css" rel="stylesheet" type="text/css" />
+	<link href="/lams/css/uppy.min.css"    rel="stylesheet" type="text/css" />
+	<link href="/lams/css/uppy.custom.css" rel="stylesheet" type="text/css" />
 	
 	<script type="text/javascript" src="${lams}/includes/javascript/uppy/uppy.min.js"></script>
 	<c:choose>
@@ -28,7 +30,7 @@
 			<script type="text/javascript" src="${lams}/includes/javascript/uppy/el_GR.min.js"></script>
 		</c:when>
 	</c:choose>
-		<lams:JSImport src="learning/includes/javascript/gate-check.js" />
+	<lams:JSImport src="learning/includes/javascript/gate-check.js" />
 		
 	<script type="text/javascript">
 		checkNextGateActivity('finishButton', '${sessionMap.toolSessionID}', '', finish);
@@ -44,7 +46,7 @@
 			$("time.timeago").timeago();
 			
 			if ($('#file-upload-area').length == 1) {
-				initFileUpload('${learnerForm.tmpFileUploadId}', '<lams:user property="localeLanguage"/>');
+				initFileUpload('${learnerForm.tmpFileUploadId}', '${language}');
 			}
 
 			<%-- Connect to command websocket only if it is learner UI --%>
@@ -63,7 +65,7 @@
 		/**
 		 * Initialise Uppy as the file upload widget
 		 */
-		function initFileUpload(tmpFileUploadId, singleFileUpload, language) {
+		function initFileUpload(tmpFileUploadId, language) {
 			  var uppyProperties = {
 				  // upload immediately 
 				  autoProceed: true,
@@ -111,7 +113,7 @@
 			  uppy.use(Uppy.Dashboard, {
 				  target: '#file-upload-area',
 				  inline: true,
-				  height: 300,
+				  height: 200,
 				  width: '100%',
 				  showProgressDetails : true,
 				  hideRetryButton : true,
@@ -416,7 +418,7 @@
 						<fmt:message key="label.learner.upload" />
 					</div>
 					
-					<div class="panel-body">
+					<div class="panel-body bg-success">
 						<div class="form-group">
 							<label for="file-upload-area"><fmt:message key="label.learner.filePath" />&nbsp;<span style="color: red">*</span></label>
 							
@@ -435,9 +437,9 @@
 						
 							<c:if test="${hasEditRight}">
 								<div class="form-group text-center">
-									<h4><fmt:message key="label.add.hint" /></h4>
 									<button id="uploadButton" type="submit" <c:if test="${sessionMap.finishLock || sessionMap.maxLimitReached}">disabled="disabled"</c:if>
-										class="btn btn-lg btn-default btn-primary btn-disable-on-submit">
+										class="btn btn-default btn-success btn-disable-on-submit"
+										title='<fmt:message key="label.add.tip" />' >
 										<i class="fa fa-xs fa-plus"></i> <fmt:message key="label.add" />
 									</button>
 								</div>