diff --git a/README.md b/README.md
index c7550f6..51d9555 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<h1><img src="https://image.flaticon.com/icons/svg/194/194242.svg" width="50px" height="50px" /> Lemmy</h1>
+<h1><img src="ui/assets/favicon.svg" width="50px" height="50px" vertical-align="bottom" /><span>Lemmy</span></h1>
 
 [![Github](https://img.shields.io/badge/-Github-blue)](https://github.com/dessalines/lemmy)
 [![Gitlab](https://img.shields.io/badge/-Gitlab-yellowgreen)](https://gitlab.com/dessalines/lemmy)
@@ -155,4 +155,4 @@ If you'd like to add translations, take a look a look at the [english translatio
 
 ## Credits
 
-Icons made by [Freepik](https://www.freepik.com/) licensed by [CC 3.0](http://creativecommons.org/licenses/by/3.0/)
+Icon made by Andy Cuccaro (@andycuccaro).
diff --git a/ui/assets/favicon.svg b/ui/assets/favicon.svg
index 7a1b2c2..1e66240 100644
--- a/ui/assets/favicon.svg
+++ b/ui/assets/favicon.svg
@@ -1,53 +1,101 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M499.059,323.505l-7.52-32.532l-70.047,16.19c1.513-11.983,2.297-24.042,2.297-36.037c0-18.334-1.801-35.785-5.316-52.19
-			c29.365-12.101,55.143-28.885,69.372-45.529c17.524-20.498,25.985-46.568,23.822-73.406
-			c-2.163-26.862-14.706-51.268-35.316-68.724C433.879-4.694,369.917,0.439,333.774,42.718
-			c-9.546,11.168-18.318,27.381-25.379,46.649c-16.512-5.419-34.132-8.243-52.395-8.243s-35.885,2.824-52.395,8.243
-			c-7.06-19.267-15.832-35.481-25.379-46.649C142.082,0.44,78.123-4.695,35.648,31.277C15.038,48.733,2.494,73.141,0.332,100.001
-			c-2.161,26.838,6.297,52.907,23.822,73.406c14.229,16.644,40.006,33.427,69.372,45.529c-3.515,16.405-5.316,33.856-5.316,52.189
-			c0,11.995,0.785,24.053,2.297,36.037l-70.047-16.19l-7.52,32.532l84.337,19.492c4.349,17.217,10.201,33.953,17.421,49.752
-			L12.941,416.27l7.52,32.532l110.634-25.57c1.38,2.197,2.779,4.373,4.218,6.509c32.548,48.323,75.409,74.934,120.687,74.934
-			c45.278,0,88.138-26.612,120.687-74.934c1.439-2.136,2.839-4.313,4.218-6.509l110.634,25.57l7.52-32.532l-101.758-23.519
-			c7.221-15.799,13.072-32.535,17.421-49.752L499.059,323.505z M183.578,220.372c0-11.41,9.189-20.65,20.482-20.65
-			c11.306,0,20.494,9.24,20.494,20.65c0,11.408-9.188,20.656-20.494,20.656C192.768,241.028,183.578,231.78,183.578,220.372z
-			 M256,413.29c-29.895,0-54.216-19.471-54.216-43.403c0-23.932,24.322-43.403,54.216-43.403s54.216,19.471,54.216,43.403
-			C310.216,393.819,285.895,413.29,256,413.29z M307.785,241.183c-11.402,0-20.65-9.317-20.65-20.81
-			c0-11.494,9.248-20.81,20.65-20.81c11.387,0,20.635,9.317,20.635,20.81C328.422,231.866,319.173,241.183,307.785,241.183z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1024"
+   height="1024"
+   viewBox="0 0 1024 1024"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (unknown)"
+   sodipodi:docname="lemmy-logo-solid.svg"
+   inkscape:export-filename="/home/andres/Pictures/References/Logos/Lemmy/lemmy-white-space_no-alpha.png"
+   inkscape:export-xdpi="300"
+   inkscape:export-ydpi="300">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="382.61395"
+     inkscape:cy="508.5765"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="740"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-26.066658)"
+     style="display:inline">
+    <path
+       id="path1087"
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 370.4568,382.2936 c -4.21152,-38.82002 -43.69954,-95.40305 -87.66365,-120.72973 -69.2936,-39.91841 -145.92188,-36.88647 -183.854976,18.55635 -37.933096,55.44282 -8.512486,126.57811 56.588786,170.52361 37.59831,25.38008 93.63292,40.61292 133.39463,38.32179 M 653.54319,382.2936 c 4.21152,-38.82002 43.69954,-95.40305 87.66365,-120.72973 69.2936,-39.91841 145.92188,-36.88647 183.85498,18.55635 37.9331,55.44282 8.51249,126.57811 -56.58879,170.52361 -37.59831,25.38008 -93.63292,40.61292 -133.39463,38.32179"
+       inkscape:connector-curvature="0"
+       inkscape:label="ears" />
+    <path
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 745.66245,576.11738 C 746.9301,442.43439 660.61747,352.34249 512,352.34249 c -148.61747,0 -235.85386,91.1103 -233.66245,223.77489 1.80521,109.28421 91.98103,208.54257 232.67118,208.54257 140.69015,0 233.6193,-99.45528 234.65372,-208.54257 z"
+       id="path969"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="szszs"
+       inkscape:label="head" />
+    <path
+       id="path1084"
+       style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 599.83093,636.10901 c 0,20.56567 16.67996,37.23744 37.25573,37.23744 20.57577,0 37.25573,-16.67177 37.25573,-37.23744 0,-20.56568 -16.67995,-37.23745 -37.25573,-37.23745 -20.57577,0 -37.25573,16.67177 -37.25573,37.23745 z m -250.17332,0 c 0,20.75515 16.83364,37.58053 37.59899,37.58053 20.76534,0 37.59898,-16.82538 37.59898,-37.58053 0,-20.75516 -16.83363,-37.58054 -37.59898,-37.58054 -20.76535,0 -37.59899,16.82538 -37.59899,37.58054 z"
+       inkscape:connector-curvature="0"
+       inkscape:label="eyes"
+       sodipodi:nodetypes="ssssssssss" />
+    <path
+       id="path1008"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:32;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 358.38738,747.29948 -48.63668,64.26759 m 355.86191,-64.26759 48.63669,64.26759 M 277.70645,631.8233 194.14389,647.53759 m 552.14966,-15.71429 83.56256,15.71429"
+       inkscape:connector-curvature="0"
+       inkscape:label="whiskers"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 512,687.69141 c -37.69005,0 -61.74003,26.09705 -60.92773,58.26757 0.87969,34.83946 26.68193,58.26954 60.92773,58.26954 34.2458,0 60.85342,-27.04049 60.92773,-58.26954 C 573.00431,713.7783 549.69005,687.69141 512,687.69141 Z"
+       transform="translate(0,26.066658)"
+       id="path1115"
+       inkscape:connector-curvature="0"
+       inkscape:label="nose"
+       sodipodi:nodetypes="zszsz" />
+  </g>
+</svg>
diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx
index 7a173be..06bf338 100644
--- a/ui/src/components/navbar.tsx
+++ b/ui/src/components/navbar.tsx
@@ -78,7 +78,6 @@ export class Navbar extends Component<any, NavbarState> {
     return (
       <nav class="container navbar navbar-expand-md navbar-light navbar-bg p-0 px-3">
         <Link title={version} class="navbar-brand" to="/">
-          <svg class="icon mr-2 mouse-icon"><use xlinkHref="#icon-mouse"></use></svg>
           {this.state.siteName}
         </Link>
         <button class="navbar-toggler" type="button" onClick={linkEvent(this, this.expandNavbar)}>
diff --git a/ui/src/components/symbols.tsx b/ui/src/components/symbols.tsx
index 1085a4d..3ff81a9 100644
--- a/ui/src/components/symbols.tsx
+++ b/ui/src/components/symbols.tsx
@@ -23,55 +23,46 @@ export class Symbols extends Component<any, any> {
             <path d="M28 5h-24c-2.209 0-4 1.792-4 4v13c0 2.209 1.791 4 4 4h24c2.209 0 4-1.791 4-4v-13c0-2.208-1.791-4-4-4zM2 10.25l6.999 5.25-6.999 5.25v-10.5zM30 22c0 1.104-0.898 2-2 2h-24c-1.103 0-2-0.896-2-2l7.832-5.875 4.368 3.277c0.533 0.398 1.166 0.6 1.8 0.6 0.633 0 1.266-0.201 1.799-0.6l4.369-3.277 7.832 5.875zM30 20.75l-7-5.25 7-5.25v10.5zM17.199 18.602c-0.349 0.262-0.763 0.4-1.199 0.4s-0.851-0.139-1.2-0.4l-12.8-9.602c0-1.103 0.897-2 2-2h24c1.102 0 2 0.897 2 2l-12.801 9.602z"></path>
           </symbol>         
           <symbol id="icon-mouse" version="1.1" x="0px" y="0px"
-            viewBox="0 0 512 512">
-            <g>
-              <g>
-                <path d="M499.059,323.505l-7.52-32.532l-70.047,16.19c1.513-11.983,2.297-24.042,2.297-36.037c0-18.334-1.801-35.785-5.316-52.19
-                  c29.365-12.101,55.143-28.885,69.372-45.529c17.524-20.498,25.985-46.568,23.822-73.406
-                  c-2.163-26.862-14.706-51.268-35.316-68.724C433.879-4.694,369.917,0.439,333.774,42.718
-                  c-9.546,11.168-18.318,27.381-25.379,46.649c-16.512-5.419-34.132-8.243-52.395-8.243s-35.885,2.824-52.395,8.243
-                  c-7.06-19.267-15.832-35.481-25.379-46.649C142.082,0.44,78.123-4.695,35.648,31.277C15.038,48.733,2.494,73.141,0.332,100.001
-                  c-2.161,26.838,6.297,52.907,23.822,73.406c14.229,16.644,40.006,33.427,69.372,45.529c-3.515,16.405-5.316,33.856-5.316,52.189
-                  c0,11.995,0.785,24.053,2.297,36.037l-70.047-16.19l-7.52,32.532l84.337,19.492c4.349,17.217,10.201,33.953,17.421,49.752
-                  L12.941,416.27l7.52,32.532l110.634-25.57c1.38,2.197,2.779,4.373,4.218,6.509c32.548,48.323,75.409,74.934,120.687,74.934
-                  c45.278,0,88.138-26.612,120.687-74.934c1.439-2.136,2.839-4.313,4.218-6.509l110.634,25.57l7.52-32.532l-101.758-23.519
-                  c7.221-15.799,13.072-32.535,17.421-49.752L499.059,323.505z M183.578,220.372c0-11.41,9.189-20.65,20.482-20.65
-                  c11.306,0,20.494,9.24,20.494,20.65c0,11.408-9.188,20.656-20.494,20.656C192.768,241.028,183.578,231.78,183.578,220.372z
-                  M256,413.29c-29.895,0-54.216-19.471-54.216-43.403c0-23.932,24.322-43.403,54.216-43.403s54.216,19.471,54.216,43.403
-                  C310.216,393.819,285.895,413.29,256,413.29z M307.785,241.183c-11.402,0-20.65-9.317-20.65-20.81
-                  c0-11.494,9.248-20.81,20.65-20.81c11.387,0,20.635,9.317,20.635,20.81C328.422,231.866,319.173,241.183,307.785,241.183z"/>
-                </g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
-              <g>
-              </g>
+            viewBox="0 0 1024 1024">
+  <g
+     id="layer1"
+     transform="translate(0,-26.066658)"
+     style="display:inline">
+    <path
+       id="path1087"
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 370.4568,382.2936 c -4.21152,-38.82002 -43.69954,-95.40305 -87.66365,-120.72973 -69.2936,-39.91841 -145.92188,-36.88647 -183.854976,18.55635 -37.933096,55.44282 -8.512486,126.57811 56.588786,170.52361 37.59831,25.38008 93.63292,40.61292 133.39463,38.32179 M 653.54319,382.2936 c 4.21152,-38.82002 43.69954,-95.40305 87.66365,-120.72973 69.2936,-39.91841 145.92188,-36.88647 183.85498,18.55635 37.9331,55.44282 8.51249,126.57811 -56.58879,170.52361 -37.59831,25.38008 -93.63292,40.61292 -133.39463,38.32179"
+       inkscape:label="ears" />
+    <path
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 745.66245,576.11738 C 746.9301,442.43439 660.61747,352.34249 512,352.34249 c -148.61747,0 -235.85386,91.1103 -233.66245,223.77489 1.80521,109.28421 91.98103,208.54257 232.67118,208.54257 140.69015,0 233.6193,-99.45528 234.65372,-208.54257 z"
+       id="path969"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="szszs"
+       inkscape:label="head" />
+    <path
+       id="path1084"
+       style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 599.83093,636.10901 c 0,20.56567 16.67996,37.23744 37.25573,37.23744 20.57577,0 37.25573,-16.67177 37.25573,-37.23744 0,-20.56568 -16.67995,-37.23745 -37.25573,-37.23745 -20.57577,0 -37.25573,16.67177 -37.25573,37.23745 z m -250.17332,0 c 0,20.75515 16.83364,37.58053 37.59899,37.58053 20.76534,0 37.59898,-16.82538 37.59898,-37.58053 0,-20.75516 -16.83363,-37.58054 -37.59898,-37.58054 -20.76535,0 -37.59899,16.82538 -37.59899,37.58054 z"
+       inkscape:connector-curvature="0"
+       inkscape:label="eyes"
+       sodipodi:nodetypes="ssssssssss" />
+    <path
+       id="path1008"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:32;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 358.38738,747.29948 -48.63668,64.26759 m 355.86191,-64.26759 48.63669,64.26759 M 277.70645,631.8233 194.14389,647.53759 m 552.14966,-15.71429 83.56256,15.71429"
+       inkscape:connector-curvature="0"
+       inkscape:label="whiskers"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 512,687.69141 c -37.69005,0 -61.74003,26.09705 -60.92773,58.26757 0.87969,34.83946 26.68193,58.26954 60.92773,58.26954 34.2458,0 60.85342,-27.04049 60.92773,-58.26954 C 573.00431,713.7783 549.69005,687.69141 512,687.69141 Z"
+       transform="translate(0,26.066658)"
+       id="path1115"
+       inkscape:connector-curvature="0"
+       inkscape:label="nose"
+       sodipodi:nodetypes="zszsz" />
+  </g>
             </symbol>
             <symbol id="icon-search" viewBox="0 0 32 32">
               <title>search</title>