diff --git a/docs/developer-guide/img/c9d4b9cc-61f6-11e5-8b67-4691600188cd.png b/docs/developer-guide/img/c9d4b9cc-61f6-11e5-8b67-4691600188cd.png
new file mode 100644
index 0000000000..8337b8a44b
Binary files /dev/null and b/docs/developer-guide/img/c9d4b9cc-61f6-11e5-8b67-4691600188cd.png differ
diff --git a/docs/website/hugo.toml b/docs/website/hugo.toml
index 1688e269a0..fb1e94a6be 100644
--- a/docs/website/hugo.toml
+++ b/docs/website/hugo.toml
@@ -31,6 +31,12 @@ keywords = [
   "java",
 ]
 
+[params.assets]
+favicon = "favicon.ico"
+favicon16x16 = "favicon.ico"
+favicon32x32 = "favicon.ico"
+apple_touch_icon = "favicon.ico"
+
 [params.label]
 text = "CODENAME ONE"
 icon = "/uploads/Codename-One-White-Logo.png"
diff --git a/docs/website/layouts/partials/extend_head.html b/docs/website/layouts/partials/extend_head.html
index c1f1af7601..ca2d2b687d 100644
--- a/docs/website/layouts/partials/extend_head.html
+++ b/docs/website/layouts/partials/extend_head.html
@@ -3,8 +3,13 @@
 <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700;800&display=swap">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css">
 {{- if eq .Layout "developer-guide" -}}
-<link rel="stylesheet" href="/developer-guide/asciidoctor.css">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+  {{- $asciidoctorCssPath := "static/developer-guide/asciidoctor.css" -}}
+  {{- if fileExists $asciidoctorCssPath -}}
+<style>
+{{ readFile $asciidoctorCssPath | safeCSS }}
+</style>
+  {{- end -}}
 {{- end -}}
 {{- with site.GetPage "section" "blog" -}}
   {{- with .OutputFormats.Get "RSS" -}}
diff --git a/docs/website/themes/PaperMod/layouts/partials/head.html b/docs/website/themes/PaperMod/layouts/partials/head.html
index 4ea6885218..c512b1e4f2 100644
--- a/docs/website/themes/PaperMod/layouts/partials/head.html
+++ b/docs/website/themes/PaperMod/layouts/partials/head.html
@@ -95,11 +95,11 @@
 {{- end -}}
 
 {{- /* Favicons */}}
-<link rel="icon" href="{{ site.Params.assets.favicon | default "favicon.ico" | absURL }}">
-<link rel="icon" type="image/png" sizes="16x16" href="{{ site.Params.assets.favicon16x16 | default "favicon-16x16.png" | absURL }}">
-<link rel="icon" type="image/png" sizes="32x32" href="{{ site.Params.assets.favicon32x32 | default "favicon-32x32.png" | absURL }}">
-<link rel="apple-touch-icon" href="{{ site.Params.assets.apple_touch_icon | default "apple-touch-icon.png" | absURL }}">
-<link rel="mask-icon" href="{{ site.Params.assets.safari_pinned_tab | default "safari-pinned-tab.svg" | absURL }}">
+<link rel="icon" href="/favicon.ico">
+<link rel="icon" type="image/png" sizes="16x16" href="/favicon.ico">
+<link rel="icon" type="image/png" sizes="32x32" href="/favicon.ico">
+<link rel="apple-touch-icon" href="/favicon.ico">
+<link rel="mask-icon" href="/favicon.ico">
 <meta name="theme-color" content="{{ site.Params.assets.theme_color | default "#2e2e33" }}">
 <meta name="msapplication-TileColor" content="{{ site.Params.assets.msapplication_TileColor | default "#2e2e33" }}">
 
diff --git a/scripts/website/build.sh b/scripts/website/build.sh
index 4e1b73d916..afbc5c2b3a 100755
--- a/scripts/website/build.sh
+++ b/scripts/website/build.sh
@@ -68,7 +68,6 @@ build_developer_guide_for_site() {
       --require rouge \
       -a linkcss \
       -a copycss \
-      -a stylesheet=asciidoctor.css \
       -D "${html_out}" \
       -o developer-guide-full.html \
       docs/developer-guide/developer-guide.asciidoc
@@ -93,6 +92,14 @@ build_developer_guide_for_site() {
 
   if [ -f "${html_out}/asciidoctor.css" ]; then
     cp "${html_out}/asciidoctor.css" "${guide_dir}/asciidoctor.css"
+  elif command -v ruby >/dev/null 2>&1; then
+    ruby -rasciidoctor -e 'print Asciidoctor::Stylesheets.instance.primary_stylesheet_data' \
+      > "${guide_dir}/asciidoctor.css"
+  fi
+
+  if [ ! -s "${guide_dir}/asciidoctor.css" ]; then
+    echo "Asciidoctor stylesheet could not be generated for Developer Guide." >&2
+    exit 1
   fi
   # Keep guide assets under /developer-guide/ so relative image links (e.g. img/foo.png) resolve.
   rsync -a \