diff --git a/favicon.ico b/favicon.ico
index bbc3aee..39a8708 100644
Binary files a/favicon.ico and b/favicon.ico differ
diff --git a/favicon.svg b/favicon.svg
new file mode 100644
index 0000000..da348db
--- /dev/null
+++ b/favicon.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333331 4.2333334"
+   version="1.1"
+   id="svg9750"
+   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
+   sodipodi:docname="favicon.svg"
+   inkscape:export-filename="/home/iko/favicon.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview9752"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:showpageshadow="false"
+     borderlayer="true"
+     inkscape:zoom="10.300586"
+     inkscape:cx="11.407118"
+     inkscape:cy="7.8150897"
+     inkscape:window-width="1362"
+     inkscape:window-height="728"
+     inkscape:window-x="0"
+     inkscape:window-y="38"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer30"
+     width="16px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid872"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <defs
+     id="defs9747" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer30"
+     inkscape:label="favicon"
+     style="display:inline">
+    <path
+       style="display:inline;fill:#775641;fill-opacity:1;stroke-width:0.0156352;stroke-linejoin:round"
+       d="m 4.2333331,1.9755556 c 0,-0.2822223 -0.2217459,-0.5644445 -0.5543652,-0.5644445 0,0 -0.221746,0.2822223 -0.221746,0.5644444 0,0.2822221 0.221746,0.5644445 0.221746,0.5644445 0.3326193,0 0.5543652,-0.2822222 0.5543652,-0.5644444 z"
+       id="path10021"
+       sodipodi:nodetypes="zsssz" />
+    <path
+       style="display:inline;fill:#f6eab7;fill-opacity:1;stroke-width:0.0113333;stroke-linejoin:round"
+       d="m 4.0209882,1.9844343 c 0,-0.2233324 -0.2051007,-0.4095946 -0.447005,-0.4095946 0,0 -0.1167613,0.2123737 -0.1167613,0.4162656 0,0.2038917 0.112358,0.3665953 0.112358,0.3665953 0.2419043,0 0.4514083,-0.149934 0.4514083,-0.3732663 z"
+       id="path10023"
+       sodipodi:nodetypes="zsssz" />
+    <path
+       style="display:inline;fill:#775641;fill-opacity:1;stroke-width:0.0156352;stroke-linejoin:round"
+       d="M 9.7671247e-8,1.9755555 C 5.7671251e-8,1.6933332 0.22174608,1.411111 0.55436511,1.411111 c 0,0 0.22174601,0.2822223 0.22174601,0.5644444 0,0.2822221 -0.22174601,0.5644445 -0.22174601,0.5644445 C 0.22174611,2.5399999 1.3767124e-7,2.2577777 9.7671247e-8,1.9755555 Z"
+       id="path10025"
+       sodipodi:nodetypes="zsssz" />
+    <path
+       style="display:inline;fill:#f6eab7;fill-opacity:1;stroke-width:0.0113333;stroke-linejoin:round"
+       d="m 0.21234471,1.9844341 c 0,-0.2233323 0.20510065,-0.4095945 0.44700519,-0.4095945 0,0 0.11676122,0.2123736 0.11676122,0.4162656 0,0.2038916 -0.11235789,0.3665953 -0.11235789,0.3665953 -0.24190454,0 -0.45140852,-0.149934 -0.45140852,-0.3732664 z"
+       id="path10027"
+       sodipodi:nodetypes="zsssz" />
+    <path
+       id="path10029"
+       style="display:inline;fill:#775641;fill-opacity:1;stroke:none;stroke-width:0.0327579;stroke-linejoin:round"
+       d="m 2.1166664,0.28222221 c -0.7861904,0 -1.57238079,0.29949657 -1.57238079,1.19799989 0.0372613,0.2022754 0.0866604,0.3651023 0.14523536,0.4957676 -0.23739921,0.1172589 -0.4072988,0.3202392 -0.4072988,0.6648036 0,1.0482541 1.04825383,1.3103177 1.83444423,1.3103177 0.7861903,0 1.8344441,-0.2620636 1.8344441,-1.3103177 0,-0.3445643 -0.1698996,-0.5475447 -0.407299,-0.6648036 0.058575,-0.1306653 0.1079744,-0.2934922 0.1452357,-0.4957676 0,-0.89850325 -0.7861905,-1.19799989 -1.5723808,-1.19799989 z" />
+    <path
+       id="path10031"
+       style="display:inline;fill:#f6eab7;fill-opacity:1;stroke-width:0.0321393;stroke-linejoin:round"
+       d="m 1.5522221,0.63500014 c -0.467601,-6e-8 -0.77611098,0.37906546 -0.77611098,0.84666656 2.1334e-4,0.2022559 0.0728242,0.3977535 0.20469028,0.5511119 -0.27408494,0.133469 -0.48691248,0.337787 -0.48691248,0.6483324 0,0.7761111 0.83658728,1.0583334 1.62277758,1.0583334 0.7861902,0 1.6227777,-0.2822223 1.6227777,-1.0583334 0,-0.3105454 -0.2128277,-0.5148634 -0.4869126,-0.6483324 0.1318663,-0.1533584 0.2044766,-0.348856 0.2046903,-0.5511119 0,-0.4676011 -0.30851,-0.84666662 -0.7761111,-0.84666656 -0.2822222,0 -0.4206643,0.10825479 -0.5644443,0.21166665 C 1.9726572,0.7430902 1.7638888,0.63500014 1.5522221,0.63500014 Z"
+       sodipodi:nodetypes="cccsssccccc" />
+    <ellipse
+       style="display:inline;fill:#503320;fill-opacity:1;stroke-width:0.0278894;stroke-linejoin:round"
+       id="ellipse10033"
+       cx="1.5875"
+       cy="1.6227778"
+       rx="0.17638882"
+       ry="0.28222215" />
+    <ellipse
+       style="display:inline;fill:#503320;fill-opacity:1;stroke-width:0.0278894;stroke-linejoin:round"
+       id="ellipse10035"
+       cx="2.645833"
+       cy="1.6227778"
+       rx="0.1763888"
+       ry="0.28222215" />
+    <path
+       style="display:inline;fill:#503320;fill-opacity:1;stroke:#503320;stroke-width:0.129309;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.0524204,2.7471863 c 0.4057648,0.4198661 1.7227312,0.4198661 2.1284922,0 0,0 -0.1584567,0.1449448 -0.5282299,0.2231406 -0.3697732,0.078196 -0.5360162,0.063562 -0.5360162,0.063562 0,0 -0.165955,0.011142 -0.5114342,-0.063562 C 1.2597532,2.8956231 1.0524204,2.7471863 1.0524204,2.7471863 Z"
+       id="path10037"
+       sodipodi:nodetypes="cczczc" />
+  </g>
+  <metadata
+     id="metadata9811">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/freepost/static/images/freepost.svg b/freepost/static/images/freepost.svg
index ab6f899..cfa7346 100644
--- a/freepost/static/images/freepost.svg
+++ b/freepost/static/images/freepost.svg
@@ -8,7 +8,7 @@
    version="1.1"
    id="svg9750"
    inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   sodipodi:docname="freepost-icon.svg"
+   sodipodi:docname="freepost.svg"
    inkscape:export-filename="/home/iko/freepost.png"
    inkscape:export-xdpi="3.0000002"
    inkscape:export-ydpi="3.0000002"
@@ -32,76 +32,23 @@
      inkscape:showpageshadow="false"
      borderlayer="true"
      inkscape:zoom="0.91045174"
-     inkscape:cx="274.03979"
-     inkscape:cy="266.3513"
+     inkscape:cx="253.17102"
+     inkscape:cy="229.0072"
      inkscape:window-width="1362"
      inkscape:window-height="728"
      inkscape:window-x="0"
      inkscape:window-y="38"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid831"
+       empspacing="4" />
+  </sodipodi:namedview>
   <defs
      id="defs9747" />
   <g
-     inkscape:groupmode="layer"
-     id="layer30"
-     inkscape:label="16px-favicon"
-     style="display:none">
-    <g
-       id="g10748"
-       transform="matrix(1.0666666,0,0,1.0666666,-8.2118659,5.7372489)">
-      <path
-         style="display:inline;fill:#775641;fill-opacity:1;stroke-width:0.469055;stroke-linejoin:round"
-         d="m 134.69863,53.888 c 0,-8.466669 -6.65238,-16.933335 -16.63096,-16.933335 0,0 -6.65238,8.466668 -6.65238,16.933332 0,8.466665 6.65238,16.933337 6.65238,16.933337 9.97858,0 16.63096,-8.466665 16.63096,-16.933334 z"
-         id="path10021"
-         sodipodi:nodetypes="zsssz" />
-      <path
-         style="display:inline;fill:#f6eab7;fill-opacity:1;stroke-width:0.339998;stroke-linejoin:round"
-         d="m 128.32828,54.154361 c 0,-6.699971 -6.15302,-12.287839 -13.41015,-12.287839 0,0 -3.50284,6.371211 -3.50284,12.48797 0,6.11675 3.37074,10.997861 3.37074,10.997861 7.25713,0 13.54225,-4.498022 13.54225,-11.197992 z"
-         id="path10023"
-         sodipodi:nodetypes="zsssz" />
-      <path
-         style="display:inline;fill:#775641;fill-opacity:1;stroke-width:0.469055;stroke-linejoin:round"
-         d="m 7.6986259,53.887997 c -1.2e-6,-8.466669 6.6523801,-16.933335 16.6309521,-16.933335 0,0 6.652381,8.466668 6.652381,16.933332 0,8.466665 -6.652381,16.933337 -6.652381,16.933337 -9.978571,0 -16.6309509,-8.466665 -16.6309521,-16.933334 z"
-         id="path10025"
-         sodipodi:nodetypes="zsssz" />
-      <path
-         style="display:inline;fill:#f6eab7;fill-opacity:1;stroke-width:0.339998;stroke-linejoin:round"
-         d="m 14.068965,54.154357 c 0,-6.699971 6.15302,-12.287839 13.410157,-12.287839 0,0 3.502837,6.371211 3.502837,12.48797 0,6.11675 -3.370737,10.997861 -3.370737,10.997861 -7.257137,0 -13.542257,-4.498022 -13.542257,-11.197992 z"
-         id="path10027"
-         sodipodi:nodetypes="zsssz" />
-      <path
-         id="path10029"
-         style="display:inline;fill:#775641;fill-opacity:1;stroke:none;stroke-width:0.982736;stroke-linejoin:round"
-         d="m 71.19862,3.087994 c -23.585713,0 -47.171427,8.984898 -47.171427,35.939999 1.117838,6.068265 2.599811,10.95307 4.357061,14.873031 -7.121977,3.517767 -12.218965,9.607178 -12.218965,19.944111 0,31.447625 31.447618,39.309535 55.033331,39.309535 23.585714,0 55.03333,-7.86191 55.03333,-39.309535 0,-10.33693 -5.09699,-16.426344 -12.21897,-19.944111 1.75725,-3.919961 3.23923,-8.804766 4.35707,-14.873031 0,-26.955099 -23.585716,-35.939999 -47.17143,-35.939999 z" />
-      <path
-         id="path10031"
-         style="display:inline;fill:#f6eab7;fill-opacity:1;stroke-width:0.964179;stroke-linejoin:round"
-         d="m 54.265292,13.671333 c -14.028033,-2e-6 -23.283333,11.371966 -23.283333,25.4 0.0064,6.067676 2.184725,11.932605 6.140709,16.533357 -8.222549,4.004072 -14.607376,10.133613 -14.607376,19.449976 0,23.283333 25.097621,31.750004 48.683333,31.750004 23.585707,0 48.683335,-8.466671 48.683335,-31.750004 0,-9.316363 -6.38483,-15.445904 -14.60738,-19.449976 3.95599,-4.600752 6.1343,-10.465681 6.14071,-16.533357 0,-14.028034 -9.2553,-25.400002 -23.283334,-25.4 -8.466667,0 -12.619932,3.247644 -16.933331,6.35 -4.32028,-3.107298 -10.583333,-6.35 -16.933333,-6.35 z"
-         sodipodi:nodetypes="cccsssccccc" />
-      <ellipse
-         style="display:inline;fill:#503320;fill-opacity:1;stroke-width:0.836683;stroke-linejoin:round"
-         id="ellipse10033"
-         cx="55.323627"
-         cy="43.304665"
-         rx="5.2916651"
-         ry="8.4666653" />
-      <ellipse
-         style="display:inline;fill:#503320;fill-opacity:1;stroke-width:0.836683;stroke-linejoin:round"
-         id="ellipse10035"
-         cx="87.073624"
-         cy="43.304665"
-         rx="5.2916646"
-         ry="8.4666653" />
-      <path
-         style="display:inline;fill:#503320;fill-opacity:1;stroke:#503320;stroke-width:3.87928;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 39.271237,77.036923 c 12.172947,12.595984 51.681943,12.595984 63.854773,0 0,0 -4.753702,4.348345 -15.846899,6.69422 -11.093196,2.345874 -16.080487,1.906854 -16.080487,1.906854 0,0 -4.978651,0.33426 -15.343026,-1.906854 -10.364375,-2.241114 -16.584361,-6.69422 -16.584361,-6.69422 z"
-         id="path10037"
-         sodipodi:nodetypes="cczczc" />
-    </g>
-  </g>
-  <g
-     inkscape:label="512px"
+     inkscape:label="freepost"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">