diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index 20098b007..3077fa34e 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -4238,7 +4238,6 @@ class AppModel extends Model
         $newImageDir = APP . 'files/img';
         $oldOrgDir = new Folder($oldImageDir . '/orgs');
         $oldCustomDir = new Folder($oldImageDir . '/custom');
-        $result = false;
         $result = $oldOrgDir->copy([
             'from' => $oldImageDir . '/orgs',
             'to' => $newImageDir . '/orgs',
diff --git a/app/Model/Server.php b/app/Model/Server.php
index 3e59bb006..9d3e21858 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -2595,33 +2595,33 @@ class Server extends AppModel
 
     public function getFileRules()
     {
-        return array(
-            'orgs' => array(
+        return [
+            'orgs' => [
                 'name' => __('Organisation logos'),
                 'description' => __('The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name.'),
-                'expected' => array(),
+                'expected' => [],
                 'valid_format' => __('48x48 pixel .png files or .svg file'),
-                'path' => APP . 'webroot' . DS . 'img' . DS . 'orgs',
+                'path' => APP . 'files' . DS . 'img' . DS . 'orgs',
                 'regex' => '.*\.(png|svg)$',
                 'regex_error' => __('Filename must be in the following format: *.png or *.svg'),
-                'files' => array(),
-            ),
-            'img' => array(
+                'files' => [],
+            ],
+            'img' => [
                 'name' => __('Additional image files'),
                 'description' => __('Image files uploaded into this directory can be used for various purposes, such as for the login page logos'),
-                'expected' => array(
+                'expected' => [
                     'MISP.footer_logo' => Configure::read('MISP.footer_logo'),
                     'MISP.home_logo' => Configure::read('MISP.home_logo'),
                     'MISP.welcome_logo' => Configure::read('MISP.welcome_logo'),
                     'MISP.welcome_logo2' => Configure::read('MISP.welcome_logo2'),
-                ),
+                ],
                 'valid_format' => __('PNG or SVG file'),
-                'path' => APP . 'webroot' . DS . 'img' . DS . 'custom',
+                'path' => APP . 'files' . DS . 'img' . DS . 'custom',
                 'regex' => '.*\.(png|svg)$',
                 'regex_error' => __('Filename must be in the following format: *.png or *.svg'),
                 'files' => array(),
-            ),
-        );
+            ],
+        ];
     }
 
     public function grabFiles()
diff --git a/app/View/Elements/footer.ctp b/app/View/Elements/footer.ctp
index a23c721c0..8159f267e 100644
--- a/app/View/Elements/footer.ctp
+++ b/app/View/Elements/footer.ctp
@@ -34,7 +34,7 @@
             <div class="pull-right" style="position:relative;padding-top:9px;z-index:2;">
                 <?php
                     if (Configure::read('MISP.footer_logo')) {
-                        echo $this->Html->image('custom/' . h(Configure::read('MISP.footer_logo')), array('alt' => 'Footer Logo', 'onerror' => "this.style.display='none';", 'style' => 'height:24px'));
+                        echo '<img src="' . $this->Image->base64(APP . 'files/img/custom/' . Configure::read('MISP.footer_logo')) . '" alt="' . __('Footer logo') . '" style="height:24px" onerror="this.style.display=\'none\';">';
                     }
                 ?>
             </div>
diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp
index 4f2010b28..0e7f67c6c 100755
--- a/app/View/Elements/global_menu.ctp
+++ b/app/View/Elements/global_menu.ctp
@@ -1,563 +1,574 @@
 <?php
-    if (!empty($me)) {
-        // New approach how to define menu requirements. It takes ACLs from ACLComponent.
-        $menu = array(
-            array(
-                'type' => 'root',
-                'url' => empty($homepage['path']) ? $baseurl .'/' : $baseurl . h($homepage['path']),
-                'html' => Configure::read('MISP.home_logo') ? '<img src="' . $baseurl . '/img/custom/' . Configure::read('MISP.home_logo') . '" style="height:24px;" alt="' . __('Home') . '">' : __('Home'),
-            ),
-            array(
-                'type' => 'root',
-                'text' => __('Event Actions'),
-                'children' => array(
-                    array(
-                        'text' => __('List Events'),
-                        'url' => $baseurl . '/events/index'
-                    ),
-                    array(
-                        'text' => __('Add Event'),
-                        'url' => $baseurl . '/events/add',
-                        'requirement' => $this->Acl->canAccess('events', 'add'),
-                    ),
-                    array(
-                        'text' => __('List Attributes'),
-                        'url' => $baseurl . '/attributes/index'
-                    ),
-                    array(
-                        'text' => __('Search Attributes'),
-                        'url' => $baseurl . '/attributes/search'
-                    ),
-                    array(
-                        'type' => 'separator'
-                    ),
-                    array(
-                        'text' => __('List Collections'),
-                        'url' => $baseurl . '/collections/index'
-                    ),
-                    [
-                        'type' => 'separator'
-                    ],
-                    [
-                        'text' => __('List Analyst Data'),
-                        'url' => $baseurl . '/analyst_data/index'
-                    ],
-                    [
-                        'type' => 'separator'
-                    ],
-                    array(
-                        'text' => __('View Proposals'),
-                        'url' => $baseurl . '/shadow_attributes/index/all:0'
-                    ),
-                    array(
-                        'text' => __('Events with proposals'),
-                        'url' => $baseurl . '/events/proposalEventIndex'
-                    ),
-                    array(
-                        'url' => $baseurl . '/event_delegations/index/context:pending',
-                        'text' => __('View delegation requests'),
-                        'requirement' => $this->Acl->canAccess('event_delegations', 'index'),
-                    ),
-                    array(
-                        'type' => 'separator'
-                    ),
-                    array(
-                        'text' => __('List Tags'),
-                        'url' => $baseurl . '/tags/index'
-                    ),
-                    array(
-                        'text' => __('Add Tag'),
-                        'url' => $baseurl . '/tags/add',
-                        'requirement' => $this->Acl->canAccess('tags', 'add'),
-                    ),
-                    array(
-                        'text' => __('List Tag Collections'),
-                        'url' => $baseurl . '/tag_collections/index'
-                    ),
-                    array(
-                        'text' => __('List Taxonomies'),
-                        'url' => $baseurl . '/taxonomies/index'
-                    ),
-                    array(
-                        'text' => __('List Templates'),
-                        'url' => $baseurl . '/templates/index'
-                    ),
-                    array(
-                        'type' => 'separator'
-                    ),
-                    array(
-                        'text' => __('Export'),
-                        'url' => $baseurl . '/events/export'
-                    ),
-                    array(
-                        'text' => __('Automation'),
-                        'url' => $baseurl . '/events/automation',
-                        'requirement' => $this->Acl->canAccess('events', 'automation'),
-                    ),
-                    array(
-                        'type' => 'separator',
-                        'requirement' =>
-                            Configure::read('MISP.enableEventBlocklisting') !== false &&
-                            !$isSiteAdmin &&
-                            $hostOrgUser
-                    ),
-                    array(
-                        'text' => __('Blocklist Event'),
-                        'url' => $baseurl . '/eventBlocklists/add',
-                        'requirement' =>
-                            Configure::read('MISP.enableEventBlocklisting') !== false &&
-                            !$isSiteAdmin && $hostOrgUser
-                    ),
-                    array(
-                        'text' => __('Manage Event Blocklists'),
-                        'url' => $baseurl . '/eventBlocklists',
-                        'requirement' =>
-                            Configure::read('MISP.enableEventBlocklisting') !== false &&
-                            !$isSiteAdmin && $hostOrgUser
-                    )
-                )
-            ),
-            array(
-                'type' => 'root',
-                'text' => __('Dashboard'),
-                'url' => $baseurl . '/dashboards'
-            ),
-            array(
-                'type' => 'root',
-                'text' => __('Galaxies'),
-                'url' => $baseurl . '/galaxies/index',
-                'children' => array(
-                    array(
-                        'text' => __('List Galaxies'),
-                        'url' => $baseurl . '/galaxies/index'
-                    ),
-                    array(
-                        'text' => __('List Relationships'),
-                        'url' => $baseurl . '/galaxy_cluster_relations/index'
-                    ),
-                )
-            ),
-            array(
-                'type' => 'root',
-                'text' => __('Input Filters'),
-                'children' => array(
-                    array(
-                        'text' => __('Import Regexp'),
-                        'url' => $baseurl . '/admin/regexp/index',
-                        'requirement' => $isAclRegexp
-                    ),
-                    array(
-                        'text' => __('Import Regexp'),
-                        'url' => $baseurl . '/regexp/index',
-                        'requirement' => !$isAclRegexp
-                    ),
-                    array(
-                        'text' => __('Signature Allowedlist'),
-                        'url' => $baseurl . '/admin/allowedlists/index',
-                        'requirement' => $isAclRegexp
-                    ),
-                    array(
-                        'text' => __('Signature Allowedlist'),
-                        'url' => $baseurl . '/allowedlists/index',
-                        'requirement' => !$isAclRegexp
-                    ),
-                    array(
-                        'text' => __('Warninglists'),
-                        'url' => $baseurl . '/warninglists/index'
-                    ),
-                    array(
-                        'text' => __('Noticelists'),
-                        'url' => $baseurl . '/noticelists/index'
-                    ),
-                    array(
-                        'text' => __('Correlation Exclusions'),
-		            	'url' => $baseurl . '/correlation_exclusions/index',
-	            		'requirement' => $this->Acl->canAccess('correlation_exclusions', 'index'),
-                    )
-                )
-            ),
-            array(
-                'type' => 'root',
-                'text' => __('Global Actions'),
-                'children' => array(
-                    array(
-                        'text' => __('News'),
-                        'url' => $baseurl . '/news'
-                    ),
-                    array(
-                        'text' => __('My Profile'),
-                        'url' => $baseurl . '/users/view/me'
-                    ),
-                    array(
-                        'text' => __('My Settings'),
-                        'url' => $baseurl . '/user_settings/index/user_id:me'
-                    ),
-                    array(
-                        'text' => __('Set Setting'),
-                        'url' => $baseurl . '/user_settings/setSetting'
-                    ),
-                    array(
-                        'text' => __('Organisations'),
-                        'url' => $baseurl . '/organisations/index',
-                        'requirement' => $this->Acl->canAccess('organisations', 'index'),
-                    ),
-                    array(
-                        'text' => __('Role Permissions'),
-                        'url' => $baseurl . '/roles/index'
-                    ),
-                    array(
-                        'type' => 'separator'
-                    ),
-                    array(
-                        'text' => __('List Object Templates'),
-                        'url' => $baseurl . '/objectTemplates/index'
-                    ),
-                    array(
-                        'type' => 'separator'
-                    ),
-                    array(
-                        'text' => __('List Sharing Groups'),
-                        'url' => $baseurl . '/sharing_groups/index'
-                    ),
-                    array(
-                        'text' => __('Add Sharing Group'),
-                        'url' => $baseurl . '/sharing_groups/add',
-                        'requirement' => $this->Acl->canAccess('sharing_groups', 'add'),
-                    ),
-                    array(
-                        'text' => __('List Sharing Groups Blueprints'),
-                        'url' => $baseurl . '/sharing_group_blueprints/index',
-                        'requirement' => $this->Acl->canAccess('sharing_group_blueprints', 'index'),
-                    ),
-                    array(
-                        'text' => __('Add Sharing Group Blueprint'),
-                        'url' => $baseurl . '/sharing_group_blueprints/add',
-                        'requirement' => $this->Acl->canAccess('sharing_group_blueprints', 'add'),
-                    ),
-                    array(
-                        'type' => 'separator'
-                    ),
-                    array(
-                        'text' => __('Decaying Models Tool'),
-                        'url' => $baseurl . '/decayingModel/decayingTool',
-                        'requirement' => $isAdmin
-                    ),
-                    array(
-                        'text' => __('List Decaying Models'),
-                        'url' => $baseurl . '/decayingModel/index',
-                    ),
-                    array(
-                        'type' => 'separator'
-                    ),
-                    array(
-                        'text' => __('User Guide'),
-                        'url' => 'https://www.circl.lu/doc/misp/'
-                    ),
-                    array(
-                        'text' => __('Categories & Types'),
-                        'url' => $baseurl . '/pages/display/doc/categories_and_types'
-                    ),
-                    array(
-                        'text' => __('Terms & Conditions'),
-                        'url' => $baseurl . '/users/terms'
-                    ),
-                    array(
-                        'text' => __('Statistics'),
-                        'url' => $baseurl . '/users/statistics'
-                    ),
-                    array(
-                        'type' => 'separator',
-                        'requirement' => $this->Acl->canAccess('threads', 'index'),
-                    ),
-                    array(
-                        'text' => __('List Discussions'),
-                        'url' => $baseurl . '/threads/index',
-                        'requirement' => $this->Acl->canAccess('threads', 'index'),
-                    ),
-                    array(
-                        'text' => __('Start Discussion'),
-                        'url' => $baseurl . '/posts/add',
-                        'requirement' => $this->Acl->canAccess('posts', 'add'),
-                    )
-                )
-            ),
-            array(
-                'type' => 'root',
-                'text' => __('Sync Actions'),
-                'requirement' =>  $isAclSync || $isAdmin || $hostOrgUser,
-                'children' => array(
-                    array(
-                        'text' => __('Create Sync Config'),
-                        'url' => $baseurl . '/servers/createSync',
-                        'requirement' => $isAclSync && !$isSiteAdmin
-                    ),
-                    array(
-                        'text' => __('Remote Servers'),
-                        'url' => $baseurl . '/servers/index',
-                        'requirement' => $this->Acl->canAccess('servers', 'index'),
-                    ),
-                    array(
-                        'text' => __('Feeds'),
-                        'url' => $baseurl . '/feeds/index',
-                        'requirement' => $this->Acl->canAccess('feeds', 'index'),
-                    ),
-                    array(
-                        'text' => __('SightingDB'),
-                        'url' => $baseurl . '/sightingdb/index',
-                        'requirement' => $this->Acl->canAccess('sightingdb', 'index'),
-                    ),
-                    array(
-                        'text' => __('Communities'),
-                        'url' => $baseurl . '/communities/index',
-                        'requirement' => $this->Acl->canAccess('communities', 'index'),
-                    ),
-                    array(
-                        'text' => __('Cerebrates'),
-                        'url' => $baseurl . '/cerebrates/index',
-                        'requirement' => $this->Acl->canAccess('cerebrates', 'index'),
-                    ),
-                    array(
-                        'text' => __('TAXII Servers'),
-                        'url' => $baseurl . '/TaxiiServers/index',
-                        'requirement' => $this->Acl->canAccess('taxiiServers', 'index'),
-                    ),
-                    array(
-                        'text' => __('Event ID translator'),
-                        'url' => '/servers/idTranslator',
-                        'requirement' => $this->Acl->canAccess('servers', 'idTranslator')
-                    )
-                )
-            ),
-            array(
-                'type' => 'root',
-                'text' => __('Administration'),
-                'url' => $baseurl . '/servers/serverSettings',
-                'requirement' => $isAdmin,
-                'children' => array(
-                    array(
-                        'text' => __('List Users'),
-                        'url' => $baseurl . '/admin/users/index'
-                    ),
-                    array(
-                        'text' => __('List Auth Keys'),
-                        'url' => $baseurl . '/auth_keys/index'
-                    ),
-                    array(
-                        'text' => __('List User Settings'),
-                        'url' => $baseurl . '/user_settings/index/user_id:all'
-                    ),
-                    array(
-                        'text' => __('Set User Setting'),
-                        'url' => $baseurl . '/user_settings/setSetting'
-                    ),
-                    array(
-                        'text' => __('Add User'),
-                        'url' => $baseurl . '/admin/users/add',
-                        'requirement' => $this->Acl->canAccess('users', 'admin_add'),
-                    ),
-                    array(
-                        'text' => __('Contact Users'),
-                        'url' => $baseurl . '/admin/users/email'
-                    ),
-                    array(
-                        'text' => __('User Registrations'),
-                        'url' => $baseurl . '/users/registrations',
-                        'requirement' => $this->Acl->canAccess('users', 'registrations'),
-                    ),
-                    array(
-                        'type' => 'separator'
-                    ),
-                    array(
-                        'text' => __('List Organisations'),
-                        'url' => $baseurl . '/organisations/index'
-                    ),
-                    array(
-                        'text' => __('Add Organisations'),
-                        'url' => $baseurl . '/admin/organisations/add',
-                        'requirement' => $this->Acl->canAccess('organisations', 'admin_add'),
-                    ),
-                    array(
-                        'type' => 'separator'
-                    ),
-                    array(
-                        'text' => __('List Roles'),
-                        'url' => $baseurl . '/roles/index'
-                    ),
-                    array(
-                        'text' => __('Add Roles'),
-                        'url' => $baseurl . '/admin/roles/add',
-                        'requirement' => $isSiteAdmin
-                    ),
-                    array(
-                        'type' => 'separator',
-                        'requirement' => $isSiteAdmin,
-                    ),
-                    array(
-                        'text' => __('Server Settings & Maintenance'),
-                        'url' => $baseurl . '/servers/serverSettings',
-                        'requirement' => $isSiteAdmin
-                    ),
-                    array(
-                        'type' => 'separator',
-                        'requirement' => $isSiteAdmin
-                    ),
-                    array(
-                        'text' => __('Jobs'),
-                        'url' => $baseurl . '/jobs/index',
-                        'requirement' => Configure::read('MISP.background_jobs') && $isSiteAdmin
-                    ),
-                    array(
-                        'text' => __('Scheduled Tasks'),
-                        'url' => $baseurl . '/tasks',
-                        'requirement' => Configure::read('MISP.background_jobs') && $isSiteAdmin
-                    ),
-                    array(
-                        'html' => sprintf(
-                            '<span style="display: flex;"><span>%s</span></span>',
-                            __('Workflows')
-                        ),
-                        'url' => $baseurl . '/workflows/triggers',
-                        'requirement' => $isSiteAdmin
-                    ),
-                    array(
-                        'type' => 'separator',
-                        'requirement' => $isSiteAdmin
-                    ),
-                    array(
-                        'text' => __('Event Block Rules'),
-                        'url' => $baseurl . '/servers/eventBlockRule',
-                        'requirement' => $isSiteAdmin
-                    ),
-                    array(
-                        'text' => __('Event Blocklists'),
-                        'url' => $baseurl . '/eventBlocklists',
-                        'requirement' => Configure::read('MISP.enableEventBlocklisting') !== false && $isSiteAdmin
-                    ),
-                    array(
-                        'text' => __('Org Blocklists'),
-                        'url' => $baseurl . '/orgBlocklists',
-                        'requirement' => Configure::read('MISP.enableOrgBlocklisting') !== false && $isSiteAdmin
-                    ),
-                    [
-                        'type' => 'separator',
-                        'requirement' => $isSiteAdmin
-                    ],
-                    [
-                        'text' => __('Top Correlations'),
-                        'url' => $baseurl . '/correlations/top',
-                        'requirement' => $isSiteAdmin
-                    ],
-                    [
-                        'html' => sprintf(
-                            '<span style="display: flex;"><span>%s</span></span>',
-                            __('Over-correlating values')
-                        ),
-                        'url' => $baseurl . '/correlations/overCorrelations',
-                        'requirement' => $isSiteAdmin
-                    ]
-                )
-            ),
-            array(
-                'type' => 'root',
-                'text' => __('Logs'),
-                'requirement' => $isAclAudit,
-                'children' => array(
-                    array(
-                        'text' => __('Application Logs'),
-                        'url' => $baseurl . '/logs/index'
-                    ),
-                    array(
-                        'text' => __('Audit Logs'),
-                        'url' => $baseurl . '/admin/audit_logs/index',
-                        'requirement' => Configure::read('MISP.log_new_audit') && $this->Acl->canAccess('auditLogs', 'admin_index'),
-                    ),
-                    array(
-                        'text' => __('Access Logs'),
-                        'url' => $baseurl . '/admin/access_logs/index',
-                        'requirement' => $isSiteAdmin
-                    ),
-                    array(
-                        'text' => __('Search Logs'),
-                        'url' => $baseurl . '/admin/logs/search',
-                        'requirement' => $this->Acl->canAccess('logs', 'admin_search')
-                    )
-                )
-            ),
-            array(
-                'type' => 'root',
-                'text' => __('API'),
-                'children' => array(
-                    array(
-                        'text' => __('OpenAPI'),
-                        'url' => $baseurl . '/api/openapi'
-                    ),
-                    array(
-                        'text' => __('REST client'),
-                        'url' => $baseurl . '/api/rest',
-                        'requirement' => $this->Acl->canAccess('api', 'rest')
-                    )
-                )
-            )
-        );
-        $menu_right = array(
-            array(
-                'type' => 'root',
-                'url' => '#',
-                'html' => sprintf(
-                    '<span class="fas fa-star %s" id="setHomePage" title="%s" role="img" aria-label="%s" data-current-page="%s"></span>',
-                    (!empty($homepage['path']) && $homepage['path'] === $this->here) ? 'orange' : '',
-		            __('Set the current page as your home page in MISP'),
-		            __('Set the current page as your home page in MISP'),
-                    h($this->here)
-                )
-            ),
-            array(
-                'type' => 'root',
-                'url' => empty($homepage['path']) ? $baseurl : $baseurl . h($homepage['path']),
-                'html' => '<span class="logoBlueStatic bold" id="smallLogo">MISP</span>'
-            ),
-            [
-                'type' => 'root',
-                'url' => Configure::read('MISP.menu_custom_right_link'),
-                'html' => Configure::read('MISP.menu_custom_right_link_html'),
-                'requirement' => !empty(Configure::read('MISP.menu_custom_right_link')),
-            ],
-            array(
-                'type' => 'root',
-                'url' => $baseurl . '/dashboards',
-                'html' => sprintf(
-                    '<span class="white" title="%s">%s%s&nbsp;&nbsp;&nbsp;%s</span>',
-                    h($me['email']),
-                    $this->UserName->prepend($me['email']),
-                    h($this->UserName->convertEmailToName($me['email'])),
-                    isset($hasNotifications) ? sprintf(
-                        '<i class="fa fa-envelope %s" role="img" aria-label="%s"></i>',
-                        $hasNotifications ? 'red' : 'white',
-                        __('Notifications')
-                    ) : ''
-                )
-            ),
-            array(
-                'url' => $baseurl . '/users/logout',
-                'text' => __('Log out'),
-                'requirement' => empty(Configure::read('Plugin.CustomAuth_disable_logout'))
-            )
-        );
-    }
-    $isHal = date('Y-10-31') == date('Y-m-d');
-    if ($isHal) {
-        $tmp = [
-            'type' => 'root',
-            'url'=> '#',
-            'html' => '<span onclick="toggleHal()" class="fa-stack fa-1x">
-                           <i class="fas fa-broom fa-stack-1x"></i>
-                           <i class="fas fa-cat fa-stack-1x fa-flip-horizontal" style="bottom: 8px; left: 2px;"></i>
-                       </span>'
-        ];
-        if (isset($menu_right)) {
-            $menu_right = array_merge([$tmp], $menu_right);
+if (!empty($me)) {
+    if (Configure::read('MISP.home_logo')) {
+        $logoPath = APP . 'files/img/custom/' . Configure::read('MISP.home_logo');
+        if (file_exists($logoPath)) {
+            $logoHtml = '<img src="' . $this->Image->base64($logoPath) . '" style="height:24px;" alt="' . __('Home') . '">';
+        } else {
+            $logoHtml =  __('Home');
         }
+    } else {
+        $logoHtml = __('Home');
     }
+
+    // New approach how to define menu requirements. It takes ACLs from ACLComponent.
+    $menu = array(
+        array(
+            'type' => 'root',
+            'url' => empty($homepage['path']) ? $baseurl .'/' : $baseurl . h($homepage['path']),
+            'html' => $logoHtml
+        ),
+        array(
+            'type' => 'root',
+            'text' => __('Event Actions'),
+            'children' => array(
+                array(
+                    'text' => __('List Events'),
+                    'url' => $baseurl . '/events/index'
+                ),
+                array(
+                    'text' => __('Add Event'),
+                    'url' => $baseurl . '/events/add',
+                    'requirement' => $this->Acl->canAccess('events', 'add'),
+                ),
+                array(
+                    'text' => __('List Attributes'),
+                    'url' => $baseurl . '/attributes/index'
+                ),
+                array(
+                    'text' => __('Search Attributes'),
+                    'url' => $baseurl . '/attributes/search'
+                ),
+                array(
+                    'type' => 'separator'
+                ),
+                array(
+                    'text' => __('List Collections'),
+                    'url' => $baseurl . '/collections/index'
+                ),
+                [
+                    'type' => 'separator'
+                ],
+                [
+                    'text' => __('List Analyst Data'),
+                    'url' => $baseurl . '/analyst_data/index'
+                ],
+                [
+                    'type' => 'separator'
+                ],
+                array(
+                    'text' => __('View Proposals'),
+                    'url' => $baseurl . '/shadow_attributes/index/all:0'
+                ),
+                array(
+                    'text' => __('Events with proposals'),
+                    'url' => $baseurl . '/events/proposalEventIndex'
+                ),
+                array(
+                    'url' => $baseurl . '/event_delegations/index/context:pending',
+                    'text' => __('View delegation requests'),
+                    'requirement' => $this->Acl->canAccess('event_delegations', 'index'),
+                ),
+                array(
+                    'type' => 'separator'
+                ),
+                array(
+                    'text' => __('List Tags'),
+                    'url' => $baseurl . '/tags/index'
+                ),
+                array(
+                    'text' => __('Add Tag'),
+                    'url' => $baseurl . '/tags/add',
+                    'requirement' => $this->Acl->canAccess('tags', 'add'),
+                ),
+                array(
+                    'text' => __('List Tag Collections'),
+                    'url' => $baseurl . '/tag_collections/index'
+                ),
+                array(
+                    'text' => __('List Taxonomies'),
+                    'url' => $baseurl . '/taxonomies/index'
+                ),
+                array(
+                    'text' => __('List Templates'),
+                    'url' => $baseurl . '/templates/index'
+                ),
+                array(
+                    'type' => 'separator'
+                ),
+                array(
+                    'text' => __('Export'),
+                    'url' => $baseurl . '/events/export'
+                ),
+                array(
+                    'text' => __('Automation'),
+                    'url' => $baseurl . '/events/automation',
+                    'requirement' => $this->Acl->canAccess('events', 'automation'),
+                ),
+                array(
+                    'type' => 'separator',
+                    'requirement' =>
+                        Configure::read('MISP.enableEventBlocklisting') !== false &&
+                        !$isSiteAdmin &&
+                        $hostOrgUser
+                ),
+                array(
+                    'text' => __('Blocklist Event'),
+                    'url' => $baseurl . '/eventBlocklists/add',
+                    'requirement' =>
+                        Configure::read('MISP.enableEventBlocklisting') !== false &&
+                        !$isSiteAdmin && $hostOrgUser
+                ),
+                array(
+                    'text' => __('Manage Event Blocklists'),
+                    'url' => $baseurl . '/eventBlocklists',
+                    'requirement' =>
+                        Configure::read('MISP.enableEventBlocklisting') !== false &&
+                        !$isSiteAdmin && $hostOrgUser
+                )
+            )
+        ),
+        array(
+            'type' => 'root',
+            'text' => __('Dashboard'),
+            'url' => $baseurl . '/dashboards'
+        ),
+        array(
+            'type' => 'root',
+            'text' => __('Galaxies'),
+            'url' => $baseurl . '/galaxies/index',
+            'children' => array(
+                array(
+                    'text' => __('List Galaxies'),
+                    'url' => $baseurl . '/galaxies/index'
+                ),
+                array(
+                    'text' => __('List Relationships'),
+                    'url' => $baseurl . '/galaxy_cluster_relations/index'
+                ),
+            )
+        ),
+        array(
+            'type' => 'root',
+            'text' => __('Input Filters'),
+            'children' => array(
+                array(
+                    'text' => __('Import Regexp'),
+                    'url' => $baseurl . '/admin/regexp/index',
+                    'requirement' => $isAclRegexp
+                ),
+                array(
+                    'text' => __('Import Regexp'),
+                    'url' => $baseurl . '/regexp/index',
+                    'requirement' => !$isAclRegexp
+                ),
+                array(
+                    'text' => __('Signature Allowedlist'),
+                    'url' => $baseurl . '/admin/allowedlists/index',
+                    'requirement' => $isAclRegexp
+                ),
+                array(
+                    'text' => __('Signature Allowedlist'),
+                    'url' => $baseurl . '/allowedlists/index',
+                    'requirement' => !$isAclRegexp
+                ),
+                array(
+                    'text' => __('Warninglists'),
+                    'url' => $baseurl . '/warninglists/index'
+                ),
+                array(
+                    'text' => __('Noticelists'),
+                    'url' => $baseurl . '/noticelists/index'
+                ),
+                array(
+                    'text' => __('Correlation Exclusions'),
+                    'url' => $baseurl . '/correlation_exclusions/index',
+                    'requirement' => $this->Acl->canAccess('correlation_exclusions', 'index'),
+                )
+            )
+        ),
+        array(
+            'type' => 'root',
+            'text' => __('Global Actions'),
+            'children' => array(
+                array(
+                    'text' => __('News'),
+                    'url' => $baseurl . '/news'
+                ),
+                array(
+                    'text' => __('My Profile'),
+                    'url' => $baseurl . '/users/view/me'
+                ),
+                array(
+                    'text' => __('My Settings'),
+                    'url' => $baseurl . '/user_settings/index/user_id:me'
+                ),
+                array(
+                    'text' => __('Set Setting'),
+                    'url' => $baseurl . '/user_settings/setSetting'
+                ),
+                array(
+                    'text' => __('Organisations'),
+                    'url' => $baseurl . '/organisations/index',
+                    'requirement' => $this->Acl->canAccess('organisations', 'index'),
+                ),
+                array(
+                    'text' => __('Role Permissions'),
+                    'url' => $baseurl . '/roles/index'
+                ),
+                array(
+                    'type' => 'separator'
+                ),
+                array(
+                    'text' => __('List Object Templates'),
+                    'url' => $baseurl . '/objectTemplates/index'
+                ),
+                array(
+                    'type' => 'separator'
+                ),
+                array(
+                    'text' => __('List Sharing Groups'),
+                    'url' => $baseurl . '/sharing_groups/index'
+                ),
+                array(
+                    'text' => __('Add Sharing Group'),
+                    'url' => $baseurl . '/sharing_groups/add',
+                    'requirement' => $this->Acl->canAccess('sharing_groups', 'add'),
+                ),
+                array(
+                    'text' => __('List Sharing Groups Blueprints'),
+                    'url' => $baseurl . '/sharing_group_blueprints/index',
+                    'requirement' => $this->Acl->canAccess('sharing_group_blueprints', 'index'),
+                ),
+                array(
+                    'text' => __('Add Sharing Group Blueprint'),
+                    'url' => $baseurl . '/sharing_group_blueprints/add',
+                    'requirement' => $this->Acl->canAccess('sharing_group_blueprints', 'add'),
+                ),
+                array(
+                    'type' => 'separator'
+                ),
+                array(
+                    'text' => __('Decaying Models Tool'),
+                    'url' => $baseurl . '/decayingModel/decayingTool',
+                    'requirement' => $isAdmin
+                ),
+                array(
+                    'text' => __('List Decaying Models'),
+                    'url' => $baseurl . '/decayingModel/index',
+                ),
+                array(
+                    'type' => 'separator'
+                ),
+                array(
+                    'text' => __('User Guide'),
+                    'url' => 'https://www.circl.lu/doc/misp/'
+                ),
+                array(
+                    'text' => __('Categories & Types'),
+                    'url' => $baseurl . '/pages/display/doc/categories_and_types'
+                ),
+                array(
+                    'text' => __('Terms & Conditions'),
+                    'url' => $baseurl . '/users/terms'
+                ),
+                array(
+                    'text' => __('Statistics'),
+                    'url' => $baseurl . '/users/statistics'
+                ),
+                array(
+                    'type' => 'separator',
+                    'requirement' => $this->Acl->canAccess('threads', 'index'),
+                ),
+                array(
+                    'text' => __('List Discussions'),
+                    'url' => $baseurl . '/threads/index',
+                    'requirement' => $this->Acl->canAccess('threads', 'index'),
+                ),
+                array(
+                    'text' => __('Start Discussion'),
+                    'url' => $baseurl . '/posts/add',
+                    'requirement' => $this->Acl->canAccess('posts', 'add'),
+                )
+            )
+        ),
+        array(
+            'type' => 'root',
+            'text' => __('Sync Actions'),
+            'requirement' =>  $isAclSync || $isAdmin || $hostOrgUser,
+            'children' => array(
+                array(
+                    'text' => __('Create Sync Config'),
+                    'url' => $baseurl . '/servers/createSync',
+                    'requirement' => $isAclSync && !$isSiteAdmin
+                ),
+                array(
+                    'text' => __('Remote Servers'),
+                    'url' => $baseurl . '/servers/index',
+                    'requirement' => $this->Acl->canAccess('servers', 'index'),
+                ),
+                array(
+                    'text' => __('Feeds'),
+                    'url' => $baseurl . '/feeds/index',
+                    'requirement' => $this->Acl->canAccess('feeds', 'index'),
+                ),
+                array(
+                    'text' => __('SightingDB'),
+                    'url' => $baseurl . '/sightingdb/index',
+                    'requirement' => $this->Acl->canAccess('sightingdb', 'index'),
+                ),
+                array(
+                    'text' => __('Communities'),
+                    'url' => $baseurl . '/communities/index',
+                    'requirement' => $this->Acl->canAccess('communities', 'index'),
+                ),
+                array(
+                    'text' => __('Cerebrates'),
+                    'url' => $baseurl . '/cerebrates/index',
+                    'requirement' => $this->Acl->canAccess('cerebrates', 'index'),
+                ),
+                array(
+                    'text' => __('TAXII Servers'),
+                    'url' => $baseurl . '/TaxiiServers/index',
+                    'requirement' => $this->Acl->canAccess('taxiiServers', 'index'),
+                ),
+                array(
+                    'text' => __('Event ID translator'),
+                    'url' => '/servers/idTranslator',
+                    'requirement' => $this->Acl->canAccess('servers', 'idTranslator')
+                )
+            )
+        ),
+        array(
+            'type' => 'root',
+            'text' => __('Administration'),
+            'url' => $baseurl . '/servers/serverSettings',
+            'requirement' => $isAdmin,
+            'children' => array(
+                array(
+                    'text' => __('List Users'),
+                    'url' => $baseurl . '/admin/users/index'
+                ),
+                array(
+                    'text' => __('List Auth Keys'),
+                    'url' => $baseurl . '/auth_keys/index'
+                ),
+                array(
+                    'text' => __('List User Settings'),
+                    'url' => $baseurl . '/user_settings/index/user_id:all'
+                ),
+                array(
+                    'text' => __('Set User Setting'),
+                    'url' => $baseurl . '/user_settings/setSetting'
+                ),
+                array(
+                    'text' => __('Add User'),
+                    'url' => $baseurl . '/admin/users/add',
+                    'requirement' => $this->Acl->canAccess('users', 'admin_add'),
+                ),
+                array(
+                    'text' => __('Contact Users'),
+                    'url' => $baseurl . '/admin/users/email'
+                ),
+                array(
+                    'text' => __('User Registrations'),
+                    'url' => $baseurl . '/users/registrations',
+                    'requirement' => $this->Acl->canAccess('users', 'registrations'),
+                ),
+                array(
+                    'type' => 'separator'
+                ),
+                array(
+                    'text' => __('List Organisations'),
+                    'url' => $baseurl . '/organisations/index'
+                ),
+                array(
+                    'text' => __('Add Organisations'),
+                    'url' => $baseurl . '/admin/organisations/add',
+                    'requirement' => $this->Acl->canAccess('organisations', 'admin_add'),
+                ),
+                array(
+                    'type' => 'separator'
+                ),
+                array(
+                    'text' => __('List Roles'),
+                    'url' => $baseurl . '/roles/index'
+                ),
+                array(
+                    'text' => __('Add Roles'),
+                    'url' => $baseurl . '/admin/roles/add',
+                    'requirement' => $isSiteAdmin
+                ),
+                array(
+                    'type' => 'separator',
+                    'requirement' => $isSiteAdmin,
+                ),
+                array(
+                    'text' => __('Server Settings & Maintenance'),
+                    'url' => $baseurl . '/servers/serverSettings',
+                    'requirement' => $isSiteAdmin
+                ),
+                array(
+                    'type' => 'separator',
+                    'requirement' => $isSiteAdmin
+                ),
+                array(
+                    'text' => __('Jobs'),
+                    'url' => $baseurl . '/jobs/index',
+                    'requirement' => Configure::read('MISP.background_jobs') && $isSiteAdmin
+                ),
+                array(
+                    'text' => __('Scheduled Tasks'),
+                    'url' => $baseurl . '/tasks',
+                    'requirement' => Configure::read('MISP.background_jobs') && $isSiteAdmin
+                ),
+                array(
+                    'html' => sprintf(
+                        '<span style="display: flex;"><span>%s</span></span>',
+                        __('Workflows')
+                    ),
+                    'url' => $baseurl . '/workflows/triggers',
+                    'requirement' => $isSiteAdmin
+                ),
+                array(
+                    'type' => 'separator',
+                    'requirement' => $isSiteAdmin
+                ),
+                array(
+                    'text' => __('Event Block Rules'),
+                    'url' => $baseurl . '/servers/eventBlockRule',
+                    'requirement' => $isSiteAdmin
+                ),
+                array(
+                    'text' => __('Event Blocklists'),
+                    'url' => $baseurl . '/eventBlocklists',
+                    'requirement' => Configure::read('MISP.enableEventBlocklisting') !== false && $isSiteAdmin
+                ),
+                array(
+                    'text' => __('Org Blocklists'),
+                    'url' => $baseurl . '/orgBlocklists',
+                    'requirement' => Configure::read('MISP.enableOrgBlocklisting') !== false && $isSiteAdmin
+                ),
+                [
+                    'type' => 'separator',
+                    'requirement' => $isSiteAdmin
+                ],
+                [
+                    'text' => __('Top Correlations'),
+                    'url' => $baseurl . '/correlations/top',
+                    'requirement' => $isSiteAdmin
+                ],
+                [
+                    'html' => sprintf(
+                        '<span style="display: flex;"><span>%s</span></span>',
+                        __('Over-correlating values')
+                    ),
+                    'url' => $baseurl . '/correlations/overCorrelations',
+                    'requirement' => $isSiteAdmin
+                ]
+            )
+        ),
+        array(
+            'type' => 'root',
+            'text' => __('Logs'),
+            'requirement' => $isAclAudit,
+            'children' => array(
+                array(
+                    'text' => __('Application Logs'),
+                    'url' => $baseurl . '/logs/index'
+                ),
+                array(
+                    'text' => __('Audit Logs'),
+                    'url' => $baseurl . '/admin/audit_logs/index',
+                    'requirement' => Configure::read('MISP.log_new_audit') && $this->Acl->canAccess('auditLogs', 'admin_index'),
+                ),
+                array(
+                    'text' => __('Access Logs'),
+                    'url' => $baseurl . '/admin/access_logs/index',
+                    'requirement' => $isSiteAdmin
+                ),
+                array(
+                    'text' => __('Search Logs'),
+                    'url' => $baseurl . '/admin/logs/search',
+                    'requirement' => $this->Acl->canAccess('logs', 'admin_search')
+                )
+            )
+        ),
+        array(
+            'type' => 'root',
+            'text' => __('API'),
+            'children' => array(
+                array(
+                    'text' => __('OpenAPI'),
+                    'url' => $baseurl . '/api/openapi'
+                ),
+                array(
+                    'text' => __('REST client'),
+                    'url' => $baseurl . '/api/rest',
+                    'requirement' => $this->Acl->canAccess('api', 'rest')
+                )
+            )
+        )
+    );
+    $menu_right = array(
+        array(
+            'type' => 'root',
+            'url' => '#',
+            'html' => sprintf(
+                '<span class="fas fa-star %s" id="setHomePage" title="%s" role="img" aria-label="%s" data-current-page="%s"></span>',
+                (!empty($homepage['path']) && $homepage['path'] === $this->here) ? 'orange' : '',
+                __('Set the current page as your home page in MISP'),
+                __('Set the current page as your home page in MISP'),
+                h($this->here)
+            )
+        ),
+        array(
+            'type' => 'root',
+            'url' => empty($homepage['path']) ? $baseurl : $baseurl . h($homepage['path']),
+            'html' => '<span class="logoBlueStatic bold" id="smallLogo">MISP</span>'
+        ),
+        [
+            'type' => 'root',
+            'url' => Configure::read('MISP.menu_custom_right_link'),
+            'html' => Configure::read('MISP.menu_custom_right_link_html'),
+            'requirement' => !empty(Configure::read('MISP.menu_custom_right_link')),
+        ],
+        array(
+            'type' => 'root',
+            'url' => $baseurl . '/dashboards',
+            'html' => sprintf(
+                '<span class="white" title="%s">%s%s&nbsp;&nbsp;&nbsp;%s</span>',
+                h($me['email']),
+                $this->UserName->prepend($me['email']),
+                h($this->UserName->convertEmailToName($me['email'])),
+                isset($hasNotifications) ? sprintf(
+                    '<i class="fa fa-envelope %s" role="img" aria-label="%s"></i>',
+                    $hasNotifications ? 'red' : 'white',
+                    __('Notifications')
+                ) : ''
+            )
+        ),
+        array(
+            'url' => $baseurl . '/users/logout',
+            'text' => __('Log out'),
+            'requirement' => empty(Configure::read('Plugin.CustomAuth_disable_logout'))
+        )
+    );
+}
+$isHal = date('Y-10-31') == date('Y-m-d');
+if ($isHal) {
+    $tmp = [
+        'type' => 'root',
+        'url'=> '#',
+        'html' => '<span onclick="toggleHal()" class="fa-stack fa-1x">
+                       <i class="fas fa-broom fa-stack-1x"></i>
+                       <i class="fas fa-cat fa-stack-1x fa-flip-horizontal" style="bottom: 8px; left: 2px;"></i>
+                   </span>'
+    ];
+    if (isset($menu_right)) {
+        $menu_right = array_merge([$tmp], $menu_right);
+    }
+}
 ?>
 <div id="topBar" class="navbar navbar-inverse <?= isset($debugMode) ? $debugMode : 'debugOff' ?>" style="z-index:100;">
   <div class="navbar-inner">
diff --git a/app/View/Helper/ImageHelper.php b/app/View/Helper/ImageHelper.php
new file mode 100644
index 000000000..7507eb921
--- /dev/null
+++ b/app/View/Helper/ImageHelper.php
@@ -0,0 +1,35 @@
+<?php
+App::uses('AppHelper', 'View/Helper');
+App::uses('FileAccessTool', 'Lib/Tools');
+
+class ImageHelper extends AppHelper
+{
+    /** @var array */
+    private $imageCache = [];
+
+    /**
+     * @param string $imagePath Path to file
+     * @return string
+     * @throws Exception
+     */
+    public function base64($imagePath)
+    {
+        if (isset($this->imageCache[$imagePath])) {
+            return $this->imageCache[$imagePath];
+        }
+
+        $ext = pathinfo($imagePath, PATHINFO_EXTENSION);
+        if ($ext === 'svg') {
+            $mime = 'image/svg+xml';
+        } else if ($ext === 'png') {
+            $mime = 'image/png';
+        } else {
+            throw new InvalidArgumentException("Only SVG and PNG images are supported");
+        }
+
+        $fileContent = base64_encode(FileAccessTool::readFromFile($imagePath));
+        $base64 = "data:$mime;base64,$fileContent";
+
+        return $this->imageCache[$imagePath] = $base64;
+    }
+}
\ No newline at end of file
diff --git a/app/View/Helper/OrgImgHelper.php b/app/View/Helper/OrgImgHelper.php
index 004059319..798fac4a0 100644
--- a/app/View/Helper/OrgImgHelper.php
+++ b/app/View/Helper/OrgImgHelper.php
@@ -22,8 +22,8 @@ class OrgImgHelper extends AppHelper
             $link = $baseurl . '/organisations/view/' . (empty($organisation['Organisation']['id']) ? h($organisation['Organisation']['name']) : h($organisation['Organisation']['id']));
         }
         if ($orgImgName) {
-            $orgImgUrl = $baseurl . '/img/orgs/' . $orgImgName;
-            return sprintf('<a href="%s" style="background-image: url(\'%s\')" class="orgImg">%s</a>', $link, $orgImgUrl, h($organisation['Organisation']['name']));
+            $base64 = $this->_View->Image->base64(self::IMG_PATH . $orgImgName);
+            return sprintf('<a href="%s" style="background-image: url(\'%s\')" class="orgImg">%s</a>', $link, $base64, h($organisation['Organisation']['name']));
         } else {
             return sprintf('<a href="%s">%s</a>', $link, h($organisation['Organisation']['name']));
         }
@@ -56,9 +56,8 @@ class OrgImgHelper extends AppHelper
         if ($orgImgName) {
             $size = !empty($options['size']) ? $options['size'] : 48;
             $result = sprintf(
-                '<img src="data:image/%s;base64,%s" title="%s" width="%s" height="%s">',
-                'png',
-                base64_encode(FileAccessTool::readFromFile(self::IMG_PATH . $orgImgName)),
+                '<img src="%s" title="%s" width="%s" height="%s">',
+                $this->_View->Image->base64(self::IMG_PATH . $orgImgName),
                 isset($options['name']) ? h($options['name']) : h($options['id']),
                 (int)$size,
                 (int)$size
diff --git a/app/View/Users/login.ctp b/app/View/Users/login.ctp
index 077d83aa9..4b947894a 100644
--- a/app/View/Users/login.ctp
+++ b/app/View/Users/login.ctp
@@ -17,9 +17,9 @@
         </span><br /><br />
         <div>
         <?php if (Configure::read('MISP.main_logo') && file_exists(APP . '/webroot/img/custom/' . Configure::read('MISP.main_logo'))): ?>
-            <img src="<?php echo $baseurl?>/img/custom/<?php echo h(Configure::read('MISP.main_logo'));?>" style=" display:block; margin-left: auto; margin-right: auto;" />
+            <img src="<?= $this->Image->base64(APP . 'files/img/custom/' . Configure::read('MISP.home_logo')) ?>" style=" display:block; margin-left: auto; margin-right: auto;">
         <?php else: ?>
-            <img src="<?php echo $baseurl?>/img/misp-logo-s-u.png" style="display:block; margin-left: auto; margin-right: auto;"/>
+            <img src="<?php echo $baseurl?>/img/misp-logo-s-u.png" style="display:block; margin-left: auto; margin-right: auto;">
         <?php endif;?>
         </div>
         <?php
diff --git a/app/files/img/custom/empty b/app/files/img/custom/empty
new file mode 100644
index 000000000..e69de29bb