diff --git a/code/controllers/CMSFileAddController.php b/code/controllers/CMSFileAddController.php
index ea7c5cb1..42273788 100644
--- a/code/controllers/CMSFileAddController.php
+++ b/code/controllers/CMSFileAddController.php
@@ -102,6 +102,11 @@ class CMSFileAddController extends LeftAndMain {
 			)
 		);
 		$form->loadDataFrom($folder);
+		
+		if($this->currentPageID()){
+		    // Make sure this controller know current folder when AJAX 'fileexists' is fired.
+		    $uploadField->setConfig('urlFileExists', Controller::join_links($uploadField->link('fileexists'), '?ID=' . $this->currentPageID()));
+		}
 
 		$this->extend('updateEditForm', $form);
 
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 672f794e..a67d020d 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -1247,7 +1247,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		$id = (isset($data['ID'])) ? (int) $data['ID'] : null;
 		$version = (isset($data['Version'])) ? (int) $data['Version'] : null;
 
-		$record = DataObject::get_by_id($this->stat('tree_class'), $id);
+		$record = Versioned::get_latest_version($this->stat('tree_class'), $id);
 		if($record && !$record->canEdit()) return Security::permissionFailure($this);
 
 		if($version) {
diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php
index 342ae63a..ddaeeac5 100755
--- a/code/model/SiteTree.php
+++ b/code/model/SiteTree.php
@@ -2837,7 +2837,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 		}
 		$flags = $this->getStatusFlags();
 		$treeTitle = sprintf(
-			"<span class=\"jstree-pageicon page-icon class-%s\"></span><span class=\"item\" data-allowedchildren=\"%s\">%s</span>",
+			"<span class=\"jstree-pageicon class-%s\"></span><span class=\"item\" data-allowedchildren=\"%s\">%s</span>",
 			Convert::raw2htmlid($this->class),
 			Convert::raw2att(Convert::raw2json($children)),
 			Convert::raw2xml(str_replace(array("\n","\r"),"",$this->MenuTitle))
diff --git a/javascript/CMSMain.EditForm.js b/javascript/CMSMain.EditForm.js
index 3d92f5f3..79925ff0 100644
--- a/javascript/CMSMain.EditForm.js
+++ b/javascript/CMSMain.EditForm.js
@@ -254,8 +254,7 @@
 		 *
 		 * A "rollback" to a specific version needs user confirmation.
 		 */
-		$('.cms-edit-form .Actions #Form_EditForm_action_rollback').entwine({
-			
+		$('.cms-edit-form .Actions #Form_EditForm_action_doRollback').entwine({
 			/**
 			 * Function: onclick
 			 *