diff --git a/assets/images/banner.png b/assets/images/banner.png
index 976bdcb..b9b43ac 100644
Binary files a/assets/images/banner.png and b/assets/images/banner.png differ
diff --git a/assets/images/business.svg b/assets/images/business.svg
deleted file mode 100644
index 5bdb56e..0000000
--- a/assets/images/business.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14 3.5H12V2.5C12 1.39544 11.1046 0.5 10 0.5H6C4.89544 0.5 4 1.39544 4 2.5V3.5H2C0.895437 3.5 0 4.39544 0 5.5V13.5C0 14.6046 0.895437 15.5 2 15.5H14C15.1046 15.5 16 14.6046 16 13.5V5.5C16 4.39544 15.1046 3.5 14 3.5ZM6 2H10C10.2762 2 10.5 2.22384 10.5 2.5V3.5H5.5V2.5C5.5 2.22384 5.72384 2 6 2ZM2 5H14C14.275 5 14.5 5.225 14.5 5.5V8.5H1.5V5.5C1.5 5.225 1.725 5 2 5ZM14 14H2C1.725 14 1.5 13.775 1.5 13.5V10H6V10.5C6 11.0523 6.44772 11.5 7 11.5H9C9.55228 11.5 10 11.0523 10 10.5V10H14.5V13.5C14.5 13.775 14.275 14 14 14Z" fill="#C8C8C8"/>
-</svg>
diff --git a/assets/images/personal.svg b/assets/images/personal.svg
deleted file mode 100644
index b7a6f5d..0000000
--- a/assets/images/personal.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 9C10.4854 9 12.5 6.98522 12.5 4.5C12.5 2.01478 10.4854 0 8 0C5.51491 0 3.5 2.01478 3.5 4.5C3.5 6.98522 5.51491 9 8 9ZM8 1.5C9.65425 1.5 11 2.84575 11 4.5C11 6.15419 9.65425 7.5 8 7.5C6.34581 7.5 5 6.15419 5 4.5C5 2.84575 6.34581 1.5 8 1.5ZM10.9999 10H5.00006C2.23872 10 0 12.2385 0 15C0 15.5522 0.447812 16 0.999937 16H15.0001C15.5522 16 16 15.5522 16 15C16 12.2385 13.7615 10 10.9999 10ZM1.53566 14.5C1.779 12.8061 3.23987 11.5 5.00006 11.5H10.9999C12.7601 11.5 14.2211 12.8061 14.4644 14.5H1.53566Z" fill="#C8C8C8"/>
-</svg>
diff --git a/assets/images/two-logo-w.svg b/assets/images/two-logo-w.svg
deleted file mode 100644
index 3bef1c5..0000000
--- a/assets/images/two-logo-w.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<svg width="96" height="32" viewBox="0 0 96 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_18_5683)">
-<path d="M0 8.05287V0H6.52165V8.05287H11.8448V13.5685H6.52165V22.423C6.52165 24.7911 7.55742 25.7765 10.0322 25.7765H12.9915V31.5459H8.81884C2.56353 31.5459 0 28.7292 0 23.3607V8.05287Z" fill="white"/>
-<path d="M23.1231 31.3085L15.2957 8.05444H21.9542L26.9925 24.4654L33.2811 8.05444H40.0764L46.3281 24.4654L51.3663 8.05444H58.073L50.2418 31.3085H43.0099L36.6658 14.8939L30.3772 31.3085H23.1231Z" fill="white"/>
-<path d="M61.4202 28.4958C59.0786 26.1241 57.9097 23.2192 57.9097 19.6708C57.9097 16.1224 59.0786 13.2285 61.3758 10.9046C63.673 8.58062 66.8654 7.37085 70.8235 7.37085C74.7816 7.37085 77.9777 8.53281 80.2712 10.8604C82.5647 13.188 83.7817 16.1371 83.7817 19.6855C83.7817 23.2339 82.6091 26.1682 80.2712 28.5105C77.9333 30.8529 74.826 32.0001 70.8235 32.0001C66.9098 31.9854 63.7581 30.8198 61.4202 28.4958ZM70.8235 26.2712C72.8469 26.2712 74.4672 25.6424 75.6324 24.4326C76.7976 23.2229 77.3895 21.616 77.3895 19.6928C77.3895 17.7697 76.8013 16.1591 75.6324 14.953C74.4635 13.747 72.8432 13.1145 70.8235 13.1145C68.8037 13.1145 67.1798 13.7396 66.0146 14.953C64.8493 16.1665 64.2612 17.7697 64.2612 19.6928C64.2612 21.616 64.8456 23.2265 66.0146 24.4326C67.1835 25.6387 68.8 26.2712 70.8235 26.2712Z" fill="white"/>
-<circle cx="92.2668" cy="28.2668" r="3.73333" fill="#FBCE49"/>
-</g>
-<defs>
-<clipPath id="clip0_18_5683">
-<rect width="96" height="32" fill="white"/>
-</clipPath>
-</defs>
-</svg>
\ No newline at end of file
diff --git a/class/WC_Twoinc.php b/class/WC_Twoinc.php
index e450d4d..b2611c7 100644
--- a/class/WC_Twoinc.php
+++ b/class/WC_Twoinc.php
@@ -2204,10 +2204,7 @@ private function make_request($endpoint, $payload = [], $method = 'POST', $param
         public function twoinc_account_init_notice()
         {
             global $pagenow;
-            // Return early if we're in options-general.php
-            if ($pagenow === 'options-general.php') {
-                return;
-            }
+
             // Do not show on the Two plugin's own settings page
             if (
                 $pagenow === 'admin.php' &&
@@ -2218,6 +2215,8 @@ public function twoinc_account_init_notice()
             ) {
                 return;
             }
+
+            // Only show notice if either API key or merchant ID is missing
             if ($this->get_option('api_key') && $this->get_merchant_id()) {
                 return;
             }
@@ -2228,7 +2227,7 @@ public function twoinc_account_init_notice()
             echo '
             <div id="twoinc-account-init-notice" class="notice notice-info is-dismissible" style="background-image: url(\'' . WC_TWOINC_PLUGIN_URL . 'assets/images/banner.png\');background-size: cover;border-left-width: 0;background-color: #e2e0ff;padding: 20px;display: flex;">
                 <div style="width:60%;padding-right:40px;">
-                    <img style="width: 100px;" src="' . WC_TWOINC_PLUGIN_URL . 'assets/images/two-logo-w.svg">
+                    <img style="width: 100px;" src="' . esc_url($this->icon) . '">
                     <p style="color: #ffffff;font-size: 1.3em;text-align: justify;font-weight:700;">' . $headline . '</p>
                     <p style="color: #ffffff;font-size: 1.3em;text-align: justify;">' . $benefits . '</p>
                 </div>
@@ -2285,5 +2284,16 @@ public function process_admin_options()
             $_POST = $post_data;
             parent::process_admin_options();
         }
+
+        /**
+         * Get payment method icon
+         *
+         * @return string
+         */
+        public function get_icon()
+        {
+            $icon_html = '<img src="' . esc_url($this->icon) . '" alt="' . esc_attr($this->title) . '" class="mollie-gateway-icon" />';
+            return apply_filters('woocommerce_gateway_icon', $icon_html, $this->id);
+        }
     }
 }
diff --git a/docker-compose.yaml b/docker-compose.yaml
index f546f40..50dae86 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.1"
-
 services:
   wordpress:
     container_name: wordpress