diff --git a/src/app/core/components/header/header.component.ts b/src/app/core/components/header/header.component.ts
index baad28af9..e813e6448 100644
--- a/src/app/core/components/header/header.component.ts
+++ b/src/app/core/components/header/header.component.ts
@@ -4,7 +4,7 @@ import {
   computed,
   inject,
 } from '@angular/core';
-import { Router, RouterLink } from '@angular/router';
+import { Router } from '@angular/router';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { map } from 'rxjs';
 import { BreadcrumbComponent } from '@core/components/breadcrumb/breadcrumb.component';
@@ -17,13 +17,7 @@ import { TranslatePipe } from '@ngx-translate/core';
 @Component({
   standalone: true,
   selector: 'osf-header',
-  imports: [
-    BreadcrumbComponent,
-    MenuModule,
-    ButtonModule,
-    TranslatePipe,
-    RouterLink,
-  ],
+  imports: [BreadcrumbComponent, MenuModule, ButtonModule, TranslatePipe],
   templateUrl: './header.component.html',
   styleUrl: './header.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/app/core/components/nav-menu/nav-menu.component.ts b/src/app/core/components/nav-menu/nav-menu.component.ts
index ddd8e39b2..892b267b2 100644
--- a/src/app/core/components/nav-menu/nav-menu.component.ts
+++ b/src/app/core/components/nav-menu/nav-menu.component.ts
@@ -1,4 +1,4 @@
-import { Component, computed, inject } from '@angular/core';
+import { Component, computed, inject, output } from '@angular/core';
 import {
   RouterLink,
   RouterLinkActive,
@@ -32,6 +32,8 @@ export class NavMenuComponent {
     this.#convertToMenuItem(item),
   );
 
+  closeMenu = output<void>();
+
   protected readonly currentRoute = toSignal(
     this.#router.events.pipe(
       filter((event): event is NavigationEnd => event instanceof NavigationEnd),
@@ -71,4 +73,8 @@ export class NavMenuComponent {
 
     return { projectId, section };
   }
+
+  goToLink() {
+    this.closeMenu.emit();
+  }
 }
diff --git a/src/app/core/components/topnav/topnav.component.html b/src/app/core/components/topnav/topnav.component.html
index d76ecde2c..6fff0ef9b 100644
--- a/src/app/core/components/topnav/topnav.component.html
+++ b/src/app/core/components/topnav/topnav.component.html
@@ -6,7 +6,7 @@
     (visibleChange)="isDrawerVisible.set($event)"
     [closable]="false"
   >
-    <osf-nav-menu />
+    <osf-nav-menu (closeMenu)="toggleMenuVisibility()" />
   </p-drawer>
   <p-button
     class="topnav-btn"
diff --git a/src/app/shared/components/resources/resources.component.html b/src/app/shared/components/resources/resources.component.html
index 5940fa633..d74e62774 100644
--- a/src/app/shared/components/resources/resources.component.html
+++ b/src/app/shared/components/resources/resources.component.html
@@ -140,8 +140,8 @@ <h3>Sort by:</h3>
                 height="13"
                 viewBox="0 0 10 10"
                 class="switch-icon"
-                (click)="switchPage(next() ?? first())"
-                (keydown.enter)="switchPage(next() ?? first())"
+                (click)="switchPage(!next() ? first() : next())"
+                (keydown.enter)="switchPage(!next() ? first() : next())"
               >
                 <path
                   d="M7.70715 5.7063C8.09762 5.31584 8.09762 4.68173 7.70715 4.29127L3.70871 0.292933C3.42132 0.00555328 2.99336 -0.0787866 2.61851 0.0773983C2.24365 0.233583 2 0.595932 2 1.00201V8.99868C2 9.40164 2.24365 9.76711 2.61851 9.92329C2.99336 10.0795 3.42132 9.99201 3.70871 9.70776L7.70715 5.70942V5.7063Z"
diff --git a/src/assets/icons/source/filter.svg b/src/assets/icons/source/filter.svg
index 85dd7f4ed..d0e579666 100644
--- a/src/assets/icons/source/filter.svg
+++ b/src/assets/icons/source/filter.svg
@@ -1,5 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <defs/>
-  <path d="M0.122,1.716 C0.328,1.278 0.765,1 1.25,1 L14.75,1 C15.234,1 15.672,1.278 15.878,1.716 C16.084,2.153 16.022,2.669 15.716,3.044 L10,10.028 L10,14 C10,14.378 9.787,14.725 9.447,14.894 C9.106,15.062 8.703,15.028 8.4,14.8 L6.4,13.3 C6.147,13.113 6,12.816 6,12.5 L6,10.028 L0.281,3.041 C-0.022,2.669 -0.088,2.15 0.122,1.716 Z"/>
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="44" height="44" rx="8" fill="#F1F8FD"/>
+<path d="M10.1826 12.5734C10.4919 11.9172 11.1482 11.5 11.8748 11.5H32.1248C32.8513 11.5 33.5076 11.9172 33.8169 12.5734C34.1263 13.2297 34.0326 14.0031 33.5732 14.5656L24.9998 25.0422V31C24.9998 31.5672 24.681 32.0875 24.1701 32.3406C23.6591 32.5938 23.0544 32.5422 22.5998 32.2L19.5998 29.95C19.2201 29.6688 18.9998 29.2234 18.9998 28.75V25.0422L10.4216 14.5609C9.96694 14.0031 9.86851 13.225 10.1826 12.5734Z" fill="#337AB7"/>
 </svg>
-