diff --git a/Model/AdminLogo.php b/Model/AdminLogo.php
deleted file mode 100644
index b61dda5..0000000
--- a/Model/AdminLogo.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Copyright © element119. All rights reserved.
- * See LICENCE.txt for licence details.
- */
-declare(strict_types=1);
-
-namespace Element119\CustomAdminLogo\Model;
-
-use Element119\CustomAdminLogo\Model\Config\Backend\AdminLoginLogo;
-use Element119\CustomAdminLogo\Model\Config\Backend\AdminMenuLogo;
-use Element119\CustomAdminLogo\Scope\Config;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\Driver\File as FileDriver;
-use Magento\Framework\UrlInterface;
-
-class AdminLogo
-{
-    /** @var Config */
-    private Config $moduleConfig;
-
-    /** @var FileDriver */
-    private FileDriver $fileDriver;
-
-    /** @var UrlInterface */
-    private UrlInterface $urlBuilder;
-
-    /**
-     * @param Config $moduleConfig
-     * @param FileDriver $fileDriver
-     * @param UrlInterface $urlBuilder
-     */
-    public function __construct(
-        Config $moduleConfig,
-        FileDriver $fileDriver,
-        UrlInterface $urlBuilder
-    ) {
-        $this->moduleConfig = $moduleConfig;
-        $this->fileDriver = $fileDriver;
-        $this->urlBuilder = $urlBuilder;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getCustomAdminLoginLogoSrc(): ?string
-    {
-        if (!$logoFileName = $this->moduleConfig->getAdminLoginLogoFileName()) {
-            return null;
-        }
-
-        return $this->fileDriver->getAbsolutePath(
-            $this->urlBuilder->getBaseUrl() . DirectoryList::MEDIA . DIRECTORY_SEPARATOR,
-            AdminLoginLogo::UPLOAD_DIR . DIRECTORY_SEPARATOR . $logoFileName
-        );
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getCustomAdminMenuLogoSrc(): ?string
-    {
-        if (!$logoFileName = $this->moduleConfig->getAdminMenuLogoFileName()) {
-            return null;
-        }
-
-        return $this->fileDriver->getAbsolutePath(
-            $this->urlBuilder->getBaseUrl() . DirectoryList::MEDIA . DIRECTORY_SEPARATOR,
-            AdminMenuLogo::UPLOAD_DIR . DIRECTORY_SEPARATOR . $logoFileName
-        );
-    }
-}
diff --git a/Model/Config/Backend/AdminLoginLogo.php b/Model/Config/Backend/AdminLoginLogo.php
index 9e3eca6..1d232ef 100644
--- a/Model/Config/Backend/AdminLoginLogo.php
+++ b/Model/Config/Backend/AdminLoginLogo.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright © element119. All rights reserved.
- * See LICENCE.txt for licence details.
+ * See LICENSE for license details.
  */
 declare(strict_types=1);
 
@@ -11,16 +11,6 @@
 
 class AdminLoginLogo extends Image
 {
-    public const UPLOAD_DIR = 'admin/logo/custom/login';
-
-    /**
-     * @inheritDoc
-     */
-    protected function _getUploadDir(): string
-    {
-        return $this->_mediaDirectory->getAbsolutePath(self::UPLOAD_DIR);
-    }
-
     /**
      * @inheritDoc
      */
diff --git a/Model/Config/Backend/AdminMenuLogo.php b/Model/Config/Backend/AdminMenuLogo.php
index f03d88a..2200598 100644
--- a/Model/Config/Backend/AdminMenuLogo.php
+++ b/Model/Config/Backend/AdminMenuLogo.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright © element119. All rights reserved.
- * See LICENCE.txt for licence details.
+ * See LICENSE for license details.
  */
 declare(strict_types=1);
 
@@ -11,16 +11,6 @@
 
 class AdminMenuLogo extends Image
 {
-    public const UPLOAD_DIR = 'admin/logo/custom/menu';
-
-    /**
-     * @inheritDoc
-     */
-    protected function _getUploadDir(): string
-    {
-        return $this->_mediaDirectory->getAbsolutePath(self::UPLOAD_DIR);
-    }
-
     /**
      * @inheritDoc
      */
diff --git a/Plugin/Backend/Block/Page/HeaderPlugin.php b/Plugin/Backend/Block/Page/HeaderPlugin.php
new file mode 100644
index 0000000..c8ba710
--- /dev/null
+++ b/Plugin/Backend/Block/Page/HeaderPlugin.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © element119. All rights reserved.
+ * See LICENSE for license details.
+ */
+declare(strict_types=1);
+
+namespace Element119\CustomAdminLogo\Plugin\Backend\Block\Page;
+
+use Magento\Backend\Block\Page\Header;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Plugin that injects custom admin logo URLs into the Header block.
+ *
+ * Replaces a template override approach: layout XML arguments drive which
+ * config path and upload directory apply per layout handle (login vs. menu),
+ * and the core template renders the custom logo without modification.
+ */
+class HeaderPlugin
+{
+    /** @var ScopeConfigInterface */
+    private ScopeConfigInterface $scopeConfig;
+
+    /** @var StoreManagerInterface */
+    private StoreManagerInterface $storeManager;
+
+    /** @var LoggerInterface */
+    private LoggerInterface $logger;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        StoreManagerInterface $storeManager,
+        LoggerInterface $logger
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->storeManager = $storeManager;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Set custom logo URL on the block before rendering, if configured.
+     *
+     * Reads the config path and upload directory from layout XML arguments
+     * to determine which custom logo (login or menu) applies to this context.
+     *
+     * @param Header $subject
+     * @return void
+     */
+    public function beforeToHtml(Header $subject): void
+    {
+        if ($subject->getData('show_part') !== 'logo') {
+            return;
+        }
+
+        $configPath = $subject->getData('custom_logo_config_path');
+        $uploadDir = $subject->getData('custom_logo_upload_dir');
+
+        if (!$configPath || !$uploadDir) {
+            return;
+        }
+
+        $filename = $this->scopeConfig->getValue($configPath);
+
+        if (!is_string($filename) || $filename === '') {
+            return;
+        }
+
+        $filename = basename($filename);
+
+        if ($filename === '') {
+            return;
+        }
+
+        try {
+            $mediaUrl = $this->storeManager->getStore()
+                ->getBaseUrl(UrlInterface::URL_TYPE_MEDIA);
+        } catch (NoSuchEntityException $e) {
+            $this->logger->warning(
+                'Element119_CustomAdminLogo: Unable to resolve store for media URL.',
+                ['exception' => $e]
+            );
+            return;
+        } catch (\Throwable $e) {
+            $this->logger->error(
+                'Element119_CustomAdminLogo: Unexpected error resolving media URL.',
+                ['exception' => $e]
+            );
+            return;
+        }
+
+        $subject->setLogoImageSrc($mediaUrl . $uploadDir . '/' . $filename);
+    }
+
+    /**
+     * Pass through full URLs without asset repository resolution.
+     *
+     * When a custom logo is configured, logo_image_src is set to a full media
+     * URL. The core template passes this to getViewFileUrl(), which would
+     * attempt static file resolution. This plugin short-circuits that for
+     * absolute URLs, returning the fileId as-is.
+     *
+     * @param Header $subject
+     * @param string $result
+     * @param string $fileId
+     * @return string
+     */
+    public function afterGetViewFileUrl(
+        Header $subject,
+        string $result,
+        string $fileId = ''
+    ): string {
+        if ($subject->getData('show_part') !== 'logo') {
+            return $result;
+        }
+
+        if (str_starts_with($fileId, 'http://') || str_starts_with($fileId, 'https://')) {
+            return $fileId;
+        }
+
+        return $result;
+    }
+}
diff --git a/Scope/Config.php b/Scope/Config.php
deleted file mode 100644
index 391eec0..0000000
--- a/Scope/Config.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © element119. All rights reserved.
- * See LICENCE.txt for licence details.
- */
-declare(strict_types=1);
-
-namespace Element119\CustomAdminLogo\Scope;
-
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\ScopeInterface;
-
-class Config
-{
-    private const XML_PATH_LOGIN_LOGO = 'admin/e119_admin_logos/login';
-    private const XML_PATH_MENU_LOGO = 'admin/e119_admin_logos/menu';
-
-    /** @var ScopeConfigInterface */
-    private ScopeConfigInterface $scopeConfig;
-
-    /**
-     * @param ScopeConfigInterface $scopeConfig
-     */
-    public function __construct(
-        ScopeConfigInterface $scopeConfig
-    ) {
-        $this->scopeConfig = $scopeConfig;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getAdminLoginLogoFileName(): ?string
-    {
-        return $this->scopeConfig->getValue(self::XML_PATH_LOGIN_LOGO, ScopeInterface::SCOPE_STORE);
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getAdminMenuLogoFileName(): ?string
-    {
-        return $this->scopeConfig->getValue(self::XML_PATH_MENU_LOGO, ScopeInterface::SCOPE_STORE);
-    }
-}
diff --git a/Test/Unit/Plugin/Backend/Block/Page/HeaderPluginTest.php b/Test/Unit/Plugin/Backend/Block/Page/HeaderPluginTest.php
new file mode 100644
index 0000000..fabce88
--- /dev/null
+++ b/Test/Unit/Plugin/Backend/Block/Page/HeaderPluginTest.php
@@ -0,0 +1,350 @@
+<?php
+/**
+ * Copyright © element119. All rights reserved.
+ * See LICENSE for license details.
+ */
+declare(strict_types=1);
+
+namespace Element119\CustomAdminLogo\Test\Unit\Plugin\Backend\Block\Page;
+
+use Element119\CustomAdminLogo\Plugin\Backend\Block\Page\HeaderPlugin;
+use Magento\Backend\Block\Page\Header;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+class HeaderPluginTest extends TestCase
+{
+    private ScopeConfigInterface&MockObject $scopeConfig;
+    private StoreManagerInterface&MockObject $storeManager;
+    private LoggerInterface&MockObject $logger;
+    private MockObject $header;
+    private HeaderPlugin $plugin;
+
+    protected function setUp(): void
+    {
+        $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->header = $this->getMockBuilder(Header::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['setLogoImageSrc'])
+            ->onlyMethods(['getData'])
+            ->getMock();
+
+        $this->plugin = new HeaderPlugin(
+            $this->scopeConfig,
+            $this->storeManager,
+            $this->logger
+        );
+    }
+
+    /**
+     * Helper: configure getData to return the given map plus show_part=logo.
+     */
+    private function setHeaderData(array $extra = []): void
+    {
+        $map = [['show_part', null, 'logo']];
+        foreach ($extra as $key => $value) {
+            $map[] = [$key, null, $value];
+        }
+        $this->header->method('getData')->willReturnMap($map);
+    }
+
+    // ── show_part guard ──────────────────────────────────────────────
+
+    public function testBeforeToHtmlSkipsNonLogoBlock(): void
+    {
+        $this->header->method('getData')->willReturnMap([
+            ['show_part', null, 'user'],
+        ]);
+
+        $this->scopeConfig->expects($this->never())->method('getValue');
+        $this->header->expects($this->never())->method('setLogoImageSrc');
+
+        $this->plugin->beforeToHtml($this->header);
+    }
+
+    public function testAfterGetViewFileUrlSkipsNonLogoBlock(): void
+    {
+        $this->header->method('getData')->willReturnMap([
+            ['show_part', null, 'user'],
+        ]);
+
+        $url = 'https://example.com/media/admin/logo/custom/menu/logo.png';
+        $result = $this->plugin->afterGetViewFileUrl($this->header, 'original-result', $url);
+
+        $this->assertSame('original-result', $result);
+    }
+
+    // ── beforeToHtml guard clauses ───────────────────────────────────
+
+    public function testBeforeToHtmlDoesNothingWhenNoConfigPath(): void
+    {
+        $this->setHeaderData([
+            'custom_logo_config_path' => null,
+            'custom_logo_upload_dir' => null,
+        ]);
+
+        $this->scopeConfig->expects($this->never())->method('getValue');
+        $this->header->expects($this->never())->method('setLogoImageSrc');
+
+        $this->plugin->beforeToHtml($this->header);
+    }
+
+    public function testBeforeToHtmlDoesNothingWhenNoUploadDir(): void
+    {
+        $this->setHeaderData([
+            'custom_logo_config_path' => 'admin/e119_admin_logos/menu',
+            'custom_logo_upload_dir' => null,
+        ]);
+
+        $this->scopeConfig->expects($this->never())->method('getValue');
+        $this->header->expects($this->never())->method('setLogoImageSrc');
+
+        $this->plugin->beforeToHtml($this->header);
+    }
+
+    public function testBeforeToHtmlDoesNothingWhenNoFilenameInConfig(): void
+    {
+        $configPath = 'admin/e119_admin_logos/menu';
+
+        $this->setHeaderData([
+            'custom_logo_config_path' => $configPath,
+            'custom_logo_upload_dir' => 'admin/logo/custom/menu',
+        ]);
+
+        $this->scopeConfig->method('getValue')
+            ->with($configPath)
+            ->willReturn(null);
+
+        $this->header->expects($this->never())->method('setLogoImageSrc');
+
+        $this->plugin->beforeToHtml($this->header);
+    }
+
+    public function testBeforeToHtmlDoesNothingWhenFilenameIsEmptyString(): void
+    {
+        $configPath = 'admin/e119_admin_logos/menu';
+
+        $this->setHeaderData([
+            'custom_logo_config_path' => $configPath,
+            'custom_logo_upload_dir' => 'admin/logo/custom/menu',
+        ]);
+
+        $this->scopeConfig->method('getValue')
+            ->with($configPath)
+            ->willReturn('');
+
+        $this->header->expects($this->never())->method('setLogoImageSrc');
+
+        $this->plugin->beforeToHtml($this->header);
+    }
+
+    public function testBeforeToHtmlDoesNothingWhenConfigReturnsNonString(): void
+    {
+        $configPath = 'admin/e119_admin_logos/menu';
+
+        $this->setHeaderData([
+            'custom_logo_config_path' => $configPath,
+            'custom_logo_upload_dir' => 'admin/logo/custom/menu',
+        ]);
+
+        $this->scopeConfig->method('getValue')
+            ->with($configPath)
+            ->willReturn(['unexpected' => 'array']);
+
+        $this->header->expects($this->never())->method('setLogoImageSrc');
+
+        $this->plugin->beforeToHtml($this->header);
+    }
+
+    // ── beforeToHtml security ────────────────────────────────────────
+
+    public function testBeforeToHtmlStripsPathTraversalFromFilename(): void
+    {
+        $configPath = 'admin/e119_admin_logos/menu';
+        $uploadDir = 'admin/logo/custom/menu';
+        $mediaUrl = 'https://example.com/media/';
+
+        $this->setHeaderData([
+            'custom_logo_config_path' => $configPath,
+            'custom_logo_upload_dir' => $uploadDir,
+        ]);
+
+        $this->scopeConfig->method('getValue')
+            ->with($configPath)
+            ->willReturn('../../etc/passwd');
+
+        $store = $this->createMock(Store::class);
+        $store->method('getBaseUrl')
+            ->with(UrlInterface::URL_TYPE_MEDIA)
+            ->willReturn($mediaUrl);
+        $this->storeManager->method('getStore')->willReturn($store);
+
+        $this->header->expects($this->once())
+            ->method('setLogoImageSrc')
+            ->with('https://example.com/media/admin/logo/custom/menu/passwd');
+
+        $this->plugin->beforeToHtml($this->header);
+    }
+
+    // ── beforeToHtml happy path ──────────────────────────────────────
+
+    public function testBeforeToHtmlSetsMenuLogoUrl(): void
+    {
+        $configPath = 'admin/e119_admin_logos/menu';
+        $uploadDir = 'admin/logo/custom/menu';
+        $filename = 'my-logo.png';
+        $mediaUrl = 'https://example.com/media/';
+
+        $this->setHeaderData([
+            'custom_logo_config_path' => $configPath,
+            'custom_logo_upload_dir' => $uploadDir,
+        ]);
+
+        $this->scopeConfig->method('getValue')
+            ->with($configPath)
+            ->willReturn($filename);
+
+        $store = $this->createMock(Store::class);
+        $store->method('getBaseUrl')
+            ->with(UrlInterface::URL_TYPE_MEDIA)
+            ->willReturn($mediaUrl);
+        $this->storeManager->method('getStore')->willReturn($store);
+
+        $this->header->expects($this->once())
+            ->method('setLogoImageSrc')
+            ->with('https://example.com/media/admin/logo/custom/menu/my-logo.png');
+
+        $this->plugin->beforeToHtml($this->header);
+    }
+
+    public function testBeforeToHtmlSetsLoginLogoUrl(): void
+    {
+        $configPath = 'admin/e119_admin_logos/login';
+        $uploadDir = 'admin/logo/custom/login';
+        $filename = 'login-logo.jpg';
+        $mediaUrl = 'https://example.com/media/';
+
+        $this->setHeaderData([
+            'custom_logo_config_path' => $configPath,
+            'custom_logo_upload_dir' => $uploadDir,
+        ]);
+
+        $this->scopeConfig->method('getValue')
+            ->with($configPath)
+            ->willReturn($filename);
+
+        $store = $this->createMock(Store::class);
+        $store->method('getBaseUrl')
+            ->with(UrlInterface::URL_TYPE_MEDIA)
+            ->willReturn($mediaUrl);
+        $this->storeManager->method('getStore')->willReturn($store);
+
+        $this->header->expects($this->once())
+            ->method('setLogoImageSrc')
+            ->with('https://example.com/media/admin/logo/custom/login/login-logo.jpg');
+
+        $this->plugin->beforeToHtml($this->header);
+    }
+
+    // ── beforeToHtml error handling ──────────────────────────────────
+
+    public function testBeforeToHtmlHandlesNoSuchEntityException(): void
+    {
+        $configPath = 'admin/e119_admin_logos/menu';
+
+        $this->setHeaderData([
+            'custom_logo_config_path' => $configPath,
+            'custom_logo_upload_dir' => 'admin/logo/custom/menu',
+        ]);
+
+        $this->scopeConfig->method('getValue')
+            ->with($configPath)
+            ->willReturn('logo.png');
+
+        $this->storeManager->method('getStore')
+            ->willThrowException(new NoSuchEntityException(__('Store not found')));
+
+        $this->logger->expects($this->once())
+            ->method('warning')
+            ->with(
+                'Element119_CustomAdminLogo: Unable to resolve store for media URL.',
+                $this->arrayHasKey('exception')
+            );
+
+        $this->header->expects($this->never())->method('setLogoImageSrc');
+
+        $this->plugin->beforeToHtml($this->header);
+    }
+
+    public function testBeforeToHtmlHandlesUnexpectedThrowable(): void
+    {
+        $configPath = 'admin/e119_admin_logos/menu';
+
+        $this->setHeaderData([
+            'custom_logo_config_path' => $configPath,
+            'custom_logo_upload_dir' => 'admin/logo/custom/menu',
+        ]);
+
+        $this->scopeConfig->method('getValue')
+            ->with($configPath)
+            ->willReturn('logo.png');
+
+        $this->storeManager->method('getStore')
+            ->willThrowException(new \RuntimeException('Unexpected failure'));
+
+        $this->logger->expects($this->once())
+            ->method('error')
+            ->with(
+                'Element119_CustomAdminLogo: Unexpected error resolving media URL.',
+                $this->arrayHasKey('exception')
+            );
+
+        $this->header->expects($this->never())->method('setLogoImageSrc');
+
+        $this->plugin->beforeToHtml($this->header);
+    }
+
+    // ── afterGetViewFileUrl ──────────────────────────────────────────
+
+    public function testAfterGetViewFileUrlPassesThroughHttpsUrl(): void
+    {
+        $this->setHeaderData();
+        $url = 'https://example.com/media/admin/logo/custom/menu/logo.png';
+
+        $result = $this->plugin->afterGetViewFileUrl($this->header, 'ignored', $url);
+
+        $this->assertSame($url, $result);
+    }
+
+    public function testAfterGetViewFileUrlPassesThroughHttpUrl(): void
+    {
+        $this->setHeaderData();
+        $url = 'http://example.com/media/admin/logo/custom/login/logo.png';
+
+        $result = $this->plugin->afterGetViewFileUrl($this->header, 'ignored', $url);
+
+        $this->assertSame($url, $result);
+    }
+
+    public function testAfterGetViewFileUrlReturnsOriginalResultForViewFile(): void
+    {
+        $this->setHeaderData();
+        $resolvedUrl = 'https://example.com/static/adminhtml/Magento/backend/en_US/images/mage-os-icon.svg';
+
+        $result = $this->plugin->afterGetViewFileUrl(
+            $this->header,
+            $resolvedUrl,
+            'images/mage-os-icon.svg'
+        );
+
+        $this->assertSame($resolvedUrl, $result);
+    }
+}
diff --git a/ViewModel/AdminLogo.php b/ViewModel/AdminLogo.php
deleted file mode 100644
index 71ddea6..0000000
--- a/ViewModel/AdminLogo.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Copyright © element119. All rights reserved.
- * See LICENCE.txt for licence details.
- */
-declare(strict_types=1);
-
-namespace Element119\CustomAdminLogo\ViewModel;
-
-use Element119\CustomAdminLogo\Model\AdminLogo as AdminLogoModel;
-use Magento\Framework\App\Area;
-use Magento\Framework\App\RequestInterface;
-use Magento\Framework\View\Element\Block\ArgumentInterface;
-
-class AdminLogo implements ArgumentInterface
-{
-    /** @var AdminLogoModel */
-    private AdminLogoModel $adminLogo;
-
-    /** @var RequestInterface */
-    private RequestInterface $request;
-
-    /**
-     * @param AdminLogoModel $adminLogo
-     * @param RequestInterface $request
-     */
-    public function __construct(
-        AdminLogoModel $adminLogo,
-        RequestInterface $request
-    ) {
-        $this->adminLogo = $adminLogo;
-        $this->request = $request;
-    }
-
-    /**
-     * @return AdminLogoModel
-     */
-    public function getAdminLogoModel(): AdminLogoModel
-    {
-        return $this->adminLogo;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isAdminLoginPage(): bool
-    {
-        return $this->request->getRouteName() === Area::AREA_ADMINHTML
-            && $this->request->getControllerName() === 'auth'
-            && $this->request->getActionName() === 'login';
-    }
-}
diff --git a/composer.json b/composer.json
index d3181dd..c2ae9fd 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,10 @@
         }
     ],
     "require": {
-        "magento/module-config": "^101.0"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "^101.0",
+        "magento/module-store": "*"
     },
     "autoload": {
         "psr-4": {
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
new file mode 100644
index 0000000..1fec063
--- /dev/null
+++ b/etc/adminhtml/di.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © element119. All rights reserved.
+ * See LICENSE for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Backend\Block\Page\Header">
+        <plugin name="element119_custom_admin_logo_header"
+                type="Element119\CustomAdminLogo\Plugin\Backend\Block\Page\HeaderPlugin"/>
+    </type>
+</config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index eef10f8..0b1f620 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -2,7 +2,7 @@
 <!--
 /**
  * Copyright © element119. All rights reserved.
- * See LICENCE.txt for licence details.
+ * See LICENSE for license details.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -13,8 +13,8 @@
                    translate="label"
                    sortOrder="100"
                    showInDefault="1"
-                   showInWebsite="1"
-                   showInStore="1">
+                   showInWebsite="0"
+                   showInStore="0">
                 <label>Admin Logos</label>
                 <field id="login"
                        translate="label comment"
diff --git a/etc/module.xml b/etc/module.xml
index 49a5f8f..818bbcb 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -2,14 +2,16 @@
 <!--
 /**
  * Copyright © element119. All rights reserved.
- * See LICENCE.txt for licence details.
+ * See LICENSE for license details.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Element119_CustomAdminLogo">
         <sequence>
+            <module name="Magento_Backend"/>
             <module name="Magento_Config"/>
+            <module name="Magento_Store"/>
         </sequence>
     </module>
 </config>
diff --git a/registration.php b/registration.php
index 704de43..1ffb1c6 100644
--- a/registration.php
+++ b/registration.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright © element119. All rights reserved.
- * See LICENCE.txt for licence details.
+ * See LICENSE for license details.
  */
 declare(strict_types=1);
 
diff --git a/view/adminhtml/layout/admin_login.xml b/view/adminhtml/layout/admin_login.xml
new file mode 100644
index 0000000..9dedde4
--- /dev/null
+++ b/view/adminhtml/layout/admin_login.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © element119. All rights reserved.
+ * See LICENSE for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="logo">
+            <arguments>
+                <argument name="custom_logo_config_path" xsi:type="string">admin/e119_admin_logos/login</argument>
+                <argument name="custom_logo_upload_dir" xsi:type="string">admin/logo/custom/login</argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/view/adminhtml/layout/default.xml b/view/adminhtml/layout/default.xml
index d1c3773..9434fa8 100644
--- a/view/adminhtml/layout/default.xml
+++ b/view/adminhtml/layout/default.xml
@@ -2,7 +2,7 @@
 <!--
 /**
  * Copyright © element119. All rights reserved.
- * See LICENCE.txt for licence details.
+ * See LICENSE for license details.
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -11,11 +11,10 @@
         <css src="Element119_CustomAdminLogo::css/module.css" rel="stylesheet" type="text/css"/>
     </head>
     <body>
-        <referenceBlock name="logo" template="Element119_CustomAdminLogo::page/header.phtml">
+        <referenceBlock name="logo">
             <arguments>
-                <argument name="admin_logo_view_model" xsi:type="object">
-                    Element119\CustomAdminLogo\ViewModel\AdminLogo
-                </argument>
+                <argument name="custom_logo_config_path" xsi:type="string">admin/e119_admin_logos/menu</argument>
+                <argument name="custom_logo_upload_dir" xsi:type="string">admin/logo/custom/menu</argument>
             </arguments>
         </referenceBlock>
     </body>
diff --git a/view/adminhtml/templates/page/header.phtml b/view/adminhtml/templates/page/header.phtml
deleted file mode 100644
index d962375..0000000
--- a/view/adminhtml/templates/page/header.phtml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Copyright © element119. All rights reserved.
- * See LICENCE.txt for licence details.
- */
-declare(strict_types=1);
-
-use Element119\CustomAdminLogo\ViewModel\AdminLogo;
-use Magento\Backend\Block\Page\Header;
-use Magento\Framework\Escaper;
-
-/** @var Escaper $escaper */
-/** @var Header $block */
-$part = $block->getShowPart();
-
-/** @var AdminLogo $adminLogoViewModel */
-$adminLogoViewModel = $block->getData('admin_logo_view_model');
-?>
-<?php if ($part === 'logo'): ?>
-    <?php $edition = $block->hasEdition()
-        ? 'data-edition="' . $escaper->escapeHtml($block->getEdition()) . '"'
-        : ''; ?>
-    <?php $adminLoginLogoSrc = $adminLogoViewModel->getAdminLogoModel()->getCustomAdminLoginLogoSrc(); ?>
-    <?php $adminMenuLogoSrc = $adminLogoViewModel->getAdminLogoModel()->getCustomAdminMenuLogoSrc(); ?>
-
-    <a href="<?= $escaper->escapeUrl($block->getHomeLink()); ?>"
-       <?= /* @noEscape */ $edition; ?>
-       class="logo">
-        <img class="logo-img"
-             <?php if ($adminLogoViewModel->isAdminLoginPage()): ?>
-                 src="<?= $escaper->escapeUrl(
-                     $adminLoginLogoSrc ?: $block->getViewFileUrl('images/magento-logo.svg')
-                 ); ?>"
-             <?php else: ?>
-                 src="<?= $escaper->escapeUrl(
-                     $adminMenuLogoSrc ?: $block->getViewFileUrl('images/magento-icon.svg')
-                 ); ?>"
-             <?php endif; ?>
-             alt="<?= $escaper->escapeHtmlAttr(__('Magento Admin Panel')); ?>"
-             title="<?= $escaper->escapeHtmlAttr(__('Magento Admin Panel')); ?>"/>
-    </a>
-<?php elseif ($part === 'user'): ?>
-    <div class="admin-user admin__action-dropdown-wrap">
-        <a href="<?= $escaper->escapeUrl($block->getUrl('adminhtml/system_account/index')); ?>"
-           class="admin__action-dropdown"
-           title="<?= $escaper->escapeHtmlAttr(__('My Account')); ?>"
-           data-mage-init='{"dropdown":{}}'
-           data-toggle="dropdown">
-            <span class="admin__action-dropdown-text">
-                <span class="admin-user-account-text">
-                    <?= $escaper->escapeHtml($block->getUser()->getUserName()); ?>
-                </span>
-            </span>
-        </a>
-        <ul class="admin__action-dropdown-menu">
-            <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')): ?>
-                <li>
-                    <a href="<?= $escaper->escapeUrl($block->getUrl('adminhtml/system_account/index')); ?>"
-                       <?= /* @noEscape */ $block->getUiId('user', 'account', 'settings'); ?>
-                       title="<?= $escaper->escapeHtmlAttr(__('Account Setting')); ?>">
-                        <?= $escaper->escapeHtml(__('Account Setting')); ?>
-                        (<span class="admin-user-name">
-                            <?= $escaper->escapeHtml($block->getUser()->getUserName()); ?>
-                        </span>)
-                    </a>
-                </li>
-            <?php endif; ?>
-
-            <li>
-                <a href="<?= $escaper->escapeUrl($block->getBaseUrl()); ?>"
-                   title="<?= $escaper->escapeHtmlAttr(__('Customer View')); ?>"
-                   target="_blank"
-                   class="store-front">
-                    <?= $escaper->escapeHtml(__('Customer View')); ?>
-                </a>
-            </li>
-            <li>
-                <a href="<?= $escaper->escapeUrl($block->getLogoutLink()); ?>"
-                   class="account-signout"
-                   title="<?= $escaper->escapeHtmlAttr(__('Sign Out')); ?>">
-                    <?= $escaper->escapeHtml(__('Sign Out')); ?>
-                </a>
-            </li>
-        </ul>
-    </div>
-<?php elseif ($part === 'other'): ?>
-    <?= $block->getChildHtml(); ?>
-<?php endif; ?>
diff --git a/view/adminhtml/web/css/module.less b/view/adminhtml/web/css/module.less
index 183a30a..1616b8e 100644
--- a/view/adminhtml/web/css/module.less
+++ b/view/adminhtml/web/css/module.less
@@ -1,6 +1,6 @@
 /**
  * Copyright © element119. All rights reserved.
- * See LICENCE.txt for licence details.
+ * See LICENSE for license details.
  */
 .menu-wrapper a.logo .logo-img {
     height: auto;