diff --git a/_includes/button.html b/_includes/button.html
index 9443db8e..2e4fd5b0 100644
--- a/_includes/button.html
+++ b/_includes/button.html
@@ -5,7 +5,7 @@
   <div class="button-wrapper">
     <a
       class="button"
-      href="{{ button.link | replace: "$LINK", button.link | relative_url }}"
+      href="{{ button.link | replace: "$LINK", button.link }}"
       {% if button.tooltip %}
         data-tooltip="{{ button.tooltip | xml_escape }}"
       {% endif %}
diff --git a/_includes/header.html b/_includes/header.html
index 99764770..0cf1342b 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -48,7 +48,7 @@
     {% for page in pages %}
       {% if page.nav %}
         <a
-          href="{{ page.dir | relative_url | uri_escape | prepend: site.baseurl_root }}"
+          href="{{site.baseurl_root}}/{{site.lang}}{{ page.dir | uri_escape }}"
           data-tooltip="{% t page.nav.tooltip %}"
         >
           {% t page.title %}