diff --git a/test/fixtures/screenshots/linux/desktop/404.png b/test/fixtures/screenshots/linux/desktop/404.png
index 4522a280e..68a49449c 100644
Binary files a/test/fixtures/screenshots/linux/desktop/404.png and b/test/fixtures/screenshots/linux/desktop/404.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/about_page/_footer.png b/test/fixtures/screenshots/linux/desktop/about_page/_footer.png
index 4b3602804..7c3637997 100644
Binary files a/test/fixtures/screenshots/linux/desktop/about_page/_footer.png and b/test/fixtures/screenshots/linux/desktop/about_page/_footer.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/about_page/_missions.png b/test/fixtures/screenshots/linux/desktop/about_page/_missions.png
index f18adc987..df65f66eb 100644
Binary files a/test/fixtures/screenshots/linux/desktop/about_page/_missions.png and b/test/fixtures/screenshots/linux/desktop/about_page/_missions.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/about_us.png b/test/fixtures/screenshots/linux/desktop/about_us.png
index 82894f6ed..8d1506457 100644
Binary files a/test/fixtures/screenshots/linux/desktop/about_us.png and b/test/fixtures/screenshots/linux/desktop/about_us.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/blog/index.png b/test/fixtures/screenshots/linux/desktop/blog/index.png
index 9caf9b6f4..23e084ccb 100644
Binary files a/test/fixtures/screenshots/linux/desktop/blog/index.png and b/test/fixtures/screenshots/linux/desktop/blog/index.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/blog/index/_pagination.png b/test/fixtures/screenshots/linux/desktop/blog/index/_pagination.png
index 8cc155eca..c8ea15983 100644
Binary files a/test/fixtures/screenshots/linux/desktop/blog/index/_pagination.png and b/test/fixtures/screenshots/linux/desktop/blog/index/_pagination.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/careers.png b/test/fixtures/screenshots/linux/desktop/careers.png
index edca905ab..467e8b002 100644
Binary files a/test/fixtures/screenshots/linux/desktop/careers.png and b/test/fixtures/screenshots/linux/desktop/careers.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/careers/_footer.png b/test/fixtures/screenshots/linux/desktop/careers/_footer.png
index 4cdc4d9f0..ba29d20c3 100644
Binary files a/test/fixtures/screenshots/linux/desktop/careers/_footer.png and b/test/fixtures/screenshots/linux/desktop/careers/_footer.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/careers/junior-ruby-on-rails-developer.png b/test/fixtures/screenshots/linux/desktop/careers/junior-ruby-on-rails-developer.png
index 28bab8990..6f38e89ab 100644
Binary files a/test/fixtures/screenshots/linux/desktop/careers/junior-ruby-on-rails-developer.png and b/test/fixtures/screenshots/linux/desktop/careers/junior-ruby-on-rails-developer.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/careers/junior-ruby-on-rails-developer/_footer.png b/test/fixtures/screenshots/linux/desktop/careers/junior-ruby-on-rails-developer/_footer.png
index d8c00e939..e2db778d3 100644
Binary files a/test/fixtures/screenshots/linux/desktop/careers/junior-ruby-on-rails-developer/_footer.png and b/test/fixtures/screenshots/linux/desktop/careers/junior-ruby-on-rails-developer/_footer.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/clients.png b/test/fixtures/screenshots/linux/desktop/clients.png
index 6ca66ea67..ace65a302 100644
Binary files a/test/fixtures/screenshots/linux/desktop/clients.png and b/test/fixtures/screenshots/linux/desktop/clients.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/clients/_footer.png b/test/fixtures/screenshots/linux/desktop/clients/_footer.png
index e77d5d624..64f95a552 100644
Binary files a/test/fixtures/screenshots/linux/desktop/clients/_footer.png and b/test/fixtures/screenshots/linux/desktop/clients/_footer.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/clients/_real-clients.png b/test/fixtures/screenshots/linux/desktop/clients/_real-clients.png
index 634661848..1beb233e6 100644
Binary files a/test/fixtures/screenshots/linux/desktop/clients/_real-clients.png and b/test/fixtures/screenshots/linux/desktop/clients/_real-clients.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/clients/agent-inbox/_footer.png b/test/fixtures/screenshots/linux/desktop/clients/agent-inbox/_footer.png
index 196d0d3c8..0ea65c010 100644
Binary files a/test/fixtures/screenshots/linux/desktop/clients/agent-inbox/_footer.png and b/test/fixtures/screenshots/linux/desktop/clients/agent-inbox/_footer.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/clients/agent-inbox/_overview.png b/test/fixtures/screenshots/linux/desktop/clients/agent-inbox/_overview.png
index b3a70ff15..82e0973ea 100644
Binary files a/test/fixtures/screenshots/linux/desktop/clients/agent-inbox/_overview.png and b/test/fixtures/screenshots/linux/desktop/clients/agent-inbox/_overview.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/contact_us.png b/test/fixtures/screenshots/linux/desktop/contact_us.png
index adddf56dc..e11b08fc5 100644
Binary files a/test/fixtures/screenshots/linux/desktop/contact_us.png and b/test/fixtures/screenshots/linux/desktop/contact_us.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/free_consultation.png b/test/fixtures/screenshots/linux/desktop/free_consultation.png
index 9bb0bcafb..857b44bc9 100644
Binary files a/test/fixtures/screenshots/linux/desktop/free_consultation.png and b/test/fixtures/screenshots/linux/desktop/free_consultation.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/homepage.png b/test/fixtures/screenshots/linux/desktop/homepage.png
index eabce57a5..71c5b98d5 100644
Binary files a/test/fixtures/screenshots/linux/desktop/homepage.png and b/test/fixtures/screenshots/linux/desktop/homepage.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/homepage/_clients.png b/test/fixtures/screenshots/linux/desktop/homepage/_clients.png
index c0dbbf2fe..b949a3bba 100644
Binary files a/test/fixtures/screenshots/linux/desktop/homepage/_clients.png and b/test/fixtures/screenshots/linux/desktop/homepage/_clients.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/homepage/_footer.png b/test/fixtures/screenshots/linux/desktop/homepage/_footer.png
index 34b73ce0a..d033ecd9d 100644
Binary files a/test/fixtures/screenshots/linux/desktop/homepage/_footer.png and b/test/fixtures/screenshots/linux/desktop/homepage/_footer.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/homepage/_services.png b/test/fixtures/screenshots/linux/desktop/homepage/_services.png
index c28114a66..fd6e88ae6 100644
Binary files a/test/fixtures/screenshots/linux/desktop/homepage/_services.png and b/test/fixtures/screenshots/linux/desktop/homepage/_services.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/homepage/_technologies.png b/test/fixtures/screenshots/linux/desktop/homepage/_technologies.png
index f641f3332..af0f33c8d 100644
Binary files a/test/fixtures/screenshots/linux/desktop/homepage/_technologies.png and b/test/fixtures/screenshots/linux/desktop/homepage/_technologies.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/nav/services.png b/test/fixtures/screenshots/linux/desktop/nav/services.png
index 74d61def7..0758640bb 100644
Binary files a/test/fixtures/screenshots/linux/desktop/nav/services.png and b/test/fixtures/screenshots/linux/desktop/nav/services.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/nav/use_cases.png b/test/fixtures/screenshots/linux/desktop/nav/use_cases.png
index fe6419f27..3d90322ca 100644
Binary files a/test/fixtures/screenshots/linux/desktop/nav/use_cases.png and b/test/fixtures/screenshots/linux/desktop/nav/use_cases.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/privacy-policy.png b/test/fixtures/screenshots/linux/desktop/privacy-policy.png
index 9654ff544..e957f28d8 100644
Binary files a/test/fixtures/screenshots/linux/desktop/privacy-policy.png and b/test/fixtures/screenshots/linux/desktop/privacy-policy.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/services/_footer.png b/test/fixtures/screenshots/linux/desktop/services/_footer.png
index 51dd52237..d7fb18a07 100644
Binary files a/test/fixtures/screenshots/linux/desktop/services/_footer.png and b/test/fixtures/screenshots/linux/desktop/services/_footer.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/services/_overview.png b/test/fixtures/screenshots/linux/desktop/services/_overview.png
index f1d5029dc..3b4b68262 100644
Binary files a/test/fixtures/screenshots/linux/desktop/services/_overview.png and b/test/fixtures/screenshots/linux/desktop/services/_overview.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/services/app_web_development.png b/test/fixtures/screenshots/linux/desktop/services/app_web_development.png
index a70d85954..d5be599be 100644
Binary files a/test/fixtures/screenshots/linux/desktop/services/app_web_development.png and b/test/fixtures/screenshots/linux/desktop/services/app_web_development.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/services/fractional-cto/_clients-case-studies.png b/test/fixtures/screenshots/linux/desktop/services/fractional-cto/_clients-case-studies.png
index 3eced15db..10a759c0d 100644
Binary files a/test/fixtures/screenshots/linux/desktop/services/fractional-cto/_clients-case-studies.png and b/test/fixtures/screenshots/linux/desktop/services/fractional-cto/_clients-case-studies.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/services/fractional-cto/_footer.png b/test/fixtures/screenshots/linux/desktop/services/fractional-cto/_footer.png
index 885ff814e..feb9e6537 100644
Binary files a/test/fixtures/screenshots/linux/desktop/services/fractional-cto/_footer.png and b/test/fixtures/screenshots/linux/desktop/services/fractional-cto/_footer.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/services/fractional-cto/_overview.png b/test/fixtures/screenshots/linux/desktop/services/fractional-cto/_overview.png
index b672947e5..587974285 100644
Binary files a/test/fixtures/screenshots/linux/desktop/services/fractional-cto/_overview.png and b/test/fixtures/screenshots/linux/desktop/services/fractional-cto/_overview.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/services/fractional_cto.png b/test/fixtures/screenshots/linux/desktop/services/fractional_cto.png
index e939448e0..90819883a 100644
Binary files a/test/fixtures/screenshots/linux/desktop/services/fractional_cto.png and b/test/fixtures/screenshots/linux/desktop/services/fractional_cto.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/use-cases/_footer.png b/test/fixtures/screenshots/linux/desktop/use-cases/_footer.png
index 089bcd10e..82e452169 100644
Binary files a/test/fixtures/screenshots/linux/desktop/use-cases/_footer.png and b/test/fixtures/screenshots/linux/desktop/use-cases/_footer.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/use-cases/_overview.png b/test/fixtures/screenshots/linux/desktop/use-cases/_overview.png
index ee0cfd9d3..4531a3201 100644
Binary files a/test/fixtures/screenshots/linux/desktop/use-cases/_overview.png and b/test/fixtures/screenshots/linux/desktop/use-cases/_overview.png differ
diff --git a/test/fixtures/screenshots/linux/desktop/use-cases/startup-mvp-prototyping-development/_footer.png b/test/fixtures/screenshots/linux/desktop/use-cases/startup-mvp-prototyping-development/_footer.png
index 125a7ed8a..852e33ae0 100644
Binary files a/test/fixtures/screenshots/linux/desktop/use-cases/startup-mvp-prototyping-development/_footer.png and b/test/fixtures/screenshots/linux/desktop/use-cases/startup-mvp-prototyping-development/_footer.png differ
diff --git a/test/fixtures/screenshots/linux/mobile/about_page/achievements.png b/test/fixtures/screenshots/linux/mobile/about_page/achievements.png
index 16e2f3524..e23fb7cce 100644
Binary files a/test/fixtures/screenshots/linux/mobile/about_page/achievements.png and b/test/fixtures/screenshots/linux/mobile/about_page/achievements.png differ
diff --git a/test/fixtures/screenshots/linux/mobile/about_page/values.png b/test/fixtures/screenshots/linux/mobile/about_page/values.png
index 1b158877e..8fde0ba72 100644
Binary files a/test/fixtures/screenshots/linux/mobile/about_page/values.png and b/test/fixtures/screenshots/linux/mobile/about_page/values.png differ
diff --git a/test/fixtures/screenshots/linux/mobile/blog/index.png b/test/fixtures/screenshots/linux/mobile/blog/index.png
index 038135316..17d1bf7cc 100644
Binary files a/test/fixtures/screenshots/linux/mobile/blog/index.png and b/test/fixtures/screenshots/linux/mobile/blog/index.png differ
diff --git a/test/fixtures/screenshots/linux/mobile/blog/index/_pagination.png b/test/fixtures/screenshots/linux/mobile/blog/index/_pagination.png
index e06f2d042..4e6e4a1a0 100644
Binary files a/test/fixtures/screenshots/linux/mobile/blog/index/_pagination.png and b/test/fixtures/screenshots/linux/mobile/blog/index/_pagination.png differ
diff --git a/test/fixtures/screenshots/linux/mobile/blog/post.png b/test/fixtures/screenshots/linux/mobile/blog/post.png
index 49cd764dd..ad47753b9 100644
Binary files a/test/fixtures/screenshots/linux/mobile/blog/post.png and b/test/fixtures/screenshots/linux/mobile/blog/post.png differ
diff --git a/test/fixtures/screenshots/linux/mobile/careers.png b/test/fixtures/screenshots/linux/mobile/careers.png
index 657c0f802..550d29537 100644
Binary files a/test/fixtures/screenshots/linux/mobile/careers.png and b/test/fixtures/screenshots/linux/mobile/careers.png differ
diff --git a/test/fixtures/screenshots/linux/mobile/contact_us.png b/test/fixtures/screenshots/linux/mobile/contact_us.png
index 1094fd82f..1f8fccdf6 100644
Binary files a/test/fixtures/screenshots/linux/mobile/contact_us.png and b/test/fixtures/screenshots/linux/mobile/contact_us.png differ
diff --git a/test/fixtures/screenshots/linux/mobile/free_consultation.png b/test/fixtures/screenshots/linux/mobile/free_consultation.png
index 3a86ee39f..069a1fd27 100644
Binary files a/test/fixtures/screenshots/linux/mobile/free_consultation.png and b/test/fixtures/screenshots/linux/mobile/free_consultation.png differ
diff --git a/test/fixtures/screenshots/linux/mobile/homepage.png b/test/fixtures/screenshots/linux/mobile/homepage.png
index 11f229381..4c0a7e992 100644
Binary files a/test/fixtures/screenshots/linux/mobile/homepage.png and b/test/fixtures/screenshots/linux/mobile/homepage.png differ
diff --git a/test/fixtures/screenshots/linux/mobile/nav/hamburger_menu.png b/test/fixtures/screenshots/linux/mobile/nav/hamburger_menu.png
index 287e5c2d7..0cb1a060d 100644
Binary files a/test/fixtures/screenshots/linux/mobile/nav/hamburger_menu.png and b/test/fixtures/screenshots/linux/mobile/nav/hamburger_menu.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/about_page/_footer.png b/test/fixtures/screenshots/macos/desktop/about_page/_footer.png
index 7a4deb578..26c8d3d67 100644
Binary files a/test/fixtures/screenshots/macos/desktop/about_page/_footer.png and b/test/fixtures/screenshots/macos/desktop/about_page/_footer.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/careers/_footer.png b/test/fixtures/screenshots/macos/desktop/careers/_footer.png
index 46c1e825c..7551db485 100644
Binary files a/test/fixtures/screenshots/macos/desktop/careers/_footer.png and b/test/fixtures/screenshots/macos/desktop/careers/_footer.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/careers/junior-ruby-on-rails-developer/_footer.png b/test/fixtures/screenshots/macos/desktop/careers/junior-ruby-on-rails-developer/_footer.png
index a0ce44150..faeccec12 100644
Binary files a/test/fixtures/screenshots/macos/desktop/careers/junior-ruby-on-rails-developer/_footer.png and b/test/fixtures/screenshots/macos/desktop/careers/junior-ruby-on-rails-developer/_footer.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/clients/_footer.png b/test/fixtures/screenshots/macos/desktop/clients/_footer.png
index 2b525ba39..a1fb75d0a 100644
Binary files a/test/fixtures/screenshots/macos/desktop/clients/_footer.png and b/test/fixtures/screenshots/macos/desktop/clients/_footer.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/clients/agent-inbox/_footer.png b/test/fixtures/screenshots/macos/desktop/clients/agent-inbox/_footer.png
index f85570255..192866148 100644
Binary files a/test/fixtures/screenshots/macos/desktop/clients/agent-inbox/_footer.png and b/test/fixtures/screenshots/macos/desktop/clients/agent-inbox/_footer.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/homepage.png b/test/fixtures/screenshots/macos/desktop/homepage.png
index c85c9cfe7..72cbdb6b2 100644
Binary files a/test/fixtures/screenshots/macos/desktop/homepage.png and b/test/fixtures/screenshots/macos/desktop/homepage.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/homepage/_clients.png b/test/fixtures/screenshots/macos/desktop/homepage/_clients.png
index 455c0741e..b9e8fd904 100644
Binary files a/test/fixtures/screenshots/macos/desktop/homepage/_clients.png and b/test/fixtures/screenshots/macos/desktop/homepage/_clients.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/homepage/_cta-contact_us.png b/test/fixtures/screenshots/macos/desktop/homepage/_cta-contact_us.png
index 5eb6aa484..576ea5ad9 100644
Binary files a/test/fixtures/screenshots/macos/desktop/homepage/_cta-contact_us.png and b/test/fixtures/screenshots/macos/desktop/homepage/_cta-contact_us.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/homepage/_footer.png b/test/fixtures/screenshots/macos/desktop/homepage/_footer.png
index fea5a5503..ecda06ff1 100644
Binary files a/test/fixtures/screenshots/macos/desktop/homepage/_footer.png and b/test/fixtures/screenshots/macos/desktop/homepage/_footer.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/homepage/_technologies.png b/test/fixtures/screenshots/macos/desktop/homepage/_technologies.png
index 550698409..1c3c0089b 100644
Binary files a/test/fixtures/screenshots/macos/desktop/homepage/_technologies.png and b/test/fixtures/screenshots/macos/desktop/homepage/_technologies.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/nav/services.png b/test/fixtures/screenshots/macos/desktop/nav/services.png
index f020839e1..1e709e1f2 100644
Binary files a/test/fixtures/screenshots/macos/desktop/nav/services.png and b/test/fixtures/screenshots/macos/desktop/nav/services.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/nav/use_cases.png b/test/fixtures/screenshots/macos/desktop/nav/use_cases.png
index 926b38513..510dad5e2 100644
Binary files a/test/fixtures/screenshots/macos/desktop/nav/use_cases.png and b/test/fixtures/screenshots/macos/desktop/nav/use_cases.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/services/_footer.png b/test/fixtures/screenshots/macos/desktop/services/_footer.png
index 29b0df0b7..193796c8d 100644
Binary files a/test/fixtures/screenshots/macos/desktop/services/_footer.png and b/test/fixtures/screenshots/macos/desktop/services/_footer.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/services/fractional-cto/_clients-case-studies.png b/test/fixtures/screenshots/macos/desktop/services/fractional-cto/_clients-case-studies.png
index da8a8a01f..415a75438 100644
Binary files a/test/fixtures/screenshots/macos/desktop/services/fractional-cto/_clients-case-studies.png and b/test/fixtures/screenshots/macos/desktop/services/fractional-cto/_clients-case-studies.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/services/fractional-cto/_footer.png b/test/fixtures/screenshots/macos/desktop/services/fractional-cto/_footer.png
index a3c2df920..e32cf709b 100644
Binary files a/test/fixtures/screenshots/macos/desktop/services/fractional-cto/_footer.png and b/test/fixtures/screenshots/macos/desktop/services/fractional-cto/_footer.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/use-cases/_footer.png b/test/fixtures/screenshots/macos/desktop/use-cases/_footer.png
index b689e38f3..aad484a75 100644
Binary files a/test/fixtures/screenshots/macos/desktop/use-cases/_footer.png and b/test/fixtures/screenshots/macos/desktop/use-cases/_footer.png differ
diff --git a/test/fixtures/screenshots/macos/desktop/use-cases/startup-mvp-prototyping-development/_footer.png b/test/fixtures/screenshots/macos/desktop/use-cases/startup-mvp-prototyping-development/_footer.png
index 43e9ef86e..74d25e6ee 100644
Binary files a/test/fixtures/screenshots/macos/desktop/use-cases/startup-mvp-prototyping-development/_footer.png and b/test/fixtures/screenshots/macos/desktop/use-cases/startup-mvp-prototyping-development/_footer.png differ
diff --git a/themes/beaver/assets/css/companies.css b/themes/beaver/assets/css/companies.css
index b76e5b31c..2ead7aff4 100644
--- a/themes/beaver/assets/css/companies.css
+++ b/themes/beaver/assets/css/companies.css
@@ -10,16 +10,21 @@
 
 .client-logos > .client-logo {
   display: flex;
-  height: 4rem;
+  height: 3rem;
   justify-content: center;
-  max-width: var(--p-max-width);
+  align-items: center;
 }
 
 .client-logos > .client-logo > .image {
-  align-self: center;
-  max-height: 50%;
-  max-width: 75%;
+  max-height: 100%;
+  max-width: 100%;
   width: auto;
-
   height: auto;
+  object-fit: contain;
+}
+
+@media (max-width: 860px) {
+  .client-logos {
+    grid-template-columns: repeat(2, 1fr);
+  }
 }
diff --git a/themes/beaver/assets/css/footer.css b/themes/beaver/assets/css/footer.css
index 8aed2afce..a2400e5d6 100644
--- a/themes/beaver/assets/css/footer.css
+++ b/themes/beaver/assets/css/footer.css
@@ -88,7 +88,9 @@
 }
 
 .footer-component .social-icons svg {
-    fill: #fff
+    fill: #fff;
+    width: 100%;
+    height: 100%
 }
 
 .footer-component .footer-bottom {
diff --git a/themes/beaver/assets/css/homepage-layout.css b/themes/beaver/assets/css/homepage-layout.css
index 4f21973aa..bdff15107 100644
--- a/themes/beaver/assets/css/homepage-layout.css
+++ b/themes/beaver/assets/css/homepage-layout.css
@@ -2678,4 +2678,4 @@ span.pp-accordion-button-icon {
   .post-title { font-size: 1em; }
   .post-content > div:last-child { display: none; }
   .post-meta .post-tags { display: none; }
-}
+}
\ No newline at end of file
diff --git a/themes/beaver/assets/css/homepage-sections.css b/themes/beaver/assets/css/homepage-sections.css
index 2b2311f80..95b318baf 100644
--- a/themes/beaver/assets/css/homepage-sections.css
+++ b/themes/beaver/assets/css/homepage-sections.css
@@ -1,4 +1,3 @@
 /* Homepage semantic hooks migration layer.
- * Intentionally starts empty to keep behavior identical.
  * Future section-level styles should target .jt-home-* classes here.
  */
diff --git a/themes/beaver/layouts/baseof.html b/themes/beaver/layouts/baseof.html
index 2945ce7a0..a5fc10409 100644
--- a/themes/beaver/layouts/baseof.html
+++ b/themes/beaver/layouts/baseof.html
@@ -13,14 +13,13 @@
     {{ partialCached "page/favicons.html" . "favicons" }}
     {{ partial "page/analytics.html" . }}
     {{ $favicon := resources.Get "/img/favicon/favicon.ico" | fingerprint "md5" }}
-    <link rel="shortcut icon" href="{{ $favicon.RelPermalink }}" />
+    <link rel="shortcut icon" href="{{ $favicon.Permalink }}" />
     <meta name="msapplication-TileColor" content="#00aba9" />
     {{ $browserConfig := resources.Get "img/favicon/browserconfig.xml" | resources.ExecuteAsTemplate "browserconfig.xml" . | fingerprint "md5" }}
     <meta
       name="msapplication-config"
-      content="{{ $browserConfig.RelPermalink }}" />
+      content="{{ $browserConfig.Permalink }}" />
     <meta name="theme-color" content="#ffffff" />
-    <link rel="manifest" href="/manifest.json" />
 
     {{- $navigationResources := slice (resources.Get "css/navigation.css") -}}
     {{ partialCached "assets/css-processor.html" (dict "resources" $navigationResources "bundleName" "navigation" "context" .) "navigation" }}
diff --git a/themes/beaver/layouts/partials/assets/css-processor.html b/themes/beaver/layouts/partials/assets/css-processor.html
index 493b0b3ae..030a5d653 100644
--- a/themes/beaver/layouts/partials/assets/css-processor.html
+++ b/themes/beaver/layouts/partials/assets/css-processor.html
@@ -9,7 +9,7 @@
 
 <link
   rel="stylesheet"
-  href="{{ $bundle.RelPermalink }}"
+  href="{{ $bundle.Permalink }}"
   {{- if hugo.IsProduction }}
     integrity="{{ $bundle.Data.Integrity }}"
   {{- end }} />
diff --git a/themes/beaver/layouts/partials/assets/js-processor.html b/themes/beaver/layouts/partials/assets/js-processor.html
index 75830885b..6e3d04a82 100644
--- a/themes/beaver/layouts/partials/assets/js-processor.html
+++ b/themes/beaver/layouts/partials/assets/js-processor.html
@@ -31,7 +31,7 @@
   {{- end -}}
   
   {{/* Output script tag with appropriate attributes */}}
-  <script src="{{ $processed.RelPermalink }}"
+  <script src="{{ $processed.Permalink }}"
           {{- if $defer }} defer{{- end }}
           {{- if $async }} async{{- end }}
           {{- if hugo.IsProduction }} integrity="{{ $processed.Data.Integrity }}" crossorigin="anonymous"{{- end }}>
diff --git a/themes/beaver/layouts/partials/components/testimonial.html b/themes/beaver/layouts/partials/components/testimonial.html
index dc9b89752..9ce4cd236 100644
--- a/themes/beaver/layouts/partials/components/testimonial.html
+++ b/themes/beaver/layouts/partials/components/testimonial.html
@@ -35,8 +35,8 @@
 {{- $testimonialsData := hugo.Data.testimonials -}}
 
 {{- $nonCriticalCSS := resources.Get "css/vendors/swiper.min.css" | fingerprint "md5" -}}
-<link fetchpriority="low" rel="preload" href="{{ $nonCriticalCSS.RelPermalink }}" as="style" onload="this.onload=null;this.rel='stylesheet'">
-<noscript><link rel="stylesheet" href="{{ $nonCriticalCSS.RelPermalink }}"></noscript>
+<link fetchpriority="low" rel="preload" href="{{ $nonCriticalCSS.Permalink }}" as="style" onload="this.onload=null;this.rel='stylesheet'">
+<noscript><link rel="stylesheet" href="{{ $nonCriticalCSS.Permalink }}"></noscript>
 
 <div class="fl-col-group testimonial__header fl-col-group-custom-width" data-node="{{ $node_id }}-header">
   <div class="fl-col testimonial__header-col fl-col-small-custom-width" data-node="{{ $node_id }}-header-col">
diff --git a/themes/beaver/layouts/partials/img/generic.html b/themes/beaver/layouts/partials/img/generic.html
index bbeb2f41e..7dcbe8208 100644
--- a/themes/beaver/layouts/partials/img/generic.html
+++ b/themes/beaver/layouts/partials/img/generic.html
@@ -11,14 +11,14 @@
 {{ range $widths }}
   {{ if lt . $originalWidth }}
     {{ $resized := $image.Resize (printf "%dx webp q75" .) }}
-    {{ $srcset = printf "%s%s %dw, " $srcset $resized.RelPermalink . }}
+    {{ $srcset = printf "%s%s %dw, " $srcset $resized.Permalink . }}
   {{ end }}
 {{ end }}
 
-{{ $srcset = printf "%s%s %dw" $srcset $imageWebP.RelPermalink $originalWidth }}
+{{ $srcset = printf "%s%s %dw" $srcset $imageWebP.Permalink $originalWidth }}
 
 <img {{ $attributes | safeHTMLAttr }}
-     src="{{ $imageWebP.RelPermalink }}"
+     src="{{ $imageWebP.Permalink }}"
      alt="{{ $title }}"
      width="{{ $image.Width }}"
      height="{{ $image.Height }}"
diff --git a/themes/beaver/layouts/partials/page/favicons.html b/themes/beaver/layouts/partials/page/favicons.html
index 7f02166e7..ced0937cc 100644
--- a/themes/beaver/layouts/partials/page/favicons.html
+++ b/themes/beaver/layouts/partials/page/favicons.html
@@ -1,5 +1,5 @@
-    <link rel="apple-touch-icon" sizes="180x180" href="{{ (resources.Get "img/favicon/apple-touch-icon.png" | fingerprint "md5").RelPermalink }}">
-    <link rel="icon" type="image/png" sizes="32x32" href="{{ (resources.Get "img/favicon/favicon-32x32.png" | fingerprint "md5").RelPermalink }}">
-    <link rel="icon" type="image/png" sizes="16x16" href="{{ (resources.Get "img/favicon/favicon-16x16.png" | fingerprint "md5").RelPermalink }}">
-    <link rel="manifest" href="{{ (resources.Get "img/favicon/site.webmanifest" | resources.ExecuteAsTemplate "site.webmanifest" . | fingerprint "md5").RelPermalink }}">
-    <link rel="mask-icon" href="{{ (resources.Get "img/favicon/safari-pinned-tab.svg" | fingerprint "md5").RelPermalink }}" color="#5bbad5">
\ No newline at end of file
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ (resources.Get "img/favicon/apple-touch-icon.png" | fingerprint "md5").Permalink }}">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ (resources.Get "img/favicon/favicon-32x32.png" | fingerprint "md5").Permalink }}">
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ (resources.Get "img/favicon/favicon-16x16.png" | fingerprint "md5").Permalink }}">
+    <link rel="manifest" href="{{ (resources.Get "img/favicon/site.webmanifest" | resources.ExecuteAsTemplate "site.webmanifest" . | fingerprint "md5").Permalink }}">
+    <link rel="mask-icon" href="{{ (resources.Get "img/favicon/safari-pinned-tab.svg" | fingerprint "md5").Permalink }}" color="#5bbad5">
diff --git a/themes/beaver/layouts/partials/svgiw.html b/themes/beaver/layouts/partials/svgiw.html
index c39e9cc52..b5994092e 100644
--- a/themes/beaver/layouts/partials/svgiw.html
+++ b/themes/beaver/layouts/partials/svgiw.html
@@ -1,12 +1,12 @@
 {{ $svg := .svg }}
 {{ $svgPath := printf "img/icons/%s.svg" $svg }}
 {{ $svgFile := resources.Get $svgPath | fingerprint "md5" }}
-{{ $svgRelPermalink := $svgFile.RelPermalink }}
+{{ $svgPermalink := $svgFile.Permalink }}
 
 <img
   fetchpriority="low"
   loading="lazy"
-  src="{{ $svgRelPermalink }}"
+  src="{{ $svgPermalink }}"
   {{ with .width }}width="{{ . }}"{{ end }}
   {{ with .height }}height="{{ . }}"{{ end }}
   alt="{{ with .alt }}