diff --git a/_pkgdown.yml b/_pkgdown.yml
index 679350ce..09017781 100644
--- a/_pkgdown.yml
+++ b/_pkgdown.yml
@@ -1,9 +1,11 @@
 navbar:
-  right:
-  - icon: fa-users
-    href: https://ropengov.org
-  - icon: fab fa-github
-    href: https://github.com/rOpenGov/geofi
+  structure:
+    right: [search, users, github, lightswitch]
+  components:
+    users:
+      icon: fa-users
+      href: https://ropengov.org
+      aria-label: rOpenGov
 reference:
 - title: Statistics Finland API functions
   desc: |