diff --git a/content/_index.de.html b/content/_index.de.html
index 720ecde6..5b49b190 100644
--- a/content/_index.de.html
+++ b/content/_index.de.html
@@ -15,27 +15,27 @@
 
 	<h2 class="display-4 mb-3">Überholabstandsmessung für Radfahrende</h2>
 	<p class="mb-5">Open Innovation, Open Source, Open Data, Open Science</p>
-
-	<a class="btn btn-lg btn-secondary mr-3 mb-4" href="https://forum.openbikesensor.org" target="_blank" rel="noopener noreferrer nofollow">
-		<i class="fab fa-discourse mr-1"></i> Forum
+<div>
+	<a class="btn btn-lg btn-secondary me-3 mb-4" href="https://forum.openbikesensor.org" target="_blank" rel="noopener noreferrer nofollow">
+		<i class="fab fa-discourse me-1"></i> Forum
 	</a>
 
-	<a class="btn btn-lg btn-secondary mr-3 mb-4" href="https://matrix.to/#/#openbikesensor:matrix.org" rel="noopener noreferrer nofollow">
+	<a class="btn btn-lg btn-secondary me-3 mb-4" href="https://matrix.to/#/#openbikesensor:matrix.org" rel="noopener noreferrer nofollow">
 		<img alt="Matrix logo" src="/icons/matrix favicon.svg" width="26pt" style="vertical-align:top" /> Matrix
 	</a>
 
-	<a class="btn btn-lg btn-secondary mr-3 mb-4" href="https://github.com/openbikesensor" target="_blank" rel="noopener noreferrer nofollow">
-		<i class="fab fa-github mr-1"></i> GitHub
+	<a class="btn btn-lg btn-secondary me-3 mb-4" href="https://github.com/openbikesensor" target="_blank" rel="noopener noreferrer nofollow">
+		<i class="fab fa-github me-1"></i> GitHub
 	</a>
 
-	<a class="btn btn-lg btn-secondary mr-3 mb-4" href="{{< relref "/docs" >}}">
-    <i class="fas fa-book-open mr-1"></i> Dokumentation
+	<a class="btn btn-lg btn-secondary me-3 mb-4" href="{{< relref "/docs" >}}">
+    <i class="fas fa-book-open me-1"></i> Dokumentation
 	</a>
 
-	<a class="btn btn-lg btn-secondary mr-3 mb-4" href="#unterstuetzen" rel="noopener noreferrer nofollow">
-		<i class="fas fa-hand-holding-heart mr-1"></i> Unterstützen
+	<a class="btn btn-lg btn-secondary me-3 mb-4" href="#unterstuetzen" rel="noopener noreferrer nofollow">
+		<i class="fas fa-hand-holding-heart me-1"></i> Unterstützen
 	</a>
-
+</div>
 </div>
 {{< /blocks/cover >}}
 
diff --git a/layouts/faq/li.html b/layouts/faq/li.html
index 5162d9a4..d9ccc39b 100644
--- a/layouts/faq/li.html
+++ b/layouts/faq/li.html
@@ -1,5 +1,5 @@
 {{ if .IsNode }}
-  <h2 class="display-2 text-center my-5 font-weight-light">{{ .Title }}</h2>
+  <h2 class="display-2 text-center my-5 fw-light">{{ .Title }}</h2>
   {{ .Content }}
 
   <div class="row">
diff --git a/layouts/partials/page-meta-links.html b/layouts/partials/page-meta-links.html
index 11703e35..46abba5d 100644
--- a/layouts/partials/page-meta-links.html
+++ b/layouts/partials/page-meta-links.html
@@ -4,7 +4,7 @@
   {{ $gh_subdir := ($.Param "github_subdir") }}
   {{ $gh_project_repo := ($.Param "github_project_repo") }}
   {{ $gh_branch := (default "master" ($.Param "github_branch")) }}
-  <div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
+  <div class="td-page-meta ms-2 pb-1 pt-2 mb-0">
   {{ if $gh_repo }}
     {{ $gh_repo_path := printf "%s/content/%s" $gh_branch $pathFormatted }}
     {{ $editURL := printf "%s/edit/%s" $gh_repo $gh_repo_path }}
diff --git a/layouts/shortcodes/blocks/feature.html b/layouts/shortcodes/blocks/feature.html
index 9c409f57..cffec75b 100644
--- a/layouts/shortcodes/blocks/feature.html
+++ b/layouts/shortcodes/blocks/feature.html
@@ -6,5 +6,5 @@ <h4 class="h3">
     {{ .Get "title" | markdownify }}
   </h4>
   <p class="mb-0">{{ .Inner }}</p>
-  {{ with .Get "url" }}<p class="mt-auto"><a href="{{ . }}" class="btn btn-outline-light">{{ with $url_text }}{{ $url_text }}{{ else }}{{ T "ui_read_more" }}{{ end }} <i class="fa fa-arrow-right ml-2"></i></a></p>{{ end }}
+  {{ with .Get "url" }}<p class="mt-auto"><a href="{{ . }}" class="btn btn-outline-light">{{ with $url_text }}{{ $url_text }}{{ else }}{{ T "ui_read_more" }}{{ end }} <i class="fa fa-arrow-right ms-2"></i></a></p>{{ end }}
 </div>