diff --git a/Configuration/FlexForms/DateList.xml b/Configuration/FlexForms/DateList.xml
index e971c51..8c9f409 100644
--- a/Configuration/FlexForms/DateList.xml
+++ b/Configuration/FlexForms/DateList.xml
@@ -13,6 +13,7 @@
                             <label>Sort By</label>
                             <config>
                                 <type>select</type>
+                                <renderType>selectSingle</renderType>
                                 <items type="array">
                                     <numIndex index="0" type="array">
                                         <numIndex index="0">Start</numIndex>
@@ -33,6 +34,7 @@
                             <label>Sort Order</label>
                             <config>
                                 <type>select</type>
+                                <renderType>selectSingle</renderType>
                                 <items type="array">
                                     <numIndex index="0" type="array">
                                         <numIndex index="0">
@@ -128,6 +130,7 @@
                         <label>Layout option</label>
                         <config>
                             <type>select</type>
+                            <renderType>selectSingle</renderType>
                             <items type="array">
                                 <numIndex index="0" type="array">
                                     <numIndex index="0">Default</numIndex>
@@ -164,11 +167,12 @@
                             <label>Region</label>
                             <config>
                                 <type>select</type>
+                                <renderType>selectSingle</renderType>
                                 <foreign_table>tx_events_domain_model_region</foreign_table>
                                 <foreign_table_where>AND tx_events_domain_model_region.deleted = 0 AND tx_events_domain_model_region.hidden = 0</foreign_table_where>
-                                <size>3</size>
+                                <size>1</size>
                                 <minitems>0</minitems>
-                                <maxitems>2</maxitems>
+                                <maxitems>1</maxitems>
                             </config>
                         </TCEforms>
                     </settings.region>
@@ -179,6 +183,7 @@
                             <label>Combination</label>
                             <config>
                                 <type>select</type>
+                                <renderType>selectSingle</renderType>
                                 <items type="array">
                                     <numIndex index="0" type="array">
                                         <numIndex index="0">And</numIndex>
@@ -202,6 +207,7 @@
                             </label>
                             <config>
                                 <type>select</type>
+                                <renderType>selectTree</renderType>
                                 <autoSizeMax>20</autoSizeMax>
                                 <foreign_table>sys_category</foreign_table>
                                 <foreign_table_where> AND sys_category.sys_language_uid IN (-1, 0) ORDER BY sys_category.title ASC</foreign_table_where>
@@ -233,4 +239,4 @@
             </ROOT>
         </sConstrains>
     </sheets>
-</T3DataStructure>
\ No newline at end of file
+</T3DataStructure>
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index b0fb92b..e52eb3a 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -8,7 +8,7 @@ call_user_func(function () {
         'Events',
         'Pi1',
         'Events Plugin',
-        'EXT:events/Resources/Public/Icons/user_plugin_events.svg'
+        'EXT:events/Resources/Public/Icons/Extension.svg'
     );
 
     $pluginSignature = 'events_pi1';
@@ -26,7 +26,7 @@ call_user_func(function () {
         'Events',
         'DateSearch',
         'Events: Date Search',
-        'EXT:events/Resources/Public/Icons/user_plugin_events.svg'
+        'EXT:events/Resources/Public/Icons/Extension.svg'
     );
 
     $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['events_datesearch'] = 'pi_flexform';
@@ -42,7 +42,7 @@ call_user_func(function () {
         'Events',
         'DateList',
         'Events: Date List',
-        'EXT:events/Resources/Public/Icons/user_plugin_events.svg'
+        'EXT:events/Resources/Public/Icons/Extension.svg'
     );
 
     $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['events_datelist'] = 'pi_flexform';
@@ -58,7 +58,7 @@ call_user_func(function () {
         'Events',
         'DateShow',
         'Events: Date Show',
-        'EXT:events/Resources/Public/Icons/user_plugin_events.svg'
+        'EXT:events/Resources/Public/Icons/Extension.svg'
     );
 
     $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['events_dateshow'] = 'pi_flexform';
@@ -75,7 +75,7 @@ call_user_func(function () {
         'Events',
         'Selected',
         'Events: Show selected',
-        'EXT:events/Resources/Public/Icons/user_plugin_events.svg'
+        'EXT:events/Resources/Public/Icons/Extension.svg'
     );
 
     $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['events_selected'] = 'pi_flexform';
diff --git a/Configuration/TCA/Overrides/tx_events_domain_model_event.php b/Configuration/TCA/Overrides/tx_events_domain_model_event.php
index cd6e18b..9e75ded 100644
--- a/Configuration/TCA/Overrides/tx_events_domain_model_event.php
+++ b/Configuration/TCA/Overrides/tx_events_domain_model_event.php
@@ -3,7 +3,7 @@
 defined('TYPO3') or die();
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::makeCategorizable(
-    'dd_events',
+    'events',
     'tx_events_domain_model_event',
     'categories',
     [
diff --git a/Configuration/TCA/tx_events_domain_model_date.php b/Configuration/TCA/tx_events_domain_model_date.php
index 1aa1f5c..3f8636d 100644
--- a/Configuration/TCA/tx_events_domain_model_date.php
+++ b/Configuration/TCA/tx_events_domain_model_date.php
@@ -20,7 +20,7 @@ return [
             'endtime' => 'endtime',
         ],
         'searchFields' => '',
-        'iconfile' => 'EXT:events/Resources/Public/Icons/tx_events_domain_model_date.gif'
+        'iconfile' => 'EXT:events/Resources/Public/Icons/tx_events_domain_model_date.svg'
     ],
     'types' => [
         '1' => ['showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, start, end, canceled, event, --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access, starttime, endtime'],
diff --git a/Configuration/TCA/tx_events_domain_model_event.php b/Configuration/TCA/tx_events_domain_model_event.php
index ed72bbf..3900e2e 100644
--- a/Configuration/TCA/tx_events_domain_model_event.php
+++ b/Configuration/TCA/tx_events_domain_model_event.php
@@ -19,7 +19,7 @@ return [
             'endtime' => 'endtime',
         ],
         'searchFields' => 'title,global_id,slug,teaser,details,price_info,street,district,city,zip,country,web,booking,ticket,facebook,youtube,latitude,longitude',
-        'iconfile' => 'EXT:events/Resources/Public/Icons/tx_events_domain_model_event.gif'
+        'iconfile' => 'EXT:events/Resources/Public/Icons/tx_events_domain_model_event.svg'
     ],
     'types' => [
         '1' => ['showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title, global_id, slug, highlight, teaser, details, price_info, name, street, district, city, zip, country, phone, web, ticket, facebook, youtube, instagram, latitude, longitude, images, pages, categories, dates, organizer, region, partner, --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access, starttime, endtime'],
diff --git a/Configuration/TCA/tx_events_domain_model_organizer.php b/Configuration/TCA/tx_events_domain_model_organizer.php
index 3893357..b3b80c0 100644
--- a/Configuration/TCA/tx_events_domain_model_organizer.php
+++ b/Configuration/TCA/tx_events_domain_model_organizer.php
@@ -17,7 +17,7 @@ return [
             'endtime' => 'endtime',
         ],
         'searchFields' => 'name,street,district,city,zip,phone,web,email',
-        'iconfile' => 'EXT:events/Resources/Public/Icons/tx_events_domain_model_organizer.gif'
+        'iconfile' => 'EXT:events/Resources/Public/Icons/tx_events_domain_model_organizer.svg'
     ],
     'types' => [
         '1' => ['showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, street, district, city, zip, phone, web, email, --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access, starttime, endtime'],
@@ -184,6 +184,6 @@ return [
                 'eval' => 'trim'
             ],
         ],
-    
+
     ],
 ];
diff --git a/Configuration/TCA/tx_events_domain_model_partner.php b/Configuration/TCA/tx_events_domain_model_partner.php
index 88320c3..e4e142c 100644
--- a/Configuration/TCA/tx_events_domain_model_partner.php
+++ b/Configuration/TCA/tx_events_domain_model_partner.php
@@ -17,7 +17,7 @@ return [
             'disabled' => 'hidden',
         ],
         'searchFields' => 'title',
-        'iconfile' => 'EXT:events/Resources/Public/Icons/tx_events_domain_model_partner.gif'
+        'iconfile' => 'EXT:events/Resources/Public/Icons/tx_events_domain_model_partner.svg'
     ],
     'types' => [
         '1' => ['showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title, link, images, --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access'],
diff --git a/Configuration/TCA/tx_events_domain_model_region.php b/Configuration/TCA/tx_events_domain_model_region.php
index 027904e..822b513 100644
--- a/Configuration/TCA/tx_events_domain_model_region.php
+++ b/Configuration/TCA/tx_events_domain_model_region.php
@@ -17,7 +17,7 @@ return [
             'endtime' => 'endtime',
         ],
         'searchFields' => 'title',
-        'iconfile' => 'EXT:events/Resources/Public/Icons/tx_events_domain_model_region.gif'
+        'iconfile' => 'EXT:events/Resources/Public/Icons/tx_events_domain_model_region.svg'
     ],
     'types' => [
         '1' => ['showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title, --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access, starttime, endtime'],
@@ -121,6 +121,6 @@ return [
                 'eval' => 'trim'
             ],
         ],
-    
+
     ],
 ];
diff --git a/Resources/Public/Icons/Extension.svg b/Resources/Public/Icons/Extension.svg
index ec1bdec..f0baaf6 100644
--- a/Resources/Public/Icons/Extension.svg
+++ b/Resources/Public/Icons/Extension.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 83.1 84.17"><title>Extension</title><path d="M106.07,100.13a11.56,11.56,0,0,1-3.55.51c-10.69,0-26.39-37.36-26.39-49.79,0-4.58,1.08-6.1,2.61-7.42C65.67,45,50,49.75,44.95,55.86a12.21,12.21,0,0,0-1.74,7c0,19.41,20.72,63.45,35.33,63.45,6.76,0,18.16-11.11,27.54-26.17" transform="translate(-43.2 -42.12)" style="fill:#ff8700"/><path d="M99.25,42.12c13.52,0,27,2.18,27,9.81,0,15.48-9.82,34.25-14.83,34.25-8.94,0-20.07-24.87-20.07-37.3,0-5.67,2.18-6.76,7.85-6.76" transform="translate(-43.2 -42.12)" style="fill:#ff8700"/></svg>
\ No newline at end of file
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><rect width="16" height="16" fill="#f18519"/><polygon points="9.348 13.939 7.736 13.348 6.403 12.431 4.837 12.323 3.438 11.883 6.98 1.703 8.072 2.083 9.475 3.241 11.293 3.203 12.89 3.759 9.348 13.939" fill="#fff"/><line x1="5.56817" y1="9.89512" x2="6.60766" y2="10.25681" fill="#f18519" stroke="#f18519" stroke-linecap="round" stroke-miterlimit="10" stroke-width="0.5"/><line x1="7.75059" y1="10.65449" x2="8.76597" y2="11.00779" fill="#f18519" stroke="#f18519" stroke-linecap="round" stroke-miterlimit="10" stroke-width="0.5"/><path d="M8.42341,1.942,6.73947,1.3561l-3.725,10.70565,1.81686.63217A1.61336,1.61336,0,0,1,7.424,13.596l1.98114.68933,3.725-10.70565-2.01139-.69985A1.59583,1.59583,0,0,1,8.42341,1.942Z" fill="none" stroke="#fff" stroke-miterlimit="10" stroke-width="0.75"/><line x1="9.76625" y1="11.35583" x2="10.66971" y2="11.67018" fill="#f18519" stroke="#f18519" stroke-linecap="round" stroke-miterlimit="10" stroke-width="0.5"/><line x1="3.63513" y1="9.22253" x2="4.5725" y2="9.54869" fill="#f18519" stroke="#f18519" stroke-linecap="round" stroke-miterlimit="10" stroke-width="0.5"/></svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/relation.gif b/Resources/Public/Icons/relation.gif
deleted file mode 100644
index db61d7e..0000000
Binary files a/Resources/Public/Icons/relation.gif and /dev/null differ
diff --git a/Resources/Public/Icons/tx_events_domain_model_date.gif b/Resources/Public/Icons/tx_events_domain_model_date.gif
deleted file mode 100644
index 37ba37b..0000000
Binary files a/Resources/Public/Icons/tx_events_domain_model_date.gif and /dev/null differ
diff --git a/Resources/Public/Icons/tx_events_domain_model_date.svg b/Resources/Public/Icons/tx_events_domain_model_date.svg
new file mode 100644
index 0000000..d859b72
--- /dev/null
+++ b/Resources/Public/Icons/tx_events_domain_model_date.svg
@@ -0,0 +1 @@
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M8,.63544A7.31924,7.31924,0,0,0,.63544,8,7.31924,7.31924,0,0,0,8,15.36456,7.31924,7.31924,0,0,0,15.36456,8,7.31924,7.31924,0,0,0,8,.63544Z" fill="#fff" stroke="#b9b9b9" stroke-miterlimit="10"/><path d="M6.94792,3.89689V8l4.31353,2.6302a2.75862,2.75862,0,0,0,.526-.94687L8,7.36875V3.79168C7.68438,3.79168,7.26354,3.89689,6.94792,3.89689Z" fill="#f1851b"/></svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/tx_events_domain_model_event.gif b/Resources/Public/Icons/tx_events_domain_model_event.gif
deleted file mode 100644
index 37ba37b..0000000
Binary files a/Resources/Public/Icons/tx_events_domain_model_event.gif and /dev/null differ
diff --git a/Resources/Public/Icons/tx_events_domain_model_event.svg b/Resources/Public/Icons/tx_events_domain_model_event.svg
new file mode 100644
index 0000000..51822b4
--- /dev/null
+++ b/Resources/Public/Icons/tx_events_domain_model_event.svg
@@ -0,0 +1 @@
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><polygon points="9.301 14.909 7.48 14.242 5.976 13.207 4.207 13.084 2.628 12.587 6.628 1.091 7.861 1.52 9.445 2.828 11.498 2.786 13.301 3.413 9.301 14.909" fill="#fff"/><line x1="3.50014" y1="9.8092" x2="3.90851" y2="9.9513" fill="#f18519" stroke="#f18519" stroke-linecap="round" stroke-miterlimit="10" stroke-width="0.75"/><line x1="9.77353" y1="11.99201" x2="10.18191" y2="12.1341" fill="#f18519" stroke="#f18519" stroke-linecap="round" stroke-miterlimit="10" stroke-width="0.75"/><line x1="5.03287" y1="10.34251" x2="6.50597" y2="10.85507" fill="#f18519" stroke="#f18519" stroke-linecap="round" stroke-miterlimit="10" stroke-width="0.75"/><line x1="7.82721" y1="11.31479" x2="8.64397" y2="11.59898" fill="#f18519" stroke="#f18519" stroke-linecap="round" stroke-miterlimit="10" stroke-width="0.75"/><path d="M8.25714,1.3615,6.35555.69985,2.14913,12.78917,4.2008,13.503a1.82189,1.82189,0,0,1,2.92772,1.01869l2.2372.77842L13.57215,3.21083l-2.27135-.7903A1.80208,1.80208,0,0,1,8.25714,1.3615Z" fill="none" stroke="#b9b9b9" stroke-miterlimit="10" stroke-width="0.75"/></svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/tx_events_domain_model_events.gif b/Resources/Public/Icons/tx_events_domain_model_events.gif
deleted file mode 100644
index 37ba37b..0000000
Binary files a/Resources/Public/Icons/tx_events_domain_model_events.gif and /dev/null differ
diff --git a/Resources/Public/Icons/tx_events_domain_model_organizer.gif b/Resources/Public/Icons/tx_events_domain_model_organizer.gif
deleted file mode 100644
index 37ba37b..0000000
Binary files a/Resources/Public/Icons/tx_events_domain_model_organizer.gif and /dev/null differ
diff --git a/Resources/Public/Icons/tx_events_domain_model_organizer.svg b/Resources/Public/Icons/tx_events_domain_model_organizer.svg
new file mode 100644
index 0000000..fdbd451
--- /dev/null
+++ b/Resources/Public/Icons/tx_events_domain_model_organizer.svg
@@ -0,0 +1 @@
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M10.77071,5.949a18.65037,18.65037,0,0,1-1.9384-.76481c.03454.11132.03982.16841-.02879.237a1.69858,1.69858,0,0,1-2.30305,0c-.06958-.06957-.05662-.12714-.01488-.2423A19.3485,19.3485,0,0,1,4.53327,5.949s-.67172.38384-.7197,1.87123h7.67685C11.44244,6.28486,10.77071,5.949,10.77071,5.949Z" fill="#f18519"/><path d="M9.28335,1.53478A1.40357,1.40357,0,0,0,7.84392.14334H7.46009A1.43426,1.43426,0,0,0,6.02066,1.53478v1.0556a2.17734,2.17734,0,0,0,.67341,1.39447l-.00023-.00017c-.0216,1.16208-.36943,1.26042-.19335,1.4365a1.69851,1.69851,0,0,0,2.303,0c.17661-.17655-.13335-.27489-.18422-1.4461a2.17267,2.17267,0,0,0,.664-1.3847ZM7.37457,4.417A.8868.8868,0,0,0,7.9305,4.4168a.8868.8868,0,0,1-.55593.00018Zm-.4858-.26213c.01867.01451.03746.02844.05648.04208C6.92617,4.18312,6.90744,4.16954,6.88877,4.15485Zm.22876.152a1.368,1.368,0,0,0,.12831.059A1.34963,1.34963,0,0,1,7.11753,4.30681Zm.946.05655c.04185-.01768.08377-.03513.12474-.05737C8.14726,4.32876,8.10546,4.34521,8.06355,4.36336Zm.30393-.17292c.01709-.01241.03406-.02482.05092-.03788C8.40154,4.16585,8.38457,4.17785,8.36748,4.19044Z" fill="#fdc759"/><rect x="3.81357" y="8.21754" width="7.67685" height="7.14809" fill="#fff" stroke="#b9b9b9" stroke-miterlimit="10"/><path d="M10.85547,4.05727v.00216a.72914.72914,0,0,1-.69619.694.69619.69619,0,1,1,.69619-.69619Z" fill="#fff" stroke="#b9b9b9" stroke-miterlimit="10" stroke-width="0.75"/><rect x="2.90692" y="7.32845" width="9.39595" height="2.14786" fill="#b9b9b9"/><path d="M11.44059,7.82023c.0425-.1802.47775-2.66642.47775-2.66642S10.8621,4.43553,10.744,4.4096" fill="none" stroke="#b9b9b9" stroke-miterlimit="10" stroke-width="0.75"/></svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/tx_events_domain_model_partner.gif b/Resources/Public/Icons/tx_events_domain_model_partner.gif
deleted file mode 100644
index 37ba37b..0000000
Binary files a/Resources/Public/Icons/tx_events_domain_model_partner.gif and /dev/null differ
diff --git a/Resources/Public/Icons/tx_events_domain_model_partner.svg b/Resources/Public/Icons/tx_events_domain_model_partner.svg
new file mode 100644
index 0000000..e48ac0f
--- /dev/null
+++ b/Resources/Public/Icons/tx_events_domain_model_partner.svg
@@ -0,0 +1 @@
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><rect x="3.6353" y="0.81108" width="8.72941" height="14.37784" fill="#fff"/><path d="M11.59446.29758H4.40554A1.28529,1.28529,0,0,0,3.1218,1.58132V14.41868a1.28529,1.28529,0,0,0,1.28374,1.28374h7.18892a1.28529,1.28529,0,0,0,1.28374-1.28374V1.58132A1.28529,1.28529,0,0,0,11.59446.29758Zm.77024,14.1211a.77023.77023,0,0,1-.77024.77024H4.40554a.77023.77023,0,0,1-.77024-.77024v-.25675h8.7294Zm0-.77024H3.6353V2.35156h8.7294Zm0-11.81037H3.6353V1.58132A.77023.77023,0,0,1,4.40554.81108h7.18892a.77023.77023,0,0,1,.77024.77024Z" fill="#b9b9b9" stroke="#b9b9b9" stroke-miterlimit="10" stroke-width="0.25"/><path d="M7,8.97781v-2.5l1.25.625,1.25.625-1.25.625Z" fill="#f1851b" stroke="#f18519" stroke-miterlimit="10" stroke-width="0.75"/></svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/tx_events_domain_model_region.gif b/Resources/Public/Icons/tx_events_domain_model_region.gif
deleted file mode 100644
index 37ba37b..0000000
Binary files a/Resources/Public/Icons/tx_events_domain_model_region.gif and /dev/null differ
diff --git a/Resources/Public/Icons/tx_events_domain_model_region.svg b/Resources/Public/Icons/tx_events_domain_model_region.svg
new file mode 100644
index 0000000..f604194
--- /dev/null
+++ b/Resources/Public/Icons/tx_events_domain_model_region.svg
@@ -0,0 +1 @@
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M4.44338,4.44321a3.55662,3.55662,0,1,1,4.0012,3.52906v4.91792a.44458.44458,0,0,1-.88916,0v-4.917a3.55661,3.55661,0,0,1-3.112-3.53084ZM6.66,12.06683a.44458.44458,0,0,1-.36544.51127,5.05543,5.05543,0,0,0-1.47155.43835,1.17283,1.17283,0,0,0-.329.23563.26737.26737,0,0,0-.05068.08v.00267l.00178.00711a.13018.13018,0,0,0,.01422.02934.54862.54862,0,0,0,.12893.13338,2.43719,2.43719,0,0,0,.72288.35121A8.89157,8.89157,0,0,0,8,14.22392a8.86354,8.86354,0,0,0,2.68881-.36811,2.45929,2.45929,0,0,0,.72288-.35121.55047.55047,0,0,0,.12982-.13338.13117.13117,0,0,0,.01333-.02934l.00178-.00711v-.00356a.26749.26749,0,0,0-.05068-.08,1.17177,1.17177,0,0,0-.329-.23474A5.06425,5.06425,0,0,0,9.7054,12.5781a.44458.44458,0,1,1,.11939-.88111l.02643.0044a5.90316,5.90316,0,0,1,1.74008.52816,1.352,1.352,0,0,1,.85448,1.10522,1.12848,1.12848,0,0,1-.4837.8687,3.32,3.32,0,0,1-.9923.49615A9.744,9.744,0,0,1,8,15.11308a9.744,9.744,0,0,1-2.96978-.41346,3.32,3.32,0,0,1-.9923-.49615,1.12848,1.12848,0,0,1-.4837-.8687,1.35323,1.35323,0,0,1,.85448-1.10522,5.90307,5.90307,0,0,1,1.74008-.52816A.44457.44457,0,0,1,6.66,12.06683Z" fill="#b9b9b9" fill-rule="evenodd"/><circle cx="8" cy="4.47576" r="3.58884" fill="#f18519" stroke="#fff" stroke-miterlimit="10" stroke-width="0.75"/></svg>
\ No newline at end of file
diff --git a/Resources/Public/Icons/user_plugin_events.svg b/Resources/Public/Icons/user_plugin_events.svg
deleted file mode 100644
index 17e1eb1..0000000
--- a/Resources/Public/Icons/user_plugin_events.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#666" d="M12.053 11.026c-.238.07-.427.095-.674.095-2.033 0-5.017-7.1-5.017-9.462 0-.87.207-1.16.497-1.41C4.373.54 1.39 1.452.435 2.613c-.207.29-.332.746-.332 1.326C.103 7.628 4.04 16 6.82 16c1.283 0 3.45-2.114 5.233-4.974M10.756 0c2.57 0 5.14.415 5.14 1.865 0 2.943-1.865 6.508-2.818 6.508-1.7 0-3.814-4.725-3.814-7.088C9.264.207 9.68 0 10.756 0"/></svg>
\ No newline at end of file
diff --git a/ext_localconf.php b/ext_localconf.php
index caa33be..fec78e1 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -36,7 +36,7 @@ call_user_func(
         $iconRegistry->registerIcon(
             'events-plugin',
             \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
-            ['source' => 'EXT:events/Resources/Public/Icons/user_plugin_events.svg']
+            ['source' => 'EXT:events/Resources/Public/Icons/Extension.svg']
         );
 
         /*
diff --git a/ext_tables.php b/ext_tables.php
index e4fd548..181bc7f 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -5,15 +5,6 @@ defined('TYPO3') || die('Access denied.');
 call_user_func(
     function () {
 
-        /*
-        \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-            'Wrm.Events',
-            'Pi1',
-            'Events',
-            'EXT:events/Resources/Public/Icons/user_plugin_events.svg'
-        );
-        */
-
         \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('events', 'Configuration/TypoScript', 'Events');
 
         \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('tx_events_domain_model_event', 'EXT:events/Resources/Private/Language/locallang_csh_tx_events_domain_model_event.xlf');