diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..b594082
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "themes/navy/layout/partial/shared-partials"]
+	path = themes/navy/layout/partial/shared-partials
+	url = https://github.com/status-im/status.im-partials
diff --git a/package.json b/package.json
index b512798..862b2f1 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
     "clean": "rm -rf public/*",
     "build": "gulp run && hexo generate",
     "eslint": "eslint .",
-    "deploy": "hexo deploy"
+    "deploy": "hexo deploy",
+    "update-submodules": "git submodule update --recursive --remote"
   },
   "dependencies": {
     "gulp": "^3.9.1",
diff --git a/themes/navy/layout/layout.swig b/themes/navy/layout/layout.swig
index d1fdbe9..a517b05 100644
--- a/themes/navy/layout/layout.swig
+++ b/themes/navy/layout/layout.swig
@@ -7,7 +7,7 @@
       {{ partial('partial/header') }}
     {% endif %}
     {{ body }}
-    {{ partial('partial/footer') }}
+    {{ partial('partial/shared-partials/partials/footer') }}
   </div>
   {{ partial('partial/after_footer') }}
 </body>
diff --git a/themes/navy/layout/partial/header.swig b/themes/navy/layout/partial/header.swig
index 3bdb5e7..684a9cf 100644
--- a/themes/navy/layout/partial/header.swig
+++ b/themes/navy/layout/partial/header.swig
@@ -1,15 +1,7 @@
 <div class="header">
     <div class="header-left">
         <a class="logo" href={{url_for_lang('/')}}></a>
-        <ul class="main-nav">
-            <li class="item--to-show"><a href="https://status.im/get/" class="">App</a></li>
-            <li class="item--to-show"> <a href="https://our.status.im/tag/nimbus/">Blog</a> </li>
-            <li class="item--to-show"> <a href={{url_for_lang('docs')}}>Docs</a></li>
-            <li class="item--dropdown item--dropdown-projects"> <a href="#" class="">Projects</a></li>
-            <li><a href="https://status.im/contribute/">Contribute</a></li>
-            <li class="item--dropdown"><a href="#" class="item--dropdown-community">Community</a></li>
-            <li class="item--more"><a href="#" class="item--more">More</a></li>
-        </ul>
+        {{ partial('partial/shared-partials/partials/header-nav') }}
     </div>
     <div class="header-right">
         <a href="http://get.status.im/chat/public/status-nimbus" class="button button--secondary" style="margin-right: 8px">Nimbus Status Chat</a>
@@ -38,8 +30,13 @@
         <div class="mobile-nav-footer">
             <a href="http://get.status.im/chat/public/status-nimbus" class="button button--orange">Nimbus Status Chat</a>
         </div>
+        <header class="dropdown">
+            <nav>
+                {{ partial('partial/shared-partials/partials/header-nav') }}
+            </nav>
+        </header>
     </div>
-    <div class="mobile-nav-overlay"></div>
+    <div class="popup-overlay"></div>
 </div>
 
 <div class="popup-wrap popup-wrap--community">
@@ -49,7 +46,7 @@
         <div class="popup__inner">
             <div class="cards cards--three cards--three--even cards--community cards--community--light">
                 <div class="card">
-                    <a href={{url_for_lang('get')}} class="card-inner">
+                    <a href="https://get.status.im/chat/public/status" class="card-inner">
                         <div class="community-icon community-icon--join"></div>
                         <h4>Join the chat in Status</h4>
                         <p class="secondary-text">Whisper sweet, encrypted nothings on a distributed network that no-one owns.</p>
diff --git a/themes/navy/layout/partial/shared-partials b/themes/navy/layout/partial/shared-partials
new file mode 160000
index 0000000..100498f
--- /dev/null
+++ b/themes/navy/layout/partial/shared-partials
@@ -0,0 +1 @@
+Subproject commit 100498f37bca143184217d3531d33bd5c78f22f0