Index: typo3/class.db_list_extra.inc
===================================================================
--- typo3/class.db_list_extra.inc	(revision 3646)
+++ typo3/class.db_list_extra.inc	(working copy)
@@ -285,15 +285,29 @@
 		$this->fieldArray=array();
 			// title Column
 		$this->fieldArray[] = $titleCol;	// Add title column
-			// Control-Panel
-		if (!t3lib_div::inList($rowlist,'_CONTROL_'))	{
-			$this->fieldArray[] = '_CONTROL_';
-			$this->fieldArray[] = '_AFTERCONTROL_';
-		}
-			// Clipboard
-		if ($this->showClipboard)	{
-			$this->fieldArray[] = '_CLIPBOARD_';
-		}
+			
+		if($this->swapIconBlocks) {
+				// Clipboard
+			if ($this->showClipboard)	{
+				$this->fieldArray[] = '_CLIPBOARD_';
+				$this->fieldArray[] = '_AFTERCONTROL_';
+			}
+				// Control-Panel
+			if (!t3lib_div::inList($rowlist,'_CONTROL_'))	{
+				$this->fieldArray[] = '_CONTROL_';
+			}
+		} else {
+				// Control-Panel
+			if (!t3lib_div::inList($rowlist,'_CONTROL_'))	{
+				$this->fieldArray[] = '_CONTROL_';
+				$this->fieldArray[] = '_AFTERCONTROL_';
+			}
+				// Clipboard
+			if ($this->showClipboard)	{
+				$this->fieldArray[] = '_CLIPBOARD_';
+			}
+		}	
+		
 			// Ref
 		if (!$this->dontShowClipControlPanels)	{
 			$this->fieldArray[]='_REF_';
Index: typo3/db_list.php
===================================================================
--- typo3/db_list.php	(revision 3646)
+++ typo3/db_list.php	(working copy)
@@ -227,6 +227,7 @@
 		$dblist->tableTSconfigOverTCA = $this->modTSconfig['properties']['table.'];
 		$dblist->clickTitleMode = $this->modTSconfig['properties']['clickTitleMode'];
 		$dblist->alternateBgColors=$this->modTSconfig['properties']['alternateBgColors']?1:0;
+		$dblist->swapIconBlocks=$this->modTSconfig['properties']['swapIconBlocks']?1:0;
 		$dblist->allowedNewTables = t3lib_div::trimExplode(',', $this->modTSconfig['properties']['allowedNewTables'], 1);
 		$dblist->deniedNewTables = t3lib_div::trimExplode(',', $this->modTSconfig['properties']['deniedNewTables'], 1);
 		$dblist->newWizards=$this->modTSconfig['properties']['newWizards']?1:0;