diff --git a/website/content/pages/imprint.md b/website/content/pages/imprint.md
index 717a539..49b4eff 100644
--- a/website/content/pages/imprint.md
+++ b/website/content/pages/imprint.md
@@ -1,4 +1,4 @@
-title: Imprint – offen.software
+title: Imprint | offen.software
 template: page
 slug: imprint
 exclude_from_sitemap: true
diff --git a/website/content/pages/index.md b/website/content/pages/index.md
index 63ab470..93422d0 100644
--- a/website/content/pages/index.md
+++ b/website/content/pages/index.md
@@ -1,4 +1,4 @@
-title: offen.software
+title: Humane Computer Programs | offen.software
 description: We think up, create and ship software for organisations and individuals who embrace societal change.
 save_as: index.html
 template: index
diff --git a/website/theme/static/css/styles.css b/website/theme/static/css/styles.css
index 8d2466f..cd1f13a 100644
--- a/website/theme/static/css/styles.css
+++ b/website/theme/static/css/styles.css
@@ -61,13 +61,16 @@ LAYOUT
 .gapExtra {
   grid-gap: 1rem;
 }
+.logoPadding {
+  padding-top: 1.2rem;
+}
+.bottomPadding {
+  padding-bottom: 12rem;
+}
 
 /* ---------------------------------------------------
 SPACING
 ----------------------------------------------------*/
-.hExtra20 {
-  height: 20rem;
-}
 .wExtra24 {
   width: 24rem;
 }
@@ -75,9 +78,6 @@ SPACING
   width: 32rem;
 }
 @media only screen and (max-width: 60rem) {
-  .hExtra20 {
-    height: auto;
-  }
   .wExtra24,
   .wExtra32 {
     width: 100%;
diff --git a/website/theme/static/images/site-apple-touch-icon.png b/website/theme/static/images/site-apple-touch-icon.png
new file mode 100644
index 0000000..a9115a3
Binary files /dev/null and b/website/theme/static/images/site-apple-touch-icon.png differ
diff --git a/website/theme/static/images/site-favicon-16x16.png b/website/theme/static/images/site-favicon-16x16.png
new file mode 100644
index 0000000..45edcf4
Binary files /dev/null and b/website/theme/static/images/site-favicon-16x16.png differ
diff --git a/website/theme/static/images/site-favicon-32x32.png b/website/theme/static/images/site-favicon-32x32.png
new file mode 100644
index 0000000..b87e1d4
Binary files /dev/null and b/website/theme/static/images/site-favicon-32x32.png differ
diff --git a/website/theme/static/images/site-favicon.ico b/website/theme/static/images/site-favicon.ico
new file mode 100644
index 0000000..73da79f
Binary files /dev/null and b/website/theme/static/images/site-favicon.ico differ
diff --git a/website/theme/templates/base.html b/website/theme/templates/base.html
index 04626b1..3747504 100644
--- a/website/theme/templates/base.html
+++ b/website/theme/templates/base.html
@@ -20,8 +20,12 @@
   <link rel="canonical" href="{{ SITEURL }}">
   <!--
   <meta property="og:image" content="{{ SITEURL }}/theme/images/###">
-  <link rel="shortcut icon" type="image/x-icon" href="{{ SITEURL }}/theme/images/favicon.ico">
-  -->
+    -->
+  <link rel="shortcut icon" type="image/x-icon" href="{{ SITEURL }}/theme/images/site-favicon.ico">
+  <link rel="apple-touch-icon" sizes="180x180" href="{{ SITEURL }}/theme/images/site-apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="{{ SITEURL }}/theme/images/site-favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="{{ SITEURL }}/theme/images/site-favicon-16x16.png">
+
   {% assets filters="postcss", output="css/style.min.css", "css/tachyons.min.css", "css/styles.css", "css/fonts.css" %}
     <link rel="stylesheet" href="/{{ ASSET_URL }}">
   {% endassets %}
@@ -31,17 +35,24 @@
   -->
 </head>
 {% endblock %}
-<body class="poppins f4 trackedWide lh-title no-js colorSalmon bgColorWine">
-
+  <body class="poppins f4 trackedWide lh-title no-js colorSalmon bgColorWine">
+{% if template == 'index' %}
   <div class="w-100 mw9-ns center-ns h3 colorSalmonLink">
-    <a class="link dim" href="/"><h1 class="f4 ma0 pt3 ml3 ml5-l"><span class="fw4">offen.</span><span class="fw7">software</span></h1></a>
+    <a class="link dim" href="/"><h1 class="f4 logoPadding ma0 ml3 ml5-l"><span class="fw4">offen.</span><span class="fw7">software</span></h1></a>
   </div>
+{% else %}
+  <div class="w-100 mw9-ns center-ns h3 colorWineLink bgColorOrange">
+    <a class="link dim" href="/"><h1 class="f4 logoPadding ma0 ml3 ml5-l"><span class="fw4">offen.</span><span class="fw7">software</span></h1></a>
+  </div>
+{% endif %}
+
+
 
   {% block content %}{% endblock %}
 
   <div class="w-100 colorWine bgColorOrange">
 
-    <div class="w-100 mw9-ns center-ns flex flex-wrap justify-between pt5 pb6 ph3 ph5-l">
+    <div class="w-100 mw9-ns center-ns flex flex-wrap justify-between bottomPadding pt5 ph3 ph5-l">
 
       <div class="w-100 h3">
         <h1 class="f2 ma0 colorWineLink">
diff --git a/website/theme/templates/index.html b/website/theme/templates/index.html
index 54768d2..30655cb 100644
--- a/website/theme/templates/index.html
+++ b/website/theme/templates/index.html
@@ -82,7 +82,7 @@
       <img src="/theme/images/gfx-detail-1.svg" alt="pattern" width="64px" height="64px" class="db self-start pl5 pa0-l">
 
       <div class="w-100 w-auto-l flex flex-column-l flex-wrap justify-center">
-          <div class="wExtra32 h-auto colorSalmon bgColorWine ph3 pv4 pa4-l">
+          <div class="wExtra32 colorSalmon ph3 pv4 pa4-l">
             <div class="mw6-m center-m">
               <p class="fw7 f4 f2-l ma0 mb3">
                 We offer
@@ -96,7 +96,7 @@
               <p class="ma0 ml4-ns mb2">
                 Support and guidance with self hosting
               </p>
-              <p class="ma0 ml4-ns">
+              <p class="ma0 ml4-ns mb4">
                 MVP development
               </p>
             </div>
@@ -107,7 +107,7 @@
       <img src="/theme/images/gfx-detail-1.svg" alt="pattern" width="64px" height="64px" class="db self-end pr5 pa0-l">
       <img src="/theme/images/gfx-detail-3.svg" alt="pattern" width="64px" height="64px" class="db self-end pr5 pa0-l">
 
-      <div class="wExtra24 h-auto h5-l colorSalmon bgColorWine ph3 pv4 pa4-l">
+      <div class="wExtra24 colorSalmon ph3 pv4 pa4-l">
         <div class="mw6-m center-m">
           <p class="fw7 f4 f2-l ma0 mb3">
             We created
@@ -118,7 +118,7 @@
           <p class="ma0 ml4-ns mb2 colorSalmonLink">
             <a class="link dim" href="https://www.analyticstxt.org/" rel="noopener" target="_blank">analytics.txt</a>
           </p>
-          <p class="ma0 ml4-ns colorSalmonLink">
+          <p class="ma0 ml4-ns colorSalmonLink mb4">
             <a class="link dim" href="https://github.com/offen/docker-volume-backup" rel="noopener" target="_blank">docker-volume-backup</a>
           </p>
         </div>
@@ -126,7 +126,7 @@
 
       <img src="/theme/images/gfx-detail-2.svg" alt="pattern" width="64px" height="128px" class="db self-start pl5 pa0-l">
 
-      <div class="wExtra24 h-auto h5-l colorSalmon bgColorWine ph3 pv4 pa4-l">
+      <div class="wExtra24 colorSalmon ph3 pv4 pa4-l">
         <div class="mw6-m center-m">
           <p class="fw7 f4 f2-l ma0 mb3">
             We worked with
@@ -140,7 +140,7 @@
           <p class="ma0 ml4-ns mb2">
             Ecosia
           </p>
-          <p class="ma0 ml4-ns">
+          <p class="ma0 ml4-ns mb4">
             Wikimedia
           </p>
         </div>
@@ -150,7 +150,7 @@
       <img src="/theme/images/gfx-detail-1.svg" alt="pattern" width="64px" height="64px" class="db self-end pr5 pa0-l">
 
       <div class="w-100 w-auto-l flex flex-column-l flex-wrap justify-center">
-        <div class="wExtra32 hExtra20 colorSalmon bgColorWine ph3 pv4 pa4-l">
+        <div class="wExtra32 colorSalmon ph3 pv4 pa4-l">
           <div class="mw6-m center-m">
             <p class="fw7 f4 f2-l ma0 mb3">
               We are
@@ -164,7 +164,7 @@
             <p class="ma0 ml5-ns ml2 mb2">
               Open Source Tomato Seeds
             </p>
-            <p class="ma0 ml5-ns ml2">
+            <p class="ma0 ml5-ns ml2 mb4">
               Psychological aspects of Software Development
             </p>
           </div>
@@ -175,7 +175,7 @@
       <img src="/theme/images/gfx-detail-3.svg" alt="pattern" width="64px" height="64px" class="db self-start pr5 pa0-l">
       <img src="/theme/images/gfx-detail-1.svg" alt="pattern" width="64px" height="64px" class="db self-start pl5 pa0-l">
 
-      <div class="wExtra32 hExtra20 colorSalmon bgColorWine ph3 pv4 pa4-l">
+      <div class="wExtra32 colorSalmon ph3 pv4 pa4-l">
         <div class="mw6-m center-m">
           <p class="fw7 f4 f2-l ma0 mb3">
             We are
@@ -189,7 +189,7 @@
           <p class="ma0 ml5-ns ml2 mb2">
             Literal present tense in Korean
           </p>
-          <p class="ma0 ml5-ns ml2">
+          <p class="ma0 ml5-ns ml2 mb4">
             Generative systems
           </p>
         </div>
