diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index 0ff017a..9e516a2 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -1,10 +1,12 @@
 <?php
 
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['versatilesearch_search'] = 'pages,recursive';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['versatilesearch_form'] = 'pages,recursive';
+TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin('WEBcoast.VersatileSearch', 'Search', 'LLL:EXT:versatile_search/Resources/Private/Language/backend.xlf:plugin.search.title', 'EXT:versatile_search/Resources/Public/Icons/Extension.svg', 'forms');
+TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin('WEBcoast.VersatileSearch', 'Form', 'LLL:EXT:versatile_search/Resources/Private/Language/backend.xlf:plugin.form.title', 'EXT:versatile_search/Resources/Public/Icons/Extension.svg', 'forms');
 
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['versatilesearch_search'] = 'pi_flexform';
-TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('versatilesearch_search', 'FILE:EXT:versatile_search/Configuration/FlexForm/search.xml');
+$GLOBALS['TCA']['tt_content']['types']['versatilesearch_search'] = $GLOBALS['TCA']['tt_content']['types']['list'];
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('tt_content', 'pi_flexform', 'versatilesearch_search', 'after:list_type');
+TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('', 'FILE:EXT:versatile_search/Configuration/FlexForm/search.xml', 'versatilesearch_search');
+$GLOBALS['TCA']['tt_content']['types']['versatilesearch_search']['showitem'] = preg_replace('/(?<=,)\s*(list_type|pages|recursive).*?,/', '', $GLOBALS['TCA']['tt_content']['types']['versatilesearch_search']['showitem']);
 
-TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin('WEBcoast.VersatileSearch', 'Search', 'LLL:EXT:versatile_search/Resources/Private/Language/backend.xlf:plugin.search.title');
-TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin('WEBcoast.VersatileSearch', 'Form', 'LLL:EXT:versatile_search/Resources/Private/Language/backend.xlf:plugin.form.title');
+$GLOBALS['TCA']['tt_content']['types']['versatilesearch_form'] = $GLOBALS['TCA']['tt_content']['types']['list'];
+$GLOBALS['TCA']['tt_content']['types']['versatilesearch_form']['showitem'] = preg_replace('/(?<=,)\s*(list_type|pages|recursive).*?,/', '', $GLOBALS['TCA']['tt_content']['types']['versatilesearch_form']['showitem']);
diff --git a/Configuration/TSConfig/Page/setup.tsconfig b/Configuration/TSConfig/Page/setup.tsconfig
new file mode 100644
index 0000000..776f2fd
--- /dev/null
+++ b/Configuration/TSConfig/Page/setup.tsconfig
@@ -0,0 +1,23 @@
+mod.wizards.newContentElement.wizardItems.forms {
+    elements {
+        versatilesearch_search {
+            title = LLL:EXT:versatile_search/Resources/Private/Language/backend.xlf:plugin.search.title
+            description = LLL:EXT:versatile_search/Resources/Private/Language/backend.xlf:plugin.search.description
+            iconIdentifier = versatile-search-plugin
+            tt_content_defValues {
+                CType = versatilesearch_search
+            }
+        }
+
+        versatilesearch_form {
+            title = LLL:EXT:versatile_search/Resources/Private/Language/backend.xlf:plugin.form.title
+            description = LLL:EXT:versatile_search/Resources/Private/Language/backend.xlf:plugin.form.description
+            iconIdentifier = versatile-search-plugin
+            tt_content_defValues {
+                CType = versatilesearch_form
+            }
+        }
+    }
+
+    show := addToList(versatilesearch_search, versatilesearch_form)
+}
diff --git a/ext_localconf.php b/ext_localconf.php
index dbdc3e4..b870617 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -1,7 +1,7 @@
 <?php
 
-TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin('WEBcoast.VersatileSearch', 'Search', [\WEBcoast\VersatileSearch\Controller\SearchController::class => 'search'], [\WEBcoast\VersatileSearch\Controller\SearchController::class => 'search']);
-TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin('WEBcoast.VersatileSearch', 'Form', [\WEBcoast\VersatileSearch\Controller\SearchController::class => 'form']);
+TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin('WEBcoast.VersatileSearch', 'Search', [\WEBcoast\VersatileSearch\Controller\SearchController::class => 'search'], [\WEBcoast\VersatileSearch\Controller\SearchController::class => 'search'], \TYPO3\CMS\Extbase\Utility\ExtensionUtility::PLUGIN_TYPE_CONTENT_ELEMENT);
+TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin('WEBcoast.VersatileSearch', 'Form', [\WEBcoast\VersatileSearch\Controller\SearchController::class => 'form'], [], \TYPO3\CMS\Extbase\Utility\ExtensionUtility::PLUGIN_TYPE_CONTENT_ELEMENT);
 
 $searchBackend = TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class)->get('versatile_search', 'search/backend');
 switch ($searchBackend) {
@@ -11,3 +11,13 @@
 
 $GLOBALS['TYPO3_CONF_VARS']['EXT']['versatile_search']['enrichResultItem'][1660903792] = \WEBcoast\VersatileSearch\Result\DataProcessorEnricher::class;
 $GLOBALS['TYPO3_CONF_VARS']['EXT']['versatile_search']['enrichResultItem'][1660909405] = \WEBcoast\VersatileSearch\Result\TypoScriptEnricher::class;
+
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('@import \'EXT:versatile_search/Configuration/TSConfig/Page/setup.tsconfig\'');
+
+\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class)->registerIcon(
+    'versatile-search-plugin',
+    \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
+    [
+        'source' => 'EXT:versatile_search/Resources/Public/Icons/Extension.svg'
+    ]
+);