Index: includes/ProtectionForm.php
===================================================================
--- includes/ProtectionForm.php	(revision 58195)
+++ includes/ProtectionForm.php	(working copy)
@@ -318,6 +318,10 @@
 			Xml::openElement( 'tbody' );
 
 		foreach( $this->mRestrictions as $action => $selected ) {
+			// Special case: apply upload protection only on images
+			if ( $action == 'upload' && $this->mTitle->getNamespace() != NS_FILE )
+				continue;
+			
 			/* Not all languages have V_x <-> N_x relation */
 			$msg = wfMsg( 'restriction-' . $action );
 			if( wfEmptyMsg( 'restriction-' . $action, $msg ) ) {
@@ -547,8 +551,8 @@
 		}
 		$script .= "[" . implode(',',$CascadeableLevels) . "];\n";
 		$options = (object)array(
-			'tableId' => 'mw-protect-table-move',
-			'labelText' => wfMsg( 'protect-unchain' ),
+			'tableId' => 'mwProtectSet',
+			'labelText' => wfMsg( 'protect-unchain2' ),
 			'numTypes' => count($this->mApplicableTypes),
 			'existingMatch' => 1 == count( array_unique( $this->mExistingExpiry ) ),
 		);
Index: languages/messages/MessagesEn.php
===================================================================
--- languages/messages/MessagesEn.php	(revision 58195)
+++ languages/messages/MessagesEn.php	(working copy)
@@ -2742,7 +2742,7 @@
 'protectexpiry'               => 'Expires:',
 'protect_expiry_invalid'      => 'Expiry time is invalid.',
 'protect_expiry_old'          => 'Expiry time is in the past.',
-'protect-unchain'             => 'Unlock move permissions',
+'protect-unchain2'            => 'Unlock further permissions',
 'protect-text'                => "You may view and change the protection level here for the page '''<nowiki>$1</nowiki>'''.",
 'protect-locked-blocked'      => "You cannot change protection levels while blocked.
 Here are the current settings for the page '''$1''':",
Index: maintenance/language/messages.inc
===================================================================
--- maintenance/language/messages.inc	(revision 58195)
+++ maintenance/language/messages.inc	(working copy)
@@ -1809,7 +1809,7 @@
 		'protectexpiry',
 		'protect_expiry_invalid',
 		'protect_expiry_old',
-		'protect-unchain',
+		'protect-unchain2',
 		'protect-text',
 		'protect-locked-blocked',
 		'protect-locked-dblock',
Index: skins/common/protect.js
===================================================================
--- skins/common/protect.js	(revision 58195)
+++ skins/common/protect.js	(working copy)
@@ -22,7 +22,7 @@
 		
 		var boxbody = box.getElementsByTagName('tbody')[0]
 		var row = document.createElement( 'tr' );
-		boxbody.insertBefore( row, boxbody.firstChild );
+		boxbody.insertBefore( row, boxbody.firstChild.nextSibling );
 
 		this.existingMatch = opts.existingMatch;