diff --git a/res/themes/riot/img/backgrounds/valley.jpg b/res/themes/riot/img/backgrounds/valley.jpg
new file mode 100644
index 00000000..4779c9d7
Binary files /dev/null and b/res/themes/riot/img/backgrounds/valley.jpg differ
diff --git a/res/themes/riot/img/logos/riot-im-logo-1.png b/res/themes/riot/img/logos/riot-im-logo-1.png
deleted file mode 100644
index 768679da..00000000
Binary files a/res/themes/riot/img/logos/riot-im-logo-1.png and /dev/null differ
diff --git a/res/themes/riot/img/logos/riot-im-logo-1.svg b/res/themes/riot/img/logos/riot-im-logo-1.svg
deleted file mode 100644
index a806c3bf..00000000
--- a/res/themes/riot/img/logos/riot-im-logo-1.svg
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<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"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 163.60767 144.2"
-   xml:space="preserve"
-   sodipodi:docname="riot-im-logo-1.svg"
-   width="163.60767"
-   height="144.2"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata3918"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs3916" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="2071"
-     id="namedview3914"
-     showgrid="false"
-     inkscape:zoom="0.98333333"
-     inkscape:cx="81.80767"
-     inkscape:cy="72.1"
-     inkscape:window-x="1912"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><style
-     type="text/css"
-     id="style3856">
-	.st0{fill:#7DC8A2;}
-	.st1{fill:#AFDBC5;}
-	.st2{fill:#764D80;}
-	.st3{fill:#764D80;stroke:#764D80;stroke-miterlimit:10;}
-</style><g
-     id="Layer_3"
-     transform="translate(-38.19233,-47.9)"><g
-       id="g3910"><g
-         id="g3886"><g
-           id="g3884"><path
-             class="st0"
-             d="M 100.6,48.1 H 59.7 c -0.1,0 -0.2,0 -0.3,0 -11.4,0 -20.6,9.2 -20.6,20.6 v 102.8 c 0,11.4 9.2,20.6 20.6,20.6 11.4,0 20.6,-9.2 20.6,-20.6 v -20.6 h 20.6 c 28.3,0 51.4,-23.1 51.4,-51.4 0,-28.3 -23.1,-51.4 -51.4,-51.4 z"
-             id="path3858"
-             inkscape:connector-curvature="0"
-             style="fill:#7dc8a2" /><path
-             class="st1"
-             d="M 59.5,186.9 C 51,186.9 44.1,180 44.1,171.5 V 68.6 c 0,-8.5 6.9,-15.4 15.3,-15.4 0.1,0 0.2,0 0.3,0 h 40.9 c 25.5,0 46.3,20.8 46.3,46.3 0,25.5 -20.8,46.3 -46.3,46.3 H 74.9 v 25.7 c 0,8.4 -6.9,15.4 -15.4,15.4 z"
-             id="path3860"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><path
-             class="st0"
-             d="m 59.5,181.7 c -5.7,0 -10.3,-4.6 -10.3,-10.3 V 68.6 c 0,-5.6 4.5,-10.2 10.1,-10.3 0.1,0 0.2,0 0.3,0 h 41 c 22.7,0 41.1,18.5 41.1,41.1 0,22.6 -18.5,41.1 -41.1,41.1 H 69.8 v 30.8 c 0,5.8 -4.6,10.4 -10.3,10.4 z"
-             id="path3862"
-             inkscape:connector-curvature="0"
-             style="fill:#7dc8a2" /><path
-             class="st1"
-             d="m 59.5,176.6 c -2.9,0 -5.2,-2.3 -5.2,-5.2 V 68.6 c 0,-2.8 2.2,-5.1 5,-5.2 h 0.2 41.1 c 19.9,0 36,16.2 36,36 0,19.8 -16.1,36 -36,36 H 64.7 v 36 c 0,2.9 -2.3,5.2 -5.2,5.2 z"
-             id="path3864"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><path
-             class="st0"
-             d="m 59.5,130.3 h 41.1 c 17,0 30.9,-13.8 30.9,-30.9 0,-17.1 -13.8,-30.9 -30.9,-30.9 H 59.5 Z"
-             id="path3866"
-             inkscape:connector-curvature="0"
-             style="fill:#7dc8a2" /><path
-             class="st1"
-             d="M 64.7,125.2 V 73.7 h 36 c 14.2,0 25.7,11.5 25.7,25.7 0,14.2 -11.5,25.7 -25.7,25.7 z"
-             id="path3868"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><path
-             class="st0"
-             d="M 69.8,120.1 V 78.9 h 30.8 c 11.4,0 20.6,9.2 20.6,20.6 0,11.4 -9.2,20.6 -20.6,20.6 z"
-             id="path3870"
-             inkscape:connector-curvature="0"
-             style="fill:#7dc8a2" /><path
-             class="st1"
-             d="M 74.9,115 V 84 h 25.7 c 8.5,0 15.5,6.9 15.5,15.5 0,8.6 -6.9,15.5 -15.5,15.5 z"
-             id="path3872"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><path
-             class="st0"
-             d="M 80,109.8 V 89.1 h 20.6 c 5.7,0 10.4,4.6 10.4,10.4 0,5.8 -4.6,10.4 -10.4,10.4 z"
-             id="path3874"
-             inkscape:connector-curvature="0"
-             style="fill:#7dc8a2" /><path
-             class="st1"
-             d="M 85.2,104.7 V 94.2 h 15.4 c 2.9,0 5.2,2.3 5.2,5.2 0,2.9 -2.3,5.2 -5.2,5.2 z"
-             id="path3876"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><g
-             id="g3882"><circle
-               transform="matrix(0.8192,-0.5736,0.5736,0.8192,-28.7245,46.1263)"
-               class="st2"
-               cx="58.799999"
-               cy="68.599998"
-               id="ellipse3878"
-               r="20.6"
-               style="fill:#764d80" /><path
-               class="st2"
-               d="m 147.6,159.6 c 6.5,9.3 4.3,22.1 -5,28.6 -9.3,6.5 -22.1,4.3 -28.6,-5 l -30.8,-44 c -6.5,-9.3 -4.3,-22.1 5,-28.6 9.3,-6.5 22.1,-4.3 28.6,5 z"
-               id="path3880"
-               inkscape:connector-curvature="0"
-               style="fill:#764d80" /></g></g></g><g
-         id="g3908"><g
-           id="g3896"><path
-             class="st2"
-             d="M 183.6,80.7 H 200 c 0.9,0 1.6,-0.7 1.6,-1.6 0,-0.9 -0.7,-1.6 -1.6,-1.6 h -16.4 c -0.9,0 -1.6,0.7 -1.6,1.6 0,0.9 0.7,1.6 1.6,1.6 z"
-             id="path3888"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80" /><path
-             class="st2"
-             d="m 183.6,51.3 h 4.9 v 5 0 l -5.8,4 c -0.7,0.5 -0.9,1.5 -0.4,2.3 0.5,0.7 1.5,0.9 2.3,0.4 l 4.6,-3.2 c 1.1,2.2 3.3,3.6 5.9,3.6 3.6,0 6.6,-3 6.6,-6.6 v -7.2 0 c 0,-0.6 -0.3,-1.1 -0.7,-1.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.3 v 0 h -9.8 -6.5 c -0.9,0 -1.6,0.7 -1.6,1.6 -0.2,1.1 0.5,1.8 1.4,1.8 z m 14.7,5.6 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 v -5.6 h 6.5 z"
-             id="path3890"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80" /><path
-             class="st2"
-             d="m 200,123.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 4.9 h -14.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 0 c 0,0.9 0.7,1.6 1.6,1.6 h 14.7 v 5 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 v -6.6 0 -6.5 c 0,-0.9 -0.7,-1.6 -1.6,-1.6 z"
-             id="path3892"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80" /><path
-             class="st2"
-             d="m 191.8,94.5 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,16.7 c -3.7,0 -6.7,-3 -6.7,-6.7 0,-3.7 3,-6.7 6.7,-6.7 3.7,0 6.7,3 6.7,6.7 0,3.7 -3,6.7 -6.7,6.7 z"
-             id="path3894"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80" /></g><g
-           id="g3902"><path
-             class="st2"
-             d="m 201.1,157 c -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.4,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.4 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.3,0 0.7,-0.1 1.1,-0.4 0.3,-0.3 0.4,-0.6 0.4,-1.1 0,-0.4 -0.1,-0.8 -0.4,-1.1 z"
-             id="path3898"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80" /><path
-             class="st2"
-             d="m 201.5,175.3 v -0.2 c 0,-0.4 -0.1,-0.8 -0.4,-1.1 -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.3,0 -0.7,0 -1.1,0.3 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 h 12.1 l -7.3,4.9 c -0.4,0.4 -0.6,0.8 -0.6,1.3 0,0.5 0.3,1 0.7,1.3 l 7.3,5 h -12.1 c -0.3,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.4,0 0.7,-0.1 1.1,-0.4 0.4,-0.3 0.4,-0.6 0.4,-1.1 v -0.2 c 0,-0.5 -0.1,-1.1 -0.7,-1.4 l -9.2,-6.1 9.2,-6.1 c 0.4,-0.3 0.7,-0.8 0.7,-1.4 z"
-             id="path3900"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80" /></g><g
-           id="g3906"><path
-             class="st3"
-             d="m 190.7,146.1 c 0.3,0 0.6,0.1 0.9,0.4 0.2,0.2 0.4,0.5 0.4,0.9 0,0.3 -0.1,0.6 -0.4,0.9 -0.2,0.2 -0.5,0.4 -0.9,0.4 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.4 -0.2,-0.2 -0.4,-0.5 -0.4,-0.9 0,-0.4 0.1,-0.7 0.4,-0.9 0.2,-0.2 0.5,-0.4 0.9,-0.4 z"
-             id="path3904"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80;stroke:#764d80;stroke-miterlimit:10" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-im-logo-2.svg b/res/themes/riot/img/logos/riot-im-logo-2.svg
deleted file mode 100644
index f9cc92f1..00000000
--- a/res/themes/riot/img/logos/riot-im-logo-2.svg
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<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"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 163.7 144.10001"
-   xml:space="preserve"
-   sodipodi:docname="riot-im-logo-2.svg"
-   width="163.7"
-   height="144.10001"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata64"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs62" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview60"
-     showgrid="false"
-     inkscape:zoom="0.98333333"
-     inkscape:cx="81.9"
-     inkscape:cy="72"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><style
-     type="text/css"
-     id="style2">
-	.st0{fill:#F69E98;}
-	.st1{fill:#764D80;}
-</style><g
-     id="Layer_3"
-     transform="translate(-38.1,-47.9)"><g
-       id="g26"><g
-         id="g24"><g
-           id="g12"><path
-             class="st0"
-             d="M 183.6,80.7 H 200 c 0.9,0 1.6,-0.7 1.6,-1.6 0,-0.9 -0.7,-1.6 -1.6,-1.6 h -16.4 c -0.9,0 -1.6,0.7 -1.6,1.6 0,0.9 0.7,1.6 1.6,1.6 z"
-             id="path4"
-             inkscape:connector-curvature="0"
-             style="fill:#f69e98" /><path
-             class="st0"
-             d="m 183.6,51.3 h 4.9 v 5 0 l -5.8,4 c -0.7,0.5 -0.9,1.5 -0.4,2.3 0.5,0.7 1.5,0.9 2.3,0.4 l 4.6,-3.2 c 1.1,2.2 3.3,3.6 5.9,3.6 3.6,0 6.6,-3 6.6,-6.6 v -7.2 0 c 0,-0.6 -0.3,-1.1 -0.7,-1.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.3 v 0 h -9.8 -6.5 c -0.9,0 -1.6,0.7 -1.6,1.6 -0.2,1.1 0.5,1.8 1.4,1.8 z m 14.7,5.6 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 v -5.6 h 6.5 z"
-             id="path6"
-             inkscape:connector-curvature="0"
-             style="fill:#f69e98" /><path
-             class="st0"
-             d="m 200,123.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 4.9 h -14.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 0 c 0,0.9 0.7,1.6 1.6,1.6 h 14.7 v 5 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 v -6.6 0 -6.5 c 0,-0.9 -0.7,-1.6 -1.6,-1.6 z"
-             id="path8"
-             inkscape:connector-curvature="0"
-             style="fill:#f69e98" /><path
-             class="st0"
-             d="m 191.8,94.5 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,16.7 c -3.7,0 -6.7,-3 -6.7,-6.7 0,-3.7 3,-6.7 6.7,-6.7 3.7,0 6.7,3 6.7,6.7 0,3.7 -3,6.7 -6.7,6.7 z"
-             id="path10"
-             inkscape:connector-curvature="0"
-             style="fill:#f69e98" /></g><g
-           id="g18"><path
-             class="st0"
-             d="m 201.1,157 c -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.4,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.4 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.3,0 0.7,-0.1 1.1,-0.4 0.3,-0.3 0.4,-0.6 0.4,-1.1 0,-0.4 -0.1,-0.8 -0.4,-1.1 z"
-             id="path14"
-             inkscape:connector-curvature="0"
-             style="fill:#f69e98" /><path
-             class="st0"
-             d="m 201.5,175.3 v -0.2 c 0,-0.4 -0.1,-0.8 -0.4,-1.1 -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.3,0 -0.7,0 -1.1,0.3 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 h 12.1 l -7.3,4.9 c -0.4,0.4 -0.6,0.8 -0.6,1.3 0,0.5 0.3,1 0.7,1.3 l 7.3,5 h -12.1 c -0.3,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.4,0 0.7,-0.1 1.1,-0.4 0.4,-0.3 0.4,-0.6 0.4,-1.1 v -0.2 c 0,-0.5 -0.1,-1.1 -0.7,-1.4 l -9.2,-6.1 9.2,-6.1 c 0.4,-0.3 0.7,-0.8 0.7,-1.4 z"
-             id="path16"
-             inkscape:connector-curvature="0"
-             style="fill:#f69e98" /></g><g
-           id="g22"><path
-             class="st0"
-             d="m 190.7,146.1 c 0.3,0 0.6,0.1 0.9,0.4 0.2,0.2 0.4,0.5 0.4,0.9 0,0.3 -0.1,0.6 -0.4,0.9 -0.2,0.2 -0.5,0.4 -0.9,0.4 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.4 -0.2,-0.2 -0.4,-0.5 -0.4,-0.9 0,-0.4 0.1,-0.7 0.4,-0.9 0.2,-0.2 0.5,-0.4 0.9,-0.4 z"
-             id="path20"
-             inkscape:connector-curvature="0"
-             style="fill:#f69e98" /></g></g></g></g><g
-     id="g57"
-     transform="translate(-38.1,-47.9)"><path
-       class="st1"
-       d="M 99.9,48 H 58.7 c -11.4,0 -20.6,9.2 -20.6,20.6 0,0 0,0 0,0 v 102.8 c 0,11.4 9.2,20.6 20.6,20.6 11.4,0 20.6,-9.2 20.6,-20.6 v -20.6 h 20.5 c 28.4,0 51.4,-23 51.4,-51.4 C 151.2,71 128.2,48 99.9,48 Z"
-       id="path29"
-       inkscape:connector-curvature="0"
-       style="fill:#764d80" /><path
-       class="st0"
-       d="m 58.7,187.6 c -8.9,0 -16.2,-7.2 -16.2,-16.2 V 68.6 c 0,-8.9 7.1,-16.1 16,-16.2 h 41.3 c 26,0 47,21 47,47 0,26 -21,47 -47,47 H 74.9 v 25 c 0,9 -7.2,16.2 -16.2,16.2 z M 58.6,53.9 c -8,0.1 -14.5,6.6 -14.5,14.7 v 102.8 c 0,8.1 6.6,14.7 14.7,14.7 8.1,0 14.7,-6.6 14.7,-14.7 v -26.5 h 26.4 c 25.1,0 45.5,-20.4 45.5,-45.5 0,-25.1 -20.4,-45.5 -45.5,-45.5 0,0 -41.3,0 -41.3,0 z"
-       id="path31"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st0"
-       d="m 58.7,182.4 c -6.1,0 -11,-4.9 -11,-11 V 68.6 c 0,-6 4.8,-10.8 10.8,-11 h 41.3 c 23.1,0 41.9,18.7 41.9,41.9 0,23.2 -18.7,41.8 -41.9,41.8 h -30 v 30.1 c 0,6.1 -4.9,11 -11.1,11 0.1,0 0.1,0 0,0 z M 58.5,59 c -5.2,0.1 -9.3,4.4 -9.3,9.6 v 102.8 c -0.2,5.3 4,9.7 9.2,9.8 5.2,0.1 9.7,-4 9.8,-9.2 0,-0.2 0,-0.4 0,-0.6 v -31.6 h 31.6 c 22.3,0 40.3,-18.1 40.3,-40.4 0,-22.3 -18.1,-40.3 -40.3,-40.3 z"
-       id="path33"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st0"
-       d="m 58.7,177.3 c -3.2,0 -5.9,-2.6 -5.9,-5.9 V 68.6 c 0,-3.1 2.5,-5.7 5.6,-5.9 h 41.4 c 20.3,0 36.7,16.4 36.7,36.7 0,20.3 -16.4,36.7 -36.7,36.7 H 64.6 v 35.2 c 0,3.3 -2.6,6 -5.9,6 z M 58.5,64.2 c -2.3,0.2 -4.1,2.1 -4.1,4.4 v 102.8 c 0,2.4 2,4.4 4.4,4.4 2.4,0 4.4,-2 4.4,-4.4 v -36.8 h 36.7 c 19.4,0 35.2,-15.8 35.2,-35.2 0,-19.4 -15.8,-35.2 -35.2,-35.2 z"
-       id="path35"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st0"
-       d="M 99.9,131 H 58 V 67.9 h 41.9 c 17.4,0 31.6,14.1 31.6,31.6 0,17.5 -14.2,31.5 -31.6,31.5 z M 59.5,129.5 H 99.9 C 116.5,129.5 130,116 130,99.4 130,82.8 116.5,69.3 99.9,69.3 H 59.5 Z"
-       id="path37"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st0"
-       d="M 99.9,125.9 H 63.2 V 73 h 36.7 c 14.6,0.3 26.2,12.3 25.9,26.9 -0.3,14.3 -11.8,25.7 -25.9,26 z M 64.6,124.4 H 99.8 C 113.6,124.1 124.5,112.7 124.2,99 123.9,85.6 113.2,74.8 99.8,74.6 H 64.6 Z"
-       id="path39"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st0"
-       d="M 99.9,120.7 H 68.3 V 78.2 h 31.6 c 11.8,0.3 21.1,10 20.8,21.7 -0.3,11.4 -9.5,20.6 -20.8,20.8 z M 69.8,119.2 H 99.9 C 110.8,119 119.5,109.9 119.2,99 119,88.4 110.4,79.9 99.9,79.7 H 69.8 Z"
-       id="path41"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st0"
-       d="M 99.9,115.6 H 73.4 V 83.3 h 26.4 c 8.9,0 16.1,7.2 16.1,16.1 0,8.9 -7.1,16.2 -16,16.2 z m -25,-1.6 h 24.9 c 8.1,0 14.6,-6.6 14.6,-14.6 0,-8 -6.6,-14.6 -14.6,-14.6 v 0 H 74.9 Z"
-       id="path43"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st0"
-       d="M 99.9,110.4 H 78.6 v -22 h 21.3 c 6.1,0 11,4.9 11,11 0,6.1 -5,11 -11,11 z m -19.8,-1.5 h 19.8 c 5.2,0 9.5,-4.3 9.5,-9.5 0,-5.2 -4.3,-9.5 -9.5,-9.5 H 80.1 Z"
-       id="path45"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st0"
-       d="M 99.9,105.3 H 83.7 V 93.6 h 16.1 c 3.2,0 5.9,2.6 5.9,5.9 0,3.3 -2.6,5.8 -5.8,5.8 0,0 0,0 0,0 z m -14.7,-1.5 h 14.7 c 2.4,0 4.4,-2 4.4,-4.4 0,-2.4 -2,-4.4 -4.4,-4.4 H 85.2 Z"
-       id="path47"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st0"
-       d="m 99.4,100.2 h -9.3 c -0.4,0 -0.8,-0.3 -0.8,-0.8 0,-0.5 0.3,-0.8 0.8,-0.8 h 9.3 c 0.4,0 0.8,0.3 0.8,0.8 0,0.5 -0.4,0.8 -0.8,0.8 z"
-       id="path49"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st0"
-       d="m 58.7,172.2 c -0.4,0 -0.8,-0.3 -0.8,-0.8 v -36 c 0,-0.4 0.3,-0.8 0.8,-0.8 0.4,0 0.8,0.3 0.8,0.8 v 36 c 0,0.4 -0.3,0.8 -0.8,0.8 z"
-       id="path51"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><circle
-       transform="matrix(0.8192,-0.5736,0.5736,0.8192,-28.7215,46.1209)"
-       class="st0"
-       cx="58.799999"
-       cy="68.599998"
-       id="ellipse53"
-       r="20.6"
-       style="fill:#f69e98" /><path
-       class="st0"
-       d="m 147.5,159.6 c 6.5,9.3 4.3,22.1 -5.1,28.6 -9.4,6.5 -22.1,4.3 -28.6,-5.1 L 83,139.1 c -6.5,-9.3 -4.2,-22.1 5.1,-28.6 9.3,-6.5 22.1,-4.2 28.6,5.1 z"
-       id="path55"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /></g></svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-im-logo-3.svg b/res/themes/riot/img/logos/riot-im-logo-3.svg
deleted file mode 100644
index 7f81dacd..00000000
--- a/res/themes/riot/img/logos/riot-im-logo-3.svg
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<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"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 163.89999 144.3"
-   xml:space="preserve"
-   sodipodi:docname="riot-im-logo-3.svg"
-   width="163.89999"
-   height="144.3"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata68"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs66" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview64"
-     showgrid="false"
-     inkscape:zoom="0.98333333"
-     inkscape:cx="82.1"
-     inkscape:cy="72.2"
-     inkscape:window-x="1034"
-     inkscape:window-y="234"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><style
-     type="text/css"
-     id="style2">
-	.st0{fill:#FAC79E;}
-	.st1{fill:#E45E5D;}
-	.st2{fill:#F8A05F;}
-</style><g
-     id="Layer_3"
-     transform="translate(-37.9,-47.9)"><g
-       id="g26"><g
-         id="g24"><g
-           id="g12"><path
-             class="st0"
-             d="M 183.6,80.7 H 200 c 0.9,0 1.6,-0.7 1.6,-1.6 0,-0.9 -0.7,-1.6 -1.6,-1.6 h -16.4 c -0.9,0 -1.6,0.7 -1.6,1.6 0,0.9 0.7,1.6 1.6,1.6 z"
-             id="path4"
-             inkscape:connector-curvature="0"
-             style="fill:#fac79e" /><path
-             class="st0"
-             d="m 183.6,51.3 h 4.9 v 5 0 l -5.8,4 c -0.7,0.5 -0.9,1.5 -0.4,2.3 0.5,0.7 1.5,0.9 2.3,0.4 l 4.6,-3.2 c 1.1,2.2 3.3,3.6 5.9,3.6 3.6,0 6.6,-3 6.6,-6.6 v -7.2 0 c 0,-0.6 -0.3,-1.1 -0.7,-1.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.3 v 0 h -9.8 -6.5 c -0.9,0 -1.6,0.7 -1.6,1.6 -0.2,1.1 0.5,1.8 1.4,1.8 z m 14.7,5.6 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 v -5.6 h 6.5 z"
-             id="path6"
-             inkscape:connector-curvature="0"
-             style="fill:#fac79e" /><path
-             class="st0"
-             d="m 200,123.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 4.9 h -14.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 0 c 0,0.9 0.7,1.6 1.6,1.6 h 14.7 v 5 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 v -6.6 0 -6.5 c 0,-0.9 -0.7,-1.6 -1.6,-1.6 z"
-             id="path8"
-             inkscape:connector-curvature="0"
-             style="fill:#fac79e" /><path
-             class="st0"
-             d="m 191.8,94.5 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,16.7 c -3.7,0 -6.7,-3 -6.7,-6.7 0,-3.7 3,-6.7 6.7,-6.7 3.7,0 6.7,3 6.7,6.7 0,3.7 -3,6.7 -6.7,6.7 z"
-             id="path10"
-             inkscape:connector-curvature="0"
-             style="fill:#fac79e" /></g><g
-           id="g18"><path
-             class="st0"
-             d="m 201.1,157 c -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.4,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.4 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.3,0 0.7,-0.1 1.1,-0.4 0.3,-0.3 0.4,-0.6 0.4,-1.1 0,-0.4 -0.1,-0.8 -0.4,-1.1 z"
-             id="path14"
-             inkscape:connector-curvature="0"
-             style="fill:#fac79e" /><path
-             class="st0"
-             d="m 201.5,175.3 v -0.2 c 0,-0.4 -0.1,-0.8 -0.4,-1.1 -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.3,0 -0.7,0 -1.1,0.3 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 h 12.1 l -7.3,4.9 c -0.4,0.4 -0.6,0.8 -0.6,1.3 0,0.5 0.3,1 0.7,1.3 l 7.3,5 h -12.1 c -0.3,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.4,0 0.7,-0.1 1.1,-0.4 0.4,-0.3 0.4,-0.6 0.4,-1.1 v -0.2 c 0,-0.5 -0.1,-1.1 -0.7,-1.4 l -9.2,-6.1 9.2,-6.1 c 0.4,-0.3 0.7,-0.8 0.7,-1.4 z"
-             id="path16"
-             inkscape:connector-curvature="0"
-             style="fill:#fac79e" /></g><g
-           id="g22"><path
-             class="st0"
-             d="m 190.7,146.1 c 0.3,0 0.6,0.1 0.9,0.4 0.2,0.2 0.4,0.5 0.4,0.9 0,0.3 -0.1,0.6 -0.4,0.9 -0.2,0.2 -0.5,0.4 -0.9,0.4 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.4 -0.2,-0.2 -0.4,-0.5 -0.4,-0.9 0,-0.4 0.1,-0.7 0.4,-0.9 0.2,-0.2 0.5,-0.4 0.9,-0.4 z"
-             id="path20"
-             inkscape:connector-curvature="0"
-             style="fill:#fac79e" /></g></g></g></g><g
-     id="g61"
-     transform="translate(-37.9,-47.9)"><path
-       class="st1"
-       d="M 99.6,48.2 H 58.5 c -11.4,0 -20.6,9.2 -20.6,20.6 0,0 0,0 0,0 v 102.8 c 0,11.4 9.2,20.6 20.6,20.6 11.4,0 20.6,-9.2 20.6,-20.6 V 151 h 20.6 c 28.4,0 51.4,-23 51.4,-51.4 0,-28.4 -23.1,-51.4 -51.5,-51.4 z"
-       id="path29"
-       inkscape:connector-curvature="0"
-       style="fill:#e45e5d" /><polygon
-       class="st2"
-       points="37.9,96.3 37.9,104.3 85,48.2 78.3,48.2 "
-       id="polygon31"
-       style="fill:#f8a05f" /><polygon
-       class="st2"
-       points="37.9,112.3 37.9,120.2 98.4,48.2 91.7,48.2 "
-       id="polygon33"
-       style="fill:#f8a05f" /><path
-       class="st2"
-       d="m 110.8,49.5 c -1.9,-0.4 -3.9,-0.8 -5.9,-1 L 38,128.3 v 8 z"
-       id="path35"
-       inkscape:connector-curvature="0"
-       style="fill:#f8a05f" /><polygon
-       class="st2"
-       points="37.9,80.3 37.9,88.3 71.6,48.2 64.8,48.2 "
-       id="polygon37"
-       style="fill:#f8a05f" /><path
-       class="st2"
-       d="m 121.2,53 c -1.6,-0.8 -3.3,-1.4 -5,-2 l -78.3,93.2 v 8 z"
-       id="path39"
-       inkscape:connector-curvature="0"
-       style="fill:#f8a05f" /><path
-       class="st2"
-       d="m 79.1,151 h 0.2 L 144,73.8 c -0.9,-1.5 -1.9,-3 -2.9,-4.5 L 43.5,185.6 c 1.2,1.3 2.5,2.4 4,3.3 l 31.6,-37.7 z"
-       id="path41"
-       inkscape:connector-curvature="0"
-       style="fill:#f8a05f" /><path
-       class="st2"
-       d="M 150.2,90.4 99.4,151 h 0.2 c 2.3,0 4.6,-0.2 6.9,-0.5 l 44.5,-53 c -0.2,-2.4 -0.4,-4.7 -0.8,-7.1 z"
-       id="path43"
-       inkscape:connector-curvature="0"
-       style="fill:#f8a05f" /><path
-       class="st2"
-       d="m 78.7,175.7 -12.6,15 c 6.4,-2.6 11.2,-8.2 12.6,-15 z"
-       id="path45"
-       inkscape:connector-curvature="0"
-       style="fill:#f8a05f" /><path
-       class="st2"
-       d="m 147.9,117.1 c 1.3,-3.6 2.2,-7.4 2.7,-11.2 l -35.9,42.8 c 3.7,-1.1 7.3,-2.7 10.6,-4.6 z"
-       id="path47"
-       inkscape:connector-curvature="0"
-       style="fill:#f8a05f" /><path
-       class="st2"
-       d="m 130.2,58.3 c -1.4,-1 -2.8,-2 -4.3,-2.9 l -88,104.8 v 8 z"
-       id="path49"
-       inkscape:connector-curvature="0"
-       style="fill:#f8a05f" /><path
-       class="st2"
-       d="m 137.8,65.2 c -1.2,-1.3 -2.4,-2.5 -3.6,-3.7 L 38.4,175.7 c 0.4,1.9 1.1,3.8 2,5.6 z"
-       id="path51"
-       inkscape:connector-curvature="0"
-       style="fill:#f8a05f" /><path
-       class="st2"
-       d="m 79.1,167.2 v -8 l -26.8,32 c 1.9,0.6 3.9,1 5.9,1 z"
-       id="path53"
-       inkscape:connector-curvature="0"
-       style="fill:#f8a05f" /><path
-       class="st2"
-       d="m 148.7,84.2 c -0.6,-1.9 -1.3,-3.7 -2.1,-5.5 L 85.9,151 h 6.7 z"
-       id="path55"
-       inkscape:connector-curvature="0"
-       style="fill:#f8a05f" /><circle
-       transform="matrix(0.8192,-0.5736,0.5736,0.8192,-28.8644,46.014)"
-       class="st0"
-       cx="58.5"
-       cy="68.800003"
-       id="ellipse57"
-       r="20.6"
-       style="fill:#fac79e" /><path
-       class="st0"
-       d="m 147.3,159.8 c 6.5,9.3 4.3,22.1 -5.1,28.6 -9.4,6.5 -22.1,4.3 -28.6,-5.1 l -30.8,-44 c -6.5,-9.3 -4.2,-22.1 5.1,-28.6 9.3,-6.5 22.1,-4.2 28.6,5.1 z"
-       id="path59"
-       inkscape:connector-curvature="0"
-       style="fill:#fac79e" /></g></svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-im-logo-4.svg b/res/themes/riot/img/logos/riot-im-logo-4.svg
deleted file mode 100644
index 307868e6..00000000
--- a/res/themes/riot/img/logos/riot-im-logo-4.svg
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<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"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 163.89999 144.10001"
-   xml:space="preserve"
-   sodipodi:docname="riot-im-logo-4.svg"
-   width="163.89999"
-   height="144.10001"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata70"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs68" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview66"
-     showgrid="false"
-     inkscape:zoom="0.98333333"
-     inkscape:cx="82.1"
-     inkscape:cy="72"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><style
-     type="text/css"
-     id="style2">
-	.st0{fill:#C7BDCD;}
-	.st1{fill:#E45E5D;}
-	.st2{fill:#F69E98;}
-</style><g
-     id="Layer_3"
-     transform="translate(-37.9,-47.9)"><g
-       id="g26"><g
-         id="g24"><g
-           id="g12"><path
-             class="st0"
-             d="M 183.6,80.7 H 200 c 0.9,0 1.6,-0.7 1.6,-1.6 0,-0.9 -0.7,-1.6 -1.6,-1.6 h -16.4 c -0.9,0 -1.6,0.7 -1.6,1.6 0,0.9 0.7,1.6 1.6,1.6 z"
-             id="path4"
-             inkscape:connector-curvature="0"
-             style="fill:#c7bdcd" /><path
-             class="st0"
-             d="m 183.6,51.3 h 4.9 v 5 0 l -5.8,4 c -0.7,0.5 -0.9,1.5 -0.4,2.3 0.5,0.7 1.5,0.9 2.3,0.4 l 4.6,-3.2 c 1.1,2.2 3.3,3.6 5.9,3.6 3.6,0 6.6,-3 6.6,-6.6 v -7.2 0 c 0,-0.6 -0.3,-1.1 -0.7,-1.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.3 v 0 h -9.8 -6.5 c -0.9,0 -1.6,0.7 -1.6,1.6 -0.2,1.1 0.5,1.8 1.4,1.8 z m 14.7,5.6 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 v -5.6 h 6.5 z"
-             id="path6"
-             inkscape:connector-curvature="0"
-             style="fill:#c7bdcd" /><path
-             class="st0"
-             d="m 200,123.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 4.9 h -14.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 0 c 0,0.9 0.7,1.6 1.6,1.6 h 14.7 v 5 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 v -6.6 0 -6.5 c 0,-0.9 -0.7,-1.6 -1.6,-1.6 z"
-             id="path8"
-             inkscape:connector-curvature="0"
-             style="fill:#c7bdcd" /><path
-             class="st0"
-             d="m 191.8,94.5 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,16.7 c -3.7,0 -6.7,-3 -6.7,-6.7 0,-3.7 3,-6.7 6.7,-6.7 3.7,0 6.7,3 6.7,6.7 0,3.7 -3,6.7 -6.7,6.7 z"
-             id="path10"
-             inkscape:connector-curvature="0"
-             style="fill:#c7bdcd" /></g><g
-           id="g18"><path
-             class="st0"
-             d="m 201.1,157 c -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.4,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.4 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.3,0 0.7,-0.1 1.1,-0.4 0.3,-0.3 0.4,-0.6 0.4,-1.1 0,-0.4 -0.1,-0.8 -0.4,-1.1 z"
-             id="path14"
-             inkscape:connector-curvature="0"
-             style="fill:#c7bdcd" /><path
-             class="st0"
-             d="m 201.5,175.3 v -0.2 c 0,-0.4 -0.1,-0.8 -0.4,-1.1 -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.3,0 -0.7,0 -1.1,0.3 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 h 12.1 l -7.3,4.9 c -0.4,0.4 -0.6,0.8 -0.6,1.3 0,0.5 0.3,1 0.7,1.3 l 7.3,5 h -12.1 c -0.3,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.4,0 0.7,-0.1 1.1,-0.4 0.4,-0.3 0.4,-0.6 0.4,-1.1 v -0.2 c 0,-0.5 -0.1,-1.1 -0.7,-1.4 l -9.2,-6.1 9.2,-6.1 c 0.4,-0.3 0.7,-0.8 0.7,-1.4 z"
-             id="path16"
-             inkscape:connector-curvature="0"
-             style="fill:#c7bdcd" /></g><g
-           id="g22"><path
-             class="st0"
-             d="m 190.7,146.1 c 0.3,0 0.6,0.1 0.9,0.4 0.2,0.2 0.4,0.5 0.4,0.9 0,0.3 -0.1,0.6 -0.4,0.9 -0.2,0.2 -0.5,0.4 -0.9,0.4 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.4 -0.2,-0.2 -0.4,-0.5 -0.4,-0.9 0,-0.4 0.1,-0.7 0.4,-0.9 0.2,-0.2 0.5,-0.4 0.9,-0.4 z"
-             id="path20"
-             inkscape:connector-curvature="0"
-             style="fill:#c7bdcd" /></g></g></g></g><g
-     id="g63"
-     transform="translate(-37.9,-47.9)"><path
-       class="st1"
-       d="M 99.6,48 H 58.5 c -11.4,0 -20.6,9.2 -20.6,20.6 0,0 0,0 0,0 v 102.8 c 0,11.4 9.2,20.6 20.6,20.6 11.4,0 20.6,-9.2 20.6,-20.6 V 150.8 H 99.6 C 128,150.8 151,127.8 151,99.4 151,71 128,48 99.6,48 Z"
-       id="path29"
-       inkscape:connector-curvature="0"
-       style="fill:#e45e5d" /><path
-       class="st2"
-       d="m 40.7,181.7 c 1.1,1.9 2.6,3.7 4.2,5.1 H 72 c 1.7,-1.5 3.1,-3.2 4.2,-5.1 z"
-       id="path31"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st2"
-       d="m 37.9,140.6 v 5.1 h 84 c 3,-1.4 5.8,-3.2 8.4,-5.1 z"
-       id="path33"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><rect
-       x="37.900002"
-       y="150.8"
-       class="st2"
-       width="41.099998"
-       height="5.0999999"
-       id="rect35"
-       style="fill:#f69e98" /><rect
-       x="37.900002"
-       y="161.10001"
-       class="st2"
-       width="41.099998"
-       height="5.0999999"
-       id="rect37"
-       style="fill:#f69e98" /><path
-       class="st2"
-       d="m 38.6,63.4 h 97.6 c -1.8,-1.9 -3.8,-3.6 -5.9,-5.1 H 40.7 c -0.9,1.6 -1.6,3.3 -2.1,5.1 z"
-       id="path39"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st2"
-       d="m 37.9,171.4 v 0 c 0,1.7 0.2,3.4 0.7,5.1 h 39.8 c 0.4,-1.7 0.7,-3.4 0.7,-5.1 0,0 -41.2,0 -41.2,0 z"
-       id="path41"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st2"
-       d="m 37.9,104.6 h 112.8 c 0.2,-1.7 0.3,-3.4 0.3,-5.1 H 37.9 Z"
-       id="path43"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st2"
-       d="m 37.9,130.3 v 5.1 h 98.3 c 1.6,-1.6 3.1,-3.3 4.4,-5.1 z"
-       id="path45"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st2"
-       d="m 37.9,68.6 v 5.1 H 144 c -1,-1.8 -2.2,-3.5 -3.4,-5.1 z"
-       id="path47"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st2"
-       d="m 58.7,48 h -0.2 c -5,0 -9.8,1.8 -13.6,5.1 h 77 C 114.9,49.7 107.3,48 99.6,48 Z"
-       id="path49"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st2"
-       d="M 37.9,78.9 V 84 h 110.7 c -0.6,-1.7 -1.2,-3.5 -1.9,-5.1 z"
-       id="path51"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st2"
-       d="m 37.9,120 v 5.1 H 144 c 1,-1.7 1.8,-3.4 2.6,-5.1 z"
-       id="path53"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st2"
-       d="m 37.9,109.7 v 5.1 h 110.7 c 0.5,-1.7 1,-3.4 1.3,-5.1 z"
-       id="path55"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><path
-       class="st2"
-       d="m 37.9,89.3 v 5.1 h 112.8 c -0.2,-1.7 -0.4,-3.4 -0.8,-5.1 z"
-       id="path57"
-       inkscape:connector-curvature="0"
-       style="fill:#f69e98" /><circle
-       transform="matrix(0.8192,-0.5736,0.5736,0.8192,-28.7665,45.9782)"
-       class="st0"
-       cx="58.5"
-       cy="68.599998"
-       id="ellipse59"
-       r="20.6"
-       style="fill:#c7bdcd" /><path
-       class="st0"
-       d="m 147.3,159.6 c 6.5,9.3 4.3,22.1 -5.1,28.6 -9.4,6.5 -22.1,4.3 -28.6,-5.1 l -30.8,-44 c -6.5,-9.3 -4.2,-22.1 5.1,-28.6 9.3,-6.5 22.1,-4.2 28.6,5.1 z"
-       id="path61"
-       inkscape:connector-curvature="0"
-       style="fill:#c7bdcd" /></g></svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-im-logo-5.svg b/res/themes/riot/img/logos/riot-im-logo-5.svg
deleted file mode 100644
index 2653d7c9..00000000
--- a/res/themes/riot/img/logos/riot-im-logo-5.svg
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<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"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 164.01289 144.2"
-   xml:space="preserve"
-   sodipodi:docname="riot-im-logo-5.svg"
-   width="164.01289"
-   height="144.2"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata42"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs40" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview38"
-     showgrid="false"
-     inkscape:zoom="0.98333333"
-     inkscape:cx="82.212895"
-     inkscape:cy="72.1"
-     inkscape:window-x="1100"
-     inkscape:window-y="295"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><style
-     type="text/css"
-     id="style2">
-	.st0{fill:#AFDBC5;}
-	.st1{fill:#764D80;}
-</style><g
-     id="Layer_3"
-     transform="translate(-37.787105,-47.9)"><g
-       id="g26"><g
-         id="g24"><g
-           id="g12"><path
-             class="st0"
-             d="M 183.6,80.7 H 200 c 0.9,0 1.6,-0.7 1.6,-1.6 0,-0.9 -0.7,-1.6 -1.6,-1.6 h -16.4 c -0.9,0 -1.6,0.7 -1.6,1.6 0,0.9 0.7,1.6 1.6,1.6 z"
-             id="path4"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><path
-             class="st0"
-             d="m 183.6,51.3 h 4.9 v 5 0 l -5.8,4 c -0.7,0.5 -0.9,1.5 -0.4,2.3 0.5,0.7 1.5,0.9 2.3,0.4 l 4.6,-3.2 c 1.1,2.2 3.3,3.6 5.9,3.6 3.6,0 6.6,-3 6.6,-6.6 v -7.2 0 c 0,-0.6 -0.3,-1.1 -0.7,-1.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.3 v 0 h -9.8 -6.5 c -0.9,0 -1.6,0.7 -1.6,1.6 -0.2,1.1 0.5,1.8 1.4,1.8 z m 14.7,5.6 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 v -5.6 h 6.5 z"
-             id="path6"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><path
-             class="st0"
-             d="m 200,123.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 4.9 h -14.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 0 c 0,0.9 0.7,1.6 1.6,1.6 h 14.7 v 5 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 v -6.6 0 -6.5 c 0,-0.9 -0.7,-1.6 -1.6,-1.6 z"
-             id="path8"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><path
-             class="st0"
-             d="m 191.8,94.5 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,16.7 c -3.7,0 -6.7,-3 -6.7,-6.7 0,-3.7 3,-6.7 6.7,-6.7 3.7,0 6.7,3 6.7,6.7 0,3.7 -3,6.7 -6.7,6.7 z"
-             id="path10"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /></g><g
-           id="g18"><path
-             class="st0"
-             d="m 201.1,157 c -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.4,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.4 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.3,0 0.7,-0.1 1.1,-0.4 0.3,-0.3 0.4,-0.6 0.4,-1.1 0,-0.4 -0.1,-0.8 -0.4,-1.1 z"
-             id="path14"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><path
-             class="st0"
-             d="m 201.5,175.3 v -0.2 c 0,-0.4 -0.1,-0.8 -0.4,-1.1 -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.3,0 -0.7,0 -1.1,0.3 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 h 12.1 l -7.3,4.9 c -0.4,0.4 -0.6,0.8 -0.6,1.3 0,0.5 0.3,1 0.7,1.3 l 7.3,5 h -12.1 c -0.3,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.4,0 0.7,-0.1 1.1,-0.4 0.4,-0.3 0.4,-0.6 0.4,-1.1 v -0.2 c 0,-0.5 -0.1,-1.1 -0.7,-1.4 l -9.2,-6.1 9.2,-6.1 c 0.4,-0.3 0.7,-0.8 0.7,-1.4 z"
-             id="path16"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /></g><g
-           id="g22"><path
-             class="st0"
-             d="m 190.7,146.1 c 0.3,0 0.6,0.1 0.9,0.4 0.2,0.2 0.4,0.5 0.4,0.9 0,0.3 -0.1,0.6 -0.4,0.9 -0.2,0.2 -0.5,0.4 -0.9,0.4 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.4 -0.2,-0.2 -0.4,-0.5 -0.4,-0.9 0,-0.4 0.1,-0.7 0.4,-0.9 0.2,-0.2 0.5,-0.4 0.9,-0.4 z"
-             id="path20"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /></g></g></g></g><g
-     id="g35"
-     transform="translate(-37.787105,-47.9)"><path
-       class="st1"
-       d="M 99.5,48.1 H 58.4 c -11.4,0 -20.6,9.2 -20.6,20.6 0,0 0,0 0,0 v 102.8 c 0,11.4 9.2,20.6 20.6,20.6 11.4,0 20.6,-9.2 20.6,-20.6 v -20.6 h 20.6 c 28.4,0 51.4,-23 51.4,-51.4 0,-28.4 -23.2,-51.4 -51.5,-51.4 z"
-       id="path29"
-       inkscape:connector-curvature="0"
-       style="fill:#764d80" /><circle
-       transform="matrix(0.8211,-0.5708,0.5708,0.8211,-28.7968,45.5905)"
-       class="st0"
-       cx="58.299999"
-       cy="68.699997"
-       id="ellipse31"
-       r="20.5"
-       style="fill:#afdbc5" /><path
-       class="st0"
-       d="m 147.2,159.6 c 6.5,9.3 4.3,22.1 -5.1,28.6 -9.4,6.5 -22.1,4.3 -28.6,-5.1 l -30.8,-44 c -6.5,-9.3 -4.2,-22.1 5.1,-28.6 9.3,-6.5 22.1,-4.2 28.6,5.1 z"
-       id="path33"
-       inkscape:connector-curvature="0"
-       style="fill:#afdbc5" /></g></svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-im-logo-black-text.png b/res/themes/riot/img/logos/riot-im-logo-black-text.png
new file mode 100644
index 00000000..2b433461
Binary files /dev/null and b/res/themes/riot/img/logos/riot-im-logo-black-text.png differ
diff --git a/res/themes/riot/img/logos/riot-im-logo-black-text.svg b/res/themes/riot/img/logos/riot-im-logo-black-text.svg
new file mode 100644
index 00000000..ce50d65d
--- /dev/null
+++ b/res/themes/riot/img/logos/riot-im-logo-black-text.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="334px" height="293px" viewBox="0 0 334 293" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
+    <title>alt black logotype</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="alt-black-logotype" transform="translate(-71.000000, -93.000000)">
+            <g id="Group-17" transform="translate(75.000000, 97.000000)">
+                <path d="M83.6089795,81.3669988 L83.6089795,122.62072 L125.566883,122.57759 C126.099705,122.57759 126.585875,122.563213 127.069589,122.532064 C138.101709,121.806044 146.725079,112.775129 146.725079,101.973492 C146.725079,90.6087715 137.254595,81.3669988 125.608625,81.3669988 L83.6089795,81.3669988 Z M42.1126914,285.126882 C19.1964277,285.126882 0.616403324,266.99796 0.616403324,244.632726 L0.616403324,167.456616 C0.466623823,166.057291 0.385595568,164.634005 0.385595568,163.193947 C0.383140166,161.727531 0.461713019,160.280285 0.616403324,158.852207 L0.616403324,40.8728429 C0.616403324,18.5076092 19.1964277,0.376291002 42.1126914,0.376291002 L125.608625,0.376291002 C183.015916,0.376291002 229.720111,45.9525832 229.720111,101.973492 C229.720111,155.236486 187.089427,199.758492 132.667905,203.333479 C130.354916,203.489226 127.970721,203.568297 125.608625,203.568297 L83.6089795,203.609031 L83.6089795,244.632726 C83.6089795,266.99796 65.0314105,285.126882 42.1126914,285.126882 Z" id="Fill-1" fill="#A2DDEF"></path>
+                <path d="M83.6089795,81.3669988 L83.6089795,122.62072 L125.566883,122.57759 C126.099705,122.57759 126.585875,122.563213 127.069589,122.532064 C138.101709,121.806044 146.725079,112.775129 146.725079,101.973492 C146.725079,90.6087715 137.254595,81.3669988 125.608625,81.3669988 L83.6089795,81.3669988 Z M42.1126914,285.126882 C19.1964277,285.126882 0.616403324,266.99796 0.616403324,244.632726 L0.616403324,167.456616 C0.466623823,166.057291 0.385595568,164.634005 0.385595568,163.193947 C0.383140166,161.727531 0.461713019,160.280285 0.616403324,158.852207 L0.616403324,40.8728429 C0.616403324,18.5076092 19.1964277,0.376291002 42.1126914,0.376291002 L125.608625,0.376291002 C183.015916,0.376291002 229.720111,45.9525832 229.720111,101.973492 C229.720111,155.236486 187.089427,199.758492 132.667905,203.333479 C130.354916,203.489226 127.970721,203.568297 125.608625,203.568297 L83.6089795,203.609031 L83.6089795,244.632726 C83.6089795,266.99796 65.0314105,285.126882 42.1126914,285.126882 Z" id="Stroke-3" stroke="#368BD6" stroke-width="7.31760436"></path>
+                <path d="M42.112937,244.632007 L42.112937,40.8721241 L125.60887,40.8721241 C160.188292,40.8721241 188.221613,68.2284423 188.221613,101.972773 C188.221613,134.31778 162.466905,160.792332 129.881269,162.932053 C128.466958,163.025501 127.04528,163.073423 125.60887,163.073423 L41.8821292,163.15489" id="Stroke-5" stroke="#368BD6" stroke-width="7.31760436" stroke-linecap="round"></path>
+                <path d="M76.3063694,17.6478871 C82.6683151,26.5062832 85.1114398,37.2552053 83.1864049,47.9010949 C81.2589146,58.5541728 75.1940725,67.8342832 66.1090863,74.0377962 C47.352273,86.8449715 21.4060437,82.3858222 8.27210017,64.0963611 C1.91015446,55.237965 -0.532970194,44.4914391 1.39452011,33.8407572 C3.31955501,23.1900754 9.38439712,13.9075689 18.4718387,7.70645204 C37.228652,-5.10072328 63.1724259,-0.641573933 76.3063694,17.6478871 Z M188.563159,285.10364 C175.48569,285.10364 162.619385,279.089419 154.543569,267.844503 L95.8963005,186.170906 C82.7451692,167.855088 87.2999393,142.602549 106.066574,129.771412 C124.833209,116.930692 150.710687,121.37786 163.861819,139.693679 L222.509087,221.367276 C235.662674,239.683094 231.107904,264.935633 212.341269,277.76677 C205.092923,282.724309 196.786299,285.10364 188.563159,285.10364 Z" id="Combined-Shape" fill="#368BD6"></path>
+                <path d="M292.369925,66.0049901 C290.529323,66.0049901 289.097744,64.6169023 289.097744,62.832218 C289.097744,61.0475337 290.529323,59.659446 292.369925,59.659446 L325.909774,59.659446 C327.750376,59.659446 329.181955,61.0475337 329.181955,62.832218 C329.181955,64.6169023 327.750376,66.0049901 325.909774,66.0049901 L292.369925,66.0049901 Z M292.369925,7.70530356 C290.529323,7.70530356 289.097744,6.31721579 289.506767,4.135935 C289.506767,2.35125072 290.938346,0.963162945 292.778947,0.963162945 L306.07218,0.963162945 L326.114286,0.963162945 C326.72782,0.963162945 327.341353,1.1614612 327.954887,1.55805771 C328.772932,2.15295247 329.386466,3.14444373 329.386466,4.33423325 L329.386466,18.6117075 C329.386466,25.7504446 323.251128,31.6993922 315.888722,31.6993922 C310.571429,31.6993922 306.07218,28.9232167 303.822556,24.5606551 L294.415038,30.9061992 C292.778947,31.8976905 290.733835,31.501094 289.711278,30.1130062 C288.688722,28.5266202 289.097744,26.5436376 290.529323,25.5521464 L302.390977,17.6202162 L302.390977,7.70530356 L292.369925,7.70530356 Z M322.433083,18.8100058 L322.228571,7.70530356 L308.935338,7.70530356 L308.935338,18.8100058 C308.935338,22.3793743 312.003008,25.3538481 315.684211,25.3538481 C319.365414,25.3538481 322.433083,22.3793743 322.433083,18.8100058 Z M325.909774,151.273239 C327.750376,151.273239 329.181955,152.661327 329.181955,154.446011 L329.181955,167.335398 L329.181955,180.423082 C329.181955,182.207767 327.750376,183.595854 325.909774,183.595854 C324.069173,183.595854 322.637594,182.207767 322.637594,180.423082 L322.637594,170.50817 L292.574436,170.50817 C290.733835,170.50817 289.302256,169.120082 289.302256,167.335398 C289.302256,165.550713 290.733835,164.162626 292.574436,164.162626 L322.637594,164.162626 L322.637594,154.446011 C322.637594,152.661327 324.069173,151.273239 325.909774,151.273239 Z M309.13985,93.3701491 C320.38797,93.3701491 329.590977,102.29357 329.590977,113.199974 C329.590977,124.106378 320.38797,133.0298 309.13985,133.0298 C297.891729,133.0298 288.688722,124.106378 288.688722,113.199974 C288.688722,102.29357 297.891729,93.3701491 309.13985,93.3701491 Z M309.13985,126.485957 C316.706767,126.485957 322.842105,120.53701 322.842105,113.199974 C322.842105,105.862939 316.706767,99.9139914 309.13985,99.9139914 C301.572932,99.9139914 295.437594,105.862939 295.437594,113.199974 C295.437594,120.53701 301.572932,126.485957 309.13985,126.485957 Z M328.159398,217.306557 C328.772932,217.901452 328.977444,218.694645 328.977444,219.487838 C328.977444,220.47933 328.772932,221.074224 328.159398,221.669119 C327.341353,222.264014 326.523308,222.462312 325.909774,222.462312 L292.165414,222.462312 C291.142857,222.462312 290.529323,222.462312 289.915789,221.669119 C289.302256,220.875926 289.097744,220.281031 289.097744,219.487838 C289.097744,218.496347 289.302256,217.901452 289.915789,217.306557 C290.733835,216.711663 291.347368,216.513364 292.165414,216.513364 L325.909774,216.513364 C326.932331,216.513364 327.545865,216.711663 328.159398,217.306557 Z M328.977444,253.595138 C328.977444,254.784927 328.36391,255.776419 327.545865,256.371313 L308.730827,268.467507 L327.545865,280.5637 C328.772932,281.158595 328.977444,282.348385 328.977444,283.339876 L328.977444,283.736472 C328.977444,284.727964 328.977444,285.322858 328.159398,285.917753 C327.341353,286.512648 326.72782,286.710946 325.909774,286.710946 L292.369925,286.710946 C291.347368,286.710946 290.733835,286.710946 290.120301,285.917753 C289.506767,285.12456 289.302256,284.727964 289.302256,283.736472 C289.302256,282.744981 289.506767,282.150086 290.120301,281.555192 C290.938346,280.960297 291.756391,280.761999 292.369925,280.761999 L317.115789,280.761999 L302.186466,270.847086 C301.368421,270.252191 300.754887,269.2607 300.754887,268.269209 C300.754887,267.277717 301.16391,266.484524 301.981955,265.691331 L316.911278,255.974717 L292.165414,255.974717 C291.142857,255.974717 290.529323,255.974717 289.915789,255.181524 C289.302256,254.388331 289.097744,253.991734 289.097744,253.000243 C289.097744,252.008752 289.302256,251.413857 289.915789,250.818962 C290.733835,250.224068 291.55188,250.224068 292.165414,250.224068 L325.909774,250.224068 C326.932331,250.224068 327.545865,250.422366 328.159398,251.017261 C328.772932,251.612155 328.977444,252.405348 328.977444,253.198541 L328.977444,253.595138 Z M306.890226,195.692048 C307.503759,195.692048 308.117293,195.890346 308.730827,196.485241 C309.13985,196.881837 309.548872,197.476732 309.548872,198.269925 C309.548872,198.86482 309.344361,199.459715 308.730827,200.054609 C308.321805,200.451206 307.708271,200.847802 306.890226,200.847802 L305.867669,200.847802 C305.254135,200.847802 304.640602,200.649504 304.027068,200.054609 C303.618045,199.658013 303.209023,199.063118 303.209023,198.269925 C303.209023,197.476732 303.413534,196.881837 304.027068,196.485241 C304.43609,196.088644 305.049624,195.692048 305.867669,195.692048 L306.890226,195.692048 Z" id="Combined-Shape" fill="#212121"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-im-logo.png b/res/themes/riot/img/logos/riot-im-logo.png
new file mode 100644
index 00000000..66651582
Binary files /dev/null and b/res/themes/riot/img/logos/riot-im-logo.png differ
diff --git a/res/themes/riot/img/logos/riot-im-logo.svg b/res/themes/riot/img/logos/riot-im-logo.svg
new file mode 100644
index 00000000..8a7956cc
--- /dev/null
+++ b/res/themes/riot/img/logos/riot-im-logo.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="334px" height="293px" viewBox="0 0 334 293" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
+    <title>animatedLogo-0</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="animatedLogo-0" transform="translate(-71.000000, -93.000000)">
+            <g id="Group-17" transform="translate(75.000000, 97.000000)">
+                <path d="M83.6089795,81.3669988 L83.6089795,122.62072 L125.566883,122.57759 C126.099705,122.57759 126.585875,122.563213 127.069589,122.532064 C138.101709,121.806044 146.725079,112.775129 146.725079,101.973492 C146.725079,90.6087715 137.254595,81.3669988 125.608625,81.3669988 L83.6089795,81.3669988 Z M42.1126914,285.126882 C19.1964277,285.126882 0.616403324,266.99796 0.616403324,244.632726 L0.616403324,167.456616 C0.466623823,166.057291 0.385595568,164.634005 0.385595568,163.193947 C0.383140166,161.727531 0.461713019,160.280285 0.616403324,158.852207 L0.616403324,40.8728429 C0.616403324,18.5076092 19.1964277,0.376291002 42.1126914,0.376291002 L125.608625,0.376291002 C183.015916,0.376291002 229.720111,45.9525832 229.720111,101.973492 C229.720111,155.236486 187.089427,199.758492 132.667905,203.333479 C130.354916,203.489226 127.970721,203.568297 125.608625,203.568297 L83.6089795,203.609031 L83.6089795,244.632726 C83.6089795,266.99796 65.0314105,285.126882 42.1126914,285.126882 Z" id="Fill-1" fill="#A2DDEF"></path>
+                <path d="M83.6089795,81.3669988 L83.6089795,122.62072 L125.566883,122.57759 C126.099705,122.57759 126.585875,122.563213 127.069589,122.532064 C138.101709,121.806044 146.725079,112.775129 146.725079,101.973492 C146.725079,90.6087715 137.254595,81.3669988 125.608625,81.3669988 L83.6089795,81.3669988 Z M42.1126914,285.126882 C19.1964277,285.126882 0.616403324,266.99796 0.616403324,244.632726 L0.616403324,167.456616 C0.466623823,166.057291 0.385595568,164.634005 0.385595568,163.193947 C0.383140166,161.727531 0.461713019,160.280285 0.616403324,158.852207 L0.616403324,40.8728429 C0.616403324,18.5076092 19.1964277,0.376291002 42.1126914,0.376291002 L125.608625,0.376291002 C183.015916,0.376291002 229.720111,45.9525832 229.720111,101.973492 C229.720111,155.236486 187.089427,199.758492 132.667905,203.333479 C130.354916,203.489226 127.970721,203.568297 125.608625,203.568297 L83.6089795,203.609031 L83.6089795,244.632726 C83.6089795,266.99796 65.0314105,285.126882 42.1126914,285.126882 Z" id="Stroke-3" stroke="#368BD6" stroke-width="7.31760436"></path>
+                <path d="M42.112937,244.632007 L42.112937,40.8721241 L125.60887,40.8721241 C160.188292,40.8721241 188.221613,68.2284423 188.221613,101.972773 C188.221613,134.31778 162.466905,160.792332 129.881269,162.932053 C128.466958,163.025501 127.04528,163.073423 125.60887,163.073423 L41.8821292,163.15489" id="Stroke-5" stroke="#368BD6" stroke-width="7.31760436" stroke-linecap="round"></path>
+                <path d="M76.3063694,17.6478871 C82.6683151,26.5062832 85.1114398,37.2552053 83.1864049,47.9010949 C81.2589146,58.5541728 75.1940725,67.8342832 66.1090863,74.0377962 C47.352273,86.8449715 21.4060437,82.3858222 8.27210017,64.0963611 C1.91015446,55.237965 -0.532970194,44.4914391 1.39452011,33.8407572 C3.31955501,23.1900754 9.38439712,13.9075689 18.4718387,7.70645204 C37.228652,-5.10072328 63.1724259,-0.641573933 76.3063694,17.6478871 Z M188.563159,285.10364 C175.48569,285.10364 162.619385,279.089419 154.543569,267.844503 L95.8963005,186.170906 C82.7451692,167.855088 87.2999393,142.602549 106.066574,129.771412 C124.833209,116.930692 150.710687,121.37786 163.861819,139.693679 L222.509087,221.367276 C235.662674,239.683094 231.107904,264.935633 212.341269,277.76677 C205.092923,282.724309 196.786299,285.10364 188.563159,285.10364 Z" id="Combined-Shape" fill="#368BD6"></path>
+                <path d="M292.369925,66.0049901 C290.529323,66.0049901 289.097744,64.6169023 289.097744,62.832218 C289.097744,61.0475337 290.529323,59.659446 292.369925,59.659446 L325.909774,59.659446 C327.750376,59.659446 329.181955,61.0475337 329.181955,62.832218 C329.181955,64.6169023 327.750376,66.0049901 325.909774,66.0049901 L292.369925,66.0049901 Z M292.369925,7.70530356 C290.529323,7.70530356 289.097744,6.31721579 289.506767,4.135935 C289.506767,2.35125072 290.938346,0.963162945 292.778947,0.963162945 L306.07218,0.963162945 L326.114286,0.963162945 C326.72782,0.963162945 327.341353,1.1614612 327.954887,1.55805771 C328.772932,2.15295247 329.386466,3.14444373 329.386466,4.33423325 L329.386466,18.6117075 C329.386466,25.7504446 323.251128,31.6993922 315.888722,31.6993922 C310.571429,31.6993922 306.07218,28.9232167 303.822556,24.5606551 L294.415038,30.9061992 C292.778947,31.8976905 290.733835,31.501094 289.711278,30.1130062 C288.688722,28.5266202 289.097744,26.5436376 290.529323,25.5521464 L302.390977,17.6202162 L302.390977,7.70530356 L292.369925,7.70530356 Z M322.433083,18.8100058 L322.228571,7.70530356 L308.935338,7.70530356 L308.935338,18.8100058 C308.935338,22.3793743 312.003008,25.3538481 315.684211,25.3538481 C319.365414,25.3538481 322.433083,22.3793743 322.433083,18.8100058 Z M325.909774,151.273239 C327.750376,151.273239 329.181955,152.661327 329.181955,154.446011 L329.181955,167.335398 L329.181955,180.423082 C329.181955,182.207767 327.750376,183.595854 325.909774,183.595854 C324.069173,183.595854 322.637594,182.207767 322.637594,180.423082 L322.637594,170.50817 L292.574436,170.50817 C290.733835,170.50817 289.302256,169.120082 289.302256,167.335398 C289.302256,165.550713 290.733835,164.162626 292.574436,164.162626 L322.637594,164.162626 L322.637594,154.446011 C322.637594,152.661327 324.069173,151.273239 325.909774,151.273239 Z M309.13985,93.3701491 C320.38797,93.3701491 329.590977,102.29357 329.590977,113.199974 C329.590977,124.106378 320.38797,133.0298 309.13985,133.0298 C297.891729,133.0298 288.688722,124.106378 288.688722,113.199974 C288.688722,102.29357 297.891729,93.3701491 309.13985,93.3701491 Z M309.13985,126.485957 C316.706767,126.485957 322.842105,120.53701 322.842105,113.199974 C322.842105,105.862939 316.706767,99.9139914 309.13985,99.9139914 C301.572932,99.9139914 295.437594,105.862939 295.437594,113.199974 C295.437594,120.53701 301.572932,126.485957 309.13985,126.485957 Z M328.159398,217.306557 C328.772932,217.901452 328.977444,218.694645 328.977444,219.487838 C328.977444,220.47933 328.772932,221.074224 328.159398,221.669119 C327.341353,222.264014 326.523308,222.462312 325.909774,222.462312 L292.165414,222.462312 C291.142857,222.462312 290.529323,222.462312 289.915789,221.669119 C289.302256,220.875926 289.097744,220.281031 289.097744,219.487838 C289.097744,218.496347 289.302256,217.901452 289.915789,217.306557 C290.733835,216.711663 291.347368,216.513364 292.165414,216.513364 L325.909774,216.513364 C326.932331,216.513364 327.545865,216.711663 328.159398,217.306557 Z M328.977444,253.595138 C328.977444,254.784927 328.36391,255.776419 327.545865,256.371313 L308.730827,268.467507 L327.545865,280.5637 C328.772932,281.158595 328.977444,282.348385 328.977444,283.339876 L328.977444,283.736472 C328.977444,284.727964 328.977444,285.322858 328.159398,285.917753 C327.341353,286.512648 326.72782,286.710946 325.909774,286.710946 L292.369925,286.710946 C291.347368,286.710946 290.733835,286.710946 290.120301,285.917753 C289.506767,285.12456 289.302256,284.727964 289.302256,283.736472 C289.302256,282.744981 289.506767,282.150086 290.120301,281.555192 C290.938346,280.960297 291.756391,280.761999 292.369925,280.761999 L317.115789,280.761999 L302.186466,270.847086 C301.368421,270.252191 300.754887,269.2607 300.754887,268.269209 C300.754887,267.277717 301.16391,266.484524 301.981955,265.691331 L316.911278,255.974717 L292.165414,255.974717 C291.142857,255.974717 290.529323,255.974717 289.915789,255.181524 C289.302256,254.388331 289.097744,253.991734 289.097744,253.000243 C289.097744,252.008752 289.302256,251.413857 289.915789,250.818962 C290.733835,250.224068 291.55188,250.224068 292.165414,250.224068 L325.909774,250.224068 C326.932331,250.224068 327.545865,250.422366 328.159398,251.017261 C328.772932,251.612155 328.977444,252.405348 328.977444,253.198541 L328.977444,253.595138 Z M306.890226,195.692048 C307.503759,195.692048 308.117293,195.890346 308.730827,196.485241 C309.13985,196.881837 309.548872,197.476732 309.548872,198.269925 C309.548872,198.86482 309.344361,199.459715 308.730827,200.054609 C308.321805,200.451206 307.708271,200.847802 306.890226,200.847802 L305.867669,200.847802 C305.254135,200.847802 304.640602,200.649504 304.027068,200.054609 C303.618045,199.658013 303.209023,199.063118 303.209023,198.269925 C303.209023,197.476732 303.413534,196.881837 304.027068,196.485241 C304.43609,196.088644 305.049624,195.692048 305.867669,195.692048 L306.890226,195.692048 Z" id="Combined-Shape" fill="#368BD6"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-logo-1.svg b/res/themes/riot/img/logos/riot-logo-1.svg
deleted file mode 100644
index 297608b8..00000000
--- a/res/themes/riot/img/logos/riot-logo-1.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 174.99 143.93"><defs><style type="text/css">.cls-1{fill:#764d80;}.cls-2{fill:#7dc8a2;}.cls-3{fill:#afdbc5;}</style></defs><title>Asset 4</title><g id="Layer_2" data-name="Layer 2"><g id="Design"><path class="cls-1" d="M146.53,51.12h25.61a2.57,2.57,0,0,0,0-5.14H146.53a2.57,2.57,0,0,0,0,5.14Z"/><path class="cls-1" d="M146.53,5.14h7.66v7.79l-.05,0-9,6.32a2.57,2.57,0,0,0,2.95,4.21l7.23-5.06a10.24,10.24,0,0,0,19.42-4.59V2.64s0,0,0-.07A2.57,2.57,0,0,0,172.14,0H146.53a2.57,2.57,0,0,0,0,5.14Zm23,8.71a5.12,5.12,0,1,1-10.23,0V5.14h10.23Z"/><path class="cls-1" d="M172.14,118.28a2.57,2.57,0,0,0-2.57,2.57v7.6h-23A2.57,2.57,0,0,0,144,131h0a2.57,2.57,0,0,0,2.57,2.57h23v7.78a2.57,2.57,0,0,0,5.14,0V131h0V120.85A2.57,2.57,0,0,0,172.14,118.28Z"/><path class="cls-1" d="M159.34,72.63A15.65,15.65,0,1,0,175,88.28,15.67,15.67,0,0,0,159.34,72.63Zm0,26.16a10.51,10.51,0,1,1,10.51-10.51A10.52,10.52,0,0,1,159.34,98.79Z"/><path class="cls-2" d="M62.33,0H21.22A20.56,20.56,0,0,0,.66,20.57v102.8a20.56,20.56,0,0,0,41.12,0V102.79H62.33A51.38,51.38,0,0,0,62.33,0Z"/><path class="cls-3" d="M21.22,138.81A15.45,15.45,0,0,1,5.79,123.37V20.57A15.45,15.45,0,0,1,21.09,5.14H62.33a46.26,46.26,0,0,1,0,92.51H36.65v25.71A15.45,15.45,0,0,1,21.22,138.81Z"/><path class="cls-2" d="M21.22,133.68a10.32,10.32,0,0,1-10.3-10.3V20.57A10.33,10.33,0,0,1,21,10.27H62.33a41.13,41.13,0,0,1,0,82.26H31.52v30.84A10.32,10.32,0,0,1,21.22,133.68Z"/><path class="cls-3" d="M21.22,128.55A5.18,5.18,0,0,1,16,123.37V20.57a5.2,5.2,0,0,1,5-5.17H62.33a36,36,0,0,1,0,72H26.39v36A5.18,5.18,0,0,1,21.22,128.55Z"/><path class="cls-2" d="M21.27,82.28H62.33a30.87,30.87,0,0,0,0-61.75H21.22Z"/><path class="cls-3" d="M26.39,77.15l0-51.49h36a25.75,25.75,0,0,1,0,51.49Z"/><path class="cls-2" d="M31.51,72l0-41.23H62.33a20.62,20.62,0,0,1,0,41.23Z"/><path class="cls-3" d="M36.64,66.9l0-31H62.33a15.49,15.49,0,0,1,0,31Z"/><path class="cls-2" d="M41.76,61.77l0-20.72H62.33a10.36,10.36,0,0,1,0,20.72Z"/><path class="cls-3" d="M46.89,56.64V46.18H62.33a5.23,5.23,0,0,1,0,10.47Z"/><circle class="cls-1" cx="20.56" cy="20.57" r="20.56" transform="translate(-8.08 15.51) rotate(-35)"/><path class="cls-1" d="M109.34,111.57a20.56,20.56,0,1,1-33.69,23.59l-30.79-44A20.56,20.56,0,0,1,78.55,67.58Z"/></g></g></svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-logo-2.svg b/res/themes/riot/img/logos/riot-logo-2.svg
deleted file mode 100644
index 757f6230..00000000
--- a/res/themes/riot/img/logos/riot-logo-2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 174.36 143.93"><defs><style type="text/css">.cls-1{fill:#764d80;}.cls-2{fill:#f69e98;}</style></defs><title>Asset 2</title><g id="Layer_2" data-name="Layer 2"><g id="Design"><path class="cls-1" d="M61.67,0H20.56A20.56,20.56,0,0,0,0,20.57v102.8a20.56,20.56,0,0,0,41.12,0V102.79H61.67A51.38,51.38,0,0,0,61.67,0Z"/><path class="cls-2" d="M20.56,139.54A16.19,16.19,0,0,1,4.39,123.37V20.57a16.21,16.21,0,0,1,16-16.17H61.67a47,47,0,0,1,0,94H36.73v25A16.19,16.19,0,0,1,20.56,139.54ZM20.39,5.9A14.7,14.7,0,0,0,5.89,20.57v102.8a14.67,14.67,0,0,0,29.34,0V96.9H61.67a45.49,45.49,0,0,0,0-91H20.39Z"/><path class="cls-2" d="M20.56,134.4a11,11,0,0,1-11-11V20.57a11.09,11.09,0,0,1,10.79-11H61.67a41.85,41.85,0,0,1,0,83.7H31.59v30.11A11,11,0,0,1,20.56,134.4ZM20.3,11A9.57,9.57,0,0,0,11,20.57v102.8a9.53,9.53,0,1,0,19.05,0V91.75H61.67a40.35,40.35,0,0,0,0-80.7H20.3Z"/><path class="cls-2" d="M20.56,129.25a5.89,5.89,0,0,1-5.88-5.88V20.57a5.94,5.94,0,0,1,5.61-5.88H61.67a36.71,36.71,0,0,1,0,73.42H26.44v35.25A5.89,5.89,0,0,1,20.56,129.25ZM20.31,16.19a4.42,4.42,0,0,0-4.13,4.38v102.8a4.38,4.38,0,0,0,8.77,0V86.61H61.67a35.21,35.21,0,0,0,0-70.42Z"/><path class="cls-2" d="M61.67,83H19.81V19.83H61.67a31.57,31.57,0,0,1,0,63.14Zm-40.36-1.5H61.67a30.07,30.07,0,0,0,0-60.14H21.32Z"/><path class="cls-2" d="M61.67,77.83H25V25H61.67a26.43,26.43,0,0,1,0,52.85Zm-35.22-1.5H61.67a24.93,24.93,0,0,0,0-49.85H26.46Z"/><path class="cls-2" d="M61.67,72.69H30.1V30.12H61.67a21.29,21.29,0,0,1,0,42.57ZM31.6,71.19H61.67a19.79,19.79,0,0,0,0-39.57H31.6Z"/><path class="cls-2" d="M61.67,67.55H35.24V35.26H61.67a16.14,16.14,0,0,1,0,32.29ZM36.74,66H61.67a14.64,14.64,0,0,0,0-29.29H36.74Z"/><path class="cls-2" d="M61.67,62.41H40.38v-22H61.67a11,11,0,0,1,0,22Zm-19.79-1.5H61.67a9.5,9.5,0,0,0,0-19H41.88Z"/><path class="cls-2" d="M61.67,57.26H45.52V45.54H61.67a5.86,5.86,0,0,1,0,11.72ZM47,55.76H61.67a4.36,4.36,0,0,0,0-8.72H47Z"/><path class="cls-2" d="M61.18,52.16H51.89a.75.75,0,1,1,0-1.5h9.29a.75.75,0,0,1,0,1.5Z"/><path class="cls-2" d="M20.56,124.12a.75.75,0,0,1-.75-.75v-36a.75.75,0,0,1,1.5,0v36A.75.75,0,0,1,20.56,124.12Z"/><circle class="cls-2" cx="20.59" cy="20.57" r="20.56" transform="translate(-8.07 15.53) rotate(-35)"/><path class="cls-2" d="M109.36,111.56a20.56,20.56,0,1,1-33.69,23.59l-30.79-44A20.56,20.56,0,0,1,78.58,67.57Z"/><path class="cls-2" d="M145.91,51.12h25.61a2.57,2.57,0,0,0,0-5.14H145.91a2.57,2.57,0,1,0,0,5.14Z"/><path class="cls-2" d="M145.91,5.14h7.66v7.79l-.05,0-9,6.32a2.57,2.57,0,0,0,2.95,4.21l7.23-5.06a10.24,10.24,0,0,0,19.42-4.59V2.64s0,0,0-.07A2.57,2.57,0,0,0,171.51,0H145.91a2.57,2.57,0,1,0,0,5.14Zm23,8.71a5.12,5.12,0,1,1-10.23,0V5.14h10.23Z"/><path class="cls-2" d="M171.51,118.28a2.57,2.57,0,0,0-2.57,2.57v7.6h-23a2.57,2.57,0,0,0-2.57,2.57h0a2.57,2.57,0,0,0,2.57,2.57h23v7.78a2.57,2.57,0,0,0,5.14,0V131h0V120.85A2.57,2.57,0,0,0,171.51,118.28Z"/><path class="cls-2" d="M158.71,72.63a15.65,15.65,0,1,0,15.65,15.65A15.67,15.67,0,0,0,158.71,72.63Zm0,26.16a10.51,10.51,0,1,1,10.51-10.51A10.52,10.52,0,0,1,158.71,98.79Z"/></g></g></svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-logo-3.svg b/res/themes/riot/img/logos/riot-logo-3.svg
deleted file mode 100644
index d71b489a..00000000
--- a/res/themes/riot/img/logos/riot-logo-3.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 174.99 143.93"><defs><style type="text/css">.cls-1{fill:#fac79e;}.cls-2{fill:#e45e5d;}.cls-3{fill:#f8a05f;}</style></defs><title>Asset 5</title><g id="Layer_2" data-name="Layer 2"><g id="Design"><path class="cls-1" d="M146.53,51.12h25.61a2.57,2.57,0,0,0,0-5.14H146.53a2.57,2.57,0,0,0,0,5.14Z"/><path class="cls-1" d="M146.53,5.14h7.66v7.79l-.05,0-9,6.32a2.57,2.57,0,0,0,2.95,4.21l7.23-5.06a10.24,10.24,0,0,0,19.42-4.59V2.64s0,0,0-.07A2.57,2.57,0,0,0,172.14,0H146.53a2.57,2.57,0,0,0,0,5.14Zm23,8.71a5.12,5.12,0,1,1-10.23,0V5.14h10.23Z"/><path class="cls-1" d="M172.14,118.28a2.57,2.57,0,0,0-2.57,2.57v7.6h-23A2.57,2.57,0,0,0,144,131h0a2.57,2.57,0,0,0,2.57,2.57h23v7.78a2.57,2.57,0,0,0,5.14,0V131h0V120.85A2.57,2.57,0,0,0,172.14,118.28Z"/><path class="cls-1" d="M159.34,72.63A15.65,15.65,0,1,0,175,88.28,15.67,15.67,0,0,0,159.34,72.63Zm0,26.16a10.51,10.51,0,1,1,10.51-10.51A10.52,10.52,0,0,1,159.34,98.79Z"/><path class="cls-2" d="M61.67,0H20.56A20.56,20.56,0,0,0,0,20.57v102.8a20.56,20.56,0,0,0,41.12,0V102.79H61.67A51.38,51.38,0,0,0,61.67,0Z"/><polygon class="cls-3" points="47.03 0.01 40.32 0.01 0 48.06 0 56.05 47.03 0.01"/><polygon class="cls-3" points="60.45 0.01 53.74 0.01 0 64.05 0 72.04 60.45 0.01"/><path class="cls-3" d="M72.83,1.24a51,51,0,0,0-5.9-1L0,80v8Z"/><polygon class="cls-3" points="33.61 0.01 26.9 0.01 0 32.06 0 40.06 33.61 0.01"/><path class="cls-3" d="M83.27,4.78a51,51,0,0,0-5-2L0,96v8Z"/><path class="cls-3" d="M41.12,102.78h.18l64.78-77.2a51.55,51.55,0,0,0-2.94-4.49L5.55,137.38a20.62,20.62,0,0,0,3.95,3.29L41.12,103Z"/><path class="cls-3" d="M112.22,42.23l-50.8,60.54h.25a51.55,51.55,0,0,0,6.85-.47L113,49.3A51.32,51.32,0,0,0,112.22,42.23Z"/><path class="cls-3" d="M40.71,127.46l-12.59,15A20.58,20.58,0,0,0,40.71,127.46Z"/><path class="cls-3" d="M110,68.88a51,51,0,0,0,2.67-11.18L76.73,100.52a51.1,51.1,0,0,0,10.6-4.64Z"/><path class="cls-3" d="M92.22,10.1a51.58,51.58,0,0,0-4.3-2.87L0,112v8Z"/><path class="cls-3" d="M99.83,17q-1.73-1.92-3.64-3.66L.42,127.5a20.41,20.41,0,0,0,2,5.58Z"/><path class="cls-3" d="M41.12,119v-8l-26.82,32a20.53,20.53,0,0,0,5.9,1Z"/><path class="cls-3" d="M110.71,36a51,51,0,0,0-2.09-5.5L48,102.78h6.71Z"/><circle class="cls-1" cx="20.59" cy="20.57" r="20.56" transform="translate(-8.07 15.53) rotate(-35)"/><path class="cls-1" d="M109.36,111.56a20.56,20.56,0,1,1-33.69,23.59l-30.79-44A20.56,20.56,0,0,1,78.58,67.57Z"/></g></g></svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-logo-4.svg b/res/themes/riot/img/logos/riot-logo-4.svg
deleted file mode 100644
index aa5522f6..00000000
--- a/res/themes/riot/img/logos/riot-logo-4.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 175.64 143.93"><defs><style type="text/css">.cls-1{fill:#e45e5d;}.cls-2{fill:#c7bdcd;}.cls-3{fill:#f69e98;}</style></defs><title>Asset 3</title><g id="Layer_2" data-name="Layer 2"><g id="Design"><path class="cls-1" d="M61.67,0H20.56A20.56,20.56,0,0,0,0,20.57v102.8a20.56,20.56,0,0,0,41.12,0V102.79H61.67A51.38,51.38,0,0,0,61.67,0Z"/><path class="cls-2" d="M147.19,51.12h25.61a2.57,2.57,0,1,0,0-5.14H147.19a2.57,2.57,0,0,0,0,5.14Z"/><path class="cls-2" d="M147.19,5.14h7.66v7.79l-.05,0-9,6.32a2.57,2.57,0,0,0,2.95,4.21l7.23-5.06a10.24,10.24,0,0,0,19.42-4.59V2.64s0,0,0-.07A2.57,2.57,0,0,0,172.79,0H147.19a2.57,2.57,0,0,0,0,5.14Zm23,8.71a5.12,5.12,0,1,1-10.23,0V5.14h10.23Z"/><path class="cls-2" d="M172.79,118.28a2.57,2.57,0,0,0-2.57,2.57v7.6h-23a2.57,2.57,0,0,0-2.57,2.57h0a2.57,2.57,0,0,0,2.57,2.57h23v7.78a2.57,2.57,0,0,0,5.14,0V131h0V120.85A2.57,2.57,0,0,0,172.79,118.28Z"/><path class="cls-2" d="M160,72.63a15.65,15.65,0,1,0,15.65,15.65A15.67,15.67,0,0,0,160,72.63Zm0,26.16A10.51,10.51,0,1,1,170.5,88.28,10.52,10.52,0,0,1,160,98.79Z"/><path class="cls-3" d="M2.77,133.64A20.62,20.62,0,0,0,7,138.77H34.14a20.62,20.62,0,0,0,4.21-5.13Z"/><path class="cls-3" d="M0,92.52v5.14H84a51.48,51.48,0,0,0,8.41-5.14Z"/><rect class="cls-3" y="102.8" width="41.12" height="5.13"/><rect class="cls-3" y="113.08" width="41.12" height="5.14"/><path class="cls-3" d="M.68,15.41H98.3a51.8,51.8,0,0,0-5.86-5.14H2.78A20.41,20.41,0,0,0,.68,15.41Z"/><path class="cls-3" d="M0,123.36H0a20.53,20.53,0,0,0,.67,5.12H40.45a20.53,20.53,0,0,0,.67-5.12H0Z"/><path class="cls-3" d="M0,56.53H112.8c.17-1.69.26-3.4.26-5.13H0Z"/><path class="cls-3" d="M0,82.24v5.14H98.32a51.79,51.79,0,0,0,4.43-5.14Z"/><path class="cls-3" d="M0,20.57V25.7H106.14a51.58,51.58,0,0,0-3.39-5.14Z"/><path class="cls-3" d="M20.81,0h-.25A20.46,20.46,0,0,0,7,5.14H84A51.07,51.07,0,0,0,61.67,0Z"/><path class="cls-3" d="M0,30.85V36H110.69a51,51,0,0,0-1.94-5.14Z"/><path class="cls-3" d="M0,72v5.13H106.14A51.24,51.24,0,0,0,108.75,72Z"/><path class="cls-3" d="M0,61.68v5.14H110.69A50.92,50.92,0,0,0,112,61.68Z"/><path class="cls-3" d="M0,41.22v5.14H112.8a51.15,51.15,0,0,0-.77-5.14Z"/><circle class="cls-2" cx="20.59" cy="20.57" r="20.56" transform="translate(-8.07 15.53) rotate(-35)"/><path class="cls-2" d="M109.36,111.56a20.56,20.56,0,0,1-33.69,23.59l-30.79-44A20.56,20.56,0,0,1,78.58,67.57Z"/></g></g></svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-logo-5.svg b/res/themes/riot/img/logos/riot-logo-5.svg
deleted file mode 100644
index 6cbc2592..00000000
--- a/res/themes/riot/img/logos/riot-logo-5.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 174.99 143.93"><defs><style type="text/css">.cls-1{fill:#764d80;}.cls-2{fill:#afdbc5;}</style></defs><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="Design"><path class="cls-1" d="M61.67,0H20.56A20.56,20.56,0,0,0,0,20.57v102.8a20.56,20.56,0,0,0,41.12,0V102.79H61.67A51.38,51.38,0,0,0,61.67,0Z"/><circle class="cls-2" cx="20.59" cy="20.57" r="20.56" transform="matrix(0.82, -0.57, 0.57, 0.82, -8.07, 15.53)"/><path class="cls-2" d="M109.36,111.56a20.56,20.56,0,1,1-33.69,23.59l-30.79-44A20.56,20.56,0,0,1,78.58,67.57Z"/><path class="cls-2" d="M146.53,51.12h25.61a2.57,2.57,0,0,0,0-5.14H146.53a2.57,2.57,0,0,0,0,5.14Z"/><path class="cls-2" d="M146.53,5.14h7.66v7.79l-.05,0-9,6.32a2.57,2.57,0,1,0,2.95,4.21l7.23-5.06a10.24,10.24,0,0,0,19.42-4.59V2.64s0,0,0-.07A2.57,2.57,0,0,0,172.14,0H146.53a2.57,2.57,0,0,0,0,5.14Zm23,8.71a5.12,5.12,0,1,1-10.23,0V5.14h10.23Z"/><path class="cls-2" d="M172.14,118.28a2.57,2.57,0,0,0-2.57,2.57v7.6h-23A2.57,2.57,0,0,0,144,131h0a2.57,2.57,0,0,0,2.57,2.57h23v7.78a2.57,2.57,0,0,0,5.14,0V131h0V120.85A2.57,2.57,0,0,0,172.14,118.28Z"/><path class="cls-2" d="M159.34,72.63A15.65,15.65,0,1,0,175,88.28,15.67,15.67,0,0,0,159.34,72.63Zm0,26.16a10.51,10.51,0,1,1,10.51-10.51A10.52,10.52,0,0,1,159.34,98.79Z"/></g></g></svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-logo-bw.svg b/res/themes/riot/img/logos/riot-logo-bw.svg
deleted file mode 100644
index e7d6e869..00000000
--- a/res/themes/riot/img/logos/riot-logo-bw.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 174.99 143.93"><defs><style type="text/css">.cls-1{fill:#fff;}</style></defs><title>Asset 6</title><g id="Layer_2" data-name="Layer 2"><g id="Design"><path d="M146.53,51.12h25.61a2.57,2.57,0,0,0,0-5.14H146.53a2.57,2.57,0,0,0,0,5.14Z"/><path d="M146.53,5.14h7.66v7.79l-.05,0-9,6.32a2.57,2.57,0,0,0,2.95,4.21l7.23-5.06a10.24,10.24,0,0,0,19.42-4.59V2.64s0,0,0-.07A2.57,2.57,0,0,0,172.14,0H146.53a2.57,2.57,0,0,0,0,5.14Zm23,8.71a5.12,5.12,0,1,1-10.23,0V5.14h10.23Z"/><path d="M172.14,118.28a2.57,2.57,0,0,0-2.57,2.57v7.6h-23A2.57,2.57,0,0,0,144,131h0a2.57,2.57,0,0,0,2.57,2.57h23v7.78a2.57,2.57,0,0,0,5.14,0V131h0V120.85A2.57,2.57,0,0,0,172.14,118.28Z"/><path d="M159.34,72.63A15.65,15.65,0,1,0,175,88.28,15.67,15.67,0,0,0,159.34,72.63Zm0,26.16a10.51,10.51,0,1,1,10.51-10.51A10.52,10.52,0,0,1,159.34,98.79Z"/><path d="M62.33,0H21.22A20.56,20.56,0,0,0,.66,20.57v102.8a20.56,20.56,0,0,0,41.12,0V102.79H62.33A51.38,51.38,0,0,0,62.33,0Z"/><path class="cls-1" d="M21.22,138.81A15.45,15.45,0,0,1,5.79,123.37V20.57A15.45,15.45,0,0,1,21.09,5.14H62.33a46.26,46.26,0,0,1,0,92.51H36.65v25.71A15.45,15.45,0,0,1,21.22,138.81Z"/><path d="M21.22,133.68a10.32,10.32,0,0,1-10.3-10.3V20.57A10.33,10.33,0,0,1,21,10.27H62.33a41.13,41.13,0,0,1,0,82.26H31.52v30.84A10.32,10.32,0,0,1,21.22,133.68Z"/><path class="cls-1" d="M21.22,128.55A5.18,5.18,0,0,1,16,123.37V20.57a5.2,5.2,0,0,1,5-5.17H62.33a36,36,0,0,1,0,72H26.39v36A5.18,5.18,0,0,1,21.22,128.55Z"/><path d="M21.27,82.28H62.33a30.87,30.87,0,0,0,0-61.75H21.22Z"/><path class="cls-1" d="M26.39,77.15l0-51.49h36a25.75,25.75,0,0,1,0,51.49Z"/><path d="M31.51,72l0-41.23H62.33a20.62,20.62,0,0,1,0,41.23Z"/><path class="cls-1" d="M36.64,66.9l0-31H62.33a15.49,15.49,0,0,1,0,31Z"/><path d="M41.76,61.77l0-20.72H62.33a10.36,10.36,0,0,1,0,20.72Z"/><path class="cls-1" d="M46.89,56.64V46.18H62.33a5.23,5.23,0,0,1,0,10.47Z"/><circle cx="20.56" cy="20.57" r="20.56" transform="translate(-8.08 15.51) rotate(-35)"/><path d="M109.34,111.57a20.56,20.56,0,1,1-33.69,23.59l-30.79-44A20.56,20.56,0,0,1,78.55,67.58Z"/></g></g></svg>
\ No newline at end of file
diff --git a/res/themes/riot/img/logos/riot-logo.svg b/res/themes/riot/img/logos/riot-logo.svg
deleted file mode 100644
index cbfaa625..00000000
--- a/res/themes/riot/img/logos/riot-logo.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.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 400 400" style="enable-background:new 0 0 400 400;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#7DC8A2;}
-	.st1{fill:#AFDBC5;}
-	.st2{fill:#764D80;}
-</style>
-<g>
-	<path class="st0" d="M212.8,38.8h-91.2c-0.2,0-0.4,0-0.6,0c-25.3,0-45.9,20.5-45.9,45.9v229.5c0,25.3,20.5,45.9,45.9,45.9
-		s45.9-20.5,45.9-45.9v-45.9h45.9c63.2,0,114.7-51.5,114.7-114.7S276,38.8,212.8,38.8z"/>
-	<path class="st1" d="M121,348.6c-19,0-34.4-15.5-34.4-34.4V84.7c0-18.9,15.3-34.3,34.2-34.4c0.2,0,0.5,0,0.7,0h91.3
-		c56.9,0,103.3,46.3,103.3,103.3s-46.3,103.3-103.3,103.3h-57.3v57.4C155.4,333.2,140,348.6,121,348.6z"/>
-	<path class="st0" d="M121,337.2c-12.7,0-23-10.3-23-23V84.7c0-12.5,10.1-22.7,22.5-23c0.2,0,0.5,0,0.7,0l91.5,0
-		c50.6,0,91.8,41.2,91.8,91.8s-41.2,91.8-91.8,91.8H144v68.8C144,326.9,133.7,337.2,121,337.2z"/>
-	<path class="st1" d="M121,325.7c-6.4,0-11.6-5.2-11.6-11.6V84.7c0-6.2,5-11.3,11.1-11.5l0.5,0l91.8,0c44.3,0,80.4,36.1,80.4,80.4
-		s-36,80.4-80.4,80.4h-80.2v80.3C132.6,320.5,127.4,325.7,121,325.7z"/>
-	<path class="st0" d="M121.1,222.4h91.7c38,0,68.9-30.9,68.9-68.9s-30.9-68.9-68.9-68.9H121L121.1,222.4z"/>
-	<path class="st1" d="M132.5,211l-0.1-114.9h80.3c31.7,0,57.5,25.8,57.5,57.5S244.5,211,212.8,211H132.5z"/>
-	<path class="st0" d="M144,199.6l-0.1-92h68.9c25.4,0,46,20.6,46,46s-20.6,46-46,46H144z"/>
-	<path class="st1" d="M155.4,188.1l-0.1-69.1h57.4c19.1,0,34.6,15.5,34.6,34.6s-15.5,34.6-34.6,34.6H155.4z"/>
-	<path class="st0" d="M166.9,176.7l0-46.3h45.9c12.8,0,23.1,10.4,23.1,23.1s-10.4,23.1-23.1,23.1H166.9z"/>
-	<path class="st1" d="M178.3,165.2l0-23.4h34.5c6.4,0,11.7,5.2,11.7,11.7s-5.2,11.7-11.7,11.7H178.3z"/>
-	<g>
-		
-			<ellipse transform="matrix(0.8192 -0.5736 0.5736 0.8192 -26.9642 83.8822)" class="st2" cx="119.5" cy="84.7" rx="45.9" ry="45.9"/>
-		<path class="st2" d="M317.7,287.8c14.5,20.8,9.5,49.4-11.3,63.9c-20.8,14.5-49.4,9.5-63.9-11.3l-68.7-98.2
-			c-14.5-20.8-9.5-49.4,11.3-63.9c20.8-14.5,49.4-9.5,63.9,11.3L317.7,287.8z"/>
-	</g>
-</g>
-</svg>
diff --git a/res/themes/riot/img/logos/riot.im logo.svg b/res/themes/riot/img/logos/riot.im logo.svg
deleted file mode 100644
index 5ebd96e8..00000000
--- a/res/themes/riot/img/logos/riot.im logo.svg	
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<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"
-   version="1.1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 163.57917 144.19999"
-   xml:space="preserve"
-   id="svg75"
-   sodipodi:docname="riot.im logo.svg"
-   width="163.57916"
-   height="144.2"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata81"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs79" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview77"
-     showgrid="false"
-     inkscape:zoom="0.28031832"
-     inkscape:cx="73.079153"
-     inkscape:cy="50.349988"
-     inkscape:window-x="1067"
-     inkscape:window-y="442"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg75" /><style
-     type="text/css"
-     id="style2">
-	.st0{fill:#7DC8A2;}
-	.st1{fill:#AFDBC5;}
-	.st2{fill:#764D80;}
-	.st3{fill:#764D80;stroke:#764D80;stroke-miterlimit:10;}
-</style><g
-     id="Grid"
-     transform="translate(-522.22083,-327.1)"><g
-       id="g4" /><g
-       id="g6" /><g
-       id="g8" /><g
-       id="g10" /><g
-       id="g12" /></g><g
-     id="Design"
-     transform="translate(-522.22083,-327.1)"><g
-       id="g17"><g
-         id="g15" /></g></g><g
-     id="Layer_3"
-     transform="translate(-522.22083,-327.1)"><g
-       id="g72"><g
-         id="g48"><g
-           id="g46"><path
-             class="st0"
-             d="m 584.6,327.3 h -40.9 c -0.1,0 -0.2,0 -0.3,0 -11.4,0 -20.6,9.2 -20.6,20.6 v 102.8 c 0,11.4 9.2,20.6 20.6,20.6 11.4,0 20.6,-9.2 20.6,-20.6 v -20.6 h 20.6 c 28.3,0 51.4,-23.1 51.4,-51.4 0,-28.3 -23.1,-51.4 -51.4,-51.4 z"
-             id="path20"
-             inkscape:connector-curvature="0"
-             style="fill:#7dc8a2" /><path
-             class="st1"
-             d="m 543.5,466.1 c -8.5,0 -15.4,-6.9 -15.4,-15.4 V 347.8 c 0,-8.5 6.9,-15.4 15.3,-15.4 0.1,0 0.2,0 0.3,0 h 40.9 c 25.5,0 46.3,20.8 46.3,46.3 0,25.5 -20.8,46.3 -46.3,46.3 h -25.7 v 25.7 c 0,8.4 -6.9,15.4 -15.4,15.4 z"
-             id="path22"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><path
-             class="st0"
-             d="m 543.5,460.9 c -5.7,0 -10.3,-4.6 -10.3,-10.3 V 347.8 c 0,-5.6 4.5,-10.2 10.1,-10.3 0.1,0 0.2,0 0.3,0 h 41 c 22.7,0 41.1,18.5 41.1,41.1 0,22.6 -18.5,41.1 -41.1,41.1 h -30.8 v 30.8 c 0,5.8 -4.6,10.4 -10.3,10.4 z"
-             id="path24"
-             inkscape:connector-curvature="0"
-             style="fill:#7dc8a2" /><path
-             class="st1"
-             d="m 543.5,455.8 c -2.9,0 -5.2,-2.3 -5.2,-5.2 V 347.8 c 0,-2.8 2.2,-5.1 5,-5.2 h 0.2 41.1 c 19.9,0 36,16.2 36,36 0,19.8 -16.1,36 -36,36 h -35.9 v 36 c 0,2.9 -2.3,5.2 -5.2,5.2 z"
-             id="path26"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><path
-             class="st0"
-             d="m 543.5,409.5 h 41.1 c 17,0 30.9,-13.8 30.9,-30.9 0,-17.1 -13.8,-30.9 -30.9,-30.9 h -41.1 z"
-             id="path28"
-             inkscape:connector-curvature="0"
-             style="fill:#7dc8a2" /><path
-             class="st1"
-             d="m 548.7,404.4 v -51.5 h 36 c 14.2,0 25.7,11.5 25.7,25.7 0,14.2 -11.5,25.7 -25.7,25.7 h -36 z"
-             id="path30"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><path
-             class="st0"
-             d="m 553.8,399.3 v -41.2 h 30.8 c 11.4,0 20.6,9.2 20.6,20.6 0,11.4 -9.2,20.6 -20.6,20.6 z"
-             id="path32"
-             inkscape:connector-curvature="0"
-             style="fill:#7dc8a2" /><path
-             class="st1"
-             d="m 558.9,394.2 v -31 h 25.7 c 8.5,0 15.5,6.9 15.5,15.5 0,8.6 -6.9,15.5 -15.5,15.5 z"
-             id="path34"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><path
-             class="st0"
-             d="m 564,389 v -20.7 h 20.6 c 5.7,0 10.4,4.6 10.4,10.4 0,5.8 -4.6,10.4 -10.4,10.4 H 564 Z"
-             id="path36"
-             inkscape:connector-curvature="0"
-             style="fill:#7dc8a2" /><path
-             class="st1"
-             d="m 569.2,383.9 v -10.5 h 15.4 c 2.9,0 5.2,2.3 5.2,5.2 0,2.9 -2.3,5.2 -5.2,5.2 h -15.4 z"
-             id="path38"
-             inkscape:connector-curvature="0"
-             style="fill:#afdbc5" /><g
-             id="g44"><circle
-               transform="matrix(0.8192,-0.5736,0.5736,0.8192,-101.3379,374.2691)"
-               class="st2"
-               cx="542.79999"
-               cy="347.79999"
-               id="ellipse40"
-               r="20.6"
-               style="fill:#764d80" /><path
-               class="st2"
-               d="m 631.6,438.8 c 6.5,9.3 4.3,22.1 -5,28.6 -9.3,6.5 -22.1,4.3 -28.6,-5 l -30.8,-44 c -6.5,-9.3 -4.3,-22.1 5,-28.6 9.3,-6.5 22.1,-4.3 28.6,5 z"
-               id="path42"
-               inkscape:connector-curvature="0"
-               style="fill:#764d80" /></g></g></g><g
-         id="g70"><g
-           id="g58"><path
-             class="st2"
-             d="M 667.6,359.9 H 684 c 0.9,0 1.6,-0.7 1.6,-1.6 0,-0.9 -0.7,-1.6 -1.6,-1.6 h -16.4 c -0.9,0 -1.6,0.7 -1.6,1.6 0,0.9 0.7,1.6 1.6,1.6 z"
-             id="path50"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80" /><path
-             class="st2"
-             d="m 667.6,330.5 h 4.9 v 5 c 0,0 0,0 0,0 l -5.8,4 c -0.7,0.5 -0.9,1.5 -0.4,2.3 0.5,0.7 1.5,0.9 2.3,0.4 l 4.6,-3.2 c 1.1,2.2 3.3,3.6 5.9,3.6 3.6,0 6.6,-3 6.6,-6.6 v -7.2 c 0,0 0,0 0,0 0,-0.6 -0.3,-1.1 -0.7,-1.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.3 v 0 h -9.8 -6.5 c -0.9,0 -1.6,0.7 -1.6,1.6 -0.2,1.1 0.5,1.8 1.4,1.8 z m 14.7,5.6 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 v -5.6 h 6.5 v 5.6 z"
-             id="path52"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80" /><path
-             class="st2"
-             d="m 684,402.9 c -0.9,0 -1.6,0.7 -1.6,1.6 v 4.9 h -14.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 0 c 0,0.9 0.7,1.6 1.6,1.6 h 14.7 v 5 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 v -6.6 0 -6.5 c 0,-0.9 -0.7,-1.6 -1.6,-1.6 z"
-             id="path54"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80" /><path
-             class="st2"
-             d="m 675.8,373.7 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,16.7 c -3.7,0 -6.7,-3 -6.7,-6.7 0,-3.7 3,-6.7 6.7,-6.7 3.7,0 6.7,3 6.7,6.7 0,3.7 -3,6.7 -6.7,6.7 z"
-             id="path56"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80" /></g><g
-           id="g64"><path
-             class="st3"
-             d="M 667.5,436.3 H 684 c 0.3,0 0.5,0.1 0.7,0.3 0.2,0.2 0.3,0.4 0.3,0.7 0,0.3 -0.1,0.5 -0.3,0.7 -0.2,0.2 -0.5,0.3 -0.7,0.3 h -16.5 c -0.3,0 -0.5,-0.1 -0.7,-0.3 -0.2,-0.2 -0.3,-0.4 -0.3,-0.7 0,-0.3 0.1,-0.5 0.3,-0.7 0.2,-0.2 0.4,-0.3 0.7,-0.3 z"
-             id="path60"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80;stroke:#764d80;stroke-miterlimit:10" /><path
-             class="st3"
-             d="M 667.5,453.3 H 684 c 0.3,0 0.5,0.1 0.7,0.3 0.2,0.2 0.3,0.4 0.3,0.7 v 0.2 c 0,0.4 -0.2,0.7 -0.5,1 l -9.8,6.5 9.8,6.5 c 0.4,0.2 0.5,0.5 0.5,1 v 0.2 c 0,0.3 -0.1,0.5 -0.3,0.7 -0.2,0.2 -0.4,0.3 -0.7,0.3 h -16.5 c -0.3,0 -0.5,-0.1 -0.7,-0.3 -0.2,-0.2 -0.3,-0.4 -0.3,-0.7 0,-0.3 0.1,-0.5 0.3,-0.7 0.2,-0.2 0.5,-0.3 0.7,-0.3 h 13.7 l -8.6,-5.9 c -0.3,-0.2 -0.5,-0.5 -0.5,-0.9 0,-0.3 0.2,-0.6 0.5,-0.9 l 8.6,-5.8 h -13.7 c -0.3,0 -0.5,-0.1 -0.7,-0.3 -0.2,-0.2 -0.3,-0.4 -0.3,-0.7 0,-0.3 0.1,-0.5 0.3,-0.7 0.2,-0.2 0.4,-0.2 0.7,-0.2 z"
-             id="path62"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80;stroke:#764d80;stroke-miterlimit:10" /></g><g
-           id="g68"><path
-             class="st3"
-             d="m 674.7,425.3 c 0.3,0 0.6,0.1 0.9,0.4 0.2,0.2 0.4,0.5 0.4,0.9 0,0.3 -0.1,0.6 -0.4,0.9 -0.2,0.2 -0.5,0.4 -0.9,0.4 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.4 -0.2,-0.2 -0.4,-0.5 -0.4,-0.9 0,-0.4 0.1,-0.7 0.4,-0.9 0.2,-0.2 0.5,-0.4 0.9,-0.4 z"
-             id="path66"
-             inkscape:connector-curvature="0"
-             style="fill:#764d80;stroke:#764d80;stroke-miterlimit:10" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/components/views/auth/VectorAuthHeaderLogo.js b/src/components/views/auth/VectorAuthHeaderLogo.js
index e4cf6bc0..7a40f445 100644
--- a/src/components/views/auth/VectorAuthHeaderLogo.js
+++ b/src/components/views/auth/VectorAuthHeaderLogo.js
@@ -20,8 +20,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const i = [1, 2, 3, 4, 5][Math.floor(Math.random() * 5)];
-const DEFAULT_LOGO_URI = "themes/riot/img/logos/riot-im-logo-" + i + ".svg";
+const LOGO_URI = "themes/riot/img/logos/riot-im-logo-black-text.svg";
 
 module.exports = React.createClass({
     displayName: 'VectorAuthHeaderLogo',
@@ -35,7 +34,7 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div className="mx_AuthHeaderLogo">
-                <img src={this.props.icon || DEFAULT_LOGO_URI} alt="Riot" />
+                <img src={LOGO_URI} alt="Riot" />
             </div>
         );
     },
diff --git a/src/components/views/auth/VectorAuthPage.js b/src/components/views/auth/VectorAuthPage.js
new file mode 100644
index 00000000..dac1eae3
--- /dev/null
+++ b/src/components/views/auth/VectorAuthPage.js
@@ -0,0 +1,70 @@
+/*
+Copyright 2019 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+'use strict';
+
+const React = require('react');
+import sdk from 'matrix-react-sdk/lib/index';
+
+module.exports = React.createClass({
+    displayName: 'VectorAuthPage',
+
+    statics: {
+        replaces: 'AuthPage',
+    },
+
+    render: function() {
+        const AuthFooter = sdk.getComponent('auth.AuthFooter');
+
+        const pageStyle = {
+            background: 'center/cover fixed url(../../themes/riot/img/backgrounds/valley.jpg)',
+        };
+
+        const modalStyle = {
+            position: 'relative',
+            background: 'initial',
+        };
+
+        const blurStyle = {
+            position: 'absolute',
+            top: 0,
+            right: 0,
+            bottom: 0,
+            left: 0,
+            filter: 'blur(10px)',
+            background: pageStyle.background,
+        };
+
+        const modalContentStyle = {
+            display: 'flex',
+            zIndex: 1,
+            background: 'rgba(255, 255, 255, 0.59)',
+            borderRadius: '4px',
+        };
+
+        return (
+            <div className="mx_AuthPage" style={pageStyle}>
+                <div className="mx_AuthPage_modal" style={modalStyle}>
+                    <div className="mx_AuthPage_modalBlur" style={blurStyle}></div>
+                    <div className="mx_AuthPage_modalContent" style={modalContentStyle}>
+                        { this.props.children }
+                    </div>
+                </div>
+                <AuthFooter />
+            </div>
+        );
+    },
+});
diff --git a/webpack.config.js b/webpack.config.js
index 6d8081c2..d0711eaf 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,7 +4,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 let og_image_url = process.env.RIOT_OG_IMAGE_URL;
-if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/riot-im-logo-1.png';
+if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/riot-im-logo-black-text.png';
 
 module.exports = {
     entry: {