diff --git a/typo3/sysext/core/Configuration/TCA/be_groups.php b/typo3/sysext/core/Configuration/TCA/be_groups.php
index b3f449022e2981c64e7bd1d3095ba1f5c7b702b0..000e7fcb2db4220fb69d0c6179b43face795aa21 100644
--- a/typo3/sysext/core/Configuration/TCA/be_groups.php
+++ b/typo3/sysext/core/Configuration/TCA/be_groups.php
@@ -71,13 +71,13 @@ return array(
                             'name' => 'wizard_edit',
                         ),
                         'popup_onlyOpenIfSelected' => 1,
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
+                        'icon' => 'actions-open',
                         'JSopenParams' => 'width=800,height=600,status=0,menubar=0,scrollbars=1'
                     ),
                     'add' => array(
                         'type' => 'script',
                         'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_add_title',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
+                        'icon' => 'actions-add',
                         'params' => array(
                             'table' => 'sys_filemounts',
                             'pid' => '0',
@@ -90,7 +90,7 @@ return array(
                     'list' => array(
                         'type' => 'script',
                         'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_list_title',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif',
+                        'icon' => 'actions-system-list-open',
                         'params' => array(
                             'table' => 'sys_filemounts',
                             'pid' => '0'
diff --git a/typo3/sysext/core/Configuration/TCA/be_users.php b/typo3/sysext/core/Configuration/TCA/be_users.php
index cfd6903d00193c34749b4788f5b7c59bac484145..b287cf79cd29f0925b79e7abac96b47fa4a959d8 100644
--- a/typo3/sysext/core/Configuration/TCA/be_users.php
+++ b/typo3/sysext/core/Configuration/TCA/be_users.php
@@ -79,13 +79,13 @@ return array(
                             'name' => 'wizard_edit',
                         ),
                         'popup_onlyOpenIfSelected' => 1,
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
+                        'icon' => 'actions-open',
                         'JSopenParams' => 'width=800,height=600,status=0,menubar=0,scrollbars=1'
                     ),
                     'add' => array(
                         'type' => 'script',
                         'title' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.usergroup_add_title',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
+                        'icon' => 'actions-add',
                         'params' => array(
                             'table' => 'be_groups',
                             'pid' => '0',
@@ -98,7 +98,7 @@ return array(
                     'list' => array(
                         'type' => 'script',
                         'title' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.usergroup_list_title',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif',
+                        'icon' => 'actions-system-list-open',
                         'params' => array(
                             'table' => 'be_groups',
                             'pid' => '0'
@@ -163,14 +163,14 @@ return array(
                         'module' => array(
                             'name' => 'wizard_edit',
                         ),
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
+                        'icon' => 'actions-open',
                         'popup_onlyOpenIfSelected' => 1,
                         'JSopenParams' => 'width=800,height=600,status=0,menubar=0,scrollbars=1'
                     ),
                     'add' => array(
                         'type' => 'script',
                         'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_add_title',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
+                        'icon' => 'actions-add',
                         'params' => array(
                             'table' => 'sys_filemounts',
                             'pid' => '0',
@@ -183,7 +183,7 @@ return array(
                     'list' => array(
                         'type' => 'script',
                         'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_list_title',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif',
+                        'icon' => 'actions-system-list-open',
                         'params' => array(
                             'table' => 'sys_filemounts',
                             'pid' => '0'
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php
index 7f808d4775a7d03b921ca972c4bb223d2502e108..677e2555a057977d8ed69f8be9044f4b8193ec0b 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php
@@ -168,14 +168,14 @@ return array(
                          'module' => array(
                              'name' => 'wizard_edit',
                          ),
-                         'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
+                         'icon' => 'actions-open',
                          'popup_onlyOpenIfSelected' => 1,
                          'JSopenParams' => 'width=800,height=600,status=0,menubar=0,scrollbars=1',
                      ),
                      'add' => array(
                          'type' => 'script',
                          'title' => 'Create new',
-                         'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
+                         'icon' => 'actions-add',
                          'params' => array(
                              'table'=>'fe_users',
                              'pid' => '###CURRENT_PID###',
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php
index 646d7b16ed412cbe18f3fb5442d1b683cfbd2ae0..9393e73533be6ba7a54e846f529f4967aa29b95f 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php
@@ -115,14 +115,14 @@ return array(
                          'module' => array(
                              'name' => 'wizard_edit',
                          ),
-                         'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
+                         'icon' => 'actions-open',
                          'popup_onlyOpenIfSelected' => 1,
                          'JSopenParams' => 'width=800,height=600,status=0,menubar=0,scrollbars=1',
                      ),
                      'add' => array(
                          'type' => 'script',
                          'title' => 'Create new',
-                         'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
+                         'icon' => 'actions-add',
                          'params' => array(
                              'table'=>'tx_blogexample_domain_model_person',
                              'pid' => '###CURRENT_PID###',
diff --git a/typo3/sysext/frontend/Configuration/TCA/sys_template.php b/typo3/sysext/frontend/Configuration/TCA/sys_template.php
index b631f0172966c225f8af18c80de9696db3a02ed5..b288019313248a73e7333a41a60587ce52b2ba73 100644
--- a/typo3/sysext/frontend/Configuration/TCA/sys_template.php
+++ b/typo3/sysext/frontend/Configuration/TCA/sys_template.php
@@ -160,13 +160,13 @@ return array(
                             'name' => 'wizard_edit',
                         ),
                         'popup_onlyOpenIfSelected' => 1,
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
+                        'icon' => 'actions-open',
                         'JSopenParams' => 'width=800,height=600,status=0,menubar=0,scrollbars=1'
                     ),
                     'add' => array(
                         'type' => 'script',
                         'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:sys_template.basedOn_add',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
+                        'icon' => 'actions-add',
                         'params' => array(
                             'table' => 'sys_template',
                             'pid' => '###CURRENT_PID###',