diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 66e2a2a5c..51e0c7672 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,4 +1,6 @@
 6.3.0
+ - Added a "Position" property to the DataForm Edit Field interface. This makes it easier to move a field to a certain position.
+ - Added the variables "record.edit.icon", "record.delete.url" and "record.delete.icon" to the DataForm DataList template.
  - Converted all confirmation pages to client-side confirmation dialogs. Saves
    a pageload. (Len Kranendonk).
  - Added a new, more user-friendly administrative console.
diff --git a/lib/WebGUI/Wobject/DataForm.pm b/lib/WebGUI/Wobject/DataForm.pm
index 8ff235e11..2ed2c20f3 100644
--- a/lib/WebGUI/Wobject/DataForm.pm
+++ b/lib/WebGUI/Wobject/DataForm.pm
@@ -246,6 +246,9 @@ sub getListTemplateVars {
 		push(@recordLoop,{
 			"record.ipAddress"=>$record->{ipAddress},
 			"record.edit.url"=>WebGUI::URL::page("func=view&entryId=".$record->{DataForm_entryId}."&wid=".$self->get("wobjectId")),
+			"record.edit.icon"=>editIcon(WebGUI::URL::page("func=view&entryId=".$record->{DataForm_entryId}."&wid=".$self->get("wobjectId"))),
+			"record.delete.url"=>WebGUI::URL::page("func=deleteEntry&entryId=".$record->{DataForm_entryId}."&wid=".$self->get("wobjectId")),
+			"record.delete.icon"=>deleteIcon(WebGUI::URL::page("func=deleteEntry&entryId=".$record->{DataForm_entryId}."&wid=".$self->get("wobjectId")),'',WebGUI::International::get('Delete entry confirmation',$self->get('namespace'))),
 			"record.username"=>$record->{username},
 			"record.userId"=>$record->{userId},
 			"record.submissionDate.epoch"=>$record->{submissionDate},
diff --git a/lib/WebGUI/i18n/English/DataForm.pm b/lib/WebGUI/i18n/English/DataForm.pm
index eb8db671b..eec20403b 100644
--- a/lib/WebGUI/i18n/English/DataForm.pm
+++ b/lib/WebGUI/i18n/English/DataForm.pm
@@ -623,7 +623,12 @@ A conditional indicating whether this field exists for the mail subsystem of the
 	'Field Position' => {
 		message =>q|Field Position|,
 		lastUpdated=>1095701013
-	}
+	},
+	'Delete entry confirmation' => {
+                message => q|Are you certain that you wish to delete this data entry?|,
+                lastUpdated => 1095701013 
+        },
+
 };
 
 1;