7 files changed, 18 insertions, 5 deletions
diff --git a/documentation/themes/beastie/layouts/articles/baseof.html b/documentation/themes/beastie/layouts/articles/baseof.html
index 80bebc87f0..e9d5f835ec 100644
--- a/documentation/themes/beastie/layouts/articles/baseof.html
+++ b/documentation/themes/beastie/layouts/articles/baseof.html
@@ -27,7 +27,7 @@
     <meta property="og:title" content="{{ if .IsHome }}{{ .Site.Params.Title }}{{ else }}{{ .Title }}{{ end }}" />
     <meta property="og:description" content="{{ if .IsHome }}{{ .Site.Params.description }}{{ else }}{{ .Description }}{{ end }}" />
     <meta property="og:type" content="website"/>
-    <meta property="og:image" content="{{ absLangURL ($.Site.BaseURL) }}favicon.ico"/>
+    <meta property="og:image" content="{{ absLangURL ($.Site.BaseURL) }}images/logo-164x164.png"/>
     <meta property="og:image:alt" content="FreeBSD Logo">
     <meta property="og:locale" content="{{ $.Site.Language.Lang | default "en" }}" />
     <meta property="og:url" content="{{ .Permalink }}" />
diff --git a/documentation/themes/beastie/layouts/books/baseof.html b/documentation/themes/beastie/layouts/books/baseof.html
index 50e97a6ea3..ccaa8b56a2 100644
--- a/documentation/themes/beastie/layouts/books/baseof.html
+++ b/documentation/themes/beastie/layouts/books/baseof.html
@@ -27,7 +27,7 @@
     <meta property="og:title" content="{{ if .IsHome }}{{ .Site.Params.Title }}{{ else }}{{ .Title }}{{ end }}" />
     <meta property="og:description" content="{{ if .IsHome }}{{ .Site.Params.description }}{{ else }}{{ .Description }}{{ end }}" />
     <meta property="og:type" content="website"/>
-    <meta property="og:image" content="{{ absLangURL ($.Site.BaseURL) }}favicon.ico"/>
+    <meta property="og:image" content="{{ absLangURL ($.Site.BaseURL) }}images/logo-164x164.png"/>
     <meta property="og:image:alt" content="FreeBSD Logo">
     <meta property="og:locale" content="{{ $.Site.Language.Lang | default "en" }}" />
     <meta property="og:url" content="{{ .Permalink }}" />
diff --git a/documentation/themes/beastie/layouts/partials/site-head.html b/documentation/themes/beastie/layouts/partials/site-head.html
index 41d83c1544..dca0017bfa 100644
--- a/documentation/themes/beastie/layouts/partials/site-head.html
+++ b/documentation/themes/beastie/layouts/partials/site-head.html
@@ -23,8 +23,8 @@
   <meta name="twitter:url" content="https://twitter.com/freebsd"/>
   <meta property="og:title" content="{{ if .IsHome }}{{ .Site.Params.Title }}{{ else }}{{ .Title }}{{ end }}" />
   <meta property="og:description" content="{{ if .IsHome }}{{ .Site.Params.description }}{{ else }}{{ .Description }}{{ end }}" />
-  <meta property="og:type" content="website"/>
-  <meta property="og:image" content="{{ absLangURL ($.Site.BaseURL) }}favicon.ico"/>
+  <meta property="og:type" content="article"/>
+  <meta property="og:image" content="{{ absLangURL ($.Site.BaseURL) }}images/logo-164x164.png"/>
   <meta property="og:image:alt" content="FreeBSD Logo">
   <meta property="og:locale" content="{{ $.Site.Language.Lang | default "en" }}" />
   <meta property="og:url" content="{{ .Permalink }}" />
diff --git a/documentation/themes/beastie/static/images/logo-164x164.png b/documentation/themes/beastie/static/images/logo-164x164.png
new file mode 100644
index 0000000000..c6868c397f
--- /dev/null
+++ b/documentation/themes/beastie/static/images/logo-164x164.png
diff --git a/website/themes/beastie/layouts/partials/site-head.html b/website/themes/beastie/layouts/partials/site-head.html
index 934dafe12d..6977fd6fcf 100644
--- a/website/themes/beastie/layouts/partials/site-head.html
+++ b/website/themes/beastie/layouts/partials/site-head.html
@@ -3,7 +3,7 @@
   <meta name="description" content="FreeBSD is an operating system used to power modern servers, desktops, and embedded platforms." />
   <meta name="keywords" content="FreeBSD, BSD, UNIX, open source" />
 
-  <meta name="copyright" content="1995-2020 The FreeBSD Foundation">
+  <meta name="copyright" content="1995-2021 The FreeBSD Foundation">
 
   <title>{{ with .Params.Title }}{{ . }} | {{ end }} {{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
 
@@ -17,5 +17,18 @@
   <link rel="search" type="application/opensearchdescription+xml" href="{{ absLangURL ($.Site.BaseURL) }}opensearch/message-id.xml" title="FreeBSD Mailing List Message-ID Search">
   <link rel="search" type="application/opensearchdescription+xml" href="{{ absLangURL ($.Site.BaseURL) }}opensearch/markmail.xml" title="FreeBSD Mailing List Search by MarkMail">
 
+  <!-- SEO -->
+  <meta name="twitter:card" content="summary_large_image"/>
+  <meta name="twitter:site" content="@freebsd"/>
+  <meta property="og:title" content="{{ if .Params.Title }}{{ .Params.Title }}{{ else }}{{ .Site.Title }}{{ end }}" />
+  <meta property="og:description" content="FreeBSD is an operating system used to power modern servers, desktops, and embedded platforms." />
+  <meta property="og:type" content="article"/>
+  <meta property="og:image" content="{{ absLangURL ($.Site.BaseURL) }}images/logo-thepowertoserve.png"/>
+  <meta property="og:image:alt" content="FreeBSD - The Power to Serve - Server - Desktop - Embedded">
+  <meta property="og:locale" content="{{ $.Site.Language.Lang | default "en" }}" />
+  <meta property="og:url" content="{{ .Permalink }}" />
+  <meta property="og:site_name" content="{{ .Site.Title }}" />
+  <!-- END SEO -->
+
   <script src="{{ absLangURL ($.Site.BaseURL) }}js/google.js"></script>
 </head>
diff --git a/website/themes/beastie/static/images/logo-164x164.png b/website/themes/beastie/static/images/logo-164x164.png
new file mode 100644
index 0000000000..c6868c397f
--- /dev/null
+++ b/website/themes/beastie/static/images/logo-164x164.png
diff --git a/website/themes/beastie/static/images/logo-thepowertoserve.png b/website/themes/beastie/static/images/logo-thepowertoserve.png
new file mode 100644
index 0000000000..2dc1a89518
--- /dev/null
+++ b/website/themes/beastie/static/images/logo-thepowertoserve.png