Index: t3lib/class.t3lib_iconworks.php
===================================================================
--- t3lib/class.t3lib_iconworks.php	(revision 7518)
+++ t3lib/class.t3lib_iconworks.php	(working copy)
@@ -788,12 +788,15 @@
 			if (!$iconName && in_array('tcarecords-' . $table . '-' . $recordType, self::$tcaSpriteIconNames)) {
 				$iconName = 'tcarecords-' . $table . '-' . $recordType;
 			}
-		} else {
+		}
+		
+		if (!$iconName) {
 			$iconName = $GLOBALS['TCA'][$table]['ctrl']['typeicon_classes'][0];
 			if (!$iconName && in_array('tcarecords-' . $table . '-default', self::$tcaSpriteIconNames)) {
 				$iconName = 'tcarecords-' . $table . '-default';
 			}
 		}
+		
 		return self::getSpriteIconClasses(($iconName ? $iconName : 'status-status-icon-missing'));
 	}
 
@@ -906,8 +909,6 @@
 		$parts = explode('-', $iconName);
 
 		if (count($parts) > 1) {
-				// will be something like "t3-icon-actions"
-			$cssClasses .= ' ' . ($baseCssClass . '-' . $parts[0]);
 				// will be something like "t3-icon-actions-document"
 			$cssClasses .= ' ' . ($baseCssClass . '-' . $parts[0] . '-' . $parts[1]);
 				// will be something like "t3-icon-document-new"
Index: t3lib/stddb/tables.php
===================================================================
--- t3lib/stddb/tables.php	(revision 7518)
+++ t3lib/stddb/tables.php	(working copy)
@@ -311,6 +311,10 @@
 			'0' => 'be_users.gif',
 			'1' => 'be_users_admin.gif'
 		),
+		'typeicon_classes' => array(
+			'0' => 'status-user-backend',
+			'1' => 'status-user-admin',
+		),
 		'mainpalette' => '1',
 		'useColumnsForDefaultValues' => 'usergroup,lockToDomain,options,db_mountpoints,file_mountpoints,fileoper_perms,userMods',
 		'dividers2tabs' => true,
@@ -340,6 +344,10 @@
 		'typeicons' => array(
 			'1' => 'be_groups_lists.gif'
 		),
+		'typeicon_classes' => array(
+			'0' => 'status-user-group-backend',
+			'1' => 'status-user-group-backend-list',
+		),
 		'enablecolumns' => array(
 			'disabled' => 'hidden'
 		),
@@ -393,6 +401,9 @@
 		'enablecolumns' => array(
 			'disabled' => 'hidden'
 		),
+		'typeicon_classes' => array(
+			'0' => 'mimetypes-x-content-language',
+		),
 		'dynamicConfigFile' => 'T3LIB:tbl_be.php',
 		'versioningWS_alwaysAllowLiveEdit' => TRUE
 	)
Index: typo3/sysext/cms/ext_tables.php
===================================================================
--- typo3/sysext/cms/ext_tables.php	(revision 7518)
+++ typo3/sysext/cms/ext_tables.php	(working copy)
@@ -741,6 +741,9 @@
 			'starttime' => 'starttime',
 			'endtime' => 'endtime'
 		),
+		'typeicon_classes' => array(
+			'0' => 'status-user-frontend',
+		),
 		'useColumnsForDefaultValues' => 'usergroup,lockToDomain,disable,starttime,endtime',
 		'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tbl_cms.php',
 		'dividers2tabs' => 1
@@ -764,6 +767,9 @@
 		'enablecolumns' => array (
 			'disabled' => 'hidden'
 		),
+		'typeicon_classes' => array(
+			'0' => 'status-user-group-frontend',
+		),
 		'title' => 'LLL:EXT:cms/locallang_tca.xml:fe_groups',
 		'useColumnsForDefaultValues' => 'lockToDomain',
 		'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tbl_cms.php',
@@ -786,6 +792,9 @@
 		'enablecolumns' => array (
 			'disabled' => 'hidden'
 		),
+		'typeicon_classes' => array(
+			'0' => 'mimetypes-x-content-domain',
+		),	
 		'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tbl_cms.php'
 	)
 );
@@ -809,6 +818,9 @@
 			'starttime' => 'starttime',
 			'endtime'   => 'endtime'
 		),
+		'typeicon_classes' => array(
+			'0' => 'mimetypes-x-content-page-language-overlay',
+		),
 		'transOrigPointerField'           => 'pid',
 		'transOrigPointerTable'           => 'pages',
 		'transOrigDiffSourceField'        => 'l18n_diffsource',