diff --git a/LICENSE.md b/LICENSE.md
index 92e760f..da71008 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -5,7 +5,7 @@ Due to the wiki-like nature of this website, pages usually have multiple authors
 frequently. Changes to the original versions of the works as well as their individual authors can be
 looked up in [https://codeberg.org/Codeberg/Documentation/commits/branch/master](the website's commit history).
 
-The Codeberg logos in this website are derivative works of mray's Codeberg Logo,
+The Codeberg logos in this website are by mray,
 licensed under [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.en).
 
 Codeberg and the Codeberg Logo are trademarks of Codeberg e.V.
\ No newline at end of file
diff --git a/assets/css/codeberg-docs.css b/assets/css/codeberg-docs.css
index 6718f8c..7b1270f 100644
--- a/assets/css/codeberg-docs.css
+++ b/assets/css/codeberg-docs.css
@@ -6,6 +6,9 @@ header > .container { display: flex; align-items: center; }
 #header-action-buttons { text-align: right; }
 #header-logo { height: 100%; padding: 10px; padding-left: 0; box-sizing: border-box; margin-left: 10px; }
 #header-logo img { height: 100%; }
+#header-logo-container { display: flex; align-items: center; height: 100%; }
+#header-logo a { text-decoration: none; }
+#logo-heading { color: #2185d0; font-weight: 700; font-size: 28pt; margin-left: 10px; }
 #contents-button { display: none; }
 
 main { flex: 1; }
diff --git a/assets/images/logo/codeberg-docs.afdesign b/assets/images/logo/codeberg-docs.afdesign
deleted file mode 100644
index 8e618aa..0000000
Binary files a/assets/images/logo/codeberg-docs.afdesign and /dev/null differ
diff --git a/assets/images/logo/codeberg-docs.svg b/assets/images/logo/codeberg-docs.svg
deleted file mode 100644
index f355b39..0000000
--- a/assets/images/logo/codeberg-docs.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 207 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(0.499021,0,0,0.499021,13.578,-16.3653)">
-        <g id="layer1">
-            <g>
-                <g id="g6933" transform="matrix(1.40064,0,0,1.40064,-15751.3,2671.17)">
-                    <g id="path6733" transform="matrix(0.264583,0,0,0.264583,0,0)">
-                        <path d="M42519.3,-7078.79C42518.9,-7078.78 42518.5,-7078.53 42518.5,-7078.22C42518.5,-7078.19 42518.5,-7078.15 42518.5,-7078.11L42552.1,-6952.23C42568.4,-6959.22 42582.1,-6971 42591.5,-6985.99L42519.9,-7078.51C42519.8,-7078.69 42519.6,-7078.79 42519.3,-7078.79Z" style="fill:url(#_Linear1);fill-rule:nonzero;"/>
-                    </g>
-                    <g id="circle6810" transform="matrix(0.264583,0,0,0.264583,0,0)">
-                        <path d="M42517.3,-7119.48C42469.6,-7119.3 42430.5,-7080 42430.5,-7032.3C42430.5,-7015.92 42435.1,-6999.87 42443.8,-6985.99L42516.5,-7079.97C42516.7,-7080.28 42517.2,-7080.48 42517.6,-7080.48C42518.1,-7080.48 42518.6,-7080.28 42518.8,-7079.97L42591.5,-6985.99C42600.2,-6999.87 42604.8,-7015.92 42604.8,-7032.3C42604.8,-7080.13 42565.5,-7119.48 42517.6,-7119.48C42517.5,-7119.48 42517.4,-7119.48 42517.3,-7119.48Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                </g>
-                <g transform="matrix(2.07335,0,0,2.07335,-30.3925,12.2647)">
-                    <g transform="matrix(26.3007,0,0,26.3007,37.6789,33.1733)">
-                        <path d="M0.08,-0.632C0.113,-0.641 0.17,-0.645 0.253,-0.645C0.367,-0.645 0.454,-0.612 0.514,-0.545C0.565,-0.488 0.591,-0.414 0.591,-0.323C0.591,-0.209 0.558,-0.123 0.493,-0.066C0.434,-0.014 0.351,0.012 0.245,0.012C0.178,0.012 0.123,0.008 0.08,-0.001L0.08,-0.632ZM0.211,-0.096C0.224,-0.093 0.241,-0.091 0.261,-0.091C0.39,-0.091 0.454,-0.167 0.454,-0.319C0.454,-0.394 0.433,-0.452 0.39,-0.492C0.355,-0.524 0.311,-0.54 0.258,-0.54C0.243,-0.54 0.227,-0.538 0.211,-0.535L0.211,-0.096Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                    <g transform="matrix(26.3007,0,0,26.3007,53.2226,33.1733)">
-                        <path d="M0.264,-0.466C0.339,-0.466 0.397,-0.44 0.438,-0.387C0.473,-0.343 0.49,-0.289 0.49,-0.226C0.49,-0.152 0.464,-0.092 0.413,-0.046C0.37,-0.007 0.321,0.012 0.264,0.012C0.198,0.012 0.143,-0.013 0.098,-0.062C0.058,-0.107 0.038,-0.161 0.038,-0.226C0.038,-0.299 0.06,-0.359 0.105,-0.404C0.146,-0.445 0.199,-0.466 0.264,-0.466ZM0.264,-0.082C0.329,-0.082 0.361,-0.13 0.361,-0.226C0.361,-0.326 0.329,-0.376 0.264,-0.376C0.199,-0.376 0.167,-0.326 0.167,-0.226C0.167,-0.13 0.199,-0.082 0.264,-0.082Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                    <g transform="matrix(26.3007,0,0,26.3007,66.0573,33.1733)">
-                        <path d="M0.449,-0.058C0.402,-0.011 0.346,0.012 0.281,0.012C0.204,0.012 0.142,-0.013 0.097,-0.062C0.058,-0.105 0.038,-0.16 0.038,-0.225C0.038,-0.298 0.063,-0.358 0.114,-0.405C0.158,-0.446 0.212,-0.466 0.275,-0.466C0.345,-0.466 0.401,-0.444 0.444,-0.4L0.406,-0.332C0.372,-0.362 0.335,-0.377 0.295,-0.377C0.258,-0.377 0.227,-0.363 0.203,-0.334C0.179,-0.305 0.167,-0.267 0.167,-0.222C0.167,-0.18 0.179,-0.146 0.203,-0.118C0.226,-0.092 0.256,-0.078 0.293,-0.078C0.337,-0.078 0.375,-0.094 0.406,-0.127L0.449,-0.058Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                    <g transform="matrix(26.3007,0,0,26.3007,77.5507,33.1733)">
-                        <path d="M0.364,-0.052C0.331,-0.009 0.285,0.012 0.227,0.012C0.17,0.012 0.129,-0.003 0.105,-0.033C0.08,-0.062 0.068,-0.112 0.068,-0.182L0.068,-0.454L0.192,-0.454L0.192,-0.215C0.192,-0.17 0.198,-0.138 0.21,-0.119C0.222,-0.101 0.243,-0.092 0.272,-0.092C0.285,-0.092 0.299,-0.095 0.315,-0.102C0.331,-0.109 0.341,-0.116 0.344,-0.123L0.344,-0.454L0.47,-0.454L0.47,0L0.376,0L0.365,-0.052L0.364,-0.052Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                    <g transform="matrix(26.3007,0,0,26.3007,90.6485,33.1733)">
-                        <path d="M0.189,-0.41C0.226,-0.447 0.273,-0.466 0.329,-0.466C0.368,-0.466 0.402,-0.458 0.432,-0.442C0.461,-0.425 0.482,-0.403 0.493,-0.376C0.508,-0.403 0.531,-0.424 0.562,-0.441C0.593,-0.458 0.626,-0.466 0.663,-0.466C0.77,-0.466 0.823,-0.401 0.823,-0.272L0.823,0L0.696,0L0.696,-0.238C0.696,-0.283 0.69,-0.314 0.677,-0.333C0.664,-0.351 0.642,-0.36 0.611,-0.36C0.567,-0.36 0.531,-0.343 0.504,-0.308L0.504,0L0.378,0L0.378,-0.252C0.378,-0.291 0.371,-0.319 0.357,-0.336C0.343,-0.352 0.319,-0.36 0.285,-0.36C0.265,-0.36 0.246,-0.357 0.229,-0.351C0.211,-0.345 0.199,-0.338 0.194,-0.329L0.194,0L0.068,0L0.068,-0.454L0.175,-0.454L0.184,-0.41L0.189,-0.41Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                    <g transform="matrix(26.3007,0,0,26.3007,112.899,33.1733)">
-                        <path d="M0.488,-0.186L0.176,-0.186C0.179,-0.155 0.191,-0.13 0.214,-0.11C0.236,-0.089 0.262,-0.079 0.293,-0.079C0.336,-0.079 0.382,-0.092 0.429,-0.119L0.461,-0.052C0.413,-0.009 0.353,0.012 0.281,0.012C0.204,0.012 0.143,-0.01 0.1,-0.054C0.059,-0.095 0.038,-0.152 0.038,-0.225C0.038,-0.296 0.061,-0.355 0.108,-0.402C0.15,-0.445 0.203,-0.466 0.268,-0.466C0.34,-0.466 0.396,-0.442 0.436,-0.393C0.471,-0.352 0.488,-0.298 0.488,-0.232L0.488,-0.186ZM0.169,-0.279L0.362,-0.279C0.359,-0.344 0.327,-0.377 0.267,-0.377C0.209,-0.377 0.176,-0.344 0.169,-0.279Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                    <g transform="matrix(26.3007,0,0,26.3007,125.681,33.1733)">
-                        <path d="M0.19,-0.41C0.203,-0.425 0.223,-0.439 0.25,-0.45C0.277,-0.461 0.302,-0.466 0.326,-0.466C0.383,-0.466 0.425,-0.45 0.451,-0.419C0.476,-0.388 0.489,-0.337 0.489,-0.267L0.489,0L0.362,0L0.362,-0.262C0.362,-0.327 0.333,-0.36 0.275,-0.36C0.26,-0.36 0.245,-0.357 0.228,-0.35C0.211,-0.344 0.2,-0.337 0.194,-0.329L0.194,0L0.068,0L0.068,-0.454L0.175,-0.454C0.178,-0.437 0.182,-0.422 0.185,-0.41L0.19,-0.41Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                    <g transform="matrix(26.3007,0,0,26.3007,138.884,33.1733)">
-                        <path d="M0.352,-0.353L0.222,-0.353L0.222,-0.128C0.222,-0.095 0.233,-0.078 0.255,-0.078C0.275,-0.078 0.3,-0.087 0.33,-0.104L0.372,-0.04C0.325,-0.003 0.272,0.016 0.215,0.016C0.135,0.016 0.095,-0.028 0.095,-0.116L0.095,-0.353L0.032,-0.353L0.032,-0.454L0.096,-0.454L0.096,-0.535C0.129,-0.553 0.172,-0.575 0.223,-0.602L0.223,-0.454L0.352,-0.454L0.352,-0.353Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                    <g transform="matrix(26.3007,0,0,26.3007,148.273,33.1733)">
-                        <path d="M0.434,0L0.333,0L0.323,-0.043C0.279,-0.006 0.234,0.012 0.189,0.012C0.088,0.012 0.038,-0.037 0.038,-0.135C0.038,-0.184 0.059,-0.222 0.101,-0.249C0.144,-0.277 0.207,-0.291 0.29,-0.291L0.311,-0.291L0.311,-0.293C0.311,-0.322 0.305,-0.341 0.293,-0.352C0.281,-0.363 0.259,-0.368 0.228,-0.368C0.184,-0.368 0.144,-0.354 0.107,-0.326C0.095,-0.348 0.084,-0.37 0.073,-0.391C0.111,-0.42 0.144,-0.44 0.172,-0.451C0.201,-0.461 0.235,-0.466 0.274,-0.466C0.381,-0.466 0.434,-0.399 0.434,-0.266L0.434,0ZM0.307,-0.214L0.292,-0.214C0.254,-0.214 0.223,-0.207 0.2,-0.194C0.177,-0.181 0.165,-0.163 0.165,-0.141C0.165,-0.1 0.183,-0.079 0.219,-0.079C0.241,-0.079 0.26,-0.085 0.277,-0.098C0.294,-0.111 0.304,-0.127 0.307,-0.146L0.307,-0.214Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                    <g transform="matrix(26.3007,0,0,26.3007,160.424,33.1733)">
-                        <path d="M0.352,-0.353L0.222,-0.353L0.222,-0.128C0.222,-0.095 0.233,-0.078 0.255,-0.078C0.275,-0.078 0.3,-0.087 0.33,-0.104L0.372,-0.04C0.325,-0.003 0.272,0.016 0.215,0.016C0.135,0.016 0.095,-0.028 0.095,-0.116L0.095,-0.353L0.032,-0.353L0.032,-0.454L0.096,-0.454L0.096,-0.535C0.129,-0.553 0.172,-0.575 0.223,-0.602L0.223,-0.454L0.352,-0.454L0.352,-0.353Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                    <g transform="matrix(26.3007,0,0,26.3007,169.814,33.1733)">
-                        <path d="M0.19,-0.454L0.19,0L0.063,0L0.063,-0.454L0.19,-0.454ZM0.048,-0.57C0.048,-0.591 0.056,-0.61 0.07,-0.625C0.086,-0.641 0.103,-0.649 0.124,-0.649C0.146,-0.649 0.165,-0.641 0.181,-0.626C0.196,-0.611 0.204,-0.592 0.204,-0.57C0.204,-0.547 0.197,-0.528 0.182,-0.513C0.167,-0.498 0.147,-0.491 0.124,-0.491C0.102,-0.491 0.084,-0.499 0.07,-0.514C0.055,-0.529 0.048,-0.547 0.048,-0.57Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                    <g transform="matrix(26.3007,0,0,26.3007,175.389,33.1733)">
-                        <path d="M0.264,-0.466C0.339,-0.466 0.397,-0.44 0.438,-0.387C0.473,-0.343 0.49,-0.289 0.49,-0.226C0.49,-0.152 0.464,-0.092 0.413,-0.046C0.37,-0.007 0.321,0.012 0.264,0.012C0.198,0.012 0.143,-0.013 0.098,-0.062C0.058,-0.107 0.038,-0.161 0.038,-0.226C0.038,-0.299 0.06,-0.359 0.105,-0.404C0.146,-0.445 0.199,-0.466 0.264,-0.466ZM0.264,-0.082C0.329,-0.082 0.361,-0.13 0.361,-0.226C0.361,-0.326 0.329,-0.376 0.264,-0.376C0.199,-0.376 0.167,-0.326 0.167,-0.226C0.167,-0.13 0.199,-0.082 0.264,-0.082Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                    <g transform="matrix(26.3007,0,0,26.3007,188.224,33.1733)">
-                        <path d="M0.19,-0.41C0.203,-0.425 0.223,-0.439 0.25,-0.45C0.277,-0.461 0.302,-0.466 0.326,-0.466C0.383,-0.466 0.425,-0.45 0.451,-0.419C0.476,-0.388 0.489,-0.337 0.489,-0.267L0.489,0L0.362,0L0.362,-0.262C0.362,-0.327 0.333,-0.36 0.275,-0.36C0.26,-0.36 0.245,-0.357 0.228,-0.35C0.211,-0.344 0.2,-0.337 0.194,-0.329L0.194,0L0.068,0L0.068,-0.454L0.175,-0.454C0.178,-0.437 0.182,-0.422 0.185,-0.41L0.19,-0.41Z" style="fill:rgb(33,133,208);fill-rule:nonzero;"/>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-    <defs>
-        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(56.051,111.858,-111.858,56.051,42519.3,-7078.79)"><stop offset="0" style="stop-color:white;stop-opacity:0"/><stop offset="0.5" style="stop-color:rgb(113,194,255);stop-opacity:0.5"/><stop offset="1" style="stop-color:rgb(57,170,255);stop-opacity:0.5"/></linearGradient>
-    </defs>
-</svg>
diff --git a/content/_includes/default_layout.njk b/content/_includes/default_layout.njk
index 2f014d0..48de0d4 100644
--- a/content/_includes/default_layout.njk
+++ b/content/_includes/default_layout.njk
@@ -26,7 +26,12 @@
     <header>
       <div class="container">
         <div id="header-logo">
-          <a href="/"><img src="/assets/images/logo/codeberg-docs.svg" alt="Codeberg Documentation"></a>
+          <a href="/">
+            <div id="header-logo-container">
+              <img src="/assets/images/logo/codeberg-favicon.svg" alt="Codeberg">
+              <div id="logo-heading">Documentation</div>
+            </div>
+          </a>
         </div>
         <div class="action-buttons" id="header-action-buttons">
           <!--<a href="#">{% fas_icon "globe-europe" %} English</a>-->