diff --git a/server/static/android-chrome-192x192.png b/server/static/android-chrome-192x192.png
new file mode 100644
index 0000000000..2342d82c0b
Binary files /dev/null and b/server/static/android-chrome-192x192.png differ
diff --git a/server/static/android-chrome-512x512.png b/server/static/android-chrome-512x512.png
new file mode 100644
index 0000000000..d25b64f77a
Binary files /dev/null and b/server/static/android-chrome-512x512.png differ
diff --git a/server/static/apple-touch-icon.png b/server/static/apple-touch-icon.png
new file mode 100644
index 0000000000..f9ba99f40f
Binary files /dev/null and b/server/static/apple-touch-icon.png differ
diff --git a/server/static/browserconfig.xml b/server/static/browserconfig.xml
new file mode 100644
index 0000000000..c3b1f8a587
--- /dev/null
+++ b/server/static/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/static/mstile-150x150.png"/>
+            <TileColor>#000000</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/server/static/favicon-16x16.png b/server/static/favicon-16x16.png
new file mode 100644
index 0000000000..486c293a82
Binary files /dev/null and b/server/static/favicon-16x16.png differ
diff --git a/server/static/favicon-32x32.png b/server/static/favicon-32x32.png
new file mode 100644
index 0000000000..a34711800b
Binary files /dev/null and b/server/static/favicon-32x32.png differ
diff --git a/server/static/favicon.png b/server/static/favicon.png
new file mode 100644
index 0000000000..821698c28f
Binary files /dev/null and b/server/static/favicon.png differ
diff --git a/server/static/favicon.svg b/server/static/favicon.svg
new file mode 100644
index 0000000000..e1ab2cfadd
--- /dev/null
+++ b/server/static/favicon.svg
@@ -0,0 +1,14 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <style>
+		path, mask {
+        fill: #000000;
+      }
+      @media ( prefers-color-scheme: dark ) {
+        path, mask {
+          fill: #FFFFFF;
+        }
+      }
+	</style>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M256 0C114.615 0 0 114.615 0 256C0 397.385 114.615 512 256 512C397.385 512 512 397.385 512 256C512 114.615 397.385 0 256 0ZM256 64C149.961 64 64 149.961 64 256C64 362.039 149.961 448 256 448C362.039 448 448 362.039 448 256C448 149.961 362.039 64 256 64Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M160 160L376 160L238 304H304L352 352H136L274 208H208L160 160Z"/>
+</svg>
diff --git a/server/static/mstile-144x144.png b/server/static/mstile-144x144.png
new file mode 100644
index 0000000000..e70abaf8d2
Binary files /dev/null and b/server/static/mstile-144x144.png differ
diff --git a/server/static/mstile-150x150.png b/server/static/mstile-150x150.png
new file mode 100644
index 0000000000..545758300a
Binary files /dev/null and b/server/static/mstile-150x150.png differ
diff --git a/server/static/mstile-310x150.png b/server/static/mstile-310x150.png
new file mode 100644
index 0000000000..73072f380d
Binary files /dev/null and b/server/static/mstile-310x150.png differ
diff --git a/server/static/mstile-310x310.png b/server/static/mstile-310x310.png
new file mode 100644
index 0000000000..2f8fc1c3a1
Binary files /dev/null and b/server/static/mstile-310x310.png differ
diff --git a/server/static/mstile-70x70.png b/server/static/mstile-70x70.png
new file mode 100644
index 0000000000..c28ce9405c
Binary files /dev/null and b/server/static/mstile-70x70.png differ
diff --git a/server/static/safari-pinned-tab.svg b/server/static/safari-pinned-tab.svg
new file mode 100644
index 0000000000..75522d5979
--- /dev/null
+++ b/server/static/safari-pinned-tab.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="700.000000pt" height="700.000000pt" viewBox="0 0 700.000000 700.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.14, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M3278 6996 c-1 -2 -39 -6 -83 -10 -490 -38 -1003 -200 -1450 -459
+-102 -59 -288 -180 -305 -197 -3 -3 -43 -34 -90 -70 -90 -69 -111 -86 -198
+-165 -352 -320 -662 -745 -837 -1145 -25 -58 -50 -114 -55 -125 -45 -93 -150
+-427 -176 -560 -2 -11 -10 -54 -19 -95 -29 -147 -35 -193 -52 -370 -15 -163
+-8 -592 12 -711 2 -13 6 -46 9 -74 21 -182 109 -547 165 -680 5 -11 25 -65 46
+-120 63 -166 249 -531 312 -610 4 -6 34 -49 65 -95 171 -256 432 -534 708
+-755 92 -74 370 -265 386 -265 4 0 15 -6 23 -14 46 -40 413 -212 571 -268 83
+-29 268 -87 293 -92 12 -2 60 -13 107 -24 109 -27 200 -44 299 -58 25 -3 57
+-8 71 -10 163 -25 682 -25 842 1 13 2 46 7 73 10 71 10 87 13 115 18 14 3 43
+8 65 12 22 4 76 16 120 27 44 10 87 21 96 23 223 51 591 200 823 334 49 28 91
+51 93 51 10 0 268 180 353 247 151 118 324 281 450 422 36 41 70 79 76 85 65
+68 263 353 352 508 46 79 172 331 172 342 0 3 11 29 24 58 57 127 151 421 182
+573 17 81 54 301 59 350 4 33 9 71 11 85 9 47 11 525 3 605 -15 165 -21 220
+-24 225 -2 3 -6 30 -10 60 -9 75 -69 337 -99 435 -135 446 -345 845 -627 1195
+-425 527 -976 912 -1614 1128 -167 56 -419 119 -555 137 -19 3 -46 7 -60 10
+-13 2 -52 7 -86 11 -33 3 -74 8 -90 10 -32 5 -540 14 -546 10z m437 -880 c149
+-14 226 -26 345 -52 379 -81 752 -256 1060 -498 155 -121 351 -319 460 -465
+14 -18 34 -45 46 -59 76 -99 197 -309 268 -468 95 -212 175 -479 200 -674 3
+-25 8 -54 10 -66 10 -49 19 -219 19 -344 0 -191 -12 -313 -49 -500 -31 -153
+-25 -131 -68 -272 -227 -744 -813 -1374 -1547 -1662 -103 -40 -308 -103 -394
+-120 -37 -8 -72 -15 -105 -21 -261 -50 -595 -51 -884 -4 -176 29 -402 89 -501
+133 -16 8 -41 17 -55 21 -42 12 -303 141 -366 181 -140 88 -175 113 -286 201
+-300 237 -550 546 -716 883 -75 154 -91 191 -130 305 -56 166 -101 346 -117
+470 -3 28 -8 57 -10 65 -23 89 -23 545 1 663 2 12 7 42 10 67 3 25 15 86 25
+135 11 50 22 104 25 120 11 58 94 295 139 398 177 404 471 777 819 1038 87 65
+194 139 201 139 4 0 19 8 33 19 101 70 367 193 529 244 74 24 199 58 263 71
+80 18 121 25 169 31 30 4 63 8 74 11 11 2 61 6 111 10 50 3 92 7 93 8 5 5 262
+-1 328 -8z"/>
+<path d="M2190 4813 c0 -1 147 -150 327 -330 l327 -328 446 -1 c245 -1 447 -2
+448 -3 2 0 -37 -43 -86 -93 -49 -51 -114 -118 -143 -149 -65 -68 -394 -412
+-535 -559 -56 -58 -130 -134 -164 -170 -34 -36 -131 -137 -215 -225 -84 -88
+-177 -185 -206 -215 -76 -80 -440 -459 -469 -489 -14 -14 -33 -35 -42 -46 -17
+-21 129 -22 2770 -15 l162 0 -327 328 -328 327 -447 0 c-308 -1 -445 2 -440
+10 3 5 44 50 91 99 231 240 537 559 591 616 47 50 322 337 526 549 169 175
+225 234 414 432 91 95 184 192 207 216 23 24 36 43 30 44 -39 1 -2937 4 -2937
+2z"/>
+</g>
+</svg>
diff --git a/server/static/site.webmanifest b/server/static/site.webmanifest
new file mode 100644
index 0000000000..bf91e3b24d
--- /dev/null
+++ b/server/static/site.webmanifest
@@ -0,0 +1,18 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "/static/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/static/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#000",
+    "background_color": "#000"
+}
diff --git a/server/styles.css b/server/styles.css
index 3bec62b3d0..ba57101e38 100644
--- a/server/styles.css
+++ b/server/styles.css
@@ -68,6 +68,13 @@
   .alternate-bg:nth-of-type(even) {
     background-color: rgba(255,255,255,0.06);
   }
+
+  :not(.type-prose) code {
+    background-color: rgba(255,255,255,0.15);
+    padding: 0px 4px;
+    border-radius: 2px;
+    color: #eee;
+  }
   
   /* This fixes scrollbar jump */
   @media screen and (min-width: 960px) {
diff --git a/server/templates/partials/layout.hbs b/server/templates/partials/layout.hbs
index d4912df084..5ea02c560a 100644
--- a/server/templates/partials/layout.hbs
+++ b/server/templates/partials/layout.hbs
@@ -3,10 +3,21 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=0.86, maximum-scale=5.0, minimum-scale=0.86">
-    <link rel="icon" href="/static/images/favicon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/static/favicon-16x16.png">
+    <link rel="shortcut icon" href="/static/favicon.png">
+    <link rel="shortcut icon" href="/static/favicon.svg">
     <link rel="stylesheet" href="/static/styles.css">
     <link rel="stylesheet" href="/static/prose.css">
 
+    <!-- Social stuff -->
+    <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
+    <link rel="manifest" href="/static/site.webmanifest">
+    <link rel="mask-icon" href="/static/safari-pinned-tab.svg" color="#000000">
+    <meta name="msapplication-TileColor" content="#000000">
+    <meta name="msapplication-config" content="/static/browserconfig.xml">
+    <meta name="theme-color" content="#000">
+
     <title>Zed – a lightning fast, collaborative code editor written natively in Rust</title>
 
 </head>