diff --git a/assets/images/logo.svg b/assets/images/logo.svg
deleted file mode 100644
index f8d99baf..00000000
--- a/assets/images/logo.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="696px" height="200px" viewBox="0 0 696 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>finales Logo</title>
-    <g id="finales-Logo" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Guide" transform="translate(349.08, 51.28)" fill="#D54716" fill-rule="nonzero">
-            <path d="M81.48,84.72 C75.96,87.6 70.2,89.68 64.2,90.96 C58.2,92.24 52.08,92.88 45.84,92.88 C39.2,92.88 33.08,91.84 27.48,89.76 C21.88,87.68 17.04,84.7 12.96,80.82 C8.88,76.94 5.7,72.24 3.42,66.72 C1.14,61.2 0,55.04 0,48.24 C0,41.44 1.14,35.28 3.42,29.76 C5.7,24.24 8.88,19.54 12.96,15.66 C17.04,11.78 21.88,8.8 27.48,6.72 C33.08,4.64 39.2,3.6 45.84,3.6 C52.64,3.6 58.9,4.42 64.62,6.06 C70.34,7.7 75.36,10.52 79.68,14.52 L66.48,28.92 C63.92,26.28 61.04,24.28 57.84,22.92 C54.64,21.56 50.64,20.88 45.84,20.88 C41.84,20.88 38.22,21.56 34.98,22.92 C31.74,24.28 28.96,26.18 26.64,28.62 C24.32,31.06 22.54,33.96 21.3,37.32 C20.06,40.68 19.44,44.32 19.44,48.24 C19.44,52.24 20.06,55.9 21.3,59.22 C22.54,62.54 24.32,65.42 26.64,67.86 C28.96,70.3 31.74,72.2 34.98,73.56 C38.22,74.92 41.84,75.6 45.84,75.6 C49.92,75.6 53.44,75.14 56.4,74.22 C59.36,73.3 61.72,72.36 63.48,71.4 L63.48,57.6 L48.24,57.6 L48.24,40.32 L81.48,40.32 L81.48,84.72 Z" id="Path"></path>
-            <path d="M151.8,90.72 L134.52,90.72 L134.52,82.8 L134.28,82.8 C133.64,83.92 132.82,85.04 131.82,86.16 C130.82,87.28 129.6,88.28 128.16,89.16 C126.72,90.04 125.08,90.76 123.24,91.32 C121.4,91.88 119.4,92.16 117.24,92.16 C112.68,92.16 108.98,91.46 106.14,90.06 C103.3,88.66 101.1,86.72 99.54,84.24 C97.98,81.76 96.94,78.84 96.42,75.48 C95.9,72.12 95.64,68.48 95.64,64.56 L95.64,32.4 L113.64,32.4 L113.64,60.96 C113.64,62.64 113.7,64.38 113.82,66.18 C113.94,67.98 114.3,69.64 114.9,71.16 C115.5,72.68 116.42,73.92 117.66,74.88 C118.9,75.84 120.68,76.32 123,76.32 C125.32,76.32 127.2,75.9 128.64,75.06 C130.08,74.22 131.18,73.1 131.94,71.7 C132.7,70.3 133.2,68.72 133.44,66.96 C133.68,65.2 133.8,63.36 133.8,61.44 L133.8,32.4 L151.8,32.4 L151.8,90.72 Z" id="Path"></path>
-            <path d="M164.76,32.4 L182.76,32.4 L182.76,90.72 L164.76,90.72 L164.76,32.4 Z M163.32,14.04 C163.32,11.16 164.34,8.7 166.38,6.66 C168.42,4.62 170.88,3.6 173.76,3.6 C176.64,3.6 179.1,4.62 181.14,6.66 C183.18,8.7 184.2,11.16 184.2,14.04 C184.2,16.92 183.18,19.38 181.14,21.42 C179.1,23.46 176.64,24.48 173.76,24.48 C170.88,24.48 168.42,23.46 166.38,21.42 C164.34,19.38 163.32,16.92 163.32,14.04 Z" id="Shape"></path>
-            <path d="M256.92,90.72 L240.36,90.72 L240.36,83.04 L240.12,83.04 C239.4,84.08 238.46,85.14 237.3,86.22 C236.14,87.3 234.78,88.28 233.22,89.16 C231.66,90.04 229.94,90.76 228.06,91.32 C226.18,91.88 224.24,92.16 222.24,92.16 C217.92,92.16 214,91.42 210.48,89.94 C206.96,88.46 203.94,86.38 201.42,83.7 C198.9,81.02 196.96,77.84 195.6,74.16 C194.24,70.48 193.56,66.44 193.56,62.04 C193.56,57.96 194.18,54.06 195.42,50.34 C196.66,46.62 198.42,43.32 200.7,40.44 C202.98,37.56 205.76,35.26 209.04,33.54 C212.32,31.82 216.04,30.96 220.2,30.96 C223.96,30.96 227.46,31.54 230.7,32.7 C233.94,33.86 236.6,35.84 238.68,38.64 L238.92,38.64 L238.92,0 L256.92,0 L256.92,90.72 Z M240.36,61.56 C240.36,57.16 239.1,53.6 236.58,50.88 C234.06,48.16 230.52,46.8 225.96,46.8 C221.4,46.8 217.86,48.16 215.34,50.88 C212.82,53.6 211.56,57.16 211.56,61.56 C211.56,65.96 212.82,69.52 215.34,72.24 C217.86,74.96 221.4,76.32 225.96,76.32 C230.52,76.32 234.06,74.96 236.58,72.24 C239.1,69.52 240.36,65.96 240.36,61.56 Z" id="Shape"></path>
-            <path d="M326.52,80.64 C323.64,84.32 320,87.16 315.6,89.16 C311.2,91.16 306.64,92.16 301.92,92.16 C297.44,92.16 293.22,91.44 289.26,90 C285.3,88.56 281.86,86.5 278.94,83.82 C276.02,81.14 273.72,77.92 272.04,74.16 C270.36,70.4 269.52,66.2 269.52,61.56 C269.52,56.92 270.36,52.72 272.04,48.96 C273.72,45.2 276.02,41.98 278.94,39.3 C281.86,36.62 285.3,34.56 289.26,33.12 C293.22,31.68 297.44,30.96 301.92,30.96 C306.08,30.96 309.86,31.68 313.26,33.12 C316.66,34.56 319.54,36.62 321.9,39.3 C324.26,41.98 326.08,45.2 327.36,48.96 C328.64,52.72 329.28,56.92 329.28,61.56 L329.28,67.2 L287.52,67.2 C288.24,70.64 289.8,73.38 292.2,75.42 C294.6,77.46 297.56,78.48 301.08,78.48 C304.04,78.48 306.54,77.82 308.58,76.5 C310.62,75.18 312.4,73.48 313.92,71.4 L326.52,80.64 Z M311.28,54.96 C311.36,51.92 310.36,49.32 308.28,47.16 C306.2,45 303.52,43.92 300.24,43.92 C298.24,43.92 296.48,44.24 294.96,44.88 C293.44,45.52 292.14,46.34 291.06,47.34 C289.98,48.34 289.14,49.5 288.54,50.82 C287.94,52.14 287.6,53.52 287.52,54.96 L311.28,54.96 Z" id="Shape"></path>
-        </g>
-        <path d="M346,18 C349.313708,18 352,20.6862915 352,24 L352,52.0843558 C335.814472,61.9012857 325,79.6877153 325,100 C325,120.312285 335.814472,138.098714 352,147.915644 L352,176 C352,179.313708 349.313708,182 346,182 L24,182 C20.6862915,182 18,179.313708 18,176 L18,148.507613 C34.7388911,138.824806 46,120.727489 46,100 C46,79.2725107 34.7388911,61.1751942 18,51.4923868 L18,24 C18,20.6862915 20.6862915,18 24,18 L346,18 Z M336,34 L34,34 L34,43.002 L34.1980271,43.1548511 C51.2773814,56.4369747 61.7571762,76.9083185 61.9958345,99.2209152 L62,100 C62,122.614632 51.4759786,143.408582 34.1980271,156.845149 L34,156.997 L34,166 L336,166 L336,156.209 L335.789156,156.041882 C319.288398,142.728797 309.232976,122.620173 309.003996,100.763155 L309,100 C309,77.8483886 319.096529,57.4260064 335.789156,43.9581181 L336,43.79 L336,34 Z" id="Combined-Shape" fill="#3C414B" fill-rule="nonzero"></path>
-        <path d="M94,145 C98.418278,145 102,148.581722 102,153 L102,170 C102,174.418278 98.418278,178 94,178 C89.581722,178 86,174.418278 86,170 L86,153 C86,148.581722 89.581722,145 94,145 Z M94,103 C98.418278,103 102,106.581722 102,111 L102,132 C102,136.418278 98.418278,140 94,140 C89.581722,140 86,136.418278 86,132 L86,111 C86,106.581722 89.581722,103 94,103 Z M94,61 C98.418278,61 102,64.581722 102,69 L102,90 C102,94.418278 98.418278,98 94,98 C89.581722,98 86,94.418278 86,90 L86,69 C86,64.581722 89.581722,61 94,61 Z M94,19 C98.418278,19 102,22.581722 102,27 L102,48 C102,52.418278 98.418278,56 94,56 C89.581722,56 86,52.418278 86,48 L86,27 C86,22.581722 89.581722,19 94,19 Z" id="Line" fill="#3C414B" fill-rule="nonzero"></path>
-        <g id="FIP" transform="translate(127.36, 57.04)" fill="#D54716" fill-rule="nonzero">
-            <polygon id="Path" points="0 0 57 0 57 17.28 18.72 17.28 18.72 34.56 54.12 34.56 54.12 51.84 18.72 51.84 18.72 84.96 0 84.96"></polygon>
-            <polygon id="Path" points="70.2 0 88.92 0 88.92 84.96 70.2 84.96"></polygon>
-            <path d="M105.96,0 L137.52,0 C141.92,0 146.08,0.4 150,1.2 C153.92,2 157.34,3.38 160.26,5.34 C163.18,7.3 165.5,9.94 167.22,13.26 C168.94,16.58 169.8,20.76 169.8,25.8 C169.8,30.76 169,34.92 167.4,38.28 C165.8,41.64 163.6,44.32 160.8,46.32 C158,48.32 154.68,49.74 150.84,50.58 C147,51.42 142.84,51.84 138.36,51.84 L124.68,51.84 L124.68,84.96 L105.96,84.96 L105.96,0 Z M124.68,36 L137.16,36 C138.84,36 140.46,35.84 142.02,35.52 C143.58,35.2 144.98,34.66 146.22,33.9 C147.46,33.14 148.46,32.1 149.22,30.78 C149.98,29.46 150.36,27.8 150.36,25.8 C150.36,23.64 149.86,21.9 148.86,20.58 C147.86,19.26 146.58,18.24 145.02,17.52 C143.46,16.8 141.72,16.34 139.8,16.14 C137.88,15.94 136.04,15.84 134.28,15.84 L124.68,15.84 L124.68,36 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
diff --git a/assets/sass/_variables.scss b/assets/sass/_variables.scss
index ac7d7a7b..b8a52535 100644
--- a/assets/sass/_variables.scss
+++ b/assets/sass/_variables.scss
@@ -39,6 +39,8 @@ html {
   --highlight-color-tip: #C4F2FF;
   --highlight-color-inofficial: #F0F3F5;
   --highlight-color-important: #FFE3D9;
+  --border: .1rem solid transparent;
+  --pagefind-ui-font: roboto,Arial,Helvetica,sans-serif;
 }
 
 html[data-theme="dark"] {
@@ -46,8 +48,8 @@ html[data-theme="dark"] {
   --link-default: #FF6B3D;
   --link-hovered: #FF8A5B;
   --link-special: #FFFFFF;
-  --bg-default: #1a1a1a;
-  --bg-neutral: #2d2d2d;
+  --bg-default: #151b23;
+  --bg-neutral: #0d1117;
   --bg-accent: #86761a;
   --bg-accent2: #DABA00;
   --bg-accent3: #fff284;
@@ -61,4 +63,5 @@ html[data-theme="dark"] {
   --highlight-color-tip: #1A4A5C;
   --highlight-color-inofficial: #2A2D30;
   --highlight-color-important: #4A2A1A;
+  --border: .1rem solid #3d444d;
 }
diff --git a/assets/sass/anchorlink.scss b/assets/sass/anchorlink.scss
index 0636005f..d539b27f 100644
--- a/assets/sass/anchorlink.scss
+++ b/assets/sass/anchorlink.scss
@@ -15,19 +15,29 @@
 }
 
 .o-divider {
-  display: block;
-  width: 100%;
+  display: grid;
+  grid-template-columns: 7fr 1fr 7fr;
   margin: 2rem 0;
-  background-image: url("/intersector.svg");
-  background-position: center;
-  background-repeat: no-repeat;
   height: 2.4rem;
-  opacity: 50%;
+  opacity: 66%;
   border: 0;
+  overflow: hidden;
+  align-items: center;
+
+  hr {
+    color: var(--link-default);
+    border-width: 2px;
+    opacity: 1;
+  }
 
   @media print {
     margin: 0;
   }
+
+  svg {
+    min-width: 37px;
+    margin: 0 .5rem;
+  }
 }
 
 .a-anchorlink__link {
diff --git a/assets/sass/expander.scss b/assets/sass/expander.scss
index 34e9aefc..4f9862fa 100644
--- a/assets/sass/expander.scss
+++ b/assets/sass/expander.scss
@@ -32,6 +32,7 @@ details {
   background-color: var(--bg-neutral);
   border-radius: var(--border-radius-m);
   margin-bottom: 1.2rem;
+  border: var(--border);
 }
 
 details[open] > .o-expander__summary {
diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss
index 578f3349..3f37d7b5 100644
--- a/assets/sass/navigation.scss
+++ b/assets/sass/navigation.scss
@@ -1,4 +1,3 @@
-
 .o-header {
   position: sticky;
   width: 100%;
@@ -8,6 +7,7 @@
   z-index: 5;
   height: 6rem;
   padding-left: calc((100vw - 100%) / 2);
+  border-bottom: var(--border);
 }
 
 .o-header__wrapper {
@@ -59,7 +59,7 @@
     background-color: var(--bg-neutral);
   }
 
-  img {
+  svg {
     width: auto;
     height: 4.4rem;
     padding: .2rem .4rem;
@@ -203,6 +203,7 @@
     background-color: var(--bg-default);
     padding: 1rem;
     overflow-y: scroll;
+    border-left: var(--border);
 
     > menu {
       margin-top: 4rem;
diff --git a/assets/sass/search.scss b/assets/sass/search.scss
index bdae69c2..af422dd6 100644
--- a/assets/sass/search.scss
+++ b/assets/sass/search.scss
@@ -13,7 +13,7 @@
     .pagefind-ui__search-input {
         z-index: 3;
         outline: .2rem solid transparent;
-        border: 0;
+        border: var(--border);
         box-shadow: var(--box-shadow);
 
         &:focus {
@@ -22,7 +22,8 @@
         }
 
         &::placeholder {
-            opacity: .5;
+            opacity: .7;
+            color: var(--color-body);
         }
     }
 
diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss
index cc006795..6879a89f 100644
--- a/assets/sass/styles.scss
+++ b/assets/sass/styles.scss
@@ -70,7 +70,7 @@ main {
   margin-right: auto;
 }
 
-.o-card{
+.o-card {
   background-color: var(--bg-default);
   border-radius: var(--border-radius-l);
   padding: 2rem;
@@ -159,21 +159,23 @@ img {
   @include add-columns(3);
 }
 
-.o-single,
-.o-list {
+.o-single {
   padding: 2rem;
   background-color: var(--bg-default);
   border-radius: var(--border-radius-l);
+  border: var(--border);
 
   &--with-sidemenu {
     padding: 0;
     background-color: inherit;
+    border: unset;
   }
 
   &__container {
     background-color: var(--bg-default);
     padding: 2rem;
     border-radius: var(--border-radius-l);
+    border: var(--border);
   }
 
   &__content-wrapper {
@@ -224,6 +226,13 @@ img {
   }
 }
 
+.o-list {
+  padding: 2rem;
+  background-color: var(--bg-default);
+  border-radius: var(--border-radius-l);
+  border: var(--border);
+}
+
 .o-list--news {
   padding: 0;
   background-color: unset;
diff --git a/assets/sass/teaser.scss b/assets/sass/teaser.scss
index 5664419f..ada5cf3d 100644
--- a/assets/sass/teaser.scss
+++ b/assets/sass/teaser.scss
@@ -10,6 +10,7 @@
     border-radius: var(--border-radius-l);
     display: flex;
     flex-direction: column;
+    border: var(--border);
 
     &:hover,
     &:focus {
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 092bdbb3..0e17f948 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -5,7 +5,7 @@
         <link>{{ .Site.BaseURL }}</link>
         <description>{{ .Site.Params.description }}</description>
         <language>{{ site.Language.LanguageCode }}</language>
-        <image>{{ (resources.Get "images/logo.svg").Permalink }}</image>
+        <image>{{ partial "header-logo" }}</image>
         {{ range where .Site.RegularPages "Section" "news" }}
         <item>
             <title>{{ .Title }}</title>
diff --git a/layouts/country/single.html b/layouts/country/single.html
index 5e67d5a3..9525a835 100644
--- a/layouts/country/single.html
+++ b/layouts/country/single.html
@@ -21,7 +21,7 @@ <h1 data-pagefind-meta="title">{{ .Title }}</h1>
             {{ $title := print (T "_operator__list_title") " in " .Title}}
             {{ partial "related" (dict "index" "country" "pageType" "operator" "title" $title "page" . "identifier" "operators") }}
             {{ with .Params.operators_without_fip }}
-                <hr class="o-divider">
+            {{ partial "intersector" }}
                 <h3 id="operators-without-fip-title">{{ T "operators_without_fip"}} in {{ $.Title }}</h3>
                 <ul aria-labelledby="operators-without-fip-title">
                     {{ range . }}
diff --git a/layouts/operator/list.html b/layouts/operator/list.html
index 6f045fd6..0c807c6c 100644
--- a/layouts/operator/list.html
+++ b/layouts/operator/list.html
@@ -6,7 +6,7 @@ <h1 data-pagefind-meta="title">{{ .Title }}</h1>
     {{ range .Pages }}
     <a href="{{ .RelPermalink }}" class="o-list__link">
       <div class="o-list__picture">
-        {{ partial "logo" (dict "operator" .File.ContentBaseName) }}
+        {{ partial "operator-logo" (dict "operator" .File.ContentBaseName) }}
       </div>
       <div>
         {{ .Title }}
diff --git a/layouts/operator/single.html b/layouts/operator/single.html
index 2778d3c4..59f8819e 100644
--- a/layouts/operator/single.html
+++ b/layouts/operator/single.html
@@ -5,7 +5,7 @@
             <div class="o-single__container content_with_heading">
                 <div class="o-single__content-header">
                     <div class="o-single__content-header-title">
-                        {{ partial "logo" (dict "operator" .File.ContentBaseName "pagefind" true)}}
+                        {{ partial "operator-logo" (dict "operator" .File.ContentBaseName "pagefind" true)}}
                         <h1 data-pagefind-meta="title">{{ .Title }}</h1>
                     </div>
                     {{ partial "updateDate.html" . }}
diff --git a/layouts/partials/content.html b/layouts/partials/content.html
index 6abcec6a..a898b96f 100644
--- a/layouts/partials/content.html
+++ b/layouts/partials/content.html
@@ -1,3 +1,3 @@
 {{- with .Content -}}
-    {{ . | replaceRE "(<h[2] id=\"([^\"]+)\".+)(</h[2]+>)" (print `<hr class="o-divider" aria-hidden="true"><span class="a-anchorlink">${1}${3}<button data-anchor="#${2}" class="a-anchorlink__link" title="` (T "anchorLink.copy") `">` (partial "icon" "link") `</button></span>`) | safeHTML }}
+    {{ . | replaceRE "(<h[2] id=\"([^\"]+)\".+)(</h[2]+>)" (print (partial "intersector") `<span class="a-anchorlink">${1}${3}<button data-anchor="#${2}" class="a-anchorlink__link" title="` (T "anchorLink.copy") `">` (partial "icon" "link") `</button></span>`) | safeHTML }}
 {{- end -}}
diff --git a/layouts/partials/header-logo.html b/layouts/partials/header-logo.html
new file mode 100644
index 00000000..2934a8b5
--- /dev/null
+++ b/layouts/partials/header-logo.html
@@ -0,0 +1,19 @@
+<svg width="696px" height="200px" viewBox="0 0 696 200" aria-hidden="true" alt="" xmlns="http://www.w3.org/2000/svg">
+  <title>finales Logo</title>
+  <g id="fipguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g style="fill: var(--link-default, #D54716);" id="Guide" transform="translate(349.08, 51.28)" fill="var(--link-default)" fill-rule="nonzero">
+      <path d="M81.48,84.72 C75.96,87.6 70.2,89.68 64.2,90.96 C58.2,92.24 52.08,92.88 45.84,92.88 C39.2,92.88 33.08,91.84 27.48,89.76 C21.88,87.68 17.04,84.7 12.96,80.82 C8.88,76.94 5.7,72.24 3.42,66.72 C1.14,61.2 0,55.04 0,48.24 C0,41.44 1.14,35.28 3.42,29.76 C5.7,24.24 8.88,19.54 12.96,15.66 C17.04,11.78 21.88,8.8 27.48,6.72 C33.08,4.64 39.2,3.6 45.84,3.6 C52.64,3.6 58.9,4.42 64.62,6.06 C70.34,7.7 75.36,10.52 79.68,14.52 L66.48,28.92 C63.92,26.28 61.04,24.28 57.84,22.92 C54.64,21.56 50.64,20.88 45.84,20.88 C41.84,20.88 38.22,21.56 34.98,22.92 C31.74,24.28 28.96,26.18 26.64,28.62 C24.32,31.06 22.54,33.96 21.3,37.32 C20.06,40.68 19.44,44.32 19.44,48.24 C19.44,52.24 20.06,55.9 21.3,59.22 C22.54,62.54 24.32,65.42 26.64,67.86 C28.96,70.3 31.74,72.2 34.98,73.56 C38.22,74.92 41.84,75.6 45.84,75.6 C49.92,75.6 53.44,75.14 56.4,74.22 C59.36,73.3 61.72,72.36 63.48,71.4 L63.48,57.6 L48.24,57.6 L48.24,40.32 L81.48,40.32 L81.48,84.72 Z" id="Path"></path>
+      <path d="M151.8,90.72 L134.52,90.72 L134.52,82.8 L134.28,82.8 C133.64,83.92 132.82,85.04 131.82,86.16 C130.82,87.28 129.6,88.28 128.16,89.16 C126.72,90.04 125.08,90.76 123.24,91.32 C121.4,91.88 119.4,92.16 117.24,92.16 C112.68,92.16 108.98,91.46 106.14,90.06 C103.3,88.66 101.1,86.72 99.54,84.24 C97.98,81.76 96.94,78.84 96.42,75.48 C95.9,72.12 95.64,68.48 95.64,64.56 L95.64,32.4 L113.64,32.4 L113.64,60.96 C113.64,62.64 113.7,64.38 113.82,66.18 C113.94,67.98 114.3,69.64 114.9,71.16 C115.5,72.68 116.42,73.92 117.66,74.88 C118.9,75.84 120.68,76.32 123,76.32 C125.32,76.32 127.2,75.9 128.64,75.06 C130.08,74.22 131.18,73.1 131.94,71.7 C132.7,70.3 133.2,68.72 133.44,66.96 C133.68,65.2 133.8,63.36 133.8,61.44 L133.8,32.4 L151.8,32.4 L151.8,90.72 Z" id="Path"></path>
+      <path d="M164.76,32.4 L182.76,32.4 L182.76,90.72 L164.76,90.72 L164.76,32.4 Z M163.32,14.04 C163.32,11.16 164.34,8.7 166.38,6.66 C168.42,4.62 170.88,3.6 173.76,3.6 C176.64,3.6 179.1,4.62 181.14,6.66 C183.18,8.7 184.2,11.16 184.2,14.04 C184.2,16.92 183.18,19.38 181.14,21.42 C179.1,23.46 176.64,24.48 173.76,24.48 C170.88,24.48 168.42,23.46 166.38,21.42 C164.34,19.38 163.32,16.92 163.32,14.04 Z" id="Shape"></path>
+      <path d="M256.92,90.72 L240.36,90.72 L240.36,83.04 L240.12,83.04 C239.4,84.08 238.46,85.14 237.3,86.22 C236.14,87.3 234.78,88.28 233.22,89.16 C231.66,90.04 229.94,90.76 228.06,91.32 C226.18,91.88 224.24,92.16 222.24,92.16 C217.92,92.16 214,91.42 210.48,89.94 C206.96,88.46 203.94,86.38 201.42,83.7 C198.9,81.02 196.96,77.84 195.6,74.16 C194.24,70.48 193.56,66.44 193.56,62.04 C193.56,57.96 194.18,54.06 195.42,50.34 C196.66,46.62 198.42,43.32 200.7,40.44 C202.98,37.56 205.76,35.26 209.04,33.54 C212.32,31.82 216.04,30.96 220.2,30.96 C223.96,30.96 227.46,31.54 230.7,32.7 C233.94,33.86 236.6,35.84 238.68,38.64 L238.92,38.64 L238.92,0 L256.92,0 L256.92,90.72 Z M240.36,61.56 C240.36,57.16 239.1,53.6 236.58,50.88 C234.06,48.16 230.52,46.8 225.96,46.8 C221.4,46.8 217.86,48.16 215.34,50.88 C212.82,53.6 211.56,57.16 211.56,61.56 C211.56,65.96 212.82,69.52 215.34,72.24 C217.86,74.96 221.4,76.32 225.96,76.32 C230.52,76.32 234.06,74.96 236.58,72.24 C239.1,69.52 240.36,65.96 240.36,61.56 Z" id="Shape"></path>
+      <path d="M326.52,80.64 C323.64,84.32 320,87.16 315.6,89.16 C311.2,91.16 306.64,92.16 301.92,92.16 C297.44,92.16 293.22,91.44 289.26,90 C285.3,88.56 281.86,86.5 278.94,83.82 C276.02,81.14 273.72,77.92 272.04,74.16 C270.36,70.4 269.52,66.2 269.52,61.56 C269.52,56.92 270.36,52.72 272.04,48.96 C273.72,45.2 276.02,41.98 278.94,39.3 C281.86,36.62 285.3,34.56 289.26,33.12 C293.22,31.68 297.44,30.96 301.92,30.96 C306.08,30.96 309.86,31.68 313.26,33.12 C316.66,34.56 319.54,36.62 321.9,39.3 C324.26,41.98 326.08,45.2 327.36,48.96 C328.64,52.72 329.28,56.92 329.28,61.56 L329.28,67.2 L287.52,67.2 C288.24,70.64 289.8,73.38 292.2,75.42 C294.6,77.46 297.56,78.48 301.08,78.48 C304.04,78.48 306.54,77.82 308.58,76.5 C310.62,75.18 312.4,73.48 313.92,71.4 L326.52,80.64 Z M311.28,54.96 C311.36,51.92 310.36,49.32 308.28,47.16 C306.2,45 303.52,43.92 300.24,43.92 C298.24,43.92 296.48,44.24 294.96,44.88 C293.44,45.52 292.14,46.34 291.06,47.34 C289.98,48.34 289.14,49.5 288.54,50.82 C287.94,52.14 287.6,53.52 287.52,54.96 L311.28,54.96 Z" id="Shape"></path>
+    </g>
+    <path style="fill: var(--color-body, #3C414B);" d="M346,18 C349.313708,18 352,20.6862915 352,24 L352,52.0843558 C335.814472,61.9012857 325,79.6877153 325,100 C325,120.312285 335.814472,138.098714 352,147.915644 L352,176 C352,179.313708 349.313708,182 346,182 L24,182 C20.6862915,182 18,179.313708 18,176 L18,148.507613 C34.7388911,138.824806 46,120.727489 46,100 C46,79.2725107 34.7388911,61.1751942 18,51.4923868 L18,24 C18,20.6862915 20.6862915,18 24,18 L346,18 Z M336,34 L34,34 L34,43.002 L34.1980271,43.1548511 C51.2773814,56.4369747 61.7571762,76.9083185 61.9958345,99.2209152 L62,100 C62,122.614632 51.4759786,143.408582 34.1980271,156.845149 L34,156.997 L34,166 L336,166 L336,156.209 L335.789156,156.041882 C319.288398,142.728797 309.232976,122.620173 309.003996,100.763155 L309,100 C309,77.8483886 319.096529,57.4260064 335.789156,43.9581181 L336,43.79 L336,34 Z" id="Combined-Shape" fill="var(--color-body)" fill-rule="nonzero"></path>
+    <path style="fill: var(--color-body, #3C414B);" d="M94,145 C98.418278,145 102,148.581722 102,153 L102,170 C102,174.418278 98.418278,178 94,178 C89.581722,178 86,174.418278 86,170 L86,153 C86,148.581722 89.581722,145 94,145 Z M94,103 C98.418278,103 102,106.581722 102,111 L102,132 C102,136.418278 98.418278,140 94,140 C89.581722,140 86,136.418278 86,132 L86,111 C86,106.581722 89.581722,103 94,103 Z M94,61 C98.418278,61 102,64.581722 102,69 L102,90 C102,94.418278 98.418278,98 94,98 C89.581722,98 86,94.418278 86,90 L86,69 C86,64.581722 89.581722,61 94,61 Z M94,19 C98.418278,19 102,22.581722 102,27 L102,48 C102,52.418278 98.418278,56 94,56 C89.581722,56 86,52.418278 86,48 L86,27 C86,22.581722 89.581722,19 94,19 Z" id="Line" fill="var(--color-body)" fill-rule="nonzero"></path>
+    <g style="fill: var(--link-default, #D54716);" id="FIP" transform="translate(127.36, 57.04)" fill="var(--link-default)" fill-rule="nonzero">
+      <polygon id="Path" points="0 0 57 0 57 17.28 18.72 17.28 18.72 34.56 54.12 34.56 54.12 51.84 18.72 51.84 18.72 84.96 0 84.96"></polygon>
+      <polygon id="Path" points="70.2 0 88.92 0 88.92 84.96 70.2 84.96"></polygon>
+      <path d="M105.96,0 L137.52,0 C141.92,0 146.08,0.4 150,1.2 C153.92,2 157.34,3.38 160.26,5.34 C163.18,7.3 165.5,9.94 167.22,13.26 C168.94,16.58 169.8,20.76 169.8,25.8 C169.8,30.76 169,34.92 167.4,38.28 C165.8,41.64 163.6,44.32 160.8,46.32 C158,48.32 154.68,49.74 150.84,50.58 C147,51.42 142.84,51.84 138.36,51.84 L124.68,51.84 L124.68,84.96 L105.96,84.96 L105.96,0 Z M124.68,36 L137.16,36 C138.84,36 140.46,35.84 142.02,35.52 C143.58,35.2 144.98,34.66 146.22,33.9 C147.46,33.14 148.46,32.1 149.22,30.78 C149.98,29.46 150.36,27.8 150.36,25.8 C150.36,23.64 149.86,21.9 148.86,20.58 C147.86,19.26 146.58,18.24 145.02,17.52 C143.46,16.8 141.72,16.34 139.8,16.14 C137.88,15.94 136.04,15.84 134.28,15.84 L124.68,15.84 L124.68,36 Z" id="Shape"></path>
+    </g>
+  </g>
+</svg>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 49d163c1..6f68b8d3 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -2,7 +2,7 @@
 <div class="o-container o-header__wrapper">
   <a id="skip-link" class="o-header__skip-link" href="#content">{{ T "skipToContent" }}</a>
   <a href="{{ .Site.BaseURL | relLangURL }}" aria-label="{{ T "home-page-text" }}" class="o-header__logo">
-    <img aria-hidden="true" src="{{ $logo.RelPermalink }}" alt="">
+  {{ partial "header-logo" }}
   </a>
   <div class="o-header__curtain"></div>
   <div class="o-header__nav o-container">
diff --git a/layouts/partials/intersector.html b/layouts/partials/intersector.html
new file mode 100644
index 00000000..2ca175e1
--- /dev/null
+++ b/layouts/partials/intersector.html
@@ -0,0 +1,10 @@
+<span class="o-divider" aria-hidden="true">
+  <hr>
+  <svg viewBox="0 0 37 24" xmlns="http://www.w3.org/2000/svg">
+    <g style="fill: var(--link-default, #D54716);" id="ticket" transform="translate(4, 4)" fill="var(--link-default)" fill-rule="nonzero">
+      <path d="M28.2926829,0 C28.6833234,0 29,0.325611091 29,0.727272727 L29,5.45454545 C27.4374383,5.45454545 26.1707317,6.75698982 26.1707317,8.36363636 C26.1707317,9.97028291 27.4374383,11.2727273 29,11.2727273 L29,15.2727273 C29,15.6743889 28.6833234,16 28.2926829,16 L0.707317073,16 C0.31667664,16 0,15.6743889 0,15.2727273 L0,11.2727273 C1.56256173,11.2727273 2.82926829,9.97028291 2.82926829,8.36363636 C2.82926829,6.75698982 1.56256173,5.45454545 0,5.45454545 L0,0.727272727 C0,0.325611091 0.31667664,0 0.707317073,0 L28.2926829,0 Z M26.8780488,2.18181818 L2.12195122,2.18181818 L2.12195122,3.76290909 L2.16408965,3.78347584 C3.78297735,4.59366299 4.90812712,6.28454086 4.95000928,8.24994726 L4.95121951,8.36363636 C4.95121951,10.3773724 3.8141098,12.1180292 2.16408965,12.9437969 L2.12195122,12.964 L2.12195122,13.8181818 L26.8780488,13.8181818 L26.8780488,12.9643636 L26.8359104,12.9437969 C25.2170227,12.1336097 24.0918729,10.4427319 24.0499907,8.47732546 L24.0487805,8.36363636 C24.0487805,6.34990032 25.1858902,4.60924351 26.8359104,3.78347584 L26.8780488,3.76254545 L26.8780488,2.18181818 Z" id="Combined-Shape"></path>
+      <path d="M20.5121951,11.6363636 C21.0981558,11.6363636 21.5731707,12.1247803 21.5731707,12.7272727 L21.5731707,14.5454545 C21.5731707,15.147947 21.0981558,15.6363636 20.5121951,15.6363636 C19.9262345,15.6363636 19.4512195,15.147947 19.4512195,14.5454545 L19.4512195,12.7272727 C19.4512195,12.1247803 19.9262345,11.6363636 20.5121951,11.6363636 Z M20.5121951,5.81818182 C21.0981558,5.81818182 21.5731707,6.30659845 21.5731707,6.90909091 L21.5731707,9.81818182 C21.5731707,10.4206743 21.0981558,10.9090909 20.5121951,10.9090909 C19.9262345,10.9090909 19.4512195,10.4206743 19.4512195,9.81818182 L19.4512195,6.90909091 C19.4512195,6.30659845 19.9262345,5.81818182 20.5121951,5.81818182 Z M20.5121951,0 C21.0981558,0 21.5731707,0.488416637 21.5731707,1.09090909 L21.5731707,4 C21.5731707,4.60249245 21.0981558,5.09090909 20.5121951,5.09090909 C19.9262345,5.09090909 19.4512195,4.60249245 19.4512195,4 L19.4512195,1.09090909 C19.4512195,0.488416637 19.9262345,0 20.5121951,0 Z" id="Line"></path>
+    </g>
+  </svg>
+  <hr>
+</span>
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
deleted file mode 100644
index 130c0e54..00000000
--- a/layouts/partials/menu.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
-{{ $logo := resources.Get "images/logo.svg" }}
-<div class="o-container o-header__wrapper">
-  <a id="skip-link" class="o-header__skip-link" href="#content">{{ T "skipToContent" }}</a>
-  <a href="{{ .Site.BaseURL | relLangURL }}" aria-label="{{ T "home-page-text" }}" class="o-header__logo">
-    <img aria-hidden="true" src="{{ $logo.RelPermalink }}" alt="">
-  </a>
-  <div class="o-header__curtain"></div>
-  <div class="o-header__nav o-container">
-    <li class="o-header__item a-theme-toggle--mobile">
-      {{ partial "theme-toggle" }}
-    </li>
-    <button class="o-nav__menu-button" title="Menü öffnen" aria-expanded="false" aria-haspopup="true">
-      <span>{{ T "menu-open" }}</span>
-      {{ partial "icon" "menu" }}
-    </button>
-    <nav>
-      <button class="o-nav__close-button" title="Menü schließen">
-        <span>{{ T "menu-close" }}</span>
-        {{ partial "icon" "close" }}
-      </button>
-      <menu>
-        <li class="o-header__item">
-          <button class="o-header__expand-button" aria-haspopup="true" aria-expanded="false">
-            <span>{{ T "countries.selection" }}</span>
-            {{ partial "icon" "keyboard_arrow_down" }}
-          </button>
-          <span id="menu-country-list-title">{{ T "country" }}</span>
-          <menu class="o-header__item-countries" aria-describedby="menu-country-list-title">
-            {{ range  where site.RegularPages "Section" "country"}}
-            <li class="o-header__item">
-              <a href="{{ .Permalink }}">{{ .Title }}</a>
-            </li>
-            {{ end }}
-          </menu>
-        </li>
-        <li class="o-header__item">
-          <span id="menu-general-list-title">{{ T "general" }}</span>
-          <ul aria-describedby="menu-general-list-title">
-            <li class="o-header__item a-theme-toggle--desktop">
-              {{ partial "theme-toggle" }}
-            </li>
-            {{ $news := site.GetPage "news" }}
-            {{ if $news }}
-            <li class="o-header__item">
-              <a href="{{ $news.RelPermalink }}">{{ $news.Title }}</a>
-            </li>
-            {{ end }}
-            {{ $informationPage := site.GetPage "generalInformation" }}
-            {{ if $informationPage }}
-            <li class="o-header__item">
-              <a href="{{ $informationPage.RelPermalink }}">{{ $informationPage.Title }}</a>
-            </li>
-            {{ end }}
-          </ul>
-        </li>
-      </menu>
-    </nav>
-  </div>
-</div>
diff --git a/layouts/partials/logo.html b/layouts/partials/operator-logo.html
similarity index 100%
rename from layouts/partials/logo.html
rename to layouts/partials/operator-logo.html
diff --git a/layouts/partials/related.html b/layouts/partials/related.html
index dfa7be35..ca98723d 100644
--- a/layouts/partials/related.html
+++ b/layouts/partials/related.html
@@ -9,7 +9,7 @@ <h3 id="o-related__title-{{ .identifier }}">{{ .title }}</h3>
         {{ if eq .Page.Type "news" }}
             {{ $text = print (partial "icon" "newspaper") $text }}
         {{ else if eq .Page.Type "operator" }}
-            {{ $text = print (partial "logo" (dict "operator" .File.ContentBaseName)) $text }}
+            {{ $text = print (partial "operator-logo" (dict "operator" .File.ContentBaseName)) $text }}
         {{ else if eq .Page.Type "country" }}
             {{ $text = print (partial "flag" (dict "country" .File.ContentBaseName)) $text }}
         {{ end }}
diff --git a/static/intersector.svg b/static/intersector.svg
deleted file mode 100644
index 5656ec78..00000000
--- a/static/intersector.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1200px" height="24px" viewBox="0 0 1200 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>intersector</title>
-    <g id="intersector" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <line x1="3.03040174e-17" y1="12" x2="575" y2="12" id="Line-2" stroke="#BA3D12" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
-        <line x1="625" y1="12" x2="1200" y2="12" id="Line-2-Copy" stroke="#BA3D12" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
-        <g id="Group-11" transform="translate(582, 0)">
-            <rect id="Rectangle" x="0" y="0" width="37" height="24"></rect>
-            <g id="Group-10-Copy" transform="translate(4, 4)" fill="#BA3D12" fill-rule="nonzero">
-                <path d="M28.2926829,0 C28.6833234,0 29,0.325611091 29,0.727272727 L29,5.45454545 C27.4374383,5.45454545 26.1707317,6.75698982 26.1707317,8.36363636 C26.1707317,9.97028291 27.4374383,11.2727273 29,11.2727273 L29,15.2727273 C29,15.6743889 28.6833234,16 28.2926829,16 L0.707317073,16 C0.31667664,16 0,15.6743889 0,15.2727273 L0,11.2727273 C1.56256173,11.2727273 2.82926829,9.97028291 2.82926829,8.36363636 C2.82926829,6.75698982 1.56256173,5.45454545 0,5.45454545 L0,0.727272727 C0,0.325611091 0.31667664,0 0.707317073,0 L28.2926829,0 Z M26.8780488,2.18181818 L2.12195122,2.18181818 L2.12195122,3.76290909 L2.16408965,3.78347584 C3.78297735,4.59366299 4.90812712,6.28454086 4.95000928,8.24994726 L4.95121951,8.36363636 C4.95121951,10.3773724 3.8141098,12.1180292 2.16408965,12.9437969 L2.12195122,12.964 L2.12195122,13.8181818 L26.8780488,13.8181818 L26.8780488,12.9643636 L26.8359104,12.9437969 C25.2170227,12.1336097 24.0918729,10.4427319 24.0499907,8.47732546 L24.0487805,8.36363636 C24.0487805,6.34990032 25.1858902,4.60924351 26.8359104,3.78347584 L26.8780488,3.76254545 L26.8780488,2.18181818 Z" id="Combined-Shape"></path>
-                <path d="M20.5121951,11.6363636 C21.0981558,11.6363636 21.5731707,12.1247803 21.5731707,12.7272727 L21.5731707,14.5454545 C21.5731707,15.147947 21.0981558,15.6363636 20.5121951,15.6363636 C19.9262345,15.6363636 19.4512195,15.147947 19.4512195,14.5454545 L19.4512195,12.7272727 C19.4512195,12.1247803 19.9262345,11.6363636 20.5121951,11.6363636 Z M20.5121951,5.81818182 C21.0981558,5.81818182 21.5731707,6.30659845 21.5731707,6.90909091 L21.5731707,9.81818182 C21.5731707,10.4206743 21.0981558,10.9090909 20.5121951,10.9090909 C19.9262345,10.9090909 19.4512195,10.4206743 19.4512195,9.81818182 L19.4512195,6.90909091 C19.4512195,6.30659845 19.9262345,5.81818182 20.5121951,5.81818182 Z M20.5121951,0 C21.0981558,0 21.5731707,0.488416637 21.5731707,1.09090909 L21.5731707,4 C21.5731707,4.60249245 21.0981558,5.09090909 20.5121951,5.09090909 C19.9262345,5.09090909 19.4512195,4.60249245 19.4512195,4 L19.4512195,1.09090909 C19.4512195,0.488416637 19.9262345,0 20.5121951,0 Z" id="Line"></path>
-            </g>
-        </g>
-    </g>
-</svg>