diff --git a/Classes/Controller/OptinController.php b/Classes/Controller/OptinController.php
index e512abeb1c1b2087300a0ea09116d7c1da24cd76..3b9d7a443d092a84a0c816e796753216365abc8e 100644
--- a/Classes/Controller/OptinController.php
+++ b/Classes/Controller/OptinController.php
@@ -513,7 +513,7 @@ class OptinController extends ActionController {
 			'iframe_description' => JsonImportService::TEXT_IFRAME_DESCRIPTION,
 			'iframe_html' => '',
 			'iframe_replacement_html' => '',
-			'iframe_whitelist_regex' => '',
+			'iframe_whitelist_regex' => JsonImportService::DEFAULT_IFRAME_WHITELIST,
 			'banner_description' => JsonImportService::TEXT_BANNER_DESCRIPTION,
 			'banner_html' => '',
 			'essential_description' => JsonImportService::TEXT_ESSENTIAL_DESCRIPTION,
diff --git a/Classes/Hook/HandleTemplateAfterTcaSave.php b/Classes/Hook/HandleTemplateAfterTcaSave.php
index ed5346791fccd5a3900f4e0f3423a2b8c9040b23..46dd35416d2051ad078edad483d32090e1254da3 100644
--- a/Classes/Hook/HandleTemplateAfterTcaSave.php
+++ b/Classes/Hook/HandleTemplateAfterTcaSave.php
@@ -98,9 +98,7 @@ class HandleTemplateAfterTcaSave {
 			if (isset($data['banner_overwritten']) && $data['banner_overwritten']) {
 				$bannerTemplate = $data['banner_html'];
 			} else {
-				if (!isset($data['banner_selection'])) {
-					$data['banner_selection'] = 0;
-				}
+				$data['banner_selection'] = 0;
 
 				$bannerTemplate = $templateService->getMustacheContent(
 					TemplateService::TYPE_BANNER,
@@ -111,9 +109,7 @@ class HandleTemplateAfterTcaSave {
 			if (isset($data['iframe_overwritten']) && $data['iframe_overwritten']) {
 				$iframeTemplate = $data['iframe_html'];
 			} else {
-				if (!isset($data['iframe_selection'])) {
-					$data['iframe_selection'] = 0;
-				}
+				$data['iframe_selection'] = 0;
 
 				$iframeTemplate = $templateService->getMustacheContent(
 					TemplateService::TYPE_IFRAME,
@@ -124,9 +120,7 @@ class HandleTemplateAfterTcaSave {
 			if (isset($data['iframe_replacement_overwritten']) && $data['iframe_replacement_overwritten']) {
 				$iframeReplacementTemplate = $data['iframe_replacement_html'];
 			} else {
-				if (!isset($data['iframe_replacement_selection'])) {
-					$data['iframe_replacement_selection'] = 0;
-				}
+				$data['iframe_replacement_selection'] = 0;
 
 				$iframeReplacementTemplate = $templateService->getMustacheContent(
 					TemplateService::TYPE_IFRAME_REPLACEMENT,
@@ -134,19 +128,6 @@ class HandleTemplateAfterTcaSave {
 				);
 			}
 
-			if (isset($data['iframe_whitelist_overwritten']) && $data['iframe_whitelist_overwritten']) {
-				$iframeWhitelistTemplate = $data['iframe_whitelist_regex'];
-			} else {
-				if (!isset($data['iframe_whitelist_selection'])) {
-					$data['iframe_whitelist_selection'] = 0;
-				}
-
-				$iframeWhitelistTemplate = $templateService->getMustacheContent(
-					TemplateService::TYPE_IFRAME_WHITELIST,
-					(int) $data['iframe_whitelist_selection']
-				);
-			}
-
 			if (VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) <= 9000000) {
 				/** @var DatabaseConnection $database */
 				$database = $GLOBALS['TYPO3_DB'];
@@ -155,7 +136,6 @@ class HandleTemplateAfterTcaSave {
 					'banner_html' => $bannerTemplate,
 					'iframe_html' => $iframeTemplate,
 					'iframe_replacement_html' => $iframeReplacementTemplate,
-					'iframe_whitelist_regex' => $iframeWhitelistTemplate,
 				]);
 			} else {
 				$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
@@ -166,7 +146,6 @@ class HandleTemplateAfterTcaSave {
 					->set('banner_html', $bannerTemplate)
 					->set('iframe_html', $iframeTemplate)
 					->set('iframe_replacement_html', $iframeReplacementTemplate)
-					->set('iframe_whitelist_regex', $iframeWhitelistTemplate)
 					->where(
 						$queryBuilder->expr()->eq(
 							'uid',
diff --git a/Classes/Service/JsonImportService.php b/Classes/Service/JsonImportService.php
index 1789f2c8e5d37f1a2303c073cfc5adf2cf41d30e..f4145ded078e4451725b8398be73132d080a051d 100644
--- a/Classes/Service/JsonImportService.php
+++ b/Classes/Service/JsonImportService.php
@@ -44,6 +44,7 @@ class JsonImportService {
 	const TEXT_IFRAME_DESCRIPTION = 'Wir verwenden auf unserer Website externe Inhalte, um Ihnen zusätzliche Informationen anzubieten.';
 	const TEXT_ESSENTIAL_DEFAULT_COOKIE_PURPOSE = 'Dieses Cookie wird verwendet, um Ihre Cookie-Einstellungen für diese Website zu speichern.';
 	const TEXT_ESSENTIAL_DEFAULT_LAST_PREFERENCES_PURPOSE = 'Dieser Wert speichert Ihre Consent-Einstellungen. Unter anderem eine zufällig generierte ID, für die historische Speicherung Ihrer vorgenommen Einstellungen, falls der Webseiten-Betreiber dies eingestellt hat.';
+	const DEFAULT_IFRAME_WHITELIST = '^https:\/\/www\.google\.com\/recaptcha\/'."\n";
 
 	/**
 	 * Separates the locale in the filename
@@ -476,7 +477,6 @@ class JsonImportService {
 			'cruser_id' => $GLOBALS['BE_USER']->user[$GLOBALS['BE_USER']->userid_column],
 			'identifier' => $service['identifier'],
 			'replacement_html' => $service['mustache'],
-			'replacement_html_overwritten' => $service['replacement_html_overwritten'],
 			'replacement_background_image' => $service['replacement_background_image'],
 			'sorting' => $serviceIndex + 1,
 			'parent_optin' => $optInId,
@@ -493,7 +493,7 @@ class JsonImportService {
 			$connectionPool,
 			'tx_sgcookieoptin_domain_model_service',
 			[
-				'pid', 'identifier', 'replacement_html_overwritten', 'replacement_html',
+				'pid', 'identifier', 'replacement_html',
 				'replacement_background_image', 'source_regex'
 			],
 			$serviceData
diff --git a/Classes/Service/LicenceCheckService.php b/Classes/Service/LicenceCheckService.php
index fc17655343fdc077b013f9e873cc7896ce93c629..1097815da53465da50d6856c483472041b134aa0 100644
--- a/Classes/Service/LicenceCheckService.php
+++ b/Classes/Service/LicenceCheckService.php
@@ -152,12 +152,13 @@ class LicenceCheckService {
 		'4.5.3' => 1655281313, // Wed, 15 Jun 2022 09:22:34 GMT
 		'4.6.0' => 1661785282, // Mon Aug 29 2022 18:01:22 GMT+0300
 		'5.0.0' => 1672837572, // Wed Jan 04 2023 14:45:57 GMT+0200
+		'5.1.0' => 1675793649, // Tue, 07 Feb 2023 18:11:50 GMT
 	];
 
 	/**
 	 * The current extension version
 	 */
-	const CURRENT_VERSION = '5.0.0';
+	const CURRENT_VERSION = '5.1.0';
 
 	/**
 	 * @param mixed $validUntil A timestamp, which says the lifetime of this key.
diff --git a/Classes/Service/StaticFileGenerationService.php b/Classes/Service/StaticFileGenerationService.php
index 2259bb8dfb7173309a65c5301b8c840ac35e1490..8515f148834aa43712b0f0a8e7e54ad59fc0d3c4 100644
--- a/Classes/Service/StaticFileGenerationService.php
+++ b/Classes/Service/StaticFileGenerationService.php
@@ -188,6 +188,9 @@ class StaticFileGenerationService implements SingletonInterface {
 			'banner_color_button_settings' => $fullData['banner_color_button_settings'],
 			'banner_color_button_settings_hover' => $fullData['banner_color_button_settings_hover'],
 			'banner_color_button_settings_text' => $fullData['banner_color_button_settings_text'],
+			'banner_color_button_accept_essential' => $fullData['banner_color_button_accept_essential'],
+			'banner_color_button_accept_essential_hover' => $fullData['banner_color_button_accept_essential_hover'],
+			'banner_color_button_accept_essential_text' => $fullData['banner_color_button_accept_essential_text'],
 			'banner_color_button_accept' => $fullData['banner_color_button_accept'],
 			'banner_color_button_accept_hover' => $fullData['banner_color_button_accept_hover'],
 			'banner_color_button_accept_text' => $fullData['banner_color_button_accept_text'],
@@ -448,18 +451,18 @@ class StaticFileGenerationService implements SingletonInterface {
 		if ((bool) $data['banner_enable'] || (int) $data['banner_force_min_width'] > 0) {
 			$content .= " \n\n" . $templateService->getCSSContent(
 				TemplateService::TYPE_BANNER,
-				$data['banner_selection']
+				0
 			);
 		}
 
 		if ((bool) $data['iframe_enabled']) {
 			$content .= " \n\n" . $templateService->getCSSContent(
 				TemplateService::TYPE_IFRAME,
-				$data['iframe_selection']
+				0
 			);
 			$content .= " \n\n" . $templateService->getCSSContent(
 				TemplateService::TYPE_IFRAME_REPLACEMENT,
-				$data['iframe_replacement_selection']
+				0
 			);
 		}
 
@@ -894,6 +897,7 @@ class StaticFileGenerationService implements SingletonInterface {
 			'fingerprint_position' => (int) $translatedData['fingerprint_position'],
 			'iframe_replacement_background_image' => (string) $translatedData['iframe_replacement_background_image'],
 			'monochrome_enabled' => (bool) $translatedData['monochrome_enabled'],
+			'show_fingerprint' => (bool) $translatedData['show_fingerprint'],
 		];
 
 		$textEntries = [
@@ -917,6 +921,7 @@ class StaticFileGenerationService implements SingletonInterface {
 			'iframe_open_settings_text' => $translatedData['iframe_open_settings_text'],
 			'iframe_button_load_one_description' => $translatedData['iframe_button_load_one_description'],
 			'banner_button_accept_text' => $translatedData['banner_button_accept_text'],
+			'banner_button_accept_essential_text' => $translatedData['banner_button_accept_essential_text'],
 			'banner_button_settings_text' => $translatedData['banner_button_settings_text'],
 			'banner_description' => $translatedData['banner_description'],
 			'save_confirmation_text' => $translatedData['save_confirmation_text'],
@@ -953,11 +958,10 @@ class StaticFileGenerationService implements SingletonInterface {
 			'banner' => [
 				'banner_html' => $translatedData['banner_html'],
 				'banner_overwritten' => $translatedData['banner_overwritten'],
-				'banner_selection' => $translatedData['banner_selection'],
 				'markup' => $this->getRenderedMustacheTemplate(
 					$translatedData['banner_overwritten'],
 					$translatedData['banner_html'],
-					$translatedData['banner_selection'],
+					0,
 					TemplateService::TYPE_BANNER,
 					$jsonDataArray
 				),
@@ -965,11 +969,10 @@ class StaticFileGenerationService implements SingletonInterface {
 			'iframe' => [
 				'iframe_html' => $translatedData['iframe_html'],
 				'iframe_overwritten' => $translatedData['iframe_overwritten'],
-				'iframe_selection' => $translatedData['iframe_selection'],
 				'markup' => $this->getRenderedMustacheTemplate(
 					$translatedData['iframe_overwritten'],
 					$translatedData['iframe_html'],
-					$translatedData['iframe_selection'],
+					0,
 					TemplateService::TYPE_IFRAME,
 					$jsonDataArray
 				),
@@ -977,26 +980,17 @@ class StaticFileGenerationService implements SingletonInterface {
 			'iframeReplacement' => [
 				'iframe_replacement_html' => $translatedData['iframe_replacement_html'],
 				'iframe_replacement_overwritten' => $translatedData['iframe_replacement_overwritten'],
-				'iframe_replacement_selection' => $translatedData['iframe_replacement_selection'],
 				'markup' => $this->getRenderedMustacheTemplate(
 					$translatedData['iframe_replacement_overwritten'],
 					$translatedData['iframe_replacement_html'],
-					$translatedData['iframe_replacement_selection'],
+					0,
 					TemplateService::TYPE_IFRAME_REPLACEMENT,
 					$jsonDataArray
 				),
 			],
 			'iframeWhitelist' => [
 				'iframe_whitelist_regex' => $translatedData['iframe_whitelist_regex'],
-				'iframe_whitelist_overwritten' => $translatedData['iframe_whitelist_overwritten'],
-				'iframe_whitelist_selection' => $translatedData['iframe_whitelist_selection'],
-				'markup' => $this->getRenderedMustacheTemplate(
-					$translatedData['iframe_whitelist_overwritten'],
-					$translatedData['iframe_whitelist_regex'],
-					$translatedData['iframe_whitelist_selection'],
-					TemplateService::TYPE_IFRAME_WHITELIST,
-					$jsonDataArray
-				),
+				'markup' => $translatedData['iframe_whitelist_regex']
 			],
 		];
 
diff --git a/Classes/Service/TemplateService.php b/Classes/Service/TemplateService.php
index a329c1a7a292781ce6345523dcc1d4840732992b..ba409e9b56d794bf7f57820b7db3416b55346d6a 100644
--- a/Classes/Service/TemplateService.php
+++ b/Classes/Service/TemplateService.php
@@ -39,7 +39,6 @@ class TemplateService implements SingletonInterface {
 	const TYPE_BANNER = 1;
 	const TYPE_IFRAME = 2;
 	const TYPE_IFRAME_REPLACEMENT = 3;
-	const TYPE_IFRAME_WHITELIST = 4;
 	const TYPE_FINGERPRINT = 5;
 	const TYPE_MONOCHROME = 6;
 
@@ -49,7 +48,6 @@ class TemplateService implements SingletonInterface {
 	const BANNER_TEMPLATE_ID_DEFAULT = 0;
 	const IFRAME_TEMPLATE_ID_DEFAULT = 0;
 	const IFRAME_REPLACEMENT_TEMPLATE_ID_DEFAULT = 0;
-	const IFRAME_WHITELIST_TEMPLATE_ID_DEFAULT = 0;
 	const IFRAME_FINGERPRINT_TEMPLATE_ID_DEFAULT = 0;
 	const IFRAME_MONOCHROME_TEMPLATE_ID_DEFAULT = 0;
 
@@ -67,9 +65,6 @@ class TemplateService implements SingletonInterface {
 		self::TYPE_IFRAME_REPLACEMENT => [
 			self::IFRAME_REPLACEMENT_TEMPLATE_ID_DEFAULT => 'Default',
 		],
-		self::TYPE_IFRAME_WHITELIST => [
-			self::IFRAME_WHITELIST_TEMPLATE_ID_DEFAULT => 'Default',
-		],
 		self::TYPE_FINGERPRINT => [
 			self::IFRAME_FINGERPRINT_TEMPLATE_ID_DEFAULT => 'Default',
 		],
@@ -83,7 +78,6 @@ class TemplateService implements SingletonInterface {
 		self::TYPE_BANNER => 'Banner',
 		self::TYPE_IFRAME => 'Iframe',
 		self::TYPE_IFRAME_REPLACEMENT => 'IframeReplacement',
-		self::TYPE_IFRAME_WHITELIST => 'IframeWhitelist',
 		self::TYPE_FINGERPRINT => 'Fingerprint',
 		self::TYPE_MONOCHROME => 'MonochromeTheme',
 	];
diff --git a/Configuration/TCA/tx_sgcookieoptin_domain_model_cookie.php b/Configuration/TCA/tx_sgcookieoptin_domain_model_cookie.php
index 7e20bdc707fb70e05c458c1c66c8496f514bf643..8913b7d8969e59467d74b3f89f483870f8d2b1ca 100644
--- a/Configuration/TCA/tx_sgcookieoptin_domain_model_cookie.php
+++ b/Configuration/TCA/tx_sgcookieoptin_domain_model_cookie.php
@@ -110,7 +110,7 @@ $configuration = [
 		'name' => [
 			'exclude' => TRUE,
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_cookie.name',
-			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_whitelist_regex.description',
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_cookie.name.description',
 			'config' => [
 				'type' => 'input',
 				'size' => 30,
diff --git a/Configuration/TCA/tx_sgcookieoptin_domain_model_optin.php b/Configuration/TCA/tx_sgcookieoptin_domain_model_optin.php
index 91e20d515e20c407ebda647303c2f7654c3b0212..3ae62c83c2f5876f82c53594df9f9a1ac106854d 100644
--- a/Configuration/TCA/tx_sgcookieoptin_domain_model_optin.php
+++ b/Configuration/TCA/tx_sgcookieoptin_domain_model_optin.php
@@ -45,7 +45,7 @@ $configuration = [
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
 		'iconfile' => 'EXT:sg_cookie_optin/Resources/Public/Icons/tx_sgcookieoptin_domain_model_optin.svg',
-		'requestUpdate' => 'template_selection, banner_selection, iframe_selection, iframe_replacement_selection',
+		'requestUpdate' => 'template_selection',
 	],
 	'interface' => [],
 	'types' => [
@@ -65,7 +65,7 @@ $configuration = [
 					services,
 				--div--;LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.tab.banner,
 					--palette--;;banner_general, --palette--;;banner_general_colors,
-					--palette--;;banner_settings_button, --palette--;;banner_accept_button,
+					--palette--;;banner_settings_button, --palette--;;banner_accept_essential_button, --palette--;;banner_accept_button,
 					--palette--;;banner_template,
 				--div--;LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.tab.essential,
 					essential_title, essential_description, essential_scripts, essential_cookies,
@@ -117,7 +117,7 @@ $configuration = [
 		],
 		'fingerprint' => [
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.fingerprint',
-			'showitem' => 'fingerprint_position, --linebreak--,
+			'showitem' => 'show_fingerprint, fingerprint_position, --linebreak--,
 			color_fingerprint_background, color_fingerprint_image'
 		],
 		'color_table' => [
@@ -146,19 +146,18 @@ $configuration = [
 		],
 		'iframe_template' => [
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_template',
-			'showitem' => 'iframe_selection, iframe_overwritten, --linebreak--,
+			'showitem' => 'iframe_overwritten, --linebreak--,
 				iframe_warning, --linebreak--,
 				iframe_html'
 		],
 		'iframe_whitelist' => [
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_whitelist',
-			'showitem' => 'iframe_whitelist_selection, iframe_whitelist_overwritten, --linebreak--,
-			iframe_whitelist_warning, --linebreak--,
-			iframe_whitelist_regex'
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_whitelist.description',
+			'showitem' => 'iframe_whitelist_regex'
 		],
 		'iframe_replacement_template' => [
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_replacement_template',
-			'showitem' => 'iframe_replacement_selection, iframe_replacement_overwritten, --linebreak--,
+			'showitem' => 'iframe_replacement_overwritten, --linebreak--,
 				iframe_replacement_warning, --linebreak--,
 				iframe_replacement_html, --linebreak--'
 		],
@@ -182,9 +181,14 @@ $configuration = [
 			'showitem' => 'banner_button_accept_text, --linebreak--,
 				banner_color_button_accept, banner_color_button_accept_hover, banner_color_button_accept_text'
 		],
+		'banner_accept_essential_button' => [
+			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.palette.banner_accept_essential_button',
+			'showitem' => 'banner_button_accept_essential_text, --linebreak--,
+				banner_color_button_accept_essential, banner_color_button_accept_essential_hover, banner_color_button_accept_essential_text'
+		],
 		'banner_template' => [
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.palette.banner_template',
-			'showitem' => 'banner_selection, banner_overwritten, --linebreak--,
+			'showitem' => 'banner_overwritten, --linebreak--,
 				banner_warning, --linebreak--,
 				banner_html'
 		],
@@ -783,6 +787,7 @@ $configuration = [
 		'essential_scripts' => [
 			'exclude' => TRUE,
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.essential_scripts',
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.essential_scripts.description',
 			'config' => [
 				'type' => 'inline',
 				'foreign_table' => 'tx_sgcookieoptin_domain_model_script',
@@ -1004,6 +1009,7 @@ $configuration = [
 			'exclude' => TRUE,
 			'onChange' => 'reload',
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_overwritten',
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_overwritten.description',
 			'config' => [
 				'type' => 'check',
 				'default' => '0',
@@ -1021,22 +1027,6 @@ $configuration = [
 				'renderType' => 'SgCookieOptinTCAWarningField'
 			]
 		],
-		'iframe_selection' => [
-			'exclude' => TRUE,
-			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_selection',
-			'onChange' => 'reload',
-			'config' => [
-				'type' => 'select',
-				'renderType' => 'selectSingle',
-				'minitems' => 1,
-				'items' => [
-					['LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_selection.0', 0],
-				],
-				'behaviour' => [
-				   'allowLanguageSynchronization' => TRUE
-				],
-			],
-		],
 		'iframe_replacement_html' => [
 			'exclude' => TRUE,
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_replacement_html',
@@ -1055,6 +1045,7 @@ $configuration = [
 			'exclude' => TRUE,
 			'onChange' => 'reload',
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_replacement_overwritten',
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_overwritten.description',
 			'config' => [
 				'type' => 'check',
 				'default' => '0',
@@ -1073,22 +1064,6 @@ $configuration = [
 				'renderType' => 'SgCookieOptinTCAWarningField'
 			]
 		],
-		'iframe_replacement_selection' => [
-			'exclude' => TRUE,
-			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_replacement_selection',
-			'onChange' => 'reload',
-			'config' => [
-				'type' => 'select',
-				'renderType' => 'selectSingle',
-				'minitems' => 1,
-				'items' => [
-					['LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_replacement_selection.0', 0],
-				],
-				'behaviour' => [
-				   'allowLanguageSynchronization' => TRUE
-			   ]
-			],
-		],
 		'iframe_replacement_background_image' => [
 			'exclude' => TRUE,
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_replacement_background_image',
@@ -1164,6 +1139,7 @@ $configuration = [
 			'exclude' => TRUE,
 			'onChange' => 'reload',
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.template_overwritten',
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.template_overwritten.description',
 			'config' => [
 				'type' => 'check',
 				'default' => '0',
@@ -1184,6 +1160,7 @@ $configuration = [
 		'template_selection' => [
 			'exclude' => TRUE,
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.template_selection',
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.template_selection.description',
 			'onChange' => 'reload',
 			'config' => [
 				'type' => 'select',
@@ -1219,6 +1196,7 @@ $configuration = [
 		'render_assets_inline' => [
 			'exclude' => FALSE,
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.render_assets_inline',
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.render_assets_inline.description',
 			'config' => [
 				'type' => 'check',
 				'default' => '0',
@@ -1305,6 +1283,7 @@ $configuration = [
 			'exclude' => TRUE,
 			'onChange' => 'reload',
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.banner_overwritten',
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_overwritten.description',
 			'config' => [
 				'type' => 'check',
 				'default' => '0',
@@ -1325,6 +1304,7 @@ $configuration = [
 		'banner_show_settings_button' => [
 			'exclude' => TRUE,
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.banner_show_settings_button',
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.banner_show_settings_button.description',
 			'config' => [
 				'type' => 'check',
 				'default' => '1',
@@ -1344,20 +1324,6 @@ $configuration = [
 				],
 			],
 		],
-		'banner_selection' => [
-			'exclude' => TRUE,
-			'l10n_mode' => 'exclude',
-			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.banner_selection',
-			'onChange' => 'reload',
-			'config' => [
-				'type' => 'select',
-				'renderType' => 'selectSingle',
-				'minitems' => 1,
-				'items' => [
-					['LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.banner_selection.0', 0],
-				],
-			],
-		],
 		'banner_color_box' => [
 			'exclude' => TRUE,
 			'l10n_mode' => 'exclude',
@@ -1477,6 +1443,53 @@ $configuration = [
 				'eval' => 'trim, required'
 			],
 		],
+		'banner_color_button_accept_essential' => [
+			'exclude' => TRUE,
+			'l10n_mode' => 'exclude',
+			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.banner_color_button_accept_essential',
+			'config' => [
+				'type' => 'input',
+				'renderType' => 'colorpicker',
+				'default' => '#575757',
+				'placeholder' => '#575757',
+				'eval' => 'trim, required'
+			],
+		],
+		'banner_color_button_accept_essential_hover' => [
+			'exclude' => TRUE,
+			'l10n_mode' => 'exclude',
+			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.banner_color_button_accept_essential_hover',
+			'config' => [
+				'type' => 'input',
+				'renderType' => 'colorpicker',
+				'default' => '#D7D7D7',
+				'placeholder' => '#D7D7D7',
+				'eval' => 'trim, required'
+			],
+		],
+		'banner_color_button_accept_essential_text' => [
+			'exclude' => TRUE,
+			'l10n_mode' => 'exclude',
+			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.banner_color_button_accept_essential_text',
+			'config' => [
+				'type' => 'input',
+				'renderType' => 'colorpicker',
+				'default' => '#FFFFFF',
+				'placeholder' => '#FFFFFF',
+				'eval' => 'trim, required'
+			],
+		],
+		'banner_button_accept_essential_text' => [
+			'exclude' => TRUE,
+			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.banner_button_accept_essential_text',
+			'config' => [
+				'type' => 'input',
+				'size' => 30,
+				'default' => 'Ablehnen',
+				'placeholder' => 'Ablehnen',
+				'eval' => 'trim, required'
+			],
+		],
 		'banner_button_settings_text' => [
 			'exclude' => TRUE,
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.banner_button_settings_text',
@@ -1511,6 +1524,7 @@ $configuration = [
 			'exclude' => TRUE,
 			'l10n_mode' => 'exclude',
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.activate_testing_mode',
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.activate_testing_mode.description',
 			'config' => [
 				'type' => 'check',
 				'default' => '0',
@@ -1594,38 +1608,6 @@ $configuration = [
 				'eval' => 'trim, required'
 			],
 		],
-		'iframe_whitelist_overwritten' => [
-			'exclude' => TRUE,
-			'l10n_mode' => 'exclude',
-			'onChange' => 'reload',
-			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_whitelist_overwritten',
-			'config' => [
-				'type' => 'check',
-				'default' => '0',
-			],
-		],
-		'iframe_whitelist_warning' => [
-			'displayCond' => 'FIELD:iframe_whitelist_overwritten:=:0',
-			'exclude' => TRUE,
-			'l10n_mode' => 'exclude',
-			'config' => [
-				'type' => 'none',
-				'renderType' => 'SgCookieOptinTCAWarningField'
-			]
-		],
-		'iframe_whitelist_selection' => [
-			'exclude' => TRUE,
-			'l10n_mode' => 'exclude',
-			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_whitelist_selection',
-			'config' => [
-				'type' => 'select',
-				'renderType' => 'selectSingle',
-				'minitems' => 1,
-				'items' => [
-					['LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_whitelist_selection.0', 0],
-				],
-			],
-		],
 		'iframe_whitelist_regex' => [
 			'exclude' => TRUE,
 			'l10n_mode' => 'exclude',
@@ -1696,10 +1678,19 @@ $configuration = [
 				'default' => '0',
 			],
 		],
+		'show_fingerprint' => [
+			'exclude' => TRUE,
+			'l10n_mode' => 'exclude',
+			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.show_fingerprint',
+			'config' => [
+				'type' => 'check',
+				'default' => '1',
+			],
+		],
 		'fingerprint_position' => [
 			'exclude' => TRUE,
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.fingerprint_position',
-			'default' => 0,
+			'default' => 1,
 			'l10n_mode' => 'exclude',
 			'config' => [
 				'type' => 'select',
@@ -1838,8 +1829,8 @@ if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo
 		. 'iframe_button_allow_one_text, iframe_button_reject_text, iframe_button_load_one_description, iframe_button_load_one_text, iframe_open_settings_text,'
 		. 'iframe_color_consent_box_background, iframe_color_button_load_one, iframe_color_button_load_one_hover,'
 		. 'iframe_color_button_load_one_text, iframe_color_open_settings, iframe_html, iframe_overwritten, iframe_warning, '
-		. 'iframe_selection, iframe_replacement_html, iframe_replacement_overwritten, iframe_replacement_warning, iframe_replacement_selection,'
-		. 'banner_enable, banner_force_min_width, banner_position, banner_overwritten, banner_warning, banner_html, banner_selection,'
+		. 'iframe_replacement_html, iframe_replacement_overwritten, iframe_replacement_warning, '
+		. 'banner_enable, banner_force_min_width, banner_position, banner_overwritten, banner_warning, banner_html,'
 		. 'banner_show_settings_button, banner_color_box, banner_color_text, banner_color_button_settings,'
 		. 'banner_color_button_settings_hover, banner_color_button_settings_text, banner_color_button_accept,'
 		. 'banner_color_button_accept_hover, banner_color_button_accept_text, banner_color_link_text,'
@@ -1847,12 +1838,12 @@ if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo
 		. 'activate_testing_mode, color_full_box, color_full_headline, color_full_text, color_full_button_close,'
 		. 'color_full_button_close_hover, color_full_button_close_text, color_table_header, save_confirmation_text,'
 		. 'color_confirmation_background, color_confirmation_text, session_only_essential_cookies, iframe_whitelist,'
-		. 'iframe_whitelist_overwritten, iframe_whitelist_warning, iframe_whitelist_selection, iframe_whitelist_regex,'
+		. 'iframe_whitelist_regex,'
 		. 'subdomain_support, set_cookie_for_domain, domains_to_delete_cookies_for, cookiebanner_whitelist_regex,'
 		. 'disable_powered_by, disable_for_this_language, render_assets_inline, consider_do_not_track,'
 		. 'banner_show_again_interval, version, unified_cookie_name, disable_usage_statistics, fingerprint_position,'
 		. 'color_fingerprint_background, color_fingerprint_image, services, iframe_replacement_background_image,'
-		. 'monochrome_enabled';
+		. 'monochrome_enabled, show_fingerprint';
 }
 
 return $configuration;
diff --git a/Configuration/TCA/tx_sgcookieoptin_domain_model_script.php b/Configuration/TCA/tx_sgcookieoptin_domain_model_script.php
index fa7c00f461b7bb079fb2d6c9da7fb780bb982c72..91ca0b38060db167a360525e8fda5a3d4127f420 100644
--- a/Configuration/TCA/tx_sgcookieoptin_domain_model_script.php
+++ b/Configuration/TCA/tx_sgcookieoptin_domain_model_script.php
@@ -127,6 +127,7 @@ $configuration = [
 		'html' => [
 			'exclude' => TRUE,
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_script.html',
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_script.html.description',
 			'config' => [
 				'type' => 'text',
 				'renderType' => 't3editor',
diff --git a/Configuration/TCA/tx_sgcookieoptin_domain_model_service.php b/Configuration/TCA/tx_sgcookieoptin_domain_model_service.php
index f36c2d222325fc72dda9e2d9477c2cf9177ad6a0..689bfd255f1d8167fb070c461d1e51e4a5e44b09 100644
--- a/Configuration/TCA/tx_sgcookieoptin_domain_model_service.php
+++ b/Configuration/TCA/tx_sgcookieoptin_domain_model_service.php
@@ -111,6 +111,7 @@ $configuration = [
 		'replacement_html_overwritten' => [
 			'exclude' => TRUE,
 			'label' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.replacement_html_overwritten',
+			'description' => 'LLL:EXT:sg_cookie_optin/Resources/Private/Language/locallang_db.xlf:tx_sgcookieoptin_domain_model_optin.iframe_overwritten.description',
 			'config' => [
 				'type' => 'check',
 				'default' => '0',
diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index cf759d6947866f497add72de386c88b9c4de7a33..2add1710856907ef42ae5a2b021886faa7eceaf9 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -46,16 +46,16 @@
 				<target><![CDATA[https://www.sgalinski.de/typo3-produkte-webentwicklung/sgalinski-cookie-optin/#c17080]]></target>
 			</trans-unit>
 			<trans-unit id="backend.exportConfig" approved="yes">
-				<source><![CDATA[Export Configuration]]></source>
-				<target><![CDATA[Konfiguration exportieren]]></target>
+				<source><![CDATA[Export]]></source>
+				<target><![CDATA[Export]]></target>
 			</trans-unit>
 			<trans-unit id="backend.fileUploadLabel" approved="yes">
 				<source><![CDATA[JSON Configuration File]]></source>
 				<target><![CDATA[JSON-Konfigurationsdatei]]></target>
 			</trans-unit>
 			<trans-unit id="backend.importConfig" approved="yes">
-				<source><![CDATA[Import Configuration]]></source>
-				<target><![CDATA[Konfiguration importieren]]></target>
+				<source><![CDATA[Import]]></source>
+				<target><![CDATA[Import]]></target>
 			</trans-unit>
 			<trans-unit id="backend.jsonExport.error" approved="yes">
 				<source><![CDATA[Could not export the configuration because of the following error:]]></source>
@@ -254,8 +254,20 @@
 				<target><![CDATA[Zu viele Einträge entdeckt]]></target>
 			</trans-unit>
 			<trans-unit id="backend.toolForCookies" approved="yes">
-				<source><![CDATA[The following tool delivers information about used cookies on your site. Use this information for the cookie instruction in the configuration. Beware that not all cookies might be listed. URL]]></source>
-				<target><![CDATA[Das nachfolgende Tool liefert Informationen zu verwendeten Cookies auf ihrer Website. Nutzen Sie diese für die Cookie-Instruktionen in der Konfiguration. Beachten Sie, dass die Liste nicht vollständig sein könnte. URL]]></target>
+				<source><![CDATA[The following tool delivers information about used cookies on your site. Use this information for the cookie instruction in the configuration. Beware that not all cookies might be listed.]]></source>
+				<target><![CDATA[Das nachfolgende Tool liefert Informationen zu verwendeten Cookies auf ihrer Website. Nutzen Sie diese für die Cookie-Instruktionen in der Konfiguration. Beachten Sie, dass die Liste nicht vollständig sein könnte.]]></target>
+			</trans-unit>
+			<trans-unit id="backend.toolForCookies.button" approved="yes">
+				<source><![CDATA[Cookie Tool]]></source>
+				<target><![CDATA[Cookie-Tool]]></target>
+			</trans-unit>
+			<trans-unit id="backend.checkStats" approved="yes">
+				<source><![CDATA[Click this button to access the statistics of your opt-in data.]]></source>
+				<target><![CDATA[Klicken Sie auf diese Taste, um auf die Statistik Ihrer Opt-in-Daten zuzugreifen.]]></target>
+			</trans-unit>
+			<trans-unit id="backend.checkStats.button" approved="yes">
+				<source><![CDATA[Statistics]]></source>
+				<target><![CDATA[Statistiken]]></target>
 			</trans-unit>
 			<trans-unit id="backend.upload" approved="yes">
 				<source><![CDATA[Upload]]></source>
diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
index 8b8b2029b53b944695dc8a8536efb69f755245f5..5c23c16c68234b4385556c34df38437b072f050f 100644
--- a/Resources/Private/Language/de.locallang_db.xlf
+++ b/Resources/Private/Language/de.locallang_db.xlf
@@ -102,17 +102,37 @@
 				<target><![CDATA[Button zum Akzeptieren ausgewählter Skripte & Cookies]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.activate_testing_mode" approved="yes">
-				<source><![CDATA[Activate TEST mode (dialog not active, add "?showOptIn=1" to the URL to get the dialog.)]]></source>
-				<target><![CDATA[Aktiviere den TEST-Modus (Dialog nicht aktiv, der Parameter "?showOptIn=1" muss an die URL angefügt werden um den Dialog anzuzeigen)]]></target>
+				<source><![CDATA[Activate TEST Mode]]></source>
+				<target><![CDATA[Aktiviere den TEST-Modus]]></target>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.activate_testing_mode.description" approved="yes">
+				<source><![CDATA[Dialog not active, add "?showOptIn=1" to the URL to get the dialog]]></source>
+				<target><![CDATA[Dialog nicht aktiv, der Parameter "?showOptIn=1" muss an die URL angefügt werden um den Dialog anzuzeigen]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_button_accept_text" approved="yes">
 				<source><![CDATA[Accept Button Text]]></source>
 				<target><![CDATA[Akzeptieren-Button Text]]></target>
 			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_button_accept_essential_text" approved="yes">
+				<source><![CDATA[Reject Button Text]]></source>
+				<target><![CDATA[Ablehnen-Button Text]]></target>
+			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_button_settings_text" approved="yes">
 				<source><![CDATA[Settings Button Text]]></source>
 				<target><![CDATA[Einstellungs-Button Text]]></target>
 			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_color_button_accept_essential" approved="yes">
+				<source><![CDATA[Background Color Reject Button]]></source>
+				<target><![CDATA[Hintergrundfarbe Ablehnen-Button]]></target>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_color_button_accept_essential_hover" approved="yes">
+				<source><![CDATA[Hover Color Reject Button]]></source>
+				<target><![CDATA[Hover-Farbe Ablehnen-Button]]></target>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_color_button_accept_essential_text" approved="yes">
+				<source><![CDATA[Text Color Reject Button]]></source>
+				<target><![CDATA[Textfarbe Ablehnen-Button]]></target>
+			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_color_box" approved="yes">
 				<source><![CDATA[Background]]></source>
 				<target><![CDATA[Hintergrund]]></target>
@@ -166,8 +186,8 @@
 				<target><![CDATA[Banner-Template-Code (HTML, Variablen und Logik werden mit Mustache verarbeitet, siehe https://mustache.github.io/mustache.5.html) ]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_overwritten" approved="yes">
-				<source><![CDATA[Overwrite Template (Allows to change the template code below. If this is selected, changes in future updates are not automatically applied. Unset this option to reset the template below.)]]></source>
-				<target><![CDATA[Vorlage überschreiben (Erlaubt die Änderung des untenstehenden Template-Codes. Änderungen in zukünftigen Updates werden dann nicht mehr automatisch übernommen. Deaktiviere diese Option, um das untenstehende Template zurückzusetzen.)]]></target>
+				<source><![CDATA[Overwrite Template]]></source>
+				<target><![CDATA[Vorlage überschreiben]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_position" approved="yes">
 				<source><![CDATA[The Position of the Banner on the Website]]></source>
@@ -181,21 +201,17 @@
 				<source><![CDATA[Top]]></source>
 				<target><![CDATA[Oben]]></target>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_selection" approved="yes">
-				<source><![CDATA[Select Banner Base Design Template (This form will be saved and reloaded when this setting changes.)]]></source>
-				<target><![CDATA[Banner-Basis-Designvorlage auswählen (Dieses Formular wird bei Änderung gespeichert und neu geladen.)]]></target>
-			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_selection.0" approved="yes">
-				<source><![CDATA[Default]]></source>
-				<target><![CDATA[Standard]]></target>
-			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_show_again_interval" approved="yes">
 				<source><![CDATA[Show the cookie banner again if not all groups were selected after: (in days)]]></source>
 				<target><![CDATA[Das Cookie-Banner erneut anzeigen, wenn nicht alle Gruppen ausgewählt wurden, nach: (in Tage)]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_show_settings_button" approved="yes">
-				<source><![CDATA[Show the Settings Button within the Banner (Should be enabled if the website uses cookies.)]]></source>
-				<target><![CDATA[Einstellungs-Button im Banner anzeigen (Dies sollte aktiviert werden, falls die Website Cookies verwendet)]]></target>
+				<source><![CDATA[Show the Settings Button within the Banner]]></source>
+				<target><![CDATA[Einstellungs-Button im Banner anzeigen]]></target>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_show_settings_button.description" approved="yes">
+				<source><![CDATA[Should be enabled if the website uses cookies]]></source>
+				<target><![CDATA[Dies sollte aktiviert werden, falls die Website Cookies verwendet]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.color_Table_data_text" approved="yes">
 				<source><![CDATA[Text Color - Data]]></source>
@@ -386,8 +402,12 @@
 				<target><![CDATA[Beschreibung (erklärt die Verwendung dieser Skripte & Cookies)]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.essential_scripts" approved="yes">
-				<source><![CDATA[Scripts (For translations: Only "translated" scripts are considered. Added scripts without a default language parent will be ignored)]]></source>
-				<target><![CDATA[Skripte (Für Übersetzungen: Es werden nur "übersetzte" Skripte berücksichtigt. Hinzugefügte Skripte ohne übergeordnete Standardsprache werden ignoriert)]]></target>
+				<source><![CDATA[Scripts]]></source>
+				<target><![CDATA[Skripte]]></target>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.essential_scripts.description" approved="yes">
+				<source><![CDATA[For translations: Only "translated" scripts are considered. Added scripts without a default language parent will be ignored]]></source>
+				<target><![CDATA[Für Übersetzungen: Es werden nur "übersetzte" Skripte berücksichtigt. Hinzugefügte Skripte ohne übergeordnete Standardsprache werden ignoriert]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.essential_title" approved="yes">
 				<source><![CDATA[Group Title for Essential Cookies & Scripts the User has to Accept]]></source>
@@ -502,8 +522,12 @@
 				<target><![CDATA[Link: "Einstellungen öffnen"]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_overwritten" approved="yes">
-				<source><![CDATA[Overwrite Iframe Template (Allows to change the template code below. If this is selected, changes in future updates are not automatically applied. Unset this option to reset the template below.)]]></source>
-				<target><![CDATA[Template des Einstellungsfensters überschreiben (Erlaubt die Änderung des untenstehenden Template-Codes. Änderungen in zukünftigen Updates werden dann nicht mehr automatisch übernommen. Deaktiviere diese Option, um das untenstehende Template zurückzusetzen.)]]></target>
+				<source><![CDATA[Overwrite Iframe Template]]></source>
+				<target><![CDATA[Template des Einstellungsfensters überschreiben]]></target>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_overwritten.description" approved="yes">
+				<source><![CDATA[Allows to change the template code below. If this is selected, changes in future updates are not automatically applied. Unset this option to reset the template below]]></source>
+				<target><![CDATA[Erlaubt die Änderung des untenstehenden Template-Codes. Änderungen in zukünftigen Updates werden dann nicht mehr automatisch übernommen. Deaktiviere diese Option, um das untenstehende Template zurückzusetzen]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_replacement_html" approved="yes">
 				<source><![CDATA[iFrame Replacement Template Code (HTML, variables and logic are processed with Mustache, see http://mustache.github.io/mustache.5.html)]]></source>
@@ -520,29 +544,13 @@
 				textEntries.iframe_open_settings_text – Der Wert des Feldes Link: "Einstellungen öffnen"]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_replacement_overwritten" approved="yes">
-				<source><![CDATA[Overwrite iFrame Replacement Template (Allows to change the template code below. If this is selected, changes in future updates are not automatically applied. Unset this option to reset the template below.)]]></source>
-				<target><![CDATA[ iFrame-Ersatz-Template überschreiben (Erlaubt die Änderung des untenstehenden Template-Codes. Änderungen in zukünftigen Updates werden dann nicht mehr automatisch übernommen. Deaktiviere diese Option, um das untenstehende Template zurückzusetzen.)]]></target>
-			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_replacement_selection" approved="yes">
-				<source><![CDATA[Select a Base Design for the iFrame Replacement Template (This form will be saved and reloaded when this setting changes.)]]></source>
-				<target><![CDATA[Basis-Designvorlage für den iFrame-Ersatz auswählen (Dieses Formular wird bei Änderung gespeichert und neu geladen.)]]></target>
-			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_replacement_selection.0" approved="yes">
-				<source><![CDATA[Default]]></source>
-				<target><![CDATA[Standard]]></target>
+				<source><![CDATA[Overwrite iFrame Replacement Template]]></source>
+				<target><![CDATA[ iFrame-Ersatz-Template überschreiben]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_replacement_template" approved="yes">
 				<source><![CDATA[iFrame Replacement Design Template]]></source>
 				<target><![CDATA[iFrame-Ersatz Designvorlage]]></target>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_selection" approved="yes">
-				<source><![CDATA[Select a Base Design for the Settings Window Template (This form will be saved and reloaded when this setting changes.)]]></source>
-				<target><![CDATA[Basis-Designvorlage für das Einstellungsfenster auswählen (Dieses Formular wird bei Änderung gespeichert und neu geladen.)]]></target>
-			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_selection.0" approved="yes">
-				<source><![CDATA[Default]]></source>
-				<target><![CDATA[Standard]]></target>
-			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_template" approved="yes">
 				<source><![CDATA[External Content Settings Window Design Template]]></source>
 				<target><![CDATA[Designvorlage für das Fenster mit Einstellungen zu externen Inhalten]]></target>
@@ -559,25 +567,17 @@
 				<source><![CDATA[External content whitelist. (Object sources matching these regular expressions will not be replaced.)]]></source>
 				<target><![CDATA[Externe Inhalte whitelisten. (Objekte, deren Quelle diese reguläre Ausdrücke entspricht, werden nicht ersetzt)]]></target>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist_overwritten" approved="yes">
-				<source><![CDATA[Overwrite Whitelist (Allows to change the template code below. If this is selected, changes in future updates are not automatically applied. Unset this option to reset the template below.)]]></source>
-				<target><![CDATA[Template des Einstellungsfensters überschreiben (Erlaubt die Änderung des untenstehenden Template-Codes. Änderungen in zukünftigen Updates werden dann nicht mehr automatisch übernommen. Deaktiviere diese Option, um das untenstehende Template zurückzusetzen.)]]></target>
-			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist_regex" approved="yes">
-				<source><![CDATA[Whitelist external content. Every new line is interpreted as a new regular expression]]></source>
-				<target><![CDATA[Externe Inhalte whitelisten. Jede neue Zeile wird als einen neuen regulären Ausdruck interpretiert.]]></target>
+				<source><![CDATA[Whitelist for external content]]></source>
+				<target><![CDATA[Whiteliste für externe Inhalte]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist_regex.description" approved="yes">
-				<source><![CDATA[This field is interpreted as a regular expression. Syntax errors in this expression may lead to errors on your website. Therefore please always test your website after you change this value. For more information hover over the field label.]]></source>
-				<target><![CDATA[Dieses Feld wird als regulärer Ausdruck interpretiert. Syntaxfehler in diesem Ausdruck können zu Fehlern auf Ihrer Website führen. Testen Sie daher bitte immer Ihre Website, nachdem Sie diesen Wert geändert haben. Für weitere Informationen fahren Sie mit dem Mauszeiger über die Feldbezeichnung.]]></target>
-			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist_selection" approved="yes">
-				<source><![CDATA[Select a base template for your whitelist (This form will be saved and reloaded when this setting changes.)]]></source>
-				<target><![CDATA[Basis-Vorlage für Ihre Whiteliste auswählen (Dieses Formular wird bei Änderung gespeichert und neu geladen.)]]></target>
+				<source><![CDATA[Whitelist all external content that matches the following regular expressions. Each new line is interpreted as a new regular expression. Syntax errors in this expression can cause errors on your website! Therefore, please always check your website after changing this value. You can also test the syntax on https://regex101.com.]]></source>
+				<target><![CDATA[Alle externen Inhalte whitelisten, die mit folgenden regulären Ausdrücken übereinstimmen. Jede neue Zeile wird als ein neuer regulärer Ausdruck interpretiert. Syntaxfehler in diesem Ausdruck können zu Fehlern auf Ihrer Website führen! Überprüfen Sie daher bitte immer Ihre Website, nachdem Sie diesen Wert geändert haben. Sie können die Syntax zudem auf https://regex101.com testen.]]></target>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist_selection.0" approved="yes">
-				<source><![CDATA[Default]]></source>
-				<target><![CDATA[Standard]]></target>
+			<trans-unit id="tx_sgcookieoptin_domain_model_cookie.name.description" approved="yes">
+				<source><![CDATA[This field is interpreted as a regular expression. Syntax errors in this expression may lead to errors on your website. Therefore please always test your website after you change this value. For more information hover over the field label. We enforce exact matches. You can also test the syntax on https://regex101.com. If your regular expression does not include the ^ and $ symbols, we will automatically add them to the regular expression when evaluating it.]]></source>
+				<target><![CDATA[Dieses Feld wird als regulärer Ausdruck interpretiert. Syntaxfehler in diesem Ausdruck können zu Fehlern auf Ihrer Website führen. Testen Sie daher bitte immer Ihre Website, nachdem Sie diesen Wert geändert haben. Für weitere Informationen fahren Sie mit dem Mauszeiger über die Feldbezeichnung. Sie können die Syntax zudem auf regex101.com testen. Wenn Ihr regulärer Ausdruck keine ^- und $-Symbole enthält, werden sie bei der Auswertung des Ausdrucks automatisch hinzugefügt.]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.link_texts" approved="yes">
 				<source><![CDATA[Link Texts]]></source>
@@ -595,6 +595,10 @@
 				<source><![CDATA[Accept Button]]></source>
 				<target><![CDATA[Akzeptieren-Button]]></target>
 			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.palette.banner_accept_essential_button" approved="yes">
+				<source><![CDATA[Essential Button]]></source>
+				<target><![CDATA[Essenziel-Button]]></target>
+			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.palette.multidomain_settings">
 				<source><![CDATA[Multidomain Settings]]></source>
 				<target><![CDATA[Multidomain-Einstellungen]]></target>
@@ -624,8 +628,12 @@
 				<target><![CDATA[Versionskontrolle]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.render_assets_inline" approved="yes">
-				<source><![CDATA[Render CSS and JavaScript contents inline (may impact the performance negatively)]]></source>
-				<target><![CDATA[CSS- und JavaScript-Inhalte inline rendern (kann sich negativ auf die Performance auswirken)]]></target>
+				<source><![CDATA[Render CSS and JavaScript contents inline]]></source>
+				<target><![CDATA[CSS- und JavaScript-Inhalte inline rendern]]></target>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.render_assets_inline.description" approved="yes">
+				<source><![CDATA[May impact the performance]]></source>
+				<target><![CDATA[Kann sich auf die Performance auswirken]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.save_confirmation_text" approved="yes">
 				<source><![CDATA[Text for notification shown when cookie preferences are set]]></source>
@@ -645,7 +653,7 @@
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.overwrite_baseurl" approved="yes">
 				<source><![CDATA[Overwrite Base-URL]]></source>
-				<target><![CDATA[Base-URL überschreiben.]]></target>
+				<target><![CDATA[Base-URL überschreiben]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.overwrite_baseurl.description" approved="yes">
 				<source><![CDATA[You can use this field to overwrite the URL from which the files are loaded in your website. If it is on another (sub)domain, please make sure to include it in your CORS policy headers.]]></source>
@@ -742,12 +750,20 @@ Ohne diese Einstellung gilt diese Konfiguration nur für die Domäne, in der sie
 				footerLinks (name) – Eine Liste der Footer-Links mit ihrem jeweiligen Namen]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.template_overwritten" approved="yes">
-				<source><![CDATA[Overwrite Template (Allows to change the template code below. If this is selected, changes in future updates are not automatically applied. Unset this option to reset the template below.)]]></source>
-				<target><![CDATA[Vorlage überschreiben (Erlaubt die Änderung des untenstehenden Template-Codes. Änderungen in zukünftigen Updates werden dann nicht mehr automatisch übernommen. Deaktiviere diese Option, um das untenstehende Template zurückzusetzen.)]]></target>
+				<source><![CDATA[Overwrite Template]]></source>
+				<target><![CDATA[Vorlage überschreiben]]></target>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.template_overwritten.description" approved="yes">
+				<source><![CDATA[Allows to change the template code below. If this is selected, changes in future updates are not automatically applied. Unset this option to reset the template below]]></source>
+				<target><![CDATA[Erlaubt die Änderung des untenstehenden Template-Codes. Änderungen in zukünftigen Updates werden dann nicht mehr automatisch übernommen. Deaktiviere diese Option, um das untenstehende Template zurückzusetzen]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.template_selection" approved="yes">
-				<source><![CDATA[Select a Base Design Template (This form will be saved and reloaded when this setting changes.)]]></source>
-				<target><![CDATA[Basis-Designvorlage auswählen (Dieses Formular wird bei Änderung gespeichert und neu geladen.)]]></target>
+				<source><![CDATA[Select a Base Design Template]]></source>
+				<target><![CDATA[Basis-Designvorlage auswählen]]></target>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.template_selection.description" approved="yes">
+				<source><![CDATA[This form will be saved and reloaded when this setting changes]]></source>
+				<target><![CDATA[Dieses Formular wird bei Änderung gespeichert und neu geladen]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.template_selection.0" approved="yes">
 				<source><![CDATA[Compact]]></source>
@@ -778,8 +794,12 @@ Ohne diese Einstellung gilt diese Konfiguration nur für die Domäne, in der sie
 				<target><![CDATA[Deaktivieren]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_script.html" approved="yes">
-				<source><![CDATA[HTML that shall be loaded if the user accepts this group (Do not use "document.write" as this will cause errors on the website)]]></source>
-				<target><![CDATA[HTML, das geladen werden soll, wenn der Benutzer diese Gruppe akzeptiert (Benutze nicht "document.write", denn dies verursacht Fehler auf der Website)]]></target>
+				<source><![CDATA[HTML that shall be loaded if the user accepts this group]]></source>
+				<target><![CDATA[HTML, das geladen werden soll, wenn der Benutzer diese Gruppe akzeptiert]]></target>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_script.html.description" approved="yes">
+				<source><![CDATA[Do not use "document.write" as this will cause errors on the website]]></source>
+				<target><![CDATA[Benutze nicht "document.write", denn dies verursacht Fehler auf der Website]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_script.parent_group" approved="yes">
 				<source><![CDATA[Group]]></source>
@@ -813,6 +833,10 @@ Ohne diese Einstellung gilt diese Konfiguration nur für die Domäne, in der sie
 				<source><![CDATA[Disable Usage Statistics and Tracability]]></source>
 				<target><![CDATA[Nutzungsstatistiken und Rückverfolgbarkeit deaktivieren]]></target>
 			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.show_fingerprint" approved="yes">
+				<source><![CDATA[Show fingerprint symbol]]></source>
+				<target><![CDATA[Fingerabdruck-Symbol anzeigen]]></target>
+			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.fingerprint_position" approved="yes">
 				<source><![CDATA[Position of the fingerprint symbol]]></source>
 				<target><![CDATA[Position des Fingerabdruck-Symbols]]></target>
@@ -878,8 +902,8 @@ Ohne diese Einstellung gilt diese Konfiguration nur für die Domäne, in der sie
 				<target><![CDATA[Automatisch allen externen Inhaltselementen, deren Quelle mit den folgenden regulären Ausdrücken übereinstimmt, die Dienstvorlage zuweisen. Jede neue Zeile wird als neuer regulärer Ausdruck interpretiert. Syntaxfehler können zu Problemen auf Ihrer Website führen!]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.replacement_html_overwritten" approved="yes">
-				<source><![CDATA[Overwrite Template (Allows to change the template code below. If this is selected, changes in future updates are not automatically applied.)]]></source>
-				<target><![CDATA[Vorlage überschreiben (Erlaubt die Änderung des untenstehenden Template-Codes. Änderungen in zukünftigen Updates werden dann nicht mehr automatisch übernommen.)]]></target>
+				<source><![CDATA[Overwrite Template]]></source>
+				<target><![CDATA[Vorlage überschreiben]]></target>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.tab.iframe_settings" approved="yes">
 				<source><![CDATA[Services]]></source>
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index cb16d522880f3b812f10a49ee8be37ee8348e149..78ef21010c9bf573ceace5cda9d84cb635d11ae5 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -37,13 +37,13 @@
 				<source><![CDATA[https://www.sgalinski.de/en/typo3-products-web-development/cookie-optin-for-typo3/#c17080]]></source>
 			</trans-unit>
 			<trans-unit id="backend.exportConfig">
-				<source><![CDATA[Export Configuration]]></source>
+				<source><![CDATA[Export]]></source>
 			</trans-unit>
 			<trans-unit id="backend.fileUploadLabel">
 				<source><![CDATA[JSON Configuration File]]></source>
 			</trans-unit>
 			<trans-unit id="backend.importConfig">
-				<source><![CDATA[Import Configuration]]></source>
+				<source><![CDATA[Import]]></source>
 			</trans-unit>
 			<trans-unit id="backend.jsonExport.error">
 				<source><![CDATA[Could not export the configuration because of the following error:]]></source>
@@ -192,8 +192,17 @@
 			<trans-unit id="backend.tooManyRecorsException.header">
 				<source><![CDATA[Too many entries detected]]></source>
 			</trans-unit>
-			<trans-unit id="backend.toolForCookies">
-				<source><![CDATA[The following tool delivers information about used cookies on your site. Use this information for the cookie instruction in the configuration. Beware that not all cookies might be listed. URL]]></source>
+			<trans-unit id="backend.toolForCookies" approved="yes">
+				<source><![CDATA[The following tool delivers information about used cookies on your site. Use this information for the cookie instruction in the configuration. Beware that not all cookies might be listed.]]></source>
+			</trans-unit>
+			<trans-unit id="backend.toolForCookies.button" approved="yes">
+				<source><![CDATA[Cookie Tool]]></source>
+			</trans-unit>
+			<trans-unit id="backend.checkStats" approved="yes">
+				<source><![CDATA[Click this button to access the statistics of your opt-in data.]]></source>
+			</trans-unit>
+			<trans-unit id="backend.checkStats.button" approved="yes">
+				<source><![CDATA[Statistics]]></source>
 			</trans-unit>
 			<trans-unit id="backend.upload">
 				<source><![CDATA[Upload]]></source>
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
index a03ab0097808277c87a1d02c26c126a258f23b03..3cb2c789ae7788924682b6108755c3056ea43a58 100644
--- a/Resources/Private/Language/locallang_db.xlf
+++ b/Resources/Private/Language/locallang_db.xlf
@@ -78,12 +78,30 @@
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.accept_specific_text">
 				<source><![CDATA[Button for Accepting Selected Cookies & Scripts]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.activate_testing_mode">
-				<source><![CDATA[Activate TEST mode (dialog not active, add "?showOptIn=1" to the URL to get the dialog.)]]></source>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.activate_testing_mode" approved="yes">
+				<source><![CDATA[Activate TEST Mode]]></source>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.activate_testing_mode.description" approved="yes">
+				<source><![CDATA[Dialog not active, add "?showOptIn=1" to the URL to get the dialog]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_button_accept_text">
 				<source><![CDATA[Accept Button Text]]></source>
 			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_button_accept_essential_text" approved="yes">
+				<source><![CDATA[Reject Button Text]]></source>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_color_button_accept_essential" approved="yes">
+				<source><![CDATA[Background Color Reject Button]]></source>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_color_button_accept_essential_hover" approved="yes">
+				<source><![CDATA[Hover Color Reject Button]]></source>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_color_button_accept_essential_text" approved="yes">
+				<source><![CDATA[Text Color Reject Button]]></source>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.palette.banner_accept_essential_button" approved="yes">
+				<source><![CDATA[Essential Button]]></source>
+			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_button_settings_text">
 				<source><![CDATA[Settings Button Text]]></source>
 			</trans-unit>
@@ -127,7 +145,7 @@
 				<source><![CDATA[Banner Template Code (HTML, variables and logic are processed with Mustache, see https://mustache.github.io/mustache.5.html) ]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_overwritten">
-				<source><![CDATA[Overwrite Template (Allows to change the template code below. If this is selected, changes in future updates are not automatically applied. Unset this option to reset the template below.)]]></source>
+				<source><![CDATA[Overwrite Template]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_position">
 				<source><![CDATA[The Position of the Banner on the Website]]></source>
@@ -138,17 +156,14 @@
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_position.1">
 				<source><![CDATA[Top]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_selection">
-				<source><![CDATA[Select Banner Base Design Template (This form will be saved and reloaded when this setting changes.)]]></source>
-			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_selection.0">
-				<source><![CDATA[Default]]></source>
-			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_show_again_interval">
 				<source><![CDATA[Show the cookie banner again if not all groups were selected after: (in days)]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_show_settings_button">
-				<source><![CDATA[Show the Settings Button within the Banner (Should be enabled if the website uses cookies.)]]></source>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_show_settings_button" approved="yes">
+				<source><![CDATA[Show the Settings Button within the Banner]]></source>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.banner_show_settings_button.description" approved="yes">
+				<source><![CDATA[Should be enabled if the website uses cookies]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.color_Table_data_text">
 				<source><![CDATA[Text Color - Data]]></source>
@@ -291,8 +306,11 @@
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.essential_description">
 				<source><![CDATA[Description (explains the use of these scripts & cookies)]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.essential_scripts">
-				<source><![CDATA[Scripts (For translations: Only "translated" scripts are considered. Added scripts without a default language parent will be ignored)]]></source>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.essential_scripts" approved="yes">
+				<source><![CDATA[Scripts]]></source>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.essential_scripts.description" approved="yes">
+				<source><![CDATA[For translations: Only "translated" scripts are considered. Added scripts without a default language parent will be ignored]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.essential_title">
 				<source><![CDATA[Group Title for Essential Cookies & Scripts the User has to Accept]]></source>
@@ -387,23 +405,11 @@
 				textEntries.iframe_open_settings_text – The value of the Link: "Open settings" field]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_replacement_overwritten">
-				<source><![CDATA[Overwrite iFrame Replacement Template (Allows to change the template code below. If this is selected, changes in future updates are not automatically applied. Unset this option to reset the template below.)]]></source>
-			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_replacement_selection">
-				<source><![CDATA[Select a Base Design for the iFrame Replacement Template (This form will be saved and reloaded when this setting changes.)]]></source>
-			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_replacement_selection.0">
-				<source><![CDATA[Default]]></source>
+				<source><![CDATA[Overwrite iFrame Replacement Template]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_replacement_template">
 				<source><![CDATA[iFrame Replacement Design Template]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_selection">
-				<source><![CDATA[Select a Base Design for the Settings Window Template (This form will be saved and reloaded when this setting changes.)]]></source>
-			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_selection.0">
-				<source><![CDATA[Default]]></source>
-			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_template">
 				<source><![CDATA[External Content Settings Window Design Template]]></source>
 			</trans-unit>
@@ -416,20 +422,11 @@
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist">
 				<source><![CDATA[External content whitelist. (Object sources matching these regular expressions will not be replaced.)]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist_overwritten">
-				<source><![CDATA[Overwrite Whitelist (Allows to change the template code below. If this is selected, changes in future updates are not automatically applied. Unset this option to reset the template below.)]]></source>
-			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist_regex">
-				<source><![CDATA[Whitelist external content. Every new line is interpreted as a new regular expression]]></source>
-			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist_regex.description">
-				<source><![CDATA[This field is interpreted as a regular expression. Syntax errors in this expression may lead to errors on your website. Therefore please always test your website after you change this value. For more information hover over the field label.]]></source>
-			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist_selection">
-				<source><![CDATA[Select a base template for your whitelist (This form will be saved and reloaded when this setting changes.)]]></source>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist_regex" approved="yes">
+				<source><![CDATA[Whitelist for external content.]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist_selection.0">
-				<source><![CDATA[Default]]></source>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.iframe_whitelist_regex.description" approved="yes">
+				<source><![CDATA[Whitelist all external content that matches the following regular expressions. Each new line is interpreted as a new regular expression. Syntax errors in this expression can cause errors on your website! Therefore, please always check your website after changing this value. You can also test the syntax on https://regex101.com.]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.link_texts">
 				<source><![CDATA[Link Texts]]></source>
@@ -464,8 +461,11 @@
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.palette.update_version">
 				<source><![CDATA[Version control]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.render_assets_inline">
-				<source><![CDATA[Render CSS and JavaScript contents inline (may impact the performance negatively)]]></source>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.render_assets_inline" approved="yes">
+				<source><![CDATA[Render CSS and JavaScript contents inline]]></source>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.render_assets_inline.description" approved="yes">
+				<source><![CDATA[May impact the performance]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.save_confirmation_text">
 				<source><![CDATA[Text for notification shown when cookie preferences are set]]></source>
@@ -545,11 +545,17 @@ Without this setting, this configuration only applies to the domain where it is
 				textEntries.user_hash_text – The hash field label (Tab Labels & Menu)
 				footerLinks (name) – A list of the footer links with their respective name]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.template_overwritten">
-				<source><![CDATA[Overwrite Template (Allows to change the template code below. If this is selected, changes in future updates are not automatically applied. Unset this option to reset the template below.)]]></source>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.template_overwritten" approved="yes">
+				<source><![CDATA[Overwrite Template]]></source>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.template_overwritten.description" approved="yes">
+				<source><![CDATA[Allows to change the template code below. If this is selected, changes in future updates are not automatically applied. Unset this option to reset the template below]]></source>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.template_selection" approved="yes">
+				<source><![CDATA[Select a Base Design Template]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_optin.template_selection">
-				<source><![CDATA[Select a Base Design Template (This form will be saved and reloaded when this setting changes.)]]></source>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.template_selection.description" approved="yes">
+				<source><![CDATA[This form will be saved and reloaded when this setting changes]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.template_selection.0">
 				<source><![CDATA[Compact]]></source>
@@ -572,8 +578,11 @@ Without this setting, this configuration only applies to the domain where it is
 			<trans-unit id="tx_sgcookieoptin_domain_model_script.hidden">
 				<source><![CDATA[Deactivate]]></source>
 			</trans-unit>
-			<trans-unit id="tx_sgcookieoptin_domain_model_script.html">
-				<source><![CDATA[HTML that shall be loaded if the user accepts this group (Do not use "document.write" as this will cause errors on the website)]]></source>
+			<trans-unit id="tx_sgcookieoptin_domain_model_script.html" approved="yes">
+				<source><![CDATA[HTML that shall be loaded if the user accepts this group]]></source>
+			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_script.html.description" approved="yes">
+				<source><![CDATA[Do not use "document.write" as this will cause errors on the website]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_script.parent_group">
 				<source><![CDATA[Group]]></source>
@@ -599,6 +608,9 @@ Without this setting, this configuration only applies to the domain where it is
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.disable_usage_statistics" approved="yes">
 				<source><![CDATA[Disable Usage Statistics and Tracability]]></source>
 			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_optin.show_fingerprint" approved="yes">
+				<source><![CDATA[Show fingerprint symbol]]></source>
+			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.fingerprint_position" approved="yes">
 				<source><![CDATA[Position of the fingerprint symbol]]></source>
 			</trans-unit>
@@ -645,7 +657,7 @@ Without this setting, this configuration only applies to the domain where it is
 				<source><![CDATA[Enter a URL to a background image if you would like to use it instead of the background color. Please make sure the origin is allowed in your content security policy.]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.replacement_html_overwritten" approved="yes">
-				<source><![CDATA[Overwrite Template (Allows to change the template code below. If this is selected, changes in future updates are not automatically applied.)]]></source>
+				<source><![CDATA[Overwrite Template]]></source>
 			</trans-unit>
 			<trans-unit id="tx_sgcookieoptin_domain_model_optin.tab.iframe_settings" approved="yes">
 				<source><![CDATA[Services]]></source>
@@ -677,6 +689,9 @@ Without this setting, this configuration only applies to the domain where it is
 				placeholders.iframe_consent_description – The description, provided for this specific element, or the global additional description, set in this tab
 				textEntries.iframe_open_settings_text – The value of the Link: "Open settings" field]]></source>
 			</trans-unit>
+			<trans-unit id="tx_sgcookieoptin_domain_model_cookie.name.description" approved="yes">
+				<source><![CDATA[This field is interpreted as a regular expression. Syntax errors in this expression may lead to errors on your website. Therefore please always test your website after you change this value. For more information hover over the field label. You can also test the syntax on https://regex101.com. We enforce exact matches. If your regular expression does not include the ^ and $ symbols, we will automatically add them to the regular expression when evaluating it.]]></source>
+			</trans-unit>
 		</body>
 	</file>
 </xliff>
diff --git a/Resources/Private/Partials/License.html b/Resources/Private/Partials/License.html
index 6a203e2d0a1104eb7f5d09eeb145c66e96597f1e..11ae733e29ab0a77d48a46a3b25fa5b47e1e29e5 100644
--- a/Resources/Private/Partials/License.html
+++ b/Resources/Private/Partials/License.html
@@ -7,7 +7,7 @@
 		</a>
 
 		<f:if condition="{showDemoButton}">
-			<f:link.action class="btn btn-default btn-sm btn-info" action="activateDemoMode">
+			<f:link.action class="btn btn-default btn-sm btn-info text-white" action="activateDemoMode">
 				<f:translate key="backend.activateDemoMode" />
 			</f:link.action>
 		</f:if>
@@ -24,12 +24,18 @@
 </a>
 
 <f:if condition="{sg:backend.isVersionHigherThan(version: '9.0.0')}">
-	<f:if condition="{isSiteRoot} && {controller} == 'Optin'">
+	<f:if condition="{isSiteRoot}">
 		<f:link.action class="btn btn-default btn-sm" action="uploadJson">
 			<f:translate key="backend.importConfig" />
 		</f:link.action>
 		<f:link.action class="btn btn-default btn-sm" action="exportJson">
 			<f:translate key="backend.exportConfig" />
 		</f:link.action>
+		<f:link.action class="btn btn-default btn-sm" action="index" controller="Statistics">
+			<f:translate key="backend.statistics_action" />
+		</f:link.action>
+		<f:link.action class="btn btn-default btn-sm" action="index" controller="Consent">
+			<f:translate key="backend.consent_action" />
+		</f:link.action>
 	</f:if>
 </f:if>
diff --git a/Resources/Private/Templates/Mustache/Banner/Default.html b/Resources/Private/Templates/Mustache/Banner/Default.html
index e55a0e01274112a219f3f1a5330244f01611aabe..807edd4b2b1a4f651476b60053afba848281c169 100644
--- a/Resources/Private/Templates/Mustache/Banner/Default.html
+++ b/Resources/Private/Templates/Mustache/Banner/Default.html
@@ -30,6 +30,7 @@
 					<button class="sg-cookie-optin-banner-button-settings">{{{textEntries.banner_button_settings_text}}}</button>
 				{{/settings.banner_show_settings_button}}
 
+				<button class="sg-cookie-optin-banner-button-accept-essential">{{{textEntries.banner_button_accept_essential_text}}}</button>
 				<button class="sg-cookie-optin-banner-button-accept">{{{textEntries.banner_button_accept_text}}}</button>
 			</div>
 		</div>
diff --git a/Resources/Private/Templates/Mustache/Template/Default.html b/Resources/Private/Templates/Mustache/Template/Default.html
index 3a04e7dc82c7a8ffbf2635c0dd6524191bef1412..81e6e8350c04059a1d7e5272deedf46dc149c6bc 100644
--- a/Resources/Private/Templates/Mustache/Template/Default.html
+++ b/Resources/Private/Templates/Mustache/Template/Default.html
@@ -66,7 +66,7 @@
 				{{#cookieData}}
 					{{^index}}<a  class="sg-cookie-optin-box-sublist-open-more-link" href="#">{{{textEntries.extend_table_link_text}}}
 						<span>
-							<svg fill='currentColor' xmlns='http://www.w3.org/2000/svg'
+							<svg class="sg-cookie-optin-box-sublist-open-more-symbol" fill='currentColor' xmlns='http://www.w3.org/2000/svg'
 								 viewBox='0 0 512 512'>
 								<path d='M504 256c0 137-111 248-248 248S8 393 8 256 119 8 256 8s248 111 248 248zM273 369.9l135.5-135.5c9.4-9.4 9.4-24.6 0-33.9l-17-17c-9.4-9.4-24.6-9.4-33.9 0L256 285.1 154.4 183.5c-9.4-9.4-24.6-9.4-33.9 0l-17 17c-9.4 9.4-9.4 24.6 0 33.9L239 369.9c9.4 9.4 24.6 9.4 34 0z'/>
 							</svg>
@@ -78,7 +78,14 @@
 	</ul>
 
 	<div class="sg-cookie-optin-box-open-more">
-		<a class="sg-cookie-optin-box-open-more-link" href="#">{{{textEntries.extend_box_link_text}}}</a>
+		<a class="sg-cookie-optin-box-open-more-link" href="#">{{{textEntries.extend_box_link_text}}}
+			<span>
+				<svg class="sg-cookie-optin-box-sublist-open-more-symbol" fill='currentColor' xmlns='http://www.w3.org/2000/svg'
+					 viewBox='0 0 512 512'>
+					<path d='M504 256c0 137-111 248-248 248S8 393 8 256 119 8 256 8s248 111 248 248zM273 369.9l135.5-135.5c9.4-9.4 9.4-24.6 0-33.9l-17-17c-9.4-9.4-24.6-9.4-33.9 0L256 285.1 154.4 183.5c-9.4-9.4-24.6-9.4-33.9 0l-17 17c-9.4 9.4-9.4 24.6 0 33.9L239 369.9c9.4 9.4 24.6 9.4 34 0z'/>
+				</svg>
+			</span>
+		</a>
 	</div>
 
 	<div class="sg-cookie-optin-box-footer">
diff --git a/Resources/Private/Templates/Mustache/Template/Full.html b/Resources/Private/Templates/Mustache/Template/Full.html
index b5c61044f435d56103ca004f5bfaa090b9717cca..3f19a56be2844d7e17c002fa7ddaa9f2f9954b74 100644
--- a/Resources/Private/Templates/Mustache/Template/Full.html
+++ b/Resources/Private/Templates/Mustache/Template/Full.html
@@ -59,7 +59,7 @@
 
 		<a  class="sg-cookie-optin-box-sublist-open-more-link" href="#">{{{textEntries.extend_table_link_text}}}
 			<span>
-				<svg fill='currentColor' xmlns='http://www.w3.org/2000/svg'
+				<svg class="sg-cookie-optin-box-sublist-open-more-symbol" fill='currentColor' xmlns='http://www.w3.org/2000/svg'
 					 viewBox='0 0 512 512'>
 					<path d='M504 256c0 137-111 248-248 248S8 393 8 256 119 8 256 8s248 111 248 248zM273 369.9l135.5-135.5c9.4-9.4 9.4-24.6 0-33.9l-17-17c-9.4-9.4-24.6-9.4-33.9 0L256 285.1 154.4 183.5c-9.4-9.4-24.6-9.4-33.9 0l-17 17c-9.4 9.4-9.4 24.6 0 33.9L239 369.9c9.4 9.4 24.6 9.4 34 0z'/>
 				</svg>
diff --git a/Resources/Private/Templates/Optin/Index.html b/Resources/Private/Templates/Optin/Index.html
index 1dcdb67f284bb44aedf51f82bf5b08dcb1a34761..ea8e497939d8a537b3155a2a816e9da4c80942f8 100644
--- a/Resources/Private/Templates/Optin/Index.html
+++ b/Resources/Private/Templates/Optin/Index.html
@@ -128,6 +128,7 @@
 						</div>
 						<div class="media-body">
 							<h4 class="alert-title"><f:translate key="backend.addScripts" /></h4>
+							<p><f:translate key="backend.toolForCookies" /> <a class="btn btn-default btn-sm text-decoration-none" href="https://www.cookieserve.com/" target="_blank"><f:translate key="backend.toolForCookies.button" /></a></p>
 						</div>
 					</div>
 				</div>
@@ -149,9 +150,6 @@
 					</div>
 				</div>
 			</div>
-
-			<p><f:translate key="backend.toolForCookies" />: <a href="https://www.cookieserve.com/" target="_blank">https://www.cookieserve.com/</a></p>
-			<iframe src="https://www.cookieserve.com/" width="100%" height="500px" style="height: 500px;"></iframe>
 		</f:then>
 		<f:else>
 			<f:flashMessages />
diff --git a/Resources/Public/JavaScript/cookieOptin.js b/Resources/Public/JavaScript/cookieOptin.js
index e97d02968e8265ff10650367467d03a39bbf426f..58ebb57e14f34c4596a5c786e272f4bfb81ee4b7 100644
--- a/Resources/Public/JavaScript/cookieOptin.js
+++ b/Resources/Public/JavaScript/cookieOptin.js
@@ -89,7 +89,9 @@ const SgCookieOptin = {
 		) {
 			SgCookieOptin.openCookieOptin(null, {hideBanner: false});
 		} else {
-			SgCookieOptin.showFingerprint();
+			if (!SgCookieOptin.jsonData.settings.activate_testing_mode) {
+				SgCookieOptin.showFingerprint();
+			}
 		}
 	},
 
@@ -687,13 +689,21 @@ const SgCookieOptin = {
 						}
 
 						const cookieName = documentCookies[documentCookieIndex].split('=')[0];
-						const regExString = SgCookieOptin.jsonData.cookieGroups[groupIndex].cookieData[cookieIndex]
+						let regExString = SgCookieOptin.jsonData.cookieGroups[groupIndex].cookieData[cookieIndex]
 							.Name.trim();
 
 						if (!regExString) {
 							continue;
 						}
 
+						if (regExString.charAt(0) !== '^') {
+							regExString = '^' + regExString;
+						}
+
+						if (regExString.charAt(regExString.length - 1) !== '$') {
+							regExString += '$';
+						}
+
 						const regEx = new RegExp(regExString);
 						if (regEx.test(cookieName)) {
 							// delete the cookie
@@ -798,7 +808,7 @@ const SgCookieOptin = {
 			}
 		});
 
-		const acceptEssentialButtons = element.querySelectorAll('.sg-cookie-optin-box-button-accept-essential');
+		const acceptEssentialButtons = element.querySelectorAll('.sg-cookie-optin-box-button-accept-essential, .sg-cookie-optin-banner-button-accept-essential');
 		SgCookieOptin.addEventListenerToList(acceptEssentialButtons, 'click', function() {
 			SgCookieOptin.acceptEssentialCookies();
 			SgCookieOptin.updateCookieList();
@@ -863,6 +873,7 @@ const SgCookieOptin = {
 			});
 			parentNode.dispatchEvent(cookieOptinHiddenEvent);
 		}
+
 		SgCookieOptin.showFingerprint();
 	},
 
@@ -934,7 +945,13 @@ const SgCookieOptin = {
 	openCookieDetails: function(event) {
 		event.preventDefault();
 
-		const openMoreElement = event.target.parentNode;
+		let link = event.target;
+		if (link.tagName !== 'A') {
+			link = link.closest('a');
+		}
+
+		const openMoreElement = link.parentNode;
+		const symbolElement = link.parentElement.querySelector('.sg-cookie-optin-box-sublist-open-more-symbol');
 		if (!openMoreElement) {
 			return;
 		}
@@ -946,10 +963,16 @@ const SgCookieOptin = {
 
 		if (cookieDetailList.classList.contains('sg-cookie-optin-visible')) {
 			cookieDetailList.classList.remove('sg-cookie-optin-visible');
-			event.target.innerHTML = SgCookieOptin.jsonData.textEntries.extend_box_link_text;
+			link.firstChild.textContent = SgCookieOptin.jsonData.textEntries.extend_box_link_text;
+			if (symbolElement) {
+				symbolElement.classList.remove('sg-cookie-optin-flipped');
+			}
 		} else {
 			cookieDetailList.classList.add('sg-cookie-optin-visible');
-			event.target.innerHTML = SgCookieOptin.jsonData.textEntries.extend_box_link_text_close;
+			link.firstChild.textContent = SgCookieOptin.jsonData.textEntries.extend_box_link_text_close;
+			if (symbolElement) {
+				symbolElement.classList.add('sg-cookie-optin-flipped');
+			}
 		}
 	},
 
@@ -963,11 +986,17 @@ const SgCookieOptin = {
 	openSubList: function(event, contentElement) {
 		event.preventDefault();
 
+		let link = event.target;
+		if (link.tagName !== 'A') {
+			link = link.closest('a');
+		}
+
 		// todo remove redundant code.
 		let height = 0;
-		const cookieSubList = event.target.previousElementSibling;
+		const cookieSubList = link.previousElementSibling;
+		const symbolElement = link.parentElement.querySelector('.sg-cookie-optin-box-sublist-open-more-symbol');
 		if (!cookieSubList || !cookieSubList.classList.contains('sg-cookie-optin-box-cookie-detail-sublist')) {
-			const cookieOptin = event.target.closest('#SgCookieOptin');
+			const cookieOptin = link.closest('#SgCookieOptin');
 			const cookieBoxes = cookieOptin.querySelectorAll('.sg-cookie-optin-box-new');
 			for (const index in cookieBoxes) {
 				if (!cookieBoxes.hasOwnProperty(index)) {
@@ -980,12 +1009,18 @@ const SgCookieOptin = {
 					visible = false;
 					cookieBox.classList.remove('sg-cookie-optin-visible');
 					cookieBox.classList.add('sg-cookie-optin-invisible');
-					event.target.innerHTML = SgCookieOptin.jsonData.textEntries.extend_table_link_text;
+					link.firstChild.textContent = SgCookieOptin.jsonData.textEntries.extend_table_link_text;
+					if (symbolElement) {
+						symbolElement.classList.remove('sg-cookie-optin-flipped');
+					}
 				} else {
 					cookieBox.classList.remove('sg-cookie-optin-invisible');
 					cookieBox.classList.add('sg-cookie-optin-visible');
 					SgCookieOptin.adjustReasonHeight(cookieOptin, contentElement);
-					event.target.innerHTML = SgCookieOptin.jsonData.textEntries.extend_table_link_text_close;
+					link.firstChild.textContent = SgCookieOptin.jsonData.textEntries.extend_table_link_text_close;
+					if (symbolElement) {
+						symbolElement.classList.add('sg-cookie-optin-flipped');
+					}
 				}
 
 				const descriptions = cookieBox.querySelectorAll('.sg-cookie-optin-checkbox-description');
@@ -1007,19 +1042,25 @@ const SgCookieOptin = {
 			if (cookieSubList.classList.contains('sg-cookie-optin-visible')) {
 				cookieSubList.classList.remove('sg-cookie-optin-visible');
 				cookieSubList.style.height = '';
-				event.target.innerHTML = SgCookieOptin.jsonData.textEntries.extend_table_link_text;
+				link.firstChild.textContent = SgCookieOptin.jsonData.textEntries.extend_table_link_text;
+				if (symbolElement) {
+					symbolElement.classList.remove('sg-cookie-optin-flipped');
+				}
 			} else {
 				cookieSubList.classList.add('sg-cookie-optin-visible');
 				cookieSubList.style.height = 'auto';
 				height = cookieSubList.getBoundingClientRect().height + 'px';
 				cookieSubList.style.height = '';
+				if (symbolElement) {
+					symbolElement.classList.add('sg-cookie-optin-flipped');
+				}
 				requestAnimationFrame(function() {
 					setTimeout(function() {
 						cookieSubList.style.height = height;
 					}, 10);
 				});
 
-				event.target.innerHTML = SgCookieOptin.jsonData.textEntries.extend_table_link_text_close;
+				link.firstChild.textContent = SgCookieOptin.jsonData.textEntries.extend_table_link_text_close;
 			}
 		}
 	},
@@ -2138,7 +2179,10 @@ const SgCookieOptin = {
 	 * Shows the fingerprint and creates the element if necessary
 	 */
 	showFingerprint: function() {
-		if (!(SgCookieOptin.jsonData.settings.fingerprint_position > 0) || !SgCookieOptin.shouldShowOptinBanner()) {
+		// noinspection EqualityComparisonWithCoercionJS
+		// checkbox and position must be set properly
+		if (!(SgCookieOptin.jsonData.settings.show_fingerprint
+			&& SgCookieOptin.jsonData.settings.fingerprint_position > 0)) {
 			return;
 		}
 
@@ -2186,87 +2230,10 @@ const SgCookieOptin = {
 		fingerprintContainer.classList.add('sg-cookie-optin-fingerprint');
 		fingerprintContainer.classList.add('sg-cookie-optin-fingerprint-' + iconPositionClass);
 		fingerprintContainer.addEventListener('click', function(e) {
-			SgCookieOptin.openCookieOptin();
+			SgCookieOptin.openCookieOptin(null, {hideBanner: true});
 		});
 
-		fingerprintContainer.innerHTML = '<svg fill="currentColor" class="sg-cookie-optin-fingerprint-icon" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\n' +
-			'\t viewBox="0 0 512 512" xml:space="preserve">\n' +
-			'<g transform="translate(1 1)">\n' +
-			'\t\t\t\t<g>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M275.334,511L275.334,511c-5.207,0-8.678-4.339-8.678-8.678\n' +
-			'\t\t\t\t\t\tc6.075-182.237-16.488-256.868-17.356-257.736c-1.736-4.339,0.868-9.546,5.207-11.281c4.339-1.736,9.546,0.868,11.281,5.207\n' +
-			'\t\t\t\t\t\tc0.868,3.471,24.298,77.234,17.356,262.942C284.012,507.529,279.673,511,275.334,511z"/>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M491.415,294.051c-4.339,0-7.81-3.471-8.678-7.81c-6.075-58.142-14.753-104.136-25.166-128.434\n' +
-			'\t\t\t\t\t\tC423.727,77.102,345.625,25.034,257.978,25.034c-28.637,0-57.275,5.207-83.308,16.488c-14.753,6.075-28.637,13.885-41.654,21.695\n' +
-			'\t\t\t\t\t\tc-4.339,2.603-9.546,1.736-12.149-2.603c-2.603-4.339-1.736-9.546,2.603-12.149c13.885-8.678,28.637-16.488,45.125-23.431\n' +
-			'\t\t\t\t\t\tc27.769-11.281,58.142-17.356,89.383-17.356c94.59,0,178.766,56.407,216.081,143.186c13.885,33.844,22.563,91.119,26.034,133.641\n' +
-			'\t\t\t\t\t\tC500.961,289.712,497.489,293.183,491.415,294.051C492.283,294.051,491.415,294.051,491.415,294.051z"/>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M43.632,363.475c-3.471,0-6.942-2.603-8.678-6.075c-43.39-145.79,2.603-231.702,49.464-277.695\n' +
-			'\t\t\t\t\t\tc3.471-3.471,8.678-3.471,12.149,0s3.471,8.678,0,12.149C34.086,152.6,18.466,242.851,51.442,352.193\n' +
-			'\t\t\t\t\t\tc1.736,4.339-0.868,9.546-6.075,10.414C45.367,363.475,44.5,363.475,43.632,363.475z"/>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M100.906,450.254c-5.207,0-8.678-3.471-8.678-8.678c0-61.614,0-101.532-3.471-122.359\n' +
-			'\t\t\t\t\t\tc-1.736-9.546-4.339-19.092-6.075-27.769C57.517,202.932,102.642,109.21,187.686,73.631\n' +
-			'\t\t\t\t\t\tc24.298-10.414,50.332-14.753,77.234-13.885c69.424,2.603,144.922,60.746,168.353,130.169\n' +
-			'\t\t\t\t\t\tc19.092,56.407,19.092,150.129,17.356,234.305c0,5.207-4.339,8.678-8.678,8.678c-5.207,0-8.678-4.339-8.678-8.678\n' +
-			'\t\t\t\t\t\tc2.603-82.441,1.736-174.427-16.488-228.23c-20.827-62.481-91.119-116.285-152.732-118.888\n' +
-			'\t\t\t\t\t\tc-24.298-0.868-47.729,3.471-69.424,13.017c-77.234,32.108-118.02,117.153-95.458,196.99c2.603,9.546,5.207,19.959,6.942,29.505\n' +
-			'\t\t\t\t\t\tc3.471,22.563,3.471,62.481,3.471,124.963C109.584,446.783,106.113,450.254,100.906,450.254z"/>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M388.147,476.288L388.147,476.288c-5.207,0-8.678-4.339-8.678-8.678\n' +
-			'\t\t\t\t\t\tc5.207-139.715,3.471-219.553-17.356-269.017c-17.356-41.654-58.142-68.556-104.136-68.556c-7.81,0-16.488,0.868-24.298,2.603\n' +
-			'\t\t\t\t\t\tc-4.339,0.868-9.546-1.736-10.414-6.942c-0.868-4.339,1.736-9.546,6.942-10.414c9.546-1.736,18.224-2.603,27.77-2.603\n' +
-			'\t\t\t\t\t\tc52.068,0,99.797,31.241,119.756,79.837c22.563,52.936,24.298,131.905,19.092,276.827\n' +
-			'\t\t\t\t\t\tC396.825,472.817,392.486,476.288,388.147,476.288z M161.652,458.932c-5.207,0-8.678-3.471-8.678-8.678\n' +
-			'\t\t\t\t\t\tc0-99.797-17.356-164.014-18.224-164.881c-15.62-58.142,3.471-118.888,48.597-150.129c4.339-2.603,9.546-1.736,12.149,1.736\n' +
-			'\t\t\t\t\t\tc2.603,4.339,1.736,9.546-1.736,12.149c-39.051,26.902-55.539,79.837-41.654,131.037c0.868,2.603,18.224,66.82,18.224,169.22\n' +
-			'\t\t\t\t\t\tC170.33,455.461,166.859,458.932,161.652,458.932z"/>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M336.079,502.322L336.079,502.322c-5.207,0-8.678-4.339-8.678-8.678c0-11.281,0-27.77,0-42.522\n' +
-			'\t\t\t\t\t\tc0-10.414-0.868-19.959,0-26.902c0-4.339,4.339-8.678,8.678-8.678l0,0c5.207,0,8.678,4.339,8.678,8.678c0,6.075,0,15.62,0,26.034\n' +
-			'\t\t\t\t\t\tc0,14.753,0.868,32.108,0,43.39C344.757,498.851,340.418,502.322,336.079,502.322z"/>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M213.72,502.322c-5.207,0-8.678-3.471-8.678-8.678c0-103.268-5.207-207.403-12.149-227.363\n' +
-			'\t\t\t\t\t\tc-12.149-36.447,4.339-74.631,38.183-88.515c8.678-3.471,17.356-5.207,26.902-5.207c27.77,0,52.936,16.488,64.217,42.522\n' +
-			'\t\t\t\t\t\tc17.356,40.786,22.563,112.814,23.431,165.749c0,5.207-3.471,8.678-8.678,8.678l0,0c-4.339,0-8.678-3.471-8.678-8.678\n' +
-			'\t\t\t\t\t\tc-0.868-51.2-6.075-120.624-22.563-158.807c-7.81-19.959-26.902-32.108-47.729-32.108c-6.942,0-13.885,1.736-19.959,4.339\n' +
-			'\t\t\t\t\t\tc-25.166,10.414-37.315,39.051-28.637,66.82c7.81,24.298,13.017,139.715,13.017,232.569\n' +
-			'\t\t\t\t\t\tC222.398,498.851,218.927,502.322,213.72,502.322z"/>\n' +
-			'\t\t\t\t</g>\n' +
-			'\t\t\t\t<g>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M267.523,511L267.523,511c-5.207,0-8.678-4.339-8.678-8.678\n' +
-			'\t\t\t\t\t\tc6.075-183.105-16.488-265.546-17.356-266.414c-1.736-4.339,1.736-9.546,6.075-10.414c4.339-1.736,9.546,1.736,10.414,6.075\n' +
-			'\t\t\t\t\t\tc0.868,3.471,24.298,85.912,17.356,271.62C276.201,507.529,271.862,511,267.523,511z"/>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M483.605,285.373c-4.339,0-7.81-3.471-8.678-7.81c-3.471-33.844-11.281-95.458-25.166-128.434\n' +
-			'\t\t\t\t\t\tC415.917,68.424,337.815,16.356,250.167,16.356c-28.637,0-57.275,5.207-83.308,16.488c-14.753,6.075-28.637,13.885-41.654,21.695\n' +
-			'\t\t\t\t\t\tc-4.339,2.603-9.546,1.736-12.149-2.603c-2.603-4.339-1.736-9.546,2.603-12.149c13.885-8.678,28.637-16.488,45.125-23.431\n' +
-			'\t\t\t\t\t\tC188.554,5.075,218.927-1,250.167-1c94.59,0,178.766,56.407,216.081,143.186c13.885,33.844,22.563,91.119,26.034,133.641\n' +
-			'\t\t\t\t\t\tC492.283,281.034,488.811,284.505,483.605,285.373C484.473,285.373,483.605,285.373,483.605,285.373z"/>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M35.822,354.797c-3.471,0-6.942-2.603-8.678-6.075c-43.39-145.79,2.603-231.702,49.464-277.695\n' +
-			'\t\t\t\t\t\tc3.471-3.471,8.678-3.471,12.149,0c3.471,3.471,3.471,8.678,0,12.149c-62.481,60.746-78.102,150.997-45.125,260.339\n' +
-			'\t\t\t\t\t\tc1.736,4.339-0.868,9.546-6.075,10.414C37.557,354.797,36.689,354.797,35.822,354.797z"/>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M93.096,441.576c-5.207,0-8.678-3.471-8.678-8.678c0-61.614,0-101.532-3.471-122.359\n' +
-			'\t\t\t\t\t\tc-1.736-9.546-3.471-18.224-6.075-27.77C49.706,194.254,94.832,100.532,179.876,64.953c24.298-10.414,50.332-14.753,77.234-13.885\n' +
-			'\t\t\t\t\t\tc69.424,2.603,144.922,60.746,168.353,130.169c19.092,56.407,19.092,150.129,17.356,234.305c0,5.207-4.339,8.678-8.678,8.678\n' +
-			'\t\t\t\t\t\tc-5.207,0-8.678-4.339-8.678-8.678c2.603-82.441,1.736-174.427-16.488-228.23c-20.827-62.481-91.119-116.285-152.732-118.888\n' +
-			'\t\t\t\t\t\tc-24.298-0.868-47.729,3.471-69.424,13.017c-77.234,32.108-118.02,117.153-95.458,196.99c2.603,9.546,5.207,19.959,6.942,29.505\n' +
-			'\t\t\t\t\t\tc3.471,22.563,3.471,62.481,3.471,124.963C101.774,438.105,98.303,441.576,93.096,441.576z"/>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M380.337,467.61L380.337,467.61c-5.207,0-8.678-4.339-8.678-8.678\n' +
-			'\t\t\t\t\t\tc5.207-139.715,3.471-219.553-17.356-269.017c-17.356-41.654-58.142-68.556-104.136-68.556c-7.81,0-16.488,0.868-24.298,2.603\n' +
-			'\t\t\t\t\t\tc-4.339,0.868-9.546-1.736-10.414-6.942c-0.868-4.339,1.736-9.546,6.942-10.414c9.546-1.736,18.224-2.603,27.77-2.603\n' +
-			'\t\t\t\t\t\tc52.068,0,99.797,31.241,119.756,79.837c22.563,52.936,24.298,131.905,19.092,276.827\n' +
-			'\t\t\t\t\t\tC389.015,464.139,384.676,467.61,380.337,467.61z M153.842,450.254c-5.207,0-8.678-3.471-8.678-8.678\n' +
-			'\t\t\t\t\t\tc0-99.797-17.356-164.014-18.224-164.881c-15.62-58.142,3.471-118.888,48.597-150.129c4.339-2.603,9.546-1.736,12.149,1.736\n' +
-			'\t\t\t\t\t\tc2.603,4.339,1.736,9.546-1.736,12.149c-39.051,26.902-55.539,79.837-41.654,131.037c0.868,3.471,18.224,67.688,18.224,170.088\n' +
-			'\t\t\t\t\t\tC162.52,446.783,159.049,450.254,153.842,450.254z"/>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M328.269,493.644L328.269,493.644c-5.207,0-8.678-4.339-8.678-8.678c0-11.281,0-27.77,0-42.522\n' +
-			'\t\t\t\t\t\tc0-10.414-0.868-19.959,0-26.034c0-4.339,4.339-8.678,8.678-8.678l0,0c5.207,0,8.678,4.339,8.678,8.678c0,6.075,0,15.62,0,26.034\n' +
-			'\t\t\t\t\t\tc0,15.62,0.868,32.108,0,43.39C336.947,490.173,332.608,493.644,328.269,493.644z"/>\n' +
-			'\t\t\t\t\t<path style="fill:currentColor;" d="M205.91,493.644c-5.207,0-8.678-3.471-8.678-8.678c0-103.268-5.207-207.403-12.149-227.363\n' +
-			'\t\t\t\t\t\tc-12.149-36.447,4.339-74.631,38.183-88.515c8.678-3.471,17.356-5.207,26.902-5.207c27.769,0,52.936,16.488,64.217,42.522\n' +
-			'\t\t\t\t\t\tc17.356,40.786,22.563,112.814,23.431,165.749c0,5.207-3.471,8.678-8.678,8.678l0,0c-4.339,0-8.678-3.471-8.678-8.678\n' +
-			'\t\t\t\t\t\tc-0.868-51.2-6.075-120.624-22.563-159.675c-7.81-19.092-26.902-32.108-47.729-32.108c-6.942,0-13.885,1.736-19.959,4.339\n' +
-			'\t\t\t\t\t\tc-25.166,10.414-37.315,39.051-28.637,66.82c7.81,25.166,13.017,140.583,13.017,233.437\n' +
-			'\t\t\t\t\t\tC214.588,490.173,211.117,493.644,205.91,493.644z"/>\n' +
-			'\t\t\t\t</g>\n' +
-			'\t\t\t</g>' +
-			'</svg>';
+		fingerprintContainer.innerHTML = '<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" fill="currentColor" class="sg-cookie-optin-fingerprint-icon" viewBox="0 0 512 512"><path d="M275.334 511c-5.207 0-8.678-4.339-8.678-8.678 6.075-182.237-16.488-256.868-17.356-257.736-1.736-4.339.868-9.546 5.207-11.281 4.339-1.736 9.546.868 11.281 5.207.868 3.471 24.298 77.234 17.356 262.942.868 6.075-3.471 9.546-7.81 9.546zM491.415 294.051c-4.339 0-7.81-3.471-8.678-7.81-6.075-58.142-14.753-104.136-25.166-128.434C423.727 77.102 345.625 25.034 257.978 25.034c-28.637 0-57.275 5.207-83.308 16.488-14.753 6.075-28.637 13.885-41.654 21.695-4.339 2.603-9.546 1.736-12.149-2.603-2.603-4.339-1.736-9.546 2.603-12.149 13.885-8.678 28.637-16.488 45.125-23.431 27.769-11.281 58.142-17.356 89.383-17.356 94.59 0 178.766 56.407 216.081 143.186 13.885 33.844 22.563 91.119 26.034 133.641.868 5.207-2.604 8.678-8.678 9.546.868 0 0 0 0 0zM43.632 363.475c-3.471 0-6.942-2.603-8.678-6.075-43.39-145.79 2.603-231.702 49.464-277.695 3.471-3.471 8.678-3.471 12.149 0s3.471 8.678 0 12.149C34.086 152.6 18.466 242.851 51.442 352.193c1.736 4.339-.868 9.546-6.075 10.414 0 .868-.867.868-1.735.868z" style="fill:currentColor" transform="translate(1 1)"/><path d="M100.906 450.254c-5.207 0-8.678-3.471-8.678-8.678 0-61.614 0-101.532-3.471-122.359-1.736-9.546-4.339-19.092-6.075-27.769-25.165-88.516 19.96-182.238 105.004-217.817 24.298-10.414 50.332-14.753 77.234-13.885 69.424 2.603 144.922 60.746 168.353 130.169 19.092 56.407 19.092 150.129 17.356 234.305 0 5.207-4.339 8.678-8.678 8.678-5.207 0-8.678-4.339-8.678-8.678 2.603-82.441 1.736-174.427-16.488-228.23-20.827-62.481-91.119-116.285-152.732-118.888-24.298-.868-47.729 3.471-69.424 13.017-77.234 32.108-118.02 117.153-95.458 196.99 2.603 9.546 5.207 19.959 6.942 29.505 3.471 22.563 3.471 62.481 3.471 124.963 0 5.206-3.471 8.677-8.678 8.677z" style="fill:currentColor" transform="translate(1 1)"/><path d="M388.147 476.288c-5.207 0-8.678-4.339-8.678-8.678 5.207-139.715 3.471-219.553-17.356-269.017-17.356-41.654-58.142-68.556-104.136-68.556-7.81 0-16.488.868-24.298 2.603-4.339.868-9.546-1.736-10.414-6.942-.868-4.339 1.736-9.546 6.942-10.414 9.546-1.736 18.224-2.603 27.77-2.603 52.068 0 99.797 31.241 119.756 79.837 22.563 52.936 24.298 131.905 19.092 276.827 0 3.472-4.339 6.943-8.678 6.943zm-226.495-17.356c-5.207 0-8.678-3.471-8.678-8.678 0-99.797-17.356-164.014-18.224-164.881-15.62-58.142 3.471-118.888 48.597-150.129 4.339-2.603 9.546-1.736 12.149 1.736 2.603 4.339 1.736 9.546-1.736 12.149-39.051 26.902-55.539 79.837-41.654 131.037.868 2.603 18.224 66.82 18.224 169.22 0 6.075-3.471 9.546-8.678 9.546zM336.079 502.322c-5.207 0-8.678-4.339-8.678-8.678v-42.522c0-10.414-.868-19.959 0-26.902 0-4.339 4.339-8.678 8.678-8.678 5.207 0 8.678 4.339 8.678 8.678v26.034c0 14.753.868 32.108 0 43.39 0 5.207-4.339 8.678-8.678 8.678z" style="fill:currentColor" transform="translate(1 1)"/><path d="M213.72 502.322c-5.207 0-8.678-3.471-8.678-8.678 0-103.268-5.207-207.403-12.149-227.363-12.149-36.447 4.339-74.631 38.183-88.515 8.678-3.471 17.356-5.207 26.902-5.207 27.77 0 52.936 16.488 64.217 42.522 17.356 40.786 22.563 112.814 23.431 165.749 0 5.207-3.471 8.678-8.678 8.678-4.339 0-8.678-3.471-8.678-8.678-.868-51.2-6.075-120.624-22.563-158.807-7.81-19.959-26.902-32.108-47.729-32.108-6.942 0-13.885 1.736-19.959 4.339-25.166 10.414-37.315 39.051-28.637 66.82 7.81 24.298 13.017 139.715 13.017 232.569-.001 5.208-3.472 8.679-8.679 8.679z" style="fill:currentColor" transform="translate(1 1)"/><path d="M267.523 511c-5.207 0-8.678-4.339-8.678-8.678 6.075-183.105-16.488-265.546-17.356-266.414-1.736-4.339 1.736-9.546 6.075-10.414 4.339-1.736 9.546 1.736 10.414 6.075.868 3.471 24.298 85.912 17.356 271.62.867 4.34-3.472 7.811-7.811 7.811zM483.605 285.373c-4.339 0-7.81-3.471-8.678-7.81-3.471-33.844-11.281-95.458-25.166-128.434C415.917 68.424 337.815 16.356 250.167 16.356c-28.637 0-57.275 5.207-83.308 16.488-14.753 6.075-28.637 13.885-41.654 21.695-4.339 2.603-9.546 1.736-12.149-2.603-2.603-4.339-1.736-9.546 2.603-12.149 13.885-8.678 28.637-16.488 45.125-23.431C188.554 5.075 218.927-1 250.167-1c94.59 0 178.766 56.407 216.081 143.186 13.885 33.844 22.563 91.119 26.034 133.641.001 5.207-3.471 8.678-8.677 9.546.868 0 0 0 0 0zM35.822 354.797c-3.471 0-6.942-2.603-8.678-6.075-43.39-145.79 2.603-231.702 49.464-277.695 3.471-3.471 8.678-3.471 12.149 0 3.471 3.471 3.471 8.678 0 12.149-62.481 60.746-78.102 150.997-45.125 260.339 1.736 4.339-.868 9.546-6.075 10.414 0 .868-.868.868-1.735.868z" style="fill:currentColor" transform="translate(1 1)"/><path d="M93.096 441.576c-5.207 0-8.678-3.471-8.678-8.678 0-61.614 0-101.532-3.471-122.359-1.736-9.546-3.471-18.224-6.075-27.77-25.166-88.515 19.96-182.237 105.004-217.816 24.298-10.414 50.332-14.753 77.234-13.885 69.424 2.603 144.922 60.746 168.353 130.169 19.092 56.407 19.092 150.129 17.356 234.305 0 5.207-4.339 8.678-8.678 8.678-5.207 0-8.678-4.339-8.678-8.678 2.603-82.441 1.736-174.427-16.488-228.23-20.827-62.481-91.119-116.285-152.732-118.888-24.298-.868-47.729 3.471-69.424 13.017-77.234 32.108-118.02 117.153-95.458 196.99 2.603 9.546 5.207 19.959 6.942 29.505 3.471 22.563 3.471 62.481 3.471 124.963 0 5.206-3.471 8.677-8.678 8.677z" style="fill:currentColor" transform="translate(1 1)"/><path d="M380.337 467.61c-5.207 0-8.678-4.339-8.678-8.678 5.207-139.715 3.471-219.553-17.356-269.017-17.356-41.654-58.142-68.556-104.136-68.556-7.81 0-16.488.868-24.298 2.603-4.339.868-9.546-1.736-10.414-6.942-.868-4.339 1.736-9.546 6.942-10.414 9.546-1.736 18.224-2.603 27.77-2.603 52.068 0 99.797 31.241 119.756 79.837 22.563 52.936 24.298 131.905 19.092 276.827 0 3.472-4.339 6.943-8.678 6.943zm-226.495-17.356c-5.207 0-8.678-3.471-8.678-8.678 0-99.797-17.356-164.014-18.224-164.881-15.62-58.142 3.471-118.888 48.597-150.129 4.339-2.603 9.546-1.736 12.149 1.736 2.603 4.339 1.736 9.546-1.736 12.149-39.051 26.902-55.539 79.837-41.654 131.037.868 3.471 18.224 67.688 18.224 170.088 0 5.207-3.471 8.678-8.678 8.678zM328.269 493.644c-5.207 0-8.678-4.339-8.678-8.678v-42.522c0-10.414-.868-19.959 0-26.034 0-4.339 4.339-8.678 8.678-8.678 5.207 0 8.678 4.339 8.678 8.678v26.034c0 15.62.868 32.108 0 43.39 0 4.339-4.339 7.81-8.678 7.81z" style="fill:currentColor" transform="translate(1 1)"/><path d="M205.91 493.644c-5.207 0-8.678-3.471-8.678-8.678 0-103.268-5.207-207.403-12.149-227.363-12.149-36.447 4.339-74.631 38.183-88.515 8.678-3.471 17.356-5.207 26.902-5.207 27.769 0 52.936 16.488 64.217 42.522 17.356 40.786 22.563 112.814 23.431 165.749 0 5.207-3.471 8.678-8.678 8.678-4.339 0-8.678-3.471-8.678-8.678-.868-51.2-6.075-120.624-22.563-159.675-7.81-19.092-26.902-32.108-47.729-32.108-6.942 0-13.885 1.736-19.959 4.339-25.166 10.414-37.315 39.051-28.637 66.82 7.81 25.166 13.017 140.583 13.017 233.437-.001 5.208-3.472 8.679-8.679 8.679z" style="fill:currentColor" transform="translate(1 1)"/></svg>';
 		document.body.appendChild(fingerprintContainer);
 
 		// Emit event
diff --git a/Resources/Public/StyleSheets/Mustache/Banner/Default.css b/Resources/Public/StyleSheets/Mustache/Banner/Default.css
index b165ee0a87623e370d41f52990333f618470dc1c..f02525f725065728c022c00458f80e781bb1f4c6 100644
--- a/Resources/Public/StyleSheets/Mustache/Banner/Default.css
+++ b/Resources/Public/StyleSheets/Mustache/Banner/Default.css
@@ -59,6 +59,7 @@
 }
 
 #SgCookieOptin .sg-cookie-optin-banner .sg-cookie-optin-banner-content .sg-cookie-optin-banner-button-settings,
+#SgCookieOptin .sg-cookie-optin-banner .sg-cookie-optin-banner-content .sg-cookie-optin-banner-button-accept-essential,
 #SgCookieOptin .sg-cookie-optin-banner .sg-cookie-optin-banner-content .sg-cookie-optin-banner-button-accept {
 	display: inline-block;
 	padding: 10px;
@@ -77,6 +78,7 @@
 	}
 
 	#SgCookieOptin .sg-cookie-optin-banner .sg-cookie-optin-banner-content .sg-cookie-optin-banner-button-settings,
+	#SgCookieOptin .sg-cookie-optin-banner .sg-cookie-optin-banner-content .sg-cookie-optin-banner-button-accept-essential,
 	#SgCookieOptin .sg-cookie-optin-banner .sg-cookie-optin-banner-content .sg-cookie-optin-banner-button-accept {
 		margin: 10px 10px 0 0;
 	}
diff --git a/Resources/Public/StyleSheets/Mustache/Fingerprint/Default.css b/Resources/Public/StyleSheets/Mustache/Fingerprint/Default.css
index 34d491d1384d8c31a032c419c5f9b7c550547f89..88d3774c6076674f3602bc2a2da0b222843195ab 100644
--- a/Resources/Public/StyleSheets/Mustache/Fingerprint/Default.css
+++ b/Resources/Public/StyleSheets/Mustache/Fingerprint/Default.css
@@ -25,8 +25,6 @@
 .sg-cookie-optin-fingerprint-icon {
 	height: inherit;
 	padding: 6px;
-	/*margin-left: 1px;*/
-	/*margin-top: -1px;*/
 }
 
 .sg-cookie-optin-fingerprint.sg-cookie-optin-fingerprint-top-left {
diff --git a/Resources/Public/StyleSheets/Mustache/MonochromeTheme/Default.css b/Resources/Public/StyleSheets/Mustache/MonochromeTheme/Default.css
index f7a62bec91e6cfe325d2e4c539dc3f0cdf8bcb78..a9ebbe7502e664ddd1230f5176502c22401e96f0 100644
--- a/Resources/Public/StyleSheets/Mustache/MonochromeTheme/Default.css
+++ b/Resources/Public/StyleSheets/Mustache/MonochromeTheme/Default.css
@@ -23,6 +23,8 @@
 	--sg-cookie-optin-banner-color-button-settings-hover-text: var(--sg-cookie-optin-color-monochrome-dark);
 	--sg-cookie-optin-color-checkbox-box-shadow: var(--sg-cookie-optin-color-monochrome-light-dark);
 	--sg-cookie-optin-color-button-all-hover: var(--sg-cookie-optin-color-button-specific-hover);
+	--sg-cookie-optin-color-fingerprint-image: var(--sg-cookie-optin-color-monochrome-dark);
+	--sg-cookie-optin-color-fingerprint-background: var(--sg-cookie-optin-color-monochrome-text);
 }
 
 @media (prefers-color-scheme: dark) {
@@ -43,6 +45,8 @@
 		--sg-cookie-optin-banner-color-button-settings-hover-text: var(--sg-cookie-optin-color-monochrome-dark);
 		--sg-cookie-optin-color-checkbox-box-shadow: var(--sg-cookie-optin-color-monochrome-light-dark);
 		--sg-cookie-optin-color-button-all-hover: var(--sg-cookie-optin-color-button-specific-hover);
+		--sg-cookie-optin-color-fingerprint-image: var(--sg-cookie-optin-color-monochrome-dark);
+		--sg-cookie-optin-color-fingerprint-background: var(--sg-cookie-optin-color-monochrome-text);
 	}
 }
 
@@ -64,5 +68,7 @@
 		--sg-cookie-optin-banner-color-button-settings-hover-text: var(--sg-cookie-optin-color-monochrome-dark);
 		--sg-cookie-optin-color-checkbox-box-shadow: var(--sg-cookie-optin-color-monochrome-light-dark);
 		--sg-cookie-optin-color-button-all-hover: var(--sg-cookie-optin-color-button-specific-hover);
+		--sg-cookie-optin-color-fingerprint-image: var(--sg-cookie-optin-color-monochrome-dark);
+		--sg-cookie-optin-color-fingerprint-background: var(--sg-cookie-optin-color-monochrome-text);
 	}
 }
diff --git a/Resources/Public/StyleSheets/Mustache/Template/Default.css b/Resources/Public/StyleSheets/Mustache/Template/Default.css
index f377cdc2f7cd401989b5efd99c9a93d3d3cf33a0..6277b0699606170cdcfbb7a10560aba5a09c6cb1 100644
--- a/Resources/Public/StyleSheets/Mustache/Template/Default.css
+++ b/Resources/Public/StyleSheets/Mustache/Template/Default.css
@@ -163,6 +163,7 @@
 #SgCookieOptin .sg-cookie-optin-box .sg-cookie-optin-box-button .sg-cookie-optin-box-button-iframe-reject,
 #SgCookieOptin .sg-cookie-optin-box .sg-cookie-optin-box-button .sg-cookie-optin-box-button-accept-essential,
 #SgCookieOptin .sg-cookie-optin-box .sg-cookie-optin-banner-content .sg-cookie-optin-banner-button-settings,
+#SgCookieOptin .sg-cookie-optin-box .sg-cookie-optin-banner-content .sg-cookie-optin-banner-button-accept-essential,
 #SgCookieOptin .sg-cookie-optin-box .sg-cookie-optin-banner-content .sg-cookie-optin-banner-button-accept {
 	display: block;
 	width: 100%;
@@ -196,6 +197,11 @@
 	background-color: var(--sg-cookie-optin-banner-color-button-settings);
 }
 
+#SgCookieOptin .sg-cookie-optin-box .sg-cookie-optin-banner-content .sg-cookie-optin-banner-button-accept-essential {
+	color: var(--sg-cookie-optin-banner-color-button-accept-essential-text);
+	background-color: var(--sg-cookie-optin-banner-color-button-accept-essential);
+}
+
 #SgCookieOptin .sg-cookie-optin-box .sg-cookie-optin-banner-content .sg-cookie-optin-banner-button-accept {
 	color: var(--sg-cookie-optin-banner-color-button-accept-text);
 	background-color: var(--sg-cookie-optin-banner-color-button-accept);
@@ -421,3 +427,14 @@
 .sg-cookie-optin-plugin-initialized .sg-cookie-optin-box-close-button {
 	display: none;
 }
+
+.sg-cookie-optin-box-sublist-open-more-symbol {
+	width: 15px;
+	height: 15px;
+	position: relative;
+	top: 3px;
+}
+
+.sg-cookie-optin-box-sublist-open-more-symbol.sg-cookie-optin-flipped {
+	transform: scale(1, -1);
+}
diff --git a/Resources/Public/StyleSheets/Mustache/Template/Full.css b/Resources/Public/StyleSheets/Mustache/Template/Full.css
index 98b3c5940ca02441a254ed9f976c301c4f8dc284..fa8e458b5b45053cb43f4fcc35376c819f0b2f5d 100644
--- a/Resources/Public/StyleSheets/Mustache/Template/Full.css
+++ b/Resources/Public/StyleSheets/Mustache/Template/Full.css
@@ -300,6 +300,10 @@
 	list-style: none;
 }
 
+.sg-cookie-optin-box-sublist-open-more-symbol {
+	top: -2px;
+}
+
 /* Responsive */
 
 @media only screen and (max-width: 1250px) {
diff --git a/Resources/Public/StyleSheets/cookieOptin.css b/Resources/Public/StyleSheets/cookieOptin.css
index 189ff131c01f5224a4fdeec8a5651bd6ea43a6d3..80d0fb127de00cb0305e66f40a6e37e958f89a05 100644
--- a/Resources/Public/StyleSheets/cookieOptin.css
+++ b/Resources/Public/StyleSheets/cookieOptin.css
@@ -52,7 +52,11 @@
 	--sg-cookie-optin-banner-color-button-accept-text: ###banner_color_button_accept_text###;
 	--sg-cookie-optin-banner-color-button-accept-hover-text: ###banner_color_button_accept_text###;
 	--sg-cookie-optin-banner-color-button-accept-hover: ###banner_color_button_accept_hover###;
+	--sg-cookie-optin-banner-color-button-accept-essential-text: ###banner_color_button_accept_essential_text###;
+	--sg-cookie-optin-banner-color-button-accept-essential-hover-text: ###banner_color_button_accept_essential_text###;
+	--sg-cookie-optin-banner-color-button-accept-essential-hover: ###banner_color_button_accept_essential_hover###;
 	--sg-cookie-optin-banner-color-button-accept: ###banner_color_button_accept###;
+	--sg-cookie-optin-banner-color-button-accept-essential: ###banner_color_button_accept_essential###;
 	--sg-cookie-optin-color-list: ###color_list###;
 	--sg-cookie-optin-color-list-text: ###color_list_text###;
 	--sg-cookie-optin-color-table: ###color_table###;
diff --git a/ext_tables.sql b/ext_tables.sql
index 8b7257c8de50aee3d976b4e012f6a3c902583684..35e9e02f9507c4a8c935ad86d149ef9ee1d4abc0 100644
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -46,7 +46,6 @@ CREATE TABLE tx_sgcookieoptin_domain_model_optin (
 	banner_overwritten tinyint(4) unsigned DEFAULT '0' NOT NULL,
 	banner_show_settings_button tinyint(4) unsigned DEFAULT '1' NOT NULL,
 	banner_position int(11) DEFAULT '0' NOT NULL,
-	banner_selection int(11) DEFAULT '0' NOT NULL,
 	banner_color_box varchar(10) DEFAULT '#DDDDDD' NOT NULL,
 	banner_color_text varchar(10) DEFAULT '#373737' NOT NULL,
 	banner_color_link_text varchar(10) DEFAULT '#373737' NOT NULL,
@@ -56,7 +55,11 @@ CREATE TABLE tx_sgcookieoptin_domain_model_optin (
 	banner_color_button_accept varchar(10) DEFAULT '#143D59' NOT NULL,
 	banner_color_button_accept_hover varchar(10) DEFAULT '#2E6B96' NOT NULL,
 	banner_color_button_accept_text varchar(10) DEFAULT '#FFFFFF' NOT NULL,
+	banner_color_button_accept_essential varchar(10) DEFAULT '#575757' NOT NULL,
+	banner_color_button_accept_essential_hover varchar(10) DEFAULT '#D7D7D7' NOT NULL,
+	banner_color_button_accept_essential_text varchar(10) DEFAULT '#FFFFFF' NOT NULL,
 	banner_button_accept_text text NOT NULL,
+	banner_button_accept_essential_text varchar(255) DEFAULT 'Reject' NOT NULL,
 	banner_button_settings_text text NOT NULL,
 	banner_description text NOT NULL,
 	banner_force_min_width int(11) DEFAULT '0' NOT NULL,
@@ -99,7 +102,8 @@ CREATE TABLE tx_sgcookieoptin_domain_model_optin (
 	-- Fingerpring settings
 	color_fingerprint_background varchar(10) DEFAULT '#143D59' NOT NULL,
 	color_fingerprint_image varchar(10) DEFAULT '#FFFFFF' NOT NULL,
-	fingerprint_position int(6) DEFAULT 1 NOT NULL,
+	fingerprint_position tinyint(1) DEFAULT '1' NOT NULL,
+	show_fingerprint tinyint(1) DEFAULT '1' NOT NULL,
 
 	-- Essential group specific columns
 	essential_title text NOT NULL,
@@ -108,23 +112,19 @@ CREATE TABLE tx_sgcookieoptin_domain_model_optin (
 	essential_cookies int(11) DEFAULT '0' NOT NULL,
 
 	-- IFrame group specific columns
-	iframe_enabled tinyint(4) unsigned DEFAULT '0' NOT NULL,
+	iframe_enabled tinyint(1) unsigned DEFAULT '0' NOT NULL,
 	iframe_title text NOT NULL,
 	iframe_description text NOT NULL,
 	iframe_cookies int(11) DEFAULT '0' NOT NULL,
 
 	iframe_html text NOT NULL,
 	iframe_overwritten tinyint(4) unsigned DEFAULT '0' NOT NULL,
-	iframe_selection int(11) DEFAULT '0' NOT NULL,
 
 	iframe_replacement_html text NOT NULL,
 	iframe_replacement_overwritten tinyint(4) unsigned DEFAULT '0' NOT NULL,
-	iframe_replacement_selection int(11) DEFAULT '0' NOT NULL,
 	iframe_replacement_background_image text NOT NULL,
 
 	iframe_whitelist_regex text NOT NULL,
-	iframe_whitelist_overwritten tinyint(4) unsigned DEFAULT '0' NOT NULL,
-	iframe_whitelist_selection int(11) DEFAULT '0' NOT NULL,
 
 	iframe_button_allow_all_text text NOT NULL,
 	iframe_button_allow_one_text text NOT NULL,