diff --git a/admin/css/screen.css b/admin/css/screen.css
index 681a35232..f99e9c6e3 100644
--- a/admin/css/screen.css
+++ b/admin/css/screen.css
@@ -325,7 +325,7 @@ body.cms { overflow: hidden; }
 .message.notice a { color: #999; }
 .message.warning { background-color: #ffbe66; border-color: #ff9300; }
 .message.error, .message.bad, .message.required { background-color: #ffbe66; border-color: #ff9300; }
-.message.good { background-color: rgba(101, 168, 57, 0.7); border-color: #65a839; color: #fff; text-shadow: 1px -1px 0 #1f9433; -moz-border-radius: 3px 3px 3px 3px; -webkit-border-radius: 3px 3px 3px 3px; -o-border-radius: 3px 3px 3px 3px; -ms-border-radius: 3px 3px 3px 3px; -khtml-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; }
+.message.good { background-color: #65a839; background-color: rgba(101, 168, 57, 0.7); border-color: #65a839; color: #fff; text-shadow: 1px -1px 0 #1f9433; -moz-border-radius: 3px 3px 3px 3px; -webkit-border-radius: 3px 3px 3px 3px; -o-border-radius: 3px 3px 3px 3px; -ms-border-radius: 3px 3px 3px 3px; -khtml-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; }
 .message p { margin: 0; }
 
 /** -------------------------------------------- "Add page" dialog -------------------------------------------- */
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
index 685bc6369..f93069e37 100644
--- a/admin/scss/_style.scss
+++ b/admin/scss/_style.scss
@@ -418,6 +418,7 @@ body.cms {
 	}
 	
 	&.good {
+		background-color: $color-good;//for browsers that don't understand rgba
 		background-color: rgba($color-good,0.7);
 		border-color: $color-good;
 		color:#fff;
diff --git a/images/upload.png b/images/upload.png
new file mode 100644
index 000000000..3a319ff14
Binary files /dev/null and b/images/upload.png differ
diff --git a/javascript/UploadField_downloadtemplate.js b/javascript/UploadField_downloadtemplate.js
index ff6716fc7..86472f818 100644
--- a/javascript/UploadField_downloadtemplate.js
+++ b/javascript/UploadField_downloadtemplate.js
@@ -6,10 +6,11 @@ window.tmpl.cache['ss-uploadfield-downloadtemplate'] = tmpl(
 			'</span></div>' +
 			'<div class="ss-uploadfield-item-info">' +
 				'<label class="ss-uploadfield-item-name">' + 
-					'<b>{%=file.name%}</b> ' + 
-					'<span>{%=o.formatFileSize(file.size)%}</span>' +
-					'{% if (file.error) { %}' +
-						'<span class="ss-uploadfield-item-status ui-state-error-text">{%=o.options.errorMessages[file.error] || file.error%}</span>' + 
+					'<span class="name">{%=file.name%}</span> ' + 
+					'{% if (!file.error) { %}' +
+						'<div class="ss-uploadfield-item-status ui-state-success-text">Uploaded</div>' +						
+					'{% } else {  %}' +
+							'<div class="ss-uploadfield-item-status ui-state-error-text">{%=o.options.errorMessages[file.error].substring(0,25) || file.error.substring(0,25)%}</div>' + 
 					'{% } %}' + 
 					'<div class="clear"><!-- --></div>' + 
 				'</label>' +
diff --git a/javascript/UploadField_uploadtemplate.js b/javascript/UploadField_uploadtemplate.js
index ded445ee5..6b5b8a76f 100644
--- a/javascript/UploadField_uploadtemplate.js
+++ b/javascript/UploadField_uploadtemplate.js
@@ -4,12 +4,11 @@ window.tmpl.cache['ss-uploadfield-uploadtemplate'] = tmpl(
 			'<div class="ss-uploadfield-item-preview preview"><span></span></div>' +
 			'<div class="ss-uploadfield-item-info">' +
 				'<label class="ss-uploadfield-item-name">' + 
-					'<b>{% if (file.name) { %}{%=file.name%}{% } else { %}' + ss.i18n._t('UploadField.NOFILENAME', 'Untitled') + '{% } %}</b> ' + 
-					'<span>{%=o.formatFileSize(file.size)%}</span>' +
-					'{% if (file.error) { %}' +
-						'<span class="ss-uploadfield-item-status ui-state-error-text">{%=o.options.errorMessages[file.error] || file.error%}</span>' + 
-					'{% } else { %}' +
-						'<span class="ss-uploadfield-item-status">0%</span>' +
+					'<span class="name">{% if (file.name) { %}{%=file.name%}{% } else { %}' + ss.i18n._t('UploadField.NOFILENAME', 'Untitled') + '{% } %}</span> ' + 
+					'{% if (!file.error) { %}' +
+						'<div class="ss-uploadfield-item-status">0%</div>' +						
+					'{% } else {  %}' +
+						'<div class="ss-uploadfield-item-status ui-state-error-text">{%=o.options.errorMessages[file.error].substring(0,25) || file.error.substring(0,25)%}</div>' + 
 					'{% } %}' + 
 					'<div class="clear"><!-- --></div>' + 
 				'</label>' +
@@ -25,4 +24,5 @@ window.tmpl.cache['ss-uploadfield-uploadtemplate'] = tmpl(
 			'</div>' +
 		'</li>' + 
 	'{% } %}'
-);
\ No newline at end of file
+);
+
diff --git a/templates/AssetUploadField.ss b/templates/AssetUploadField.ss
index bddf10e25..c6052496b 100644
--- a/templates/AssetUploadField.ss
+++ b/templates/AssetUploadField.ss
@@ -36,13 +36,11 @@
 	</h3>
 	<div class="fileOverview">
 		<div class="uploadStatus">
-			<div class="state started"><% _t('AssetUploadField.UPLOADINPROGRESS', 'Please wait… upload in progress') %></div>
-			<div class="state completed" style="display:none;"><% _t('AssetUploadField.FILEUPLOADCOMPLETED', 'File Upload Completed!') %></div>
-			
+			<div class="state"><% _t('AssetUploadField.UPLOADINPROGRESS', 'Please wait… upload in progress') %></div>
 			<div class="details"><% _t('AssetUploadField.TOTAL', 'Total') %>: <span class="total"></span> <% _t('AssetUploadField.FILES', 'Files') %> <span class="fileSize"></span> </div>
 		</div>		
 		<div class="ss-uploadfield-item-actions">
-		<button class="ss-uploadfield-item-edit-all ss-ui-button ui-corner-all" title="<% _t('AssetUploadField.EDITINFO', 'Edit files') %>">
+		<button class="ss-uploadfield-item-edit-all ss-ui-button ui-corner-all" title="<% _t('AssetUploadField.EDITINFO', 'Edit files') %>" style="display:none;">
 			<% _t('AssetUploadField.EDITALL', 'Edit all') %>
 			<span class="toggle-details">
 				<span class="toggle-details-icon"></span>
diff --git a/templates/Includes/UploadField_FileButtons.ss b/templates/Includes/UploadField_FileButtons.ss
index bf00859b5..1f0f6242c 100644
--- a/templates/Includes/UploadField_FileButtons.ss
+++ b/templates/Includes/UploadField_FileButtons.ss
@@ -1,9 +1,17 @@
 <% if canEdit %>
-	<button class="ss-uploadfield-item-edit ss-ui-button ui-corner-all" title="<% _t('UploadField.EDITINFO', 'Edit this file') %>" data-icon="pencil"><% _t('UploadField.EDIT', 'Edit') %></button>
+	<button class="ss-uploadfield-item-edit ss-ui-button ui-corner-all" title="<% _t('UploadField.EDITINFO', 'Edit this file') %>" data-icon="pencil">
+	<% _t('UploadField.EDIT', 'Edit') %>
+	<span class="toggle-details">
+		<span class="toggle-details-icon"></span>
+	</span>
+
+	</button>
 	<% if UploadFieldHasRelation %>
-	<button data-href="$UploadFieldRemoveLink" class="ss-uploadfield-item-remove ss-ui-button ui-corner-all" title="<% _t('UploadField.REMOVEINFO', 'Remove this file from here, but do not delete it from the file store') %>" data-icon="plug-disconnect-prohibition"><% _t('UploadField.REMOVE', 'Remove') %></button>
+	<button data-href="$UploadFieldRemoveLink" class="ss-uploadfield-item-remove ss-ui-button ui-corner-all" title="<% _t('UploadField.REMOVEINFO', 'Remove this file from here, but do not delete it from the file store') %>" data-icon="plug-disconnect-prohibition">
+	<% _t('UploadField.REMOVE', 'Remove') %></button>
 <% end_if %>
 <% end_if %>
 <% if canDelete %>
 	<button data-href="$UploadFieldDeleteLink" class="ss-uploadfield-item-delete ss-ui-button ui-corner-all" title="<% _t('UploadField.DELETEINFO', 'Permanently delete this file from the file store') %>" data-icon="minus-circle"><% _t('UploadField.DELETE', 'Delete from files') %></button>
-<% end_if %>
\ No newline at end of file
+<% end_if %>
+