diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 2dfa374c..75bbcdd5 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -45,7 +45,6 @@ class AssetAdmin extends LeftAndMain {
 		'getfile',
 		'getsubtree',
 		'movemarked',
-		'removefile',
 		'save',
 		'savefile',
 		'uploadiframe',
@@ -110,7 +109,7 @@ JS
 		
 		CMSBatchActionHandler::register('delete', 'AssetAdmin_DeleteBatchAction', 'Folder');
 	}
-	
+		
 	/**
 	 * Show the content of the upload iframe.  The form is specified by a template.
 	 */
@@ -609,29 +608,6 @@ JS;
 		return $form;
 	}
 		
-	public function removefile(){
-		if($fileID = $this->urlParams['ID']) {
-			$file = DataObject::get_by_id('File', $fileID);
-			// Delete the temp verions of this file in assets/_resampled
-			if($file instanceof Image) {
-				$file->deleteFormattedImages();
-			}
-			$file->delete();
-			$file->destroy();
-			
-			if(Director::is_ajax()) {
-				echo <<<JS
-				$('Form_EditForm_Files').removeFile($fileID);
-				statusMessage('removed file', 'good');
-JS;
-			} else {
-				Director::redirectBack();
-			}
-		} else {
-			user_error("AssetAdmin::removefile: Bad parameters: File=$fileID", E_USER_ERROR);
-		}
-	}
-	
 	/**
 	 * @return Form
 	 */
diff --git a/code/CMSMain.php b/code/CMSMain.php
index 5c7142ca..a7de6db9 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -323,7 +323,7 @@ JS;
 	public function getEditForm($id = null) {
 		// Include JavaScript to ensure HtmlEditorField works.
 		HtmlEditorField::include_js();
-		
+
 		if(!$id) $id = $this->currentPageID();
 
 		$record = ($id) ? $this->getRecord($id) : null;
diff --git a/javascript/AssetTableField.js b/javascript/AssetTableField.js
index 57027f7d..6f0cca19 100644
--- a/javascript/AssetTableField.js
+++ b/javascript/AssetTableField.js
@@ -14,7 +14,8 @@ AssetTableField.prototype = {
 					'ctf[ID]' : true,
 					'FileFilterButton' : true,
 					'FileFieldName' : true,
-					'FileSearch' : true
+					'FileSearch' : true,
+					'Files[]' : true
 				}
 			}
 		});
@@ -135,35 +136,4 @@ MarkingPropertiesButton.prototype = {
 		}
 		return false;
 	}
-}
-
-Behaviour.register({
-	'#Form_EditForm_Files': {
-		removeFile : function(fileID) {
-			var record;
-			if(record = $('record-' + fileID)) {
-				record.parentNode.removeChild(record);
-			} 
-		}
-	},	
-	
-	'#Form_EditForm_Files a.deletelink' : {
-		onclick : function(event) {
-			// Send request
-			new Ajax.Request(this.href + (this.href.indexOf("?") == -1 ? "?" : "&") + "ajax=1", {
-				method : 'get',
-				onSuccess : Ajax.Evaluator,
-				onFailure : function(response) {errorMessage('Server Error', response);}
-			});
-			Event.stop(event);
-			return false;
-		}
-	},
-	
-	
-	'#Form_EditForm' : {
-		changeDetection_fieldsToIgnore : {
-			'Files[]' : true
-		}
-	}
-});
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/templates/Includes/AssetTableField.ss b/templates/Includes/AssetTableField.ss
index 2b205f1f..eaf93122 100755
--- a/templates/Includes/AssetTableField.ss
+++ b/templates/Includes/AssetTableField.ss
@@ -18,40 +18,15 @@
 		<tbody>
 			<% if Items %>
 				<% control Items %>
-					<tr id="record-$Parent.Name-$ID">
-						<td class="dragfile" id="drag-$Parent.Name-$ID">
-							<img id="drag-img-$Parent.Name-$ID" alt="Drag" title="<% _t('DRAGTOFOLDER','Drag to folder on left to move file') %>" src="sapphire/images/drag.gif" />
-						</div>
-						<% if Markable %><td class="markingcheckbox">$MarkingCheckbox</td><% end_if %>
-						<% control Fields %>
-						<td>$Value</td>
-						<% end_control %>
-						<% if Can(show) %>
-						<td width="18" class="action">
-							<a class="popuplink showlink" href="$ShowLink" target="_blank" title="<% _t('SHOW', 'Show asset') %>"><img src="cms/images/show.png" alt="<% _t('SHOW', 'Show asset') %>" /></a>
-						</td>
-						<% end_if %>
-						<% if Can(edit) %>
-							<td width="18" class="action">
-								<a class="popuplink editlink" href="$EditLink" target="_blank" title="<% _t('EDIT', 'Edit asset') %>"><img src="cms/images/edit.gif" alt="<% _t('EDIT', 'Edit asset') %>" /></a>
-							</td>
-						<% end_if %>
-						<% if Can(delete) %>
-						<td width="18" class="action">
-							<a class="deletelink" href="admin/assets/removefile/$ID" title="<% _t('DELFILE', 'Delete this file') %>"><img src="cms/images/delete.gif" alt="<% _t('DELFILE', 'Delete this file') %>" title="<% _t('DELFILE','Delete this file') %>" /></a>
-						</td>
-						<% end_if %>
-					</tr>
+					<% include AssetTableField_Item %>
 				<% end_control %>
 			<% else %>
-				<tr class="notfound"> 
-					<td>&nbsp;</td> 
-					<% if Markable %><td width="18">&nbsp;</td><% end_if %> 
-					<td colspan="$Headings.Count"><i>No $NamePlural found</i></td> 
-					<% if Can(show) %><td width="18">&nbsp;</td><% end_if %> 
-					<% if Can(edit) %><td width="18">&nbsp;</td><% end_if %> 
-					<% if Can(delete) %><td width="18">&nbsp;</td><% end_if %> 
-				</tr> 
+				<tr class="notfound">
+					<td></td>
+					<% if Markable %><th width="18">&nbsp;</th><% end_if %>
+					<td colspan="$Headings.Count"><i><% _t('NOITEMSFOUND','No items found') %></i></td>
+					<% if Can(delete) %><td width="18">&nbsp;</td><% end_if %>
+				</tr>
 			<% end_if %>
 		</tbody>
 	</table>
diff --git a/templates/Includes/AssetTableField_Item.ss b/templates/Includes/AssetTableField_Item.ss
new file mode 100644
index 00000000..e90ecc9e
--- /dev/null
+++ b/templates/Includes/AssetTableField_Item.ss
@@ -0,0 +1,22 @@
+<tr id="record-$Parent.id-$ID"<% if HighlightClasses %> class="$HighlightClasses"<% end_if %>>
+	<td class="dragfile" id="drag-$Parent.Name-$ID">
+		<img id="drag-img-$Parent.Name-$ID" alt="Drag" title="<% _t('DRAGTOFOLDER','Drag to folder on left to move file') %>" src="sapphire/images/drag.gif" />
+	</div>
+	<% if Markable %><td class="markingcheckbox">$MarkingCheckbox</td><% end_if %>
+	<% control Fields %>
+	<td class="field-$Title.HTMLATT $FirstLast $Name">$Value</td>
+	<% end_control %>
+	<% control Actions %>
+		<td width="16">
+			<% if IsAllowed %>
+			<a class="$Class" href="$Link">
+				<% if Icon %><img src="$Icon" alt="$Label" /><% else %>$Label<% end_if %>
+			</a>
+			<% else %>
+				<span class="disabled">
+					<% if IconDisabled %><img src="$IconDisabled" alt="$Label" /><% else %>$Label<% end_if %>
+				</span>
+			<% end_if %>
+		</td>
+	<% end_control %>
+</tr>
\ No newline at end of file