diff --git a/public/images/logo/black.svg b/public/images/logo/black.svg
new file mode 100644
index 000000000..76e679294
--- /dev/null
+++ b/public/images/logo/black.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg 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"
+	 viewBox="0 0 320 94" style="enable-background:new 0 0 320 94;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+</style>
+<path class="st0" d="M289.3,44.3c6.9,0,13.2,4.5,15.4,11h-30.7C276.1,48.9,282.3,44.3,289.3,44.3z M320,60.9c0-8-3.1-15.6-8.8-21.4
+	c-5.7-5.8-13.3-9-21.3-9h-0.4c-8.3,0.1-16.2,3.4-22.1,9.3c-5.9,5.9-9.2,13.7-9.3,22c-0.1,8.5,3.2,16.5,9.2,22.6
+	c6.1,6.1,14.1,9.5,22.6,9.5h0c11.2,0,21.7-6,27.4-15.6l0.7-1.2l-12.6-6.2l-0.6,1c-3.1,5.2-8.6,8.2-14.7,8.2
+	c-7.7,0-14.4-5.1-16.5-12.5H320V60.9z M241.2,19.8c-5.5,0-9.9-4.4-9.9-9.9c0-5.5,4.4-9.9,9.9-9.9s9.9,4.4,9.9,9.9
+	C251.2,15.3,246.7,19.8,241.2,19.8z M233.6,92.7h15.2V31.8h-15.2V92.7z M204.5,1.3h15.2v91.5h-15.2V1.3z M175.4,92.7h15.2V1.3h-15.2
+	V92.7z M135.3,79c-9.2,0-16.8-7.5-16.8-16.7c0-9.2,7.5-16.7,16.8-16.7s16.8,7.5,16.8,16.7C152.1,71.5,144.6,79,135.3,79z
+	 M135.3,30.5c-17.6,0-31.8,14.2-31.8,31.7S117.8,94,135.3,94c17.5,0,31.8-14.2,31.8-31.7S152.9,30.5,135.3,30.5z M70.4,30.6
+	c-0.8-0.1-1.6-0.1-2.4-0.1c-7.7,0-15,3.1-20.2,8.7c-5.2-5.5-12.5-8.7-20.1-8.7C12.4,30.5,0,42.9,0,58v34.7h14.9V58.5
+	c0-6.3,5.2-12.1,11.3-12.7c0.4,0,0.9-0.1,1.3-0.1c6.9,0,12.5,5.6,12.5,12.5v34.6h15.2V58.4c0-6.3,5.2-12.1,11.3-12.7
+	c0.4,0,0.9-0.1,1.3-0.1c6.9,0,12.5,5.6,12.6,12.4v34.7h15.2V58.5c0-7-2.6-13.6-7.2-18.8C83.7,34.4,77.3,31.2,70.4,30.6z"/>
+</svg>
diff --git a/src/Settings/MollieSettingsPage.php b/src/Settings/MollieSettingsPage.php
new file mode 100644
index 000000000..53cd41b1d
--- /dev/null
+++ b/src/Settings/MollieSettingsPage.php
@@ -0,0 +1,116 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\Settings;
+
+use Mollie\WooCommerce\Settings\Page\AbstractPage;
+use Mollie\WooCommerce\Settings\Page\PageAdvancedSettings;
+use Mollie\WooCommerce\Settings\Page\PageApiKeys;
+use Mollie\WooCommerce\Settings\Page\PageNoApiKey;
+use Mollie\WooCommerce\Settings\Page\PagePaymentMethods;
+use Mollie\WooCommerce\Shared\Data;
+use WC_Settings_Page;
+
+class MollieSettingsPage extends WC_Settings_Page
+{
+    protected Settings $settingsHelper;
+    protected string $pluginPath;
+    protected string $pluginUrl;
+    protected array $gateways;
+    protected array $paymentMethods;
+    protected bool $isTestModeEnabled;
+    protected Data $dataHelper;
+
+    public function __construct(
+            Settings $settingsHelper,
+            string $pluginPath,
+            string $pluginUrl,
+            array $gateways,
+            array $paymentMethods,
+            bool $isTestModeEnabled,
+            Data $dataHelper
+    ) {
+        $this->id = 'mollie_settings';
+        $this->label = __('Mollie Settings', 'mollie-payments-for-woocommerce');
+        $this->settingsHelper = $settingsHelper;
+        $this->pluginPath = $pluginPath;
+        $this->pluginUrl = $pluginUrl;
+        $this->gateways = $gateways;
+        $this->isTestModeEnabled = $isTestModeEnabled;
+        $this->dataHelper = $dataHelper;
+        $this->paymentMethods = $paymentMethods;
+        $this->registerContentFieldType();
+        $this->outputSections();
+        parent::__construct();
+    }
+
+    public function registerContentFieldType(): void
+    {
+        add_action('woocommerce_admin_field_mollie_custom_input', static function ($value): void {
+            ?>
+            <tr valign="top">
+                <th scope="row" class="titledesc">
+                    <label for="<?php
+                    echo esc_attr($value['id']); ?>"><?php
+                        echo esc_html($value['title']); ?></label>
+                </th>
+                <td class="forminp">
+                    <?php
+                    if (!empty($value['value'])): ?>
+                        <?= $value['value']; ?>
+                    <?php
+                    endif; ?>
+                </td>
+            </tr>
+            <?php
+        });
+
+        add_action('woocommerce_admin_field_mollie_content', static function ($value): void {
+            if (!empty($value['value'])) {
+                echo $value['value'];
+            }
+        });
+    }
+
+    public function outputSections()
+    {
+        add_action(
+                'woocommerce_sections_' . $this->id,
+                [$this, 'output_sections']
+        );
+    }
+
+    protected function pages(): array
+    {
+        return [
+                PageNoApiKey::class,
+                PageApiKeys::class,
+                PagePaymentMethods::class,
+                PageAdvancedSettings::class
+        ];
+    }
+
+    public function get_settings($currentSection = '')
+    {
+        $mollieSettings = null;
+        foreach ($this->pages() as $pageClass) {
+            /** @var AbstractPage $page */
+            $page = new $pageClass($this->settingsHelper, $this->pluginUrl);
+            if ($page->slug() === $currentSection) {
+                $mollieSettings = $page->settings();
+                break;
+            }
+        }
+
+        if (!$mollieSettings) {
+            $mollieSettings = (new PageNoApiKey($this->settingsHelper, $this->pluginUrl))->settings();
+        }
+
+        return apply_filters(
+                'woocommerce_get_settings_' . $this->id,
+                $mollieSettings,
+                $currentSection
+        );
+    }
+}
diff --git a/src/Settings/Page/AbstractPage.php b/src/Settings/Page/AbstractPage.php
new file mode 100644
index 000000000..5a9864cf3
--- /dev/null
+++ b/src/Settings/Page/AbstractPage.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\Settings\Page;
+
+use Mollie\WooCommerce\Settings\Page\Section\AbstractSection;
+use Mollie\WooCommerce\Settings\Settings;
+
+abstract class AbstractPage
+{
+    protected Settings $settings;
+    protected string $pluginUrl;
+
+    public function __construct(Settings $settings, string $pluginUrl)
+    {
+        $this->settings = $settings;
+        $this->pluginUrl = $pluginUrl;
+    }
+
+    abstract public function isTab(): bool;
+
+    abstract public function slug(): string;
+
+    public function tabName(): string
+    {
+        return '';
+    }
+
+    protected function sections(): array
+    {
+        return [];
+    }
+
+    public function settings(): array
+    {
+        $settings = [];
+        $styles = [];
+
+        foreach ($this->sections() as $sectionClass) {
+            /** @var AbstractSection $section */
+            $section = new $sectionClass($this->settings, $this->pluginUrl);
+            foreach ($section->config() as $field) {
+                $settings[] = $field;
+            }
+            $styles[$sectionClass] = preg_replace('/\s+/', '', $section->styles());
+        }
+        array_unshift($settings, [
+            'id' => $this->settings->getSettingId('styles'),
+            'type' => 'mollie_content',
+            'value' => implode($styles)
+        ]);
+        return $settings;
+    }
+}
diff --git a/src/Settings/Page/Components.php b/src/Settings/Page/Components.php
deleted file mode 100644
index 59548e33f..000000000
--- a/src/Settings/Page/Components.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mollie\WooCommerce\Settings\Page;
-
-use WC_Admin_Settings;
-use WC_Settings_Page;
-
-class Components extends WC_Settings_Page
-{
-    public const FILTER_COMPONENTS_SETTINGS = 'components_settings';
-    /**
-     * @var string
-     */
-    protected $pluginPath;
-
-    public function __construct(string $pluginPath)
-    {
-        $this->id = 'mollie_components';
-        $this->label = __('Mollie Components', 'mollie-payments-for-woocommerce');
-        $this->pluginPath = $pluginPath;
-
-        parent::__construct();
-    }
-
-    public function output()
-    {
-        $settings = $this->get_settings();
-        WC_Admin_Settings::output_fields($settings);
-    }
-
-    public function get_settings()
-    {
-        $componentsSettings = $this->componentsSettings();
-
-        /**
-         * Filter Component Settings
-         *
-         * @param array $componentSettings Default components settings for the Credit Card Gateway
-         */
-        $componentsSettings = apply_filters(self::FILTER_COMPONENTS_SETTINGS, $componentsSettings);
-
-        return $componentsSettings;
-    }
-
-    protected function componentsSettings()
-    {
-        $componentSettingsFilePath = $this->componentsFilePath();
-
-        if (!file_exists($componentSettingsFilePath)) {
-            return [];
-        }
-
-        $components = include $componentSettingsFilePath;
-
-        if (!is_array($components)) {
-            $components = [];
-        }
-
-        return $components;
-    }
-
-    protected function componentsFilePath()
-    {
-        return $this->pluginPath . '/inc/settings/mollie_components.php';
-    }
-}
diff --git a/src/Settings/Page/MollieSettingsPage.php b/src/Settings/Page/MollieSettingsPageOld.php
similarity index 100%
rename from src/Settings/Page/MollieSettingsPage.php
rename to src/Settings/Page/MollieSettingsPageOld.php
diff --git a/src/Settings/Page/PageAdvancedSettings.php b/src/Settings/Page/PageAdvancedSettings.php
new file mode 100644
index 000000000..5f21e8b09
--- /dev/null
+++ b/src/Settings/Page/PageAdvancedSettings.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\Settings\Page;
+
+class PageAdvancedSettings extends AbstractPage {
+
+    public function isTab(): bool
+    {
+        // TODO: Implement isTab() method.
+    }
+
+    public function slug(): string
+    {
+        return 'mollie_advanced';
+    }
+}
diff --git a/src/Settings/Page/PageApiKeys.php b/src/Settings/Page/PageApiKeys.php
new file mode 100644
index 000000000..b393248c5
--- /dev/null
+++ b/src/Settings/Page/PageApiKeys.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\Settings\Page;
+
+class PageApiKeys extends AbstractPage {
+
+    public function isTab(): bool
+    {
+        // TODO: Implement isTab() method.
+    }
+
+    public function slug(): string
+    {
+        return 'mollie_api_keys';
+    }
+}
diff --git a/src/Settings/Page/PageNoApiKey.php b/src/Settings/Page/PageNoApiKey.php
new file mode 100644
index 000000000..4763e18df
--- /dev/null
+++ b/src/Settings/Page/PageNoApiKey.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\Settings\Page;
+
+use Mollie\WooCommerce\Settings\Page\Section\ConnectionFields;
+use Mollie\WooCommerce\Settings\Page\Section\Header;
+use Mollie\WooCommerce\Settings\Page\Section\Instructions;
+use Mollie\WooCommerce\Settings\Page\Section\Notices;
+
+class PageNoApiKey extends AbstractPage {
+    public function isTab(): bool
+    {
+        // TODO: Implement isTab() method.
+    }
+
+    public function slug(): string
+    {
+        return 'mollie_no_api_key';
+    }
+
+    public function sections(): array
+    {
+        return [
+            Header::class,
+            Notices::class,
+            Instructions::class,
+            ConnectionFields::class
+        ];
+    }
+}
diff --git a/src/Settings/Page/PagePaymentMethods.php b/src/Settings/Page/PagePaymentMethods.php
new file mode 100644
index 000000000..f15c9f460
--- /dev/null
+++ b/src/Settings/Page/PagePaymentMethods.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\Settings\Page;
+
+class PagePaymentMethods extends AbstractPage {
+
+    public function isTab(): bool
+    {
+        // TODO: Implement isTab() method.
+    }
+
+    public function slug(): string
+    {
+        return 'mollie_payment_methods';
+    }
+}
diff --git a/src/Settings/Page/Section/AbstractSection.php b/src/Settings/Page/Section/AbstractSection.php
new file mode 100644
index 000000000..89549ae76
--- /dev/null
+++ b/src/Settings/Page/Section/AbstractSection.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\Settings\Page\Section;
+
+use Mollie\WooCommerce\Settings\Settings;
+
+abstract class AbstractSection
+{
+    protected Settings $settings;
+    protected string $pluginUrl;
+
+    public function __construct(Settings $settings, string $pluginUrl)
+    {
+        $this->settings = $settings;
+        $this->pluginUrl = $pluginUrl;
+    }
+
+    abstract public function config(): array;
+
+    public function styles(): string{
+        return '';
+    }
+
+    public function images(): string
+    {
+        return $this->pluginUrl . '/public/images/';
+    }
+}
diff --git a/src/Settings/Page/Section/ConnectionFields.php b/src/Settings/Page/Section/ConnectionFields.php
new file mode 100644
index 000000000..af708c3ba
--- /dev/null
+++ b/src/Settings/Page/Section/ConnectionFields.php
@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\Settings\Page\Section;
+
+class ConnectionFields extends AbstractSection
+{
+    public function config(): array
+    {
+        return [
+            [
+                'id' => $this->settings->getSettingId('title'),
+                'title' => '',
+                'type' => 'title'
+            ],
+            [
+                'id' => $this->settings->getSettingId('test_mode_enabled'),
+                'title' => __('Mollie Payment Mode', 'mollie-payments-for-woocommerce'),
+                'default' => 'no',
+                'type' => 'select',
+                'options' => [
+                    'no' => 'Live API',
+                    'yes' => 'Test API'
+                ],
+                'desc_tip' => __(
+                    'Enable test mode if you want to test the plugin without using real payments.',
+                    'mollie-payments-for-woocommerce'
+                ),
+            ],
+            [
+                'id' => $this->settings->getSettingId('live_api_key'),
+                'title' => __('Live API key', 'mollie-payments-for-woocommerce'),
+                'default' => '',
+                'type' => 'text',
+                'desc' => sprintf(
+                /* translators: Placeholder 1: API key mode (live or test). The surrounding %s's Will be replaced by a link to the Mollie profile */
+                    __(
+                        'The API key is used to connect to Mollie. You can find your <strong>%1$s</strong> API key in your %2$sMollie account%3$s',
+                        'mollie-payments-for-woocommerce'
+                    ),
+                    'live',
+                    '<a href="https://my.mollie.com/dashboard/developers/api-keys?utm_source=woocommerce&utm_medium=plugin&utm_campaign=partner" target="_blank">',
+                    '</a>'
+                ),
+                'css' => 'width: 350px',
+                'placeholder' => __(
+                    'Live API key should start with live_',
+                    'mollie-payments-for-woocommerce'
+                ),
+            ],
+            [
+                'id' => $this->settings->getSettingId('test_api_key'),
+                'title' => __('Test API key', 'mollie-payments-for-woocommerce'),
+                'default' => '',
+                'type' => 'text',
+                'desc' => sprintf(
+                /* translators: Placeholder 1: API key mode (live or test). The surrounding %s's Will be replaced by a link to the Mollie profile */
+                    __(
+                        'The API key is used to connect to Mollie. You can find your <strong>%1$s</strong> API key in your %2$sMollie account%3$s',
+                        'mollie-payments-for-woocommerce'
+                    ),
+                    'test',
+                    '<a href="https://my.mollie.com/dashboard/developers/api-keys?utm_source=woocommerce&utm_medium=plugin&utm_campaign=partner" target="_blank">',
+                    '</a>'
+                ),
+                'css' => 'width: 350px',
+                'placeholder' => __(
+                    'Test API key should start with test_',
+                    'mollie-payments-for-woocommerce'
+                ),
+            ],
+            [
+                'id' => $this->settings->getSettingId('debug'),
+                'title' => __('Debug Log', 'mollie-payments-for-woocommerce'),
+                'type' => 'checkbox',
+                'desc' => __('Log plugin events.', 'mollie-payments-for-woocommerce'),
+                'default' => 'yes',
+            ],
+            [
+                'id' => $this->settings->getSettingId('sectionend'),
+                'type' => 'sectionend',
+            ],
+        ];
+    }
+}
diff --git a/src/Settings/Page/Section/Header.php b/src/Settings/Page/Section/Header.php
new file mode 100644
index 000000000..c6408fcea
--- /dev/null
+++ b/src/Settings/Page/Section/Header.php
@@ -0,0 +1,84 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\Settings\Page\Section;
+
+class Header extends AbstractSection
+{
+    public function config(): array
+    {
+        return [
+                [
+                        'id' => $this->settings->getSettingId('header'),
+                        'type' => 'mollie_content',
+                        'value' => $this->content()
+                ]
+        ];
+    }
+
+    public function styles(): string
+    {
+        ob_start();
+        ?>
+        <style>
+            .mollie-section--header {
+                display: flex;
+                justify-content: center;
+            }
+
+            .mollie-settings-header {
+                display: flex;
+                flex-direction: column;
+                gap: 12px;
+                align-items: center;
+            }
+
+            .mollie-settings-header__image {
+                width: 200px;
+            }
+
+            .mollie-settings-header__description {
+                margin: 0;
+            }
+
+            .mollie-settings-header__buttons {
+                display: flex;
+                gap: 12px;
+            }
+        </style>
+        <?php
+        return ob_get_clean();
+    }
+
+    protected function content(): string
+    {
+        ob_start();
+        ?>
+        <div class="mollie-section mollie-section--header">
+            <div class="mollie-settings-header">
+                <img class="mollie-settings-header__image" src="<?= $this->pluginUrl; ?>public/images/logo/black.svg"
+                     alt=""/>
+                <p class="mollie-settings-header__description">
+                    <strong>
+                        <?= __(
+                                'Effortless payments for your customers, designed for growth',
+                                'mollie-payments-for-woocommerce'
+                        ); ?>
+                    </strong>
+                </p>
+                <div class="mollie-settings-header__buttons">
+                    <a href="https://help.mollie.com/hc/en-us/sections/12858723658130-Mollie-for-WooCommerce"
+                       target="_blank" class="button-secondary">
+                        <?= __('Mollie Plugin Documentation', 'mollie-payments-for-woocommerce'); ?>
+                    </a>
+                    <a href="https://www.mollie.com/contact/merchants" target="_blank" class="button-secondary">
+                        <?= __('Contact Mollie Support', 'mollie-payments-for-woocommerce'); ?>
+                    </a>
+                </div>
+            </div>
+        </div>
+        <?php
+        return ob_get_clean();
+    }
+}
diff --git a/src/Settings/Page/Section/Instructions.php b/src/Settings/Page/Section/Instructions.php
new file mode 100644
index 000000000..46ea719cc
--- /dev/null
+++ b/src/Settings/Page/Section/Instructions.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\Settings\Page\Section;
+
+class Instructions extends AbstractSection
+{
+    public function config(): array
+    {
+        return [
+                [
+                        'id' => $this->settings->getSettingId('instructions'),
+                        'type' => 'mollie_content',
+                        'value' => $this->content()
+                ]
+        ];
+    }
+
+    protected function content(): string
+    {
+        ob_start();
+        ?>
+        <h3><?= __("Mollie API Keys", 'mollie-payments-for-woocommerce'); ?></h3>
+        <p>
+            <?= __(
+                    "To start receiving payments through the Mollie plugin in your WooCommerce store,
+            you'll need to connect it to your Mollie account using an API key.",
+                    'mollie-payments-for-woocommerce'
+            ); ?>
+        </p>
+        <p>
+            <strong>
+                <?= __("How to find your API keys:", 'mollie-payments-for-woocommerce'); ?>
+            </strong>
+        </p>
+        <ol>
+            <li>
+                <?= sprintf(
+                        __(
+                                "Log in to your <a href='%s' target='_blank'>Mollie Dashboard</a>",
+                                'mollie-payments-for-woocommerce'
+                        ),
+                        'https://my.mollie.com/dashboard/login?lang=en'
+                ); ?>
+            </li>
+            <li>
+                <?= __("Navigate to <strong>Developers > API keys.</strong>", 'mollie-payments-for-woocommerce'); ?>
+            </li>
+            <li>
+                <?= __("Click on <strong>Copy</strong> next to your API key.", 'mollie-payments-for-woocommerce'); ?>
+            </li>
+            <li>
+                <?= __(
+                        "Paste the copied API key into the <strong>Live API key</strong> or <strong>Test API key</strong> fields below.",
+                        'mollie-payments-for-woocommerce'
+                ); ?>
+            </li>
+        </ol>
+        <p>
+            <?= __(
+                    "Please note that your API keys are unique to your Mollie account and should be kept
+            private to ensure the security of your transactions.",
+                    'mollie-payments-for-woocommerce'
+            ); ?>
+        </p>
+        <?php
+        return ob_get_clean();
+    }
+}
diff --git a/src/Settings/Page/Section/Notices.php b/src/Settings/Page/Section/Notices.php
new file mode 100644
index 000000000..7c80ae69d
--- /dev/null
+++ b/src/Settings/Page/Section/Notices.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\Settings\Page\Section;
+
+class Notices extends AbstractSection
+{
+    public function config(): array
+    {
+        return [
+                [
+                        'id' => $this->settings->getSettingId('notices'),
+                        'type' => 'mollie_content',
+                        'value' => $this->content()
+                ]
+        ];
+    }
+
+    protected function content(): string
+    {
+        ob_start();
+        ?>
+        NOTICES
+        <?php
+        return ob_get_clean();
+    }
+}
diff --git a/src/Settings/SettingsModule.php b/src/Settings/SettingsModule.php
index 9dffc59c2..511f87739 100644
--- a/src/Settings/SettingsModule.php
+++ b/src/Settings/SettingsModule.php
@@ -6,15 +6,14 @@
 
 namespace Mollie\WooCommerce\Settings;
 
-use Mollie\WooCommerce\Vendor\Inpsyde\Modularity\Module\ExecutableModule;
-use Mollie\WooCommerce\Vendor\Inpsyde\Modularity\Module\ModuleClassNameIdTrait;
-use Mollie\WooCommerce\Vendor\Inpsyde\Modularity\Module\ServiceModule;
 use Mollie\WooCommerce\Notice\AdminNotice;
 use Mollie\WooCommerce\SDK\Api;
-use Mollie\WooCommerce\Settings\Page\MollieSettingsPage;
 use Mollie\WooCommerce\Shared\Data;
 use Mollie\WooCommerce\Shared\Status;
 use Mollie\WooCommerce\Uninstall\CleanDb;
+use Mollie\WooCommerce\Vendor\Inpsyde\Modularity\Module\ExecutableModule;
+use Mollie\WooCommerce\Vendor\Inpsyde\Modularity\Module\ModuleClassNameIdTrait;
+use Mollie\WooCommerce\Vendor\Inpsyde\Modularity\Module\ServiceModule;
 use Mollie\WooCommerce\Vendor\Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface as Logger;
 
@@ -113,6 +112,7 @@ public function run(ContainerInterface $container): bool
         $this->dataHelper = $container->get('settings.data_helper');
         assert($this->dataHelper instanceof Data);
         $pluginPath = $container->get('shared.plugin_path');
+        $pluginUrl = $container->get('shared.plugin_url');
 
         $paymentMethods = $container->get('gateway.paymentMethods');
         // Add settings link to plugins page
@@ -148,7 +148,7 @@ function () use ($optionName, $defaultAdvancedOptions, $defaultComponentsOptions
 
         $gateways = $container->get('gateway.instances');
         $isSDDGatewayEnabled = $container->get('gateway.isSDDGatewayEnabled');
-        $this->initMollieSettingsPage($isSDDGatewayEnabled, $gateways, $pluginPath, $paymentMethods);
+        $this->initMollieSettingsPage($isSDDGatewayEnabled, $gateways, $pluginPath, $pluginUrl, $paymentMethods);
         add_action(
             'woocommerce_admin_settings_sanitize_option',
             [$this->settingsHelper, 'updateMerchantIdOnApiKeyChanges'],
@@ -247,10 +247,11 @@ public function maybeSaveDefaultSettings($optionName, $testOption, $defaultOptio
      * @param $isSDDGatewayEnabled
      * @param $gateways
      * @param $pluginPath
+     * @param $pluginUrl
      * @param $paymentMethods
      * @return void
      */
-    protected function initMollieSettingsPage($isSDDGatewayEnabled, $gateways, $pluginPath, $paymentMethods): void
+    protected function initMollieSettingsPage($isSDDGatewayEnabled, $gateways, $pluginPath, $pluginUrl, $paymentMethods): void
     {
         if (!$isSDDGatewayEnabled) {
             //remove directdebit gateway from gateways list
@@ -258,10 +259,11 @@ protected function initMollieSettingsPage($isSDDGatewayEnabled, $gateways, $plug
         }
         add_filter(
             'woocommerce_get_settings_pages',
-            function ($settings) use ($pluginPath, $gateways, $paymentMethods) {
+            function ($settings) use ($pluginPath, $pluginUrl, $gateways, $paymentMethods) {
                 $settings[] = new MollieSettingsPage(
                     $this->settingsHelper,
                     $pluginPath,
+                    $pluginUrl,
                     $gateways,
                     $paymentMethods,
                     $this->isTestModeEnabled,