diff --git a/apps/cms/contacts/templates/a4_candy_cms_contacts/form_page.html b/apps/cms/contacts/templates/a4_candy_cms_contacts/form_page.html
index 5b5dbe3af..89bb0fb8a 100644
--- a/apps/cms/contacts/templates/a4_candy_cms_contacts/form_page.html
+++ b/apps/cms/contacts/templates/a4_candy_cms_contacts/form_page.html
@@ -1,4 +1,4 @@
-{% extends 'base_cms.html' %}
+{% extends 'base.html' %}
 
 {% block content %}
     <div class="l-wrapper">
diff --git a/apps/cms/contacts/templates/a4_candy_cms_contacts/form_page_landing.html b/apps/cms/contacts/templates/a4_candy_cms_contacts/form_page_landing.html
index c6c297b7d..f16a75a7a 100644
--- a/apps/cms/contacts/templates/a4_candy_cms_contacts/form_page_landing.html
+++ b/apps/cms/contacts/templates/a4_candy_cms_contacts/form_page_landing.html
@@ -1,4 +1,4 @@
-{% extends 'base_cms.html' %}
+{% extends 'base.html' %}
 {% load wagtailcore_tags %}
 
 {% block content %}
diff --git a/apps/cms/news/templates/a4_candy_cms_news/news_index_page.html b/apps/cms/news/templates/a4_candy_cms_news/news_index_page.html
index a886a425c..84ee93ce7 100644
--- a/apps/cms/news/templates/a4_candy_cms_news/news_index_page.html
+++ b/apps/cms/news/templates/a4_candy_cms_news/news_index_page.html
@@ -1,4 +1,4 @@
-{% extends "base_cms.html" %}
+{% extends "base.html" %}
 {% load wagtailcore_tags %}
 
 {% block title %}
diff --git a/apps/cms/news/templates/a4_candy_cms_news/news_page.html b/apps/cms/news/templates/a4_candy_cms_news/news_page.html
index 890318a87..4bc4951bd 100644
--- a/apps/cms/news/templates/a4_candy_cms_news/news_page.html
+++ b/apps/cms/news/templates/a4_candy_cms_news/news_page.html
@@ -1,4 +1,4 @@
-{% extends "base_cms.html" %}
+{% extends "base.html" %}
 {% load wagtailcore_tags wagtailimages_tags i18n %}
 
 {% block title %}
diff --git a/apps/cms/pages/templates/a4_candy_cms_pages/home_page.html b/apps/cms/pages/templates/a4_candy_cms_pages/home_page.html
index 8ba54c4ca..523c560bf 100644
--- a/apps/cms/pages/templates/a4_candy_cms_pages/home_page.html
+++ b/apps/cms/pages/templates/a4_candy_cms_pages/home_page.html
@@ -1,4 +1,4 @@
-{% extends "base_cms.html" %}
+{% extends "base.html" %}
 {% load i18n wagtailcore_tags wagtailimages_tags %}
 
 {% block content %}
diff --git a/apps/cms/pages/templates/a4_candy_cms_pages/simple_page.html b/apps/cms/pages/templates/a4_candy_cms_pages/simple_page.html
index e51062f07..f9542b1af 100644
--- a/apps/cms/pages/templates/a4_candy_cms_pages/simple_page.html
+++ b/apps/cms/pages/templates/a4_candy_cms_pages/simple_page.html
@@ -1,4 +1,4 @@
-{% extends "base_cms.html" %}
+{% extends "base.html" %}
 {% load wagtailcore_tags %}
 
 {% block title %}{% if self.seo_title %}{{ self.seo_title }}{% else %}
diff --git a/apps/cms/use_cases/templates/a4_candy_cms_use_cases/use_case_index_page.html b/apps/cms/use_cases/templates/a4_candy_cms_use_cases/use_case_index_page.html
index 47c4270e4..248453027 100644
--- a/apps/cms/use_cases/templates/a4_candy_cms_use_cases/use_case_index_page.html
+++ b/apps/cms/use_cases/templates/a4_candy_cms_use_cases/use_case_index_page.html
@@ -1,4 +1,4 @@
-{% extends "base_cms.html" %}
+{% extends "base.html" %}
 {% load static wagtailcore_tags wagtailimages_tags i18n absolute_url %}
 
 {% block title %}
diff --git a/apps/cms/use_cases/templates/a4_candy_cms_use_cases/use_case_page.html b/apps/cms/use_cases/templates/a4_candy_cms_use_cases/use_case_page.html
index 634e4125e..6feb229dc 100644
--- a/apps/cms/use_cases/templates/a4_candy_cms_use_cases/use_case_page.html
+++ b/apps/cms/use_cases/templates/a4_candy_cms_use_cases/use_case_page.html
@@ -1,4 +1,4 @@
-{% extends "base_cms.html" %}
+{% extends "base.html" %}
 {% load wagtailcore_tags wagtailimages_tags i18n absolute_url %}
 
 {% block title %}
diff --git a/apps/users/templates/a4_candy_users/indicator.html b/apps/users/templates/a4_candy_users/indicator.html
index 9d4e66d67..0992e5f73 100644
--- a/apps/users/templates/a4_candy_users/indicator.html
+++ b/apps/users/templates/a4_candy_users/indicator.html
@@ -3,16 +3,16 @@
 {% if request.user.is_authenticated %}
     <div class="dropdown dropdown--right userindicator__dropdown">
         <button
-                type="button"
-                class="dropdown-toggle btn {% if ORGANISATION %}btn--bg-tertiary{% else %}btn--secondary-filled{% endif %} btn--square btn--align-left"
-                data-toggle="dropdown"
-                data-flip="false"
-                aria-haspopup="true"
-                aria-expanded="false"
-                id="user-actions"
+            type="button"
+            class="dropdown-toggle btn {% if ORGANISATION %}btn--bg-tertiary{% else %}btn--secondary-filled{% endif %} btn--square btn--align-left"
+            data-toggle="dropdown"
+            data-flip="false"
+            aria-haspopup="true"
+            aria-expanded="false"
+            id="user-actions"
         >
             <div class="userindicator__btn-img" style="background-image: {% if request.user.avatar %} url({{ request.user.avatar|thumbnail_url:'avatar'}}) {% else %}  url({% static 'images/avatar_00.png' %}) {% endif %}"></div>
-            <div class="userindicator__btn-text">
+            <div class="userindicator__btn-text text-left">
                 <span class="userindicator__hello">{% trans "Hello" %}</span>
                 <br>
                 <span>{{ request.user.username }}</span>
@@ -43,7 +43,7 @@
         </div>
     </div>
 {% else %}
-    <div class="navi">
+    <div class="userindicator__navi {% if ORGANISATION %}userindicator__navi--bg-tertiary{% else %}userindicator__navi--secondary{% endif %}">
         <span class="navi__item"><a href="{% url 'account_login' %}?next={{ redirect_field_value }}">{% trans "Login" %}</a></span>
             <span class="d-none d-md-inline">/</span>
         <span class="navi__item"><a href="{% url 'account_signup' %}?next={{ redirect_field_value }}">{% trans "Register" %}</a></span>
diff --git a/liqd_product/assets/scss/components/_main_header.scss b/liqd_product/assets/scss/components/_main_header.scss
index ee112a947..1a518bc37 100644
--- a/liqd_product/assets/scss/components/_main_header.scss
+++ b/liqd_product/assets/scss/components/_main_header.scss
@@ -2,42 +2,27 @@
     min-height: 100px;
 }
 
-.main-header--cms {
-    background-color: $bg-light;
-    margin: $r-spacer $r-spacer 0 $r-spacer;
-    padding-left: 1*$r-spacer;
-
-    @media screen and (min-width: $breakpoint) {
-        padding-left: 2*$r-spacer;
-    }
+.main-header__brand {
+    font-size: $font-size-lg;
+    line-height: inherit;
+    white-space: nowrap;
+}
 
-    @media screen and (min-width: $breakpoint-xl) {
-        margin: 2*$r-spacer 2*$r-spacer 0 2*$r-spacer;
-    }
+.main-header__brand-img {
+    padding-top: 0.5 * $padding;
+    display: block;
+    height: 2rem;
+    width: auto;
 }
 
 .main-header__nav {
     clear: left;
 }
 
-.main-header__logo-box {
-    display: inline-block;
-    margin-right: $spacer;
-    margin-bottom: -2em;
-    padding: $padding;
-    vertical-align: middle;
-
-    background-color: $body-bg;
-    z-index: 1;
-    position: relative;
-
-    box-shadow: 0 0 8px 0 $shadow;
-}
-
-.main-header__logo-img {
-    display: block;
-    height: 2rem;
-    width: auto;
+.main-header__lang {
+    position: absolute;
+    right: 50px;
+    top: 0;
 }
 
 .main-header__mobile-menu {
@@ -112,38 +97,6 @@
     background-color: mix($brand-secondary, $body-bg, 50%);
 }
 
-.main-header__organisation-nav {
-    list-style: none;
-    padding: 0;
-    margin: 0;
-
-    @media screen and (min-width: $breakpoint) {
-        display: inline-block;
-    }
-}
-
-.main-header__organisation-nav__item {
-    display: block;
-
-    .is-active {
-        padding-bottom: 0.1em;
-        border-bottom: 0.2em solid $brand-primary;
-    }
-}
-
-.main-header__lang {
-    position: absolute;
-    right: 50px;
-}
-
-.main-header__lang--org {
-    top: 0;
-}
-
-.main-header__lang--cms {
-    top: 1.5*$r-spacer;
-}
-
 @media screen and (min-width: $breakpoint-xs) {
     .main-header__lang {
         right: 100px;
@@ -151,12 +104,13 @@
 }
 
 @media screen and (min-width: $breakpoint) {
-    .main-header__logo-img {
+    .main-header__brand-img {
         height: 3rem;
     }
 
-    .main-header__organisation-nav {
-        line-height: 4em;
+    .main-header__lang {
+        right: 250px;
+        top: 0.5*$r-spacer;
     }
 
     .main-header__mobile-menu {
@@ -170,7 +124,7 @@
             display: inline-block;
         }
 
-        .main-header__organisation-nav__link {
+        .organisation-header__nav-link {
             display: inline;
         }
     }
@@ -179,56 +133,22 @@
         display: none;
     }
 
-    .main-header__organisation-nav__item {
-        display: inline;
-        margin-right: $spacer;
-    }
-
-    .main-header__organisation-nav__link:first-child {
-        padding-left: 0;
-    }
-
-    .main-header__user--org {
+    .main-header__user {
         position: absolute;
         top: 0;
         right: 0;
     }
-
-    .main-header__user--cms {
-        position: absolute;
-        top: 1.5*$r-spacer;
-        right: 0;
-    }
-
-    .main-header__lang--org {
-        right: 250px;
-        top: 0.5*$r-spacer;
-    }
-
-    .main-header__lang--cms {
-        right: 300px;
-        top: 2.5*$r-spacer;
-    }
 }
 
 @media screen and (min-width: $breakpoint-xl) {
     .main-header__lang {
         right: 350px;
     }
-
-    .main-header__lang--cms {
-        top: 3.5*$r-spacer;
-    }
-
-    .main-header__user--cms {
-        top: 2.5*$r-spacer;
-    }
 }
 
-.main-header__user {
-    @media screen and (max-width: $breakpoint-down) {
-        // overwrite dropdown style on mobile
-
+// overwrite dropdown style on mobile
+@media screen and (max-width: $breakpoint-down) {
+    .main-header__user {
         .dropdown {
             margin-bottom: 0;
         }
diff --git a/liqd_product/assets/scss/components/_navi.scss b/liqd_product/assets/scss/components/_navi.scss
index d44a69194..f3a433f4c 100644
--- a/liqd_product/assets/scss/components/_navi.scss
+++ b/liqd_product/assets/scss/components/_navi.scss
@@ -16,10 +16,3 @@
         display: inline-block;
     }
 }
-
-.main-header--cms {
-    .navi {
-        margin-top: $r-spacer;
-        margin-right: 3.5*$r-spacer;
-    }
-}
diff --git a/liqd_product/assets/scss/components/_organisation_header.scss b/liqd_product/assets/scss/components/_organisation_header.scss
new file mode 100644
index 000000000..f06342118
--- /dev/null
+++ b/liqd_product/assets/scss/components/_organisation_header.scss
@@ -0,0 +1,54 @@
+.organisation-header__logo-box {
+    display: inline-block;
+    margin-right: $spacer;
+    margin-bottom: -2em;
+    padding: $padding;
+    vertical-align: middle;
+
+    background-color: $body-bg;
+    z-index: 1;
+    position: relative;
+
+    box-shadow: 0 0 8px 0 $shadow;
+}
+
+.organisation-header__logo-img {
+    display: block;
+    height: 2rem;
+    width: auto;
+}
+
+.organisation-header__nav {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+
+.organisation-header__nav-item {
+    display: block;
+
+    .is-active {
+        padding-bottom: 0.1em;
+        border-bottom: 0.2em solid $brand-primary;
+    }
+}
+
+@media screen and (min-width: $breakpoint) {
+    .organisation-header__logo-img {
+        height: 3rem;
+    }
+
+    .organisation-header__nav {
+        line-height: 4em;
+        display: inline-block;
+    }
+
+    .organisation-header__nav-item {
+        display: inline;
+        margin-right: $spacer;
+    }
+
+    .organisation-header__nav-link:first-child {
+        padding-left: 0;
+    }
+}
diff --git a/liqd_product/assets/scss/components/_platform_brand.scss b/liqd_product/assets/scss/components/_platform_brand.scss
deleted file mode 100644
index 23be3e4b9..000000000
--- a/liqd_product/assets/scss/components/_platform_brand.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.platform-brand {
-    padding: 0.3em 0;
-    border-bottom: 0.3em solid $brand-primary;
-}
diff --git a/liqd_product/assets/scss/components/_userindicator.scss b/liqd_product/assets/scss/components/_userindicator.scss
index 455d5115f..0a8206fb5 100644
--- a/liqd_product/assets/scss/components/_userindicator.scss
+++ b/liqd_product/assets/scss/components/_userindicator.scss
@@ -48,3 +48,17 @@
     background-color: $brand-secondary;
     color: contrast-color($brand-secondary);
 }
+
+.userindicator__navi {
+    @media screen and (min-width: $breakpoint) {
+        padding: 0.5*$r-spacer $r-spacer 0.5*$r-spacer $r-spacer;
+    }
+}
+
+.userindicator__navi--bg-tertiary {
+    background-color: $bg-tertiary;
+}
+
+.userindicator__navi--secondary {
+    background-color: $brand-secondary;
+}
diff --git a/liqd_product/assets/scss/style.scss b/liqd_product/assets/scss/style.scss
index 10ec677f2..b3390f7fe 100644
--- a/liqd_product/assets/scss/style.scss
+++ b/liqd_product/assets/scss/style.scss
@@ -59,9 +59,9 @@
 @import 'components/multiform';
 @import 'components/navi';
 @import 'components/organisation';
+@import 'components/organisation_header';
 @import 'components/pagination';
 @import 'components/participation-tile';
-@import 'components/platform_brand';
 @import 'components/poll';
 @import 'components/progress';
 @import 'components/project_header';
diff --git a/liqd_product/templates/500.html b/liqd_product/templates/500.html
index 683a79743..961d2b0d7 100644
--- a/liqd_product/templates/500.html
+++ b/liqd_product/templates/500.html
@@ -12,8 +12,8 @@
         <header class="main-header" aria-label="Header">
             <div class="u-page-ribbon u-page-ribbon--platform"></div>
             <div class="container">
-                <div class="navbar-brand main-header__brand">
-                    <a href="/" class="platform-brand__link">adhocracy+</a>
+                <div class="main-header__brand">
+                    <a href="/">adhocracy+</a>
                 </div>
             </div>
         </header>
diff --git a/liqd_product/templates/base_cms.html b/liqd_product/templates/base_cms.html
deleted file mode 100644
index 94d9808cc..000000000
--- a/liqd_product/templates/base_cms.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "base.html" %}
diff --git a/liqd_product/templates/footer_cms.html b/liqd_product/templates/footer_cms.html
deleted file mode 100644
index 3ada7908b..000000000
--- a/liqd_product/templates/footer_cms.html
+++ /dev/null
@@ -1,67 +0,0 @@
-{% load i18n static wagtailsettings_tags %}
-{% get_settings %}
-
-<footer class="footer footer--cms px-3 pt-3">
-    <div class="row mt-3 mb-3 mb-sm-4 justify-content-lg-center">
-        <div class="col-lg-5">
-            <p class="footer__description">
-                {% blocktrans %}adhocracy+ is a platform provided by Liquid Democracy e.V. in Berlin. Only the respective operator of the offer is responsible for the editorial content.{% endblocktrans %}
-            </p>
-        </div>
-        <div class="col-lg-5">
-            <div class="row">
-            <div class="col-sm-6 d-flex flex-column">
-                <a class="btn btn--transparent footer__info-btn" href="https://creativecommons.org/licenses/by-sa/4.0/">Open Content CC-BY-SA</a>
-            </div>
-            <div class="col-sm-6 d-flex flex-column mt-4 mt-sm-0">
-                <a class="btn btn--transparent footer__info-btn" href="https://github.com/liqd/a4-product">Open Source AGPLv3</a>
-            </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="row justify-content-lg-center">
-        {%  with pages=settings.a4_candy_cms_settings.ImportantPages %}
-        <div class="col-12 col-lg-6">
-            <nav class="navi p-0">
-                <ul class="navi__list mb-3 mb-sm-4 d-sm-flex flex-wrap">
-                    <li class="navi__item footer__link">
-                      2019 Liquid Democracy
-                    </li>
-                    {% if pages.imprint %}
-                    <li class="navi__item footer__link">
-                        <a href="{{ pages.imprint.url }}" class="navi__link">{% trans 'Imprint' %}</a>
-                    </li>
-                    {% endif %}
-                    {% if pages.terms_of_use %}
-                    <li class="navi__item footer__link">
-                        <a href="{{ pages.terms_of_use.url }}" class="navi__link">{% trans 'Terms of use' %}</a>
-                    </li>
-                    {% endif %}
-                    {% if pages.data_protection_policy %}
-                    <li class="navi__item footer__link">
-                        <a href="{{ pages.data_protection_policy.url }}" class="navi__link">{% trans 'Data protection policy' %}</a>
-                    </li>
-                    {% endif %}
-                    {% if pages.contact %}
-                    <li class="navi__item footer__link">
-                        <a href="{{ pages.contact.url }}" class="navi__link">{% trans 'Contact' %}</a>
-                    </li>
-                    {% endif %}
-                    {% if pages.manual_link %}
-                    <li class="navi__item footer__link">
-                        <a href="{{ pages.manual_link }}" class="navi__link">{% trans 'Manual' %}</a>
-                    </li>
-                    {% endif %}
-                </ul>
-            </nav>
-        </div>
-        {% if pages.donate_link %}
-        <div class="col-12 col-sm-6 offset-sm-6 offset-lg-0 d-flex flex-column {% if not ORGANISATION %} px-0 pl-sm-3 {% endif %}">
-            <a href="{{ pages.donate_link.url }}"  class="btn btn--full {% if ORGANISATION %} btn--bg-tertiary {% else %} btn--secondary-filled {% endif %} mb-0 mr-0 mt-auto">{% trans 'Support the further development of the platform' %}<br><b>{% trans 'Donate now' %}</b></a>
-        </div>
-        {% endif %}
-    {% endwith %}
-    </div>
-</footer>
-<div class="u-page-ribbon u-page-ribbon--platform"></div>
diff --git a/liqd_product/templates/header.html b/liqd_product/templates/header.html
index 4d35b307f..d85b2ba35 100644
--- a/liqd_product/templates/header.html
+++ b/liqd_product/templates/header.html
@@ -1,7 +1,6 @@
 {% load userindicator static i18n thumbnail %}
-{% get_current_language as LANGUAGE_CODE %}
 
-<header class="main-header main-header--org" aria-label="{% trans 'Header' %}">
+<header class="main-header" aria-label="{% trans 'Header' %}">
     {% if ORGANISATION %}
     <div class="u-page-ribbon"></div>
     {% else %}
@@ -9,63 +8,43 @@
     {% endif %}
 
     <div class="container u-position-relative">
-        <div class="navbar-brand main-header__brand">
-            {% spaceless %}
-                <a href="{% if ORGANISATION %}{% url 'organisation' organisation_slug=ORGANISATION.slug %}{% else %}/{% endif %}" class="platform-brand__link">{% if ORGANISATION %}{{ ORGANISATION.name }}{% else %}<img src="/static/images/logo.png" alt="Adhocracy+" class="main-header__logo-img" />{% endif %}</a>
-            {% endspaceless %}
+        <div class="main-header__brand">
+            {% include 'includes/header_logo_link.html' %}
         </div>
         <nav class="main-header__nav">
-                {% if ORGANISATION.logo %}
-                {% url 'organisation' organisation_slug=ORGANISATION.slug as organisation_url %}
-                {% if not request.get_full_path == organisation_url %}
-                <a href="{% url 'organisation' organisation_slug=ORGANISATION.slug %}" class="main-header__logo-box" rel="home">
-                    <img src="{% thumbnail ORGANISATION.logo '0x160' %}" height="80" alt="{{ ORGANISATION.name }}" class="main-header__logo-img" />
-                </a>
-                {% endif %}
-                {% endif %}
+            {% include 'includes/header_language_switch.html' %}
+            {% if ORGANISATION.logo %}
+            {% url 'organisation' organisation_slug=ORGANISATION.slug as organisation_url %}
+            {% if not request.get_full_path == organisation_url %}
+            <a href="{% url 'organisation' organisation_slug=ORGANISATION.slug %}" class="organisation-header__logo-box" rel="home">
+                <img src="{% thumbnail ORGANISATION.logo '0x160' %}" height="80" alt="{{ ORGANISATION.name }}" class="organisation-header__logo-img" />
+            </a>
+            {% endif %}
+            {% endif %}
             <div class="main-header__mobile-menu {% if not ORGANISATION %}main-header__mobile-menu--platform{% endif %} collapse" id="main-header-collapse">
                     {% if ORGANISATION %}
-                    <ul class="main-header__organisation-nav">
-                        <li class="main-header__organisation-nav__item">
+                    <ul class="organisation-header__nav">
+                        <li class="organisation-header__nav-item">
                             {% url 'organisation' organisation_slug=ORGANISATION.slug as organisation_url %}
-                            <a href="{{ organisation_url }}" class="main-header__organisation-nav__link"><span class="{% if request.path == organisation_url %}is-active{% endif %}">{% trans 'Participate' %}</span></a>
+                            <a href="{{ organisation_url }}" class="organisation-header__nav-link"><span class="{% if request.path == organisation_url %}is-active{% endif %}">{% trans 'Participate' %}</span></a>
                         </li>
                         {% if ORGANISATION.information %}
-                        <li class="main-header__organisation-nav__item">
+                        <li class="organisation-header__nav-item">
                             {% url 'organisation-information' organisation_slug=ORGANISATION.slug as organisation_information_url %}
-                            <a href="{{ organisation_information_url }}" class="main-header__organisation-nav__link"><span class="{% if request.path == organisation_information_url %}is-active{% endif %}">{% trans 'Information' %}</span></a>
+                            <a href="{{ organisation_information_url }}" class="organisation-header__nav-link"><span class="{% if request.path == organisation_information_url %}is-active{% endif %}">{% trans 'Information' %}</span></a>
                         </li>
                         {% endif %}
-                        <li class="main-header__organisation-nav__item">
+                        <li class="organisation-header__nav-item">
                             {% url 'organisation-imprint' organisation_slug=ORGANISATION.slug as organisation_imprint_url %}
-                            <a href="{{ organisation_imprint_url }}" class="main-header__organisation-nav__link"><span class="{% if request.path == organisation_imprint_url %}is-active{% endif %}">{% trans 'Imprint' %}</span></a>
+                            <a href="{{ organisation_imprint_url }}" class="organisation-header__nav-link"><span class="{% if request.path == organisation_imprint_url %}is-active{% endif %}">{% trans 'Imprint' %}</span></a>
                         </li>
                     </ul>
                     {% endif %}
-                <div class="main-header__user main-header__user--org">
+                <div class="main-header__user">
                     {% userindicator %}
                 </div>
             </div>
-            <div class="main-header__lang main-header__lang--org">
-                {% get_available_languages as languages %}
-                {% for lang_code, lang_name in languages %}
-                    {% if lang_code != LANGUAGE_CODE %}
-                        {% get_language_info for lang_code as lang %}
-                            <form class="lang__switch" action="{% url 'set_language' %}" method="post">{% csrf_token %}
-                                <input name="next" type="hidden" value="{{ redirect_to }}" />
-                                <input name="language" type="hidden" value="{{ lang_code }}">
-                                {% if LANGUAGE_CODE == 'de' %}
-                                <a class="lang__btn--left active" role="button">de</a><button class="lang__btn--right" type="submit">en</button>
-                                {% else %}
-                                <button class="lang__btn--left" type="submit">de</button><a class="lang__btn--right active" role="button">en</a>
-                                {% endif %}
-                            </form>
-                    {% endif %}
-                {% endfor %}
-            </div>
-            <button class="btn main-header__mobile-toggle {% if ORGANISATION %}btn--bg-tertiary{% else %}btn--secondary-filled{% endif %} btn--square btn--small btn--attached-top" data-toggle="collapse" data-target="#main-header-collapse" aria-expanded="false" aria-controls="main-header-collapse">
-                <span class="d-none d-sm-inline-block">{% trans 'Menu' %}</span>
-            </button>
+            {% include 'includes/header_mobile_toggle.html' %}
         </nav>
     </div>
 </header>
diff --git a/liqd_product/templates/header_cms.html b/liqd_product/templates/header_cms.html
deleted file mode 100644
index 783f91157..000000000
--- a/liqd_product/templates/header_cms.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% load userindicator static i18n thumbnail %}
-{% get_current_language as LANGUAGE_CODE %}
-
-<div class="u-page-ribbon u-page-ribbon--platform"></div>
-<header class="main-header main-header--cms" aria-label="{% trans 'Header' %}">
-    <nav class="main-header__nav">
-        <div class="navbar-brand main-header__brand pt-2">
-            {% spaceless %}
-            <a href="/" class="platform-brand__link"><img src="/static/images/logo.png" alt="Adhocracy+" class="main-header__logo-img" /></a>
-            {% endspaceless %}
-        </div>
-
-        <div class="main-header__mobile-menu main-header__mobile-menu--platform collapse" id="main-header-collapse">
-            <div class="main-header__user main-header__user--cms">
-                {% userindicator %}
-            </div>
-        </div>
-        <div class="main-header__lang main-header__lang--cms">
-            {% get_available_languages as languages %}
-            {% for lang_code, lang_name in languages %}
-                {% if lang_code != LANGUAGE_CODE %}
-                    {% get_language_info for lang_code as lang %}
-                        <form class="lang__switch" action="{% url 'set_language' %}" method="post">{% csrf_token %}
-                            <input name="next" type="hidden" value="{{ redirect_to }}" />
-                            <input name="language" type="hidden" value="{{ lang_code }}">
-                            {% if LANGUAGE_CODE == 'de' %}
-                            <a class="lang__btn--left active" role="button">de</a><button class="lang__btn--right" type="submit">en</button>
-                            {% else %}
-                            <button class="lang__btn--left" type="submit">de</button><a class="lang__btn--right active" role="button">en</a>
-                            {% endif %}
-                        </form>
-                {% endif %}
-            {% endfor %}
-        </div>
-        <button class="btn main-header__mobile-toggle btn--secondary-filled main-header__mobile-toggle--platform btn--square btn--small btn--attached-top" data-toggle="collapse" data-target="#main-header-collapse" aria-expanded="false" aria-controls="main-header-collapse">
-            <span class="d-none d-sm-inline-block">{% trans 'Menu' %}</span>
-        </button>
-    </nav>
-</header>
diff --git a/liqd_product/templates/header_dashboard.html b/liqd_product/templates/header_dashboard.html
index d8c0b6d42..c64945d1b 100644
--- a/liqd_product/templates/header_dashboard.html
+++ b/liqd_product/templates/header_dashboard.html
@@ -1,35 +1,20 @@
 {% load userindicator static i18n thumbnail %}
 {% get_current_language as LANGUAGE_CODE %}
 
-<header class="main-header main-header--org" aria-label="{% trans 'Header' %}">
+<header class="main-header" aria-label="{% trans 'Header' %}">
     <div class="u-page-ribbon"></div>
-    <div class="l-wrapper">
+    <div class="container u-position-relative">
+        <div class="main-header__brand">
+            {% include 'includes/header_logo_link.html' %}
+        </div>
         <nav class="main-header__nav">
+            {% include 'includes/header_language_switch.html' %}
             <div class="main-header__mobile-menu {% if not ORGANISATION %}main-header__mobile-menu--platform{% endif %} collapse" id="main-header-collapse">
-                <div class="main-header__user main-header__user--org">
+                <div class="main-header__user">
                     {% userindicator %}
                 </div>
             </div>
-            <div class="main-header__lang main-header__lang--org">
-                {% get_available_languages as languages %}
-                {% for lang_code, lang_name in languages %}
-                    {% if lang_code != LANGUAGE_CODE %}
-                        {% get_language_info for lang_code as lang %}
-                            <form class="lang__switch" action="{% url 'set_language' %}" method="post">{% csrf_token %}
-                                <input name="next" type="hidden" value="{{ redirect_to }}" />
-                                <input name="language" type="hidden" value="{{ lang_code }}">
-                                {% if LANGUAGE_CODE == 'de' %}
-                                <a class="lang__btn--left active" role="button">de</a><button class="lang__btn--right" type="submit">en</button>
-                                {% else %}
-                                <button class="lang__btn--left" type="submit">de</button><a class="lang__btn--right active" role="button">en</a>
-                                {% endif %}
-                            </form>
-                    {% endif %}
-                {% endfor %}
-            </div>
-            <button class="btn main-header__mobile-toggle {% if ORGANISATION %}btn--bg-tertiary{% else %}btn--secondary-filled{% endif %} btn--square btn--small btn--attached-top" data-toggle="collapse" data-target="#main-header-collapse" aria-expanded="false" aria-controls="main-header-collapse">
-                <span class="d-none d-sm-inline-block">{% trans 'Menu' %}</span>
-            </button>
+            {% include 'includes/header_mobile_toggle.html' %}
         </nav>
     </div>
 </header>
diff --git a/liqd_product/templates/includes/header_language_switch.html b/liqd_product/templates/includes/header_language_switch.html
new file mode 100644
index 000000000..175bfcd0b
--- /dev/null
+++ b/liqd_product/templates/includes/header_language_switch.html
@@ -0,0 +1,20 @@
+{% load userindicator static i18n thumbnail %}
+{% get_current_language as LANGUAGE_CODE %}
+
+<div class="main-header__lang">
+    {% get_available_languages as languages %}
+    {% for lang_code, lang_name in languages %}
+        {% if lang_code != LANGUAGE_CODE %}
+            {% get_language_info for lang_code as lang %}
+                <form class="lang__switch" action="{% url 'set_language' %}" method="post">{% csrf_token %}
+                    <input name="next" type="hidden" value="{{ redirect_to }}" />
+                    <input name="language" type="hidden" value="{{ lang_code }}">
+                    {% if LANGUAGE_CODE == 'de' %}
+                    <a class="lang__btn--left active" role="button">de</a><button class="lang__btn--right" type="submit">en</button>
+                    {% else %}
+                    <button class="lang__btn--left" type="submit">de</button><a class="lang__btn--right active" role="button">en</a>
+                    {% endif %}
+                </form>
+        {% endif %}
+    {% endfor %}
+</div>
diff --git a/liqd_product/templates/includes/header_logo_link.html b/liqd_product/templates/includes/header_logo_link.html
new file mode 100644
index 000000000..e3cc9760f
--- /dev/null
+++ b/liqd_product/templates/includes/header_logo_link.html
@@ -0,0 +1,13 @@
+{% load userindicator static i18n thumbnail %}
+
+{% spaceless %}
+    {% if ORGANISATION %}
+    <a href="{% url 'organisation' organisation_slug=ORGANISATION.slug %}">
+        {{ ORGANISATION.name }}
+    </a>
+    {% else %}
+    <a href="/">
+        <img src="/static/images/logo.png" alt="Adhocracy+" class="main-header__brand-img" />
+    </a>
+    {% endif %}
+{% endspaceless %}
diff --git a/liqd_product/templates/includes/header_mobile_toggle.html b/liqd_product/templates/includes/header_mobile_toggle.html
new file mode 100644
index 000000000..cf26c1d6b
--- /dev/null
+++ b/liqd_product/templates/includes/header_mobile_toggle.html
@@ -0,0 +1,5 @@
+{% load userindicator static i18n thumbnail %}
+
+<button class="btn main-header__mobile-toggle {% if ORGANISATION %}btn--bg-tertiary{% else %}btn--secondary-filled{% endif %} btn--square btn--small btn--attached-top" data-toggle="collapse" data-target="#main-header-collapse" aria-expanded="false" aria-controls="main-header-collapse">
+    <span class="d-none d-sm-inline-block">{% trans 'Menu' %}</span>
+</button>