diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss
index 4eb4eef..3ed9b29 100644
--- a/assets/scss/_styles_project.scss
+++ b/assets/scss/_styles_project.scss
@@ -73,10 +73,23 @@
 
 .sp-service-icon {
   margin-top: -4rem;
+  min-height: 6rem;
+  min-width: 4rem;
   max-width: 12rem;
   max-height: 8rem;
   margin-left: 2rem;
   width: max-content;
+  & > .error {
+    min-height: 6rem;
+    min-width: 6rem;
+  }
+}
+
+.sp-feature-img {
+  min-height: 20rem;
+  min-width: 20rem;
+  max-width: 40rem;
+  max-height: 40rem;
 }
 
 .sp-service-card {
@@ -91,8 +104,9 @@
 }
 
 .sp-supported-by-img {
-  max-width: 15rem;
+  pointer-events: none;
   margin: 1rem;
+  width: 10rem;
 }
 
 .sp-supported-by-list {
@@ -161,4 +175,20 @@ a, a.btn-link {
 .container-fluid {
   padding-left: 0 !important;
   padding-right: 0 !important;
+}
+
+.error {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  font-size: 2rem;
+  padding: 1rem;
+  background-color: transparent;
+  border: lightgray solid .25rem;
+  border-radius: .5rem;
+  & > i {
+    color: lightgray;
+  }
 }
\ No newline at end of file
diff --git a/config.toml b/config.toml
index 50ef071..388d819 100644
--- a/config.toml
+++ b/config.toml
@@ -77,7 +77,6 @@ section = ["HTML", "print", "RSS"]
 
 [params]
 copyright = "SelfPrivacy"
-privacy_policy = "https://selfprivacy.org/privacy-policy/"
 
 # First one is picked as the Twitter card image if not set on page.
 # images = ["images/project-illustration.png"]
diff --git a/content/en/_index.html b/content/en/_index.html
index 26b3548..6664107 100644
--- a/content/en/_index.html
+++ b/content/en/_index.html
@@ -10,7 +10,7 @@ linkTitle = "SelfPrivacy"
 			<div class="container rounded">
 				<div id="screenshotsCarouselControls" class="carousel slide" data-bs-ride="carousel">
 				  <div class="carousel-inner rounded">
-					<div class="carousel-item">
+					<div class="carousel-item active">
 					  <img class="d-block w-100" src="/images/screenshots/1-en.png" alt="First slide">
 					</div>
 					<div class="carousel-item">
@@ -32,15 +32,15 @@ linkTitle = "SelfPrivacy"
 						<img class="d-block w-100" src="/images/screenshots/7-en.png" alt="Seventh slide">
 					</div>
 				  </div>
-				  <ol class="carousel-indicators">
-					<li data-bs-target="#screenshotsCarouselControls" data-slide-to="0" class="active"></li>
-					<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="1"></li>
-					<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="2"></li>
-					<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="3"></li>
-					<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="4"></li>
-					<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="5"></li>
-					<li data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="6"></li>
-				  </ol>
+				  <div class="carousel-indicators">
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="0" class="active" aria-current="true"></button>
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="1"></button>
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="2"></button>
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="3"></button>
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="4"></button>
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="5"></button>
+					<button type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide-to="6"></button>
+				  </div>
 				  <button class="carousel-control-prev" type="button" data-bs-target="#screenshotsCarouselControls" data-bs-slide="prev">
 					<span class="carousel-control-prev-icon" aria-hidden="true"></span>
 					<span class="visually-hidden">Previous</span>
@@ -192,10 +192,20 @@ linkTitle = "SelfPrivacy"
 <div class="container-fluid">
 	<div class="sp-supported-by-list">
 		<a href="https://nlnet.nl/project/SelfPrivacy/" target="_blank" rel="noopener noreferrer">
-			<img class="sp-supported-by-img" src="/images/logos/nlnet.svg" alt="NLnet foundation">
+			<object role="img" aria-label="NLnet foundation" class="d-flex justify-content-center align-items-center sp-supported-by-img" type="image/svg+xml" data="/images/logos/nlnet.svg">
+                <div class="error">
+					<i class="fa-solid fa-triangle-exclamation"></i>
+					NLnet foundation
+				</div>
+            </object>
 		</a>
 		<a href="https://privacyaccelerator.org" target="_blank" rel="noopener noreferrer">
-			<img class="sp-supported-by-img" src="/images/logos/PrivacyAcceleratorLogo.svg" alt="Privacy Accelerator">
+			<object role="img" aria-label="Privacy Accelerator" class="d-flex justify-content-center align-items-center sp-supported-by-img" type="image/svg+xml" data="/images/logos/PrivacyAcceleratorLogo.svg">
+                <div class="error">
+					<i class="fa-solid fa-triangle-exclamation"></i>
+					Privacy Accelerator
+				</div>
+            </object>
 		</a>
     </div>
 </div>
diff --git a/content/en/docs/FAQ/_index.md b/content/en/docs/FAQ/_index.md
index 05e8d95..c6ddfa8 100644
--- a/content/en/docs/FAQ/_index.md
+++ b/content/en/docs/FAQ/_index.md
@@ -1,5 +1,5 @@
 ---
-title: "Frequency Asked Questions"
+title: "Frequently Asked Questions"
 linkTitle: "FAQ"
 date: 2023-03-13T
 weight: 8
@@ -7,7 +7,7 @@ description: >
     Frequently asked questions about our project.
 ---
 
-## What are self-host services and what are their advantages?
+## What are self-hosted services and what are their advantages?
 
 When we use centralised services, such as popular social networks, we trust the admins of the resource that stores our correspondence, our photos and even the most important secrets said in a chat with close people. We allow our interests and music preferences to be analysed, receive targeted advertising based on them, and most likely participate in unnamed audience analysis programs and all sorts of surveillance.
 
diff --git a/content/en/docs/Theory/SelfPrivacy automation.md b/content/en/docs/Theory/SelfPrivacy automation.md
index 6d98c1e..1473a51 100644
--- a/content/en/docs/Theory/SelfPrivacy automation.md	
+++ b/content/en/docs/Theory/SelfPrivacy automation.md	
@@ -102,4 +102,4 @@ We are working to ensure that the general configuration of SelfPrivacy can be ex
 
 All transactions take place between your application, your server, and your service providers without SelfPrivacy being involved. Your copy of SelfPrivacy App is completely autonomous and independent in managing your infrastructure. No information about your interactions with your infrastructure reaches SelfPrivacy. All backups of your services leave your server in a fully encrypted form.
 
-You can read more about this in our [privacy policy]({{< ref "policy.md" >}}).
+You can read more about this in our [privacy policy]({{< ref "/privacy-policy/" >}}).
diff --git a/content/en/download/_index.html b/content/en/download/_index.html
index 1cda708..ff1af1a 100644
--- a/content/en/download/_index.html
+++ b/content/en/download/_index.html
@@ -14,11 +14,11 @@ title: Downloads
 
 {{< blocks/section color="white" type="section" >}}
 
-	<div class="row w-100">
-		<h1 class="mx-auto text-center w-100">Android</h1>
+	<div class="mx-auto row w-100">
+		<h1 class="text-center w-100">Android</h1>
 	</div>
 
-	<div class="row w-100">
+	<div class="mx-auto row w-100">
 		<div class="col-md-4">
 			<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="https://f-droid.org/en/packages/pro.kherel.selfprivacy/" rel="noopener noreferrer" target="_blank">
 				F-Droid
@@ -42,24 +42,24 @@ title: Downloads
 {{< /blocks/section >}}
 
 {{< blocks/section color="white" type="section" >}}
-	<div class="row w-100">
-		<h1 class="mx-auto text-center w-100">iOS</h1>
+	<div class="mx-auto row w-100">
+		<h1 class="text-center w-100">iOS</h1>
 	</div>
 
-	<div class="row w-100">
-		<h4 class="mx-auto text-center w-100">Coming soon</h4>
+	<div class="mx-auto row w-100">
+		<h4 class="text-center w-100">Coming soon</h4>
 	</div>
 
 {{< /blocks/section >}}
 
 {{< blocks/section type="section" color="dark" >}}
-	<div class="row w-100">
-		<h1 class="mx-auto text-center w-100">Desktop</h1>
+	<div class="mx-auto row w-100">
+		<h1 class="text-center w-100">Desktop</h1>
 	</div>
 
-<div class="row w-100">
+<div class="mx-auto row w-100">
 		<div class="col-md-4">
-			<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding disabled" href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" rel="noopener noreferrer" target="_blank">
+			<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding" href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" rel="noopener noreferrer" target="_blank">
 				Windows
 			</a>
 		</div>
diff --git a/content/en/privacy-policy.md b/content/en/privacy-policy/_index.md
similarity index 97%
rename from content/en/privacy-policy.md
rename to content/en/privacy-policy/_index.md
index 0be808d..5a9422c 100644
--- a/content/en/privacy-policy.md
+++ b/content/en/privacy-policy/_index.md
@@ -1,13 +1,7 @@
 ---
 title: "Privacy Policy"
 date: 2023-05-15
-weight: 4
----
-
-{{< blocks/section color="white" type="section" >}}
-
-# Privacy policy
-
+type: "docs"
 ---
 
 **Last updated: May 15, 2023**
@@ -60,6 +54,4 @@ If you have any questions or concerns about our Privacy Policy or the collection
 
 *We are pleased to offer this Privacy Policy under Creative Commons Zero license as a template that can be used by anyone in the open-source community. We hope that this contribution will help to support the development of privacy policies that promote transparency, accountability, and respect for the privacy of individuals. As part of our commitment to open-source values, we believe in sharing knowledge and resources to foster innovation and collaboration. Therefore, we encourage others to adapt and modify our privacy policy to meet their specific needs, while ensuring that they comply with applicable laws and regulations.*
 
-![Licensed under CC0](/images/icons/cc-zero.svg)
-
-{{< /blocks/section >}}
+![Licensed under CC0](/images/icons/cc-zero.svg)
\ No newline at end of file
diff --git a/content/ru/docs/Theory/SelfPrivacy automation.md b/content/ru/docs/Theory/SelfPrivacy automation.md
index fd502ad..1f0fe84 100644
--- a/content/ru/docs/Theory/SelfPrivacy automation.md	
+++ b/content/ru/docs/Theory/SelfPrivacy automation.md	
@@ -89,4 +89,4 @@ __*Ручные операции*__
 ## Система очень сложная, почему она приватная?
 В отличие от Cloudron, наших коммерческих единомышленников, все операции происходят между вашим приложением, вашим сервером и вашими сервис-провадерами без участия SelfPrivacy. Ваша копия SelfPrivacy App полностью автономна и независима в управлении вашей инфраструктурой. Никакая информация о вашем взаимодействии с вашей инфраструктурой не попадает к SelfPrivacy. Все резервные копии ваших сервисов покидают ваш сервер в полностью зашифрованном виде.
 
-Подробнее об этом, вы можете прочитать в [политике приватности]({{< ref "policy.md" >}}).
\ No newline at end of file
+Подробнее об этом, вы можете прочитать в [политике приватности]({{< ref "/privacy-policy/" >}}).
\ No newline at end of file
diff --git a/content/ru/download/_index.html b/content/ru/download/_index.html
index 7e35a21..2fa6141 100644
--- a/content/ru/download/_index.html
+++ b/content/ru/download/_index.html
@@ -3,8 +3,8 @@ title: Скачать
 ---
 
 {{< blocks/lead>}}
-	<div class="row w-100 my-4">
-		<h1 class="mx-auto text-center w-100">Загрузки</h1>
+	<div class="mx-auto row w-100 my-4">
+		<h1 class="text-center w-100">Загрузки</h1>
 	</div>
 
 	<p>
@@ -15,11 +15,11 @@ title: Скачать
 
 		{{< blocks/section color="white" type="section">}}
 
-			<div class="row w-100">
-				<h1 class="mx-auto text-center w-100">Android</h1>
+			<div class="mx-auto row w-100">
+				<h1 class="text-center w-100">Android</h1>
 			</div>
 
-			<div class="row w-100">
+			<div class="mx-auto row w-100">
 				<div class="col-md-4">
 					<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding"
 						href="https://f-droid.org/en/packages/pro.kherel.selfprivacy/" rel="noopener noreferrer"
@@ -51,18 +51,18 @@ title: Скачать
 			{{< /blocks/section>}}
 
 			{{< blocks/section color="white" type="section">}}
-				<div class="row w-100">
-					<h1 class="mx-auto text-center w-100">iOS</h1>
+				<div class="mx-auto row w-100">
+					<h1 class="text-center w-100">iOS</h1>
 				</div>
-				<div class="row w-100">
-					<h4 class="mx-auto text-center w-100">Ждите скоро...</h4>
+				<div class="mx-auto row w-100">
+					<h4 class="text-center w-100">Ждите скоро...</h4>
 				</div>
 				{{< /blocks/section>}}
 					{{< blocks/section type="section" color="dark">}}
-						<div class="row w-100">
-							<h1 class="mx-auto text-center w-100">Компьютер</h1>
+						<div class="mx-auto row w-100">
+							<h1 class="text-center w-100">Компьютер</h1>
 						</div>
-						<div class="row w-100">
+						<div class="mx-auto row w-100">
 							<div class="col-md-4">
 								<a class="w-100 btn btn-lg btn-primary mb-4 mt-4 btn-block sp-button-shadow sp-button-big-padding"
 									href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest"
diff --git a/content/ru/docs/About us/policy.md b/content/ru/privacy-policy/_index.md
similarity index 99%
rename from content/ru/docs/About us/policy.md
rename to content/ru/privacy-policy/_index.md
index 7468129..620baf9 100644
--- a/content/ru/docs/About us/policy.md	
+++ b/content/ru/privacy-policy/_index.md
@@ -1,7 +1,7 @@
 ---
 title: "Политика"
 date: 2023-04-23
-weight: 5
+type: "docs"
 description: >
   Наши принципы и политика
 ---
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index f2f8f3b..009d638 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -19,7 +19,7 @@
           <li><a href="{{ ref . "/docs/services/" }}" class="nav-link">{{ T "footer_available_services"}}</a></li>
           <li><a href="{{ ref . "/docs/" }}" class="nav-link">{{ T "footer_user_guide" }}</a></li>
           <li><a href="{{ ref . "/blog/" }}" class="nav-link">{{ T "footer_blog" }}</a></li>
-           {{ with .Site.Params.privacy_policy }}<li><a href="{{ . }}" class="nav-link">{{ T "footer_privacy_policy" }}</a></li>{{ end }}
+          <li><a href="{{ ref . "/privacy-policy/" }}" class="nav-link">{{ T "footer_privacy_policy" }}</a></li>
 
         </ul>
         <h3 class="text-secondary">{{ T "footer_get_help" }}</h3>
@@ -52,7 +52,7 @@
         <h3 class="text-secondary">{{ T "footer_download_desktop" }}</h3>
           <ul class="list-unstyled">
             <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-linux"></i></span> {{ T "footer_download_linux" }}</a></li>
-            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-windows"></i></span> {{ T "footer_download_windows" }}</a></li>
+            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-windows"></i></span> {{ T "footer_download_windows" }}</a></li>
             <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-apple"></i></span> {{ T "footer_download_macos" }}</a></li>
           </ul>
 
diff --git a/layouts/shortcodes/landing-feature.html b/layouts/shortcodes/landing-feature.html
index a36baa7..fd9b408 100644
--- a/layouts/shortcodes/landing-feature.html
+++ b/layouts/shortcodes/landing-feature.html
@@ -4,7 +4,7 @@
 {{ $side := .Get 3 }}
 {{ if eq $side "right" }}
 <div class="d-flex flex-column flex-lg-row flex-xl-row justify-content-center align-items-center sp-feature sp-feature{{ $bg }} my-auto">
-        <div class="flex-none col-xl-4 col-lg-6 col-md-8 col-xs-12 px-5">
+        <div class="col-xl-4 col-lg-6 col-md-8 col-xs-12 px-5">
             {{ if $title }}
                 <h2 class="sp-feature-title">{{ $title }}</h2>
             {{ end }}
@@ -12,14 +12,22 @@
         </div>
         {{ if $illustration }}
         <div class="col-lg-4 col-md-6 col-sm-8 col-xs-12">
-            <img class="card-img-top rounded-img" src="{{ $illustration.RelPermalink }}">
+            <object role="img" class="my-auto d-flex justify-content-center align-items-center card-img-top" type="image/svg+xml" data="{{ $illustration.RelPermalink }}">
+                <div class="error sp-feature-img">
+                    <i class="fa-solid fa-triangle-exclamation"></i>
+                </div>
+            </object>
         </div>
         {{ end }}
     {{ else }}
 <div class="d-flex flex-column-reverse flex-lg-row flex-xl-row justify-content-center align-items-center sp-feature sp-feature{{ $bg }}">
         {{ if $illustration }}
         <div class="col-lg-4 col-md-6 col-sm-8 col-xs-12">
-            <img class="card-img-top rounded-img" src="{{ $illustration.RelPermalink }}">
+            <object role="img" class="col-lg-4 col-md-6 col-sm-8 col-xs-12 my-auto d-flex justify-content-center align-items-center card-img-top" type="image/svg+xml" data="{{ $illustration.RelPermalink }}">
+                <div class="error sp-feature-img">
+                    <i class="fa-solid fa-triangle-exclamation"></i>
+                </div>
+            </object>
         </div>
         {{ end }}
         <div class="col-xl-4 col-lg-6 col-md-8 col-xs-12 px-5">
diff --git a/layouts/shortcodes/landing-service.html b/layouts/shortcodes/landing-service.html
index cf7de98..baee7fa 100644
--- a/layouts/shortcodes/landing-service.html
+++ b/layouts/shortcodes/landing-service.html
@@ -1,7 +1,11 @@
 {{ $illustration := .Get 0 }}
 {{ $title := .Get 1 }}
 <div class="card sp-service-card h-100">
-    <img class="card-img-top rounded-img sp-service-icon" src="{{ $illustration }}" alt="">
+    <object class="d-flex justify-content-center align-items-center card-img-top sp-service-icon" type="image/svg+xml" data="{{ $illustration }}">
+        <div class="error">
+            <i class="fa-solid fa-triangle-exclamation"></i>
+        </div>
+    </object>
     <div class="card-body">
         <h4 class="card-title">{{ $title }}</h4>
         {{ .Inner }}
diff --git a/static/images/logos/nlnet.svg b/static/images/logos/nlnet.svg
index 248e59c..4f0e4e9 100644
--- a/static/images/logos/nlnet.svg
+++ b/static/images/logos/nlnet.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <!-- Created using Karbon14, part of koffice: http://www.koffice.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="449px" height="168px">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="449px" height="170px" viewBox="0 0 449 168">
   <defs>
   </defs>
   <g id="Layer">