diff --git a/typo3/sysext/form/Configuration/PageTS/modWizards.ts b/typo3/sysext/form/Configuration/PageTS/modWizards.ts
index edcf2c89040a3ca22f3c20065fb77420bc19bbc2..61c7c7f680d21c257ba376c195718f95bd8bbdba 100644
--- a/typo3/sysext/form/Configuration/PageTS/modWizards.ts
+++ b/typo3/sysext/form/Configuration/PageTS/modWizards.ts
@@ -2,9 +2,9 @@ mod.wizards.newContentElement.wizardItems.forms {
     show :=addToList(formframework)
     elements {
         formframework {
-            iconIdentifier = content-elements-mailform
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:forms_mail_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:forms_mail_description
+            iconIdentifier = content-form
+            title = LLL:EXT:form/Resources/Private/Language/locallang.xlf:form_new_wizard_title
+            description = LLL:EXT:form/Resources/Private/Language/locallang:form_new_wizard_description
             tt_content_defValues {
                 CType = form_formframework
             }
diff --git a/typo3/sysext/form/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/form/Configuration/TCA/Overrides/tt_content.php
index c04d725308d6434381d489e158c614087b1a342a..8680fffe7e15ac244db1c717a6d9690b401dd0b2 100644
--- a/typo3/sysext/form/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/form/Configuration/TCA/Overrides/tt_content.php
@@ -9,6 +9,8 @@ call_user_func(function () {
         'form_formframework'
     );
 
+    $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['form_formframework'] = 'content-form';
+
     $GLOBALS['TCA']['tt_content']['types']['form_formframework']['showitem'] = '
         --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
             --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,
@@ -33,6 +35,7 @@ call_user_func(function () {
     \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
         'TYPO3.CMS.Form',
         'Formframework',
-        'Form'
+        'Form',
+        'content-form'
     );
 });
diff --git a/typo3/sysext/form/Resources/Private/Language/locallang.xlf b/typo3/sysext/form/Resources/Private/Language/locallang.xlf
index b852a42e5111076830034d2dd2fc642b6cfc76ff..e8db63fce39328e5ce33a7508aae999dc84a68d9 100644
--- a/typo3/sysext/form/Resources/Private/Language/locallang.xlf
+++ b/typo3/sysext/form/Resources/Private/Language/locallang.xlf
@@ -82,6 +82,12 @@
             <trans-unit id="validation.error.1476396435" xml:space="preserve">
                 <source>Do not fill this field</source>
             </trans-unit>
+            <trans-unit id="form_new_wizard_title" xml:space="preserve">
+                <source>Form</source>
+            </trans-unit>
+            <trans-unit id="form_new_wizard_description" xml:space="preserve">
+                <source>A form allowing website users to submit messages.</source>
+            </trans-unit>
         </body>
     </file>
 </xliff>