diff --git a/server/src/resources/images/favicon.ico b/server/src/resources/images/favicon.ico
index 88d727b0..ab3fb0f1 100644
Binary files a/server/src/resources/images/favicon.ico and b/server/src/resources/images/favicon.ico differ
diff --git a/server/src/resources/images/favicon.svg b/server/src/resources/images/favicon.svg
index 8de15422..b70c1f25 100644
--- a/server/src/resources/images/favicon.svg
+++ b/server/src/resources/images/favicon.svg
@@ -1,136 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="200"
-   viewBox="0 0 52.9168 52.916668"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="favicon.svg"
-   inkscape:export-filename="/home/vx/dev/pseudotv/resources/favicon-16.png"
-   inkscape:export-xdpi="7.6799998"
-   inkscape:export-ydpi="7.6799998">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.0547013"
-     inkscape:cx="55.816079"
-     inkscape:cy="84.726326"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1056"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Capa 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-244.08278)">
-    <rect
-       style="opacity:1;fill:#a1a1a1;fill-opacity:0.86666667;stroke:none;stroke-width:1.46508551;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4712"
-       width="52.211964"
-       height="51.512306"
-       x="-0.85796964"
-       y="245.32475"
-       transform="matrix(0.99980416,-0.01978974,0.00448328,0.99998995,0,0)" />
-    <g
-       id="g4581"
-       style="fill:#080808;fill-opacity:1;stroke-width:0.68901283"
-       transform="matrix(1.2119871,0,0,1.7379906,-82.577875,-167.18505)">
-      <rect
-         transform="rotate(-0.94645665)"
-         y="239.28041"
-         x="65.156158"
-         height="27.75024"
-         width="41.471352"
-         id="rect4524"
-         style="opacity:1;fill:#080808;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       style="opacity:1;fill:#9cbc28;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4518"
-       width="10.338528"
-       height="23.042738"
-       x="8.726779"
-       y="258.22861"
-       transform="matrix(0.99995865,0.00909414,-0.00926779,0.99995705,0,0)" />
-    <ellipse
-       style="opacity:1;fill:#a1a1a1;fill-opacity:0.86792453;stroke:none;stroke-width:1.46499991;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4568"
-       cx="44.118061"
-       cy="261.20392"
-       rx="2.4216392"
-       ry="2.3988426" />
-    <ellipse
-       cy="272.90894"
-       cx="44.765343"
-       id="circle4570"
-       style="opacity:1;fill:#a1a1a1;fill-opacity:0.86792453;stroke:none;stroke-width:1.46499991;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="2.4216392"
-       ry="2.3988426" />
-    <g
-       id="g1705"
-       transform="translate(0,-2.116672)">
-      <rect
-         transform="matrix(0.99967585,0.02545985,-0.02594573,0.99966335,0,0)"
-         style="opacity:1;fill:#289bbc;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect4520"
-         width="10.338468"
-         height="23.042864"
-         x="23.424755"
-         y="259.99872" />
-    </g>
-    <rect
-       transform="matrix(0.99837418,-0.05699994,0.05808481,0.99831165,0,0)"
-       y="259.69229"
-       x="10.517879"
-       height="23.043449"
-       width="10.33821"
-       id="rect4522"
-       style="opacity:1;fill:#bc289b;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.03992438px;line-height:125%;font-family:'Liberation Serif';-inkscape-font-specification:'Liberation Serif';letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:0.264584px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="16.979799"
-       y="286.34747"
-       id="text1730"
-       transform="rotate(-1.2296789)"><tspan
-         sodipodi:role="line"
-         id="tspan1728"
-         x="16.979799"
-         y="286.34747"
-         style="fill:#e6e6e6;fill-opacity:1;stroke-width:0.264584px">dizqueTV</tspan></text>
-  </g>
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<line x1="13.0531" y1="3.85848" x2="15.1559" y2="7.61348" stroke="#231A12"/>
+<line x1="18.3012" y1="3.78277" x2="15.8843" y2="7.34375" stroke="#231A12"/>
+<path d="M0 17C0 11.4772 4.47715 7 10 7H22C27.5228 7 32 11.4772 32 17V18C32 23.5228 27.5228 28 22 28H10C4.47715 28 0 23.5228 0 18V17Z" fill="#231A12"/>
+<path d="M0 8.48936C0 7.66681 0.69548 7 1.5534 7H30.4466C31.3045 7 32 7.66681 32 8.48936V26.5106C32 27.3332 31.3045 28 30.4466 28H1.5534C0.69548 28 0 27.3332 0 26.5106V8.48936Z" fill="#231A12"/>
+<circle cx="13" cy="4" r="1" fill="#231A12"/>
+<circle cx="18" cy="4" r="1" fill="#231A12"/>
+<path d="M3.00397 11.5614C3.00397 11.0091 3.45168 10.5614 4.00397 10.5614H8.33894V24.53H4.00397C3.45168 24.53 3.00397 24.0823 3.00397 23.53V11.5614Z" fill="#DD3C2C"/>
+<path d="M18.8472 10.5614H23.1822C23.7345 10.5614 24.1822 11.0091 24.1822 11.5614V23.53C24.1822 24.0823 23.7345 24.53 23.1822 24.53H18.8472V10.5614Z" fill="#E98E1D"/>
+<rect x="13.6739" y="10.5614" width="5.33497" height="13.9686" fill="#68AAE5"/>
+<rect x="8.33899" y="10.5614" width="5.33497" height="13.9686" fill="#8DCA23"/>
+<circle cx="28" cy="14" r="1" fill="white"/>
+<circle cx="28" cy="22" r="1" fill="white"/>
+<circle cx="28" cy="18" r="1" fill="white"/>
 </svg>
diff --git a/server/src/resources/images/generic-error-screen.png b/server/src/resources/images/generic-error-screen.png
index d0ffd0c1..121ff31d 100644
Binary files a/server/src/resources/images/generic-error-screen.png and b/server/src/resources/images/generic-error-screen.png differ
diff --git a/server/src/resources/images/generic-music-screen.png b/server/src/resources/images/generic-music-screen.png
index 4efa71f9..1da2b881 100644
Binary files a/server/src/resources/images/generic-music-screen.png and b/server/src/resources/images/generic-music-screen.png differ
diff --git a/server/src/resources/images/generic-offline-screen.png b/server/src/resources/images/generic-offline-screen.png
index 73b778df..d8270d98 100644
Binary files a/server/src/resources/images/generic-offline-screen.png and b/server/src/resources/images/generic-offline-screen.png differ
diff --git a/server/src/resources/images/loading-screen.png b/server/src/resources/images/loading-screen.png
index 8bfda9a6..c65a133f 100644
Binary files a/server/src/resources/images/loading-screen.png and b/server/src/resources/images/loading-screen.png differ
diff --git a/server/svg/dizquetv.svg b/server/svg/dizquetv.svg
deleted file mode 100644
index 074a661a..00000000
--- a/server/svg/dizquetv.svg
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="200"
-   viewBox="0 0 52.9168 52.916668"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="dizquetv.svg"
-   inkscape:export-filename="/home/vx/dev/pseudotv/resources/dizquetv.png"
-   inkscape:export-xdpi="240"
-   inkscape:export-ydpi="240">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="74.610162"
-     inkscape:cy="39.873047"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1056"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Capa 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-244.08278)">
-    <rect
-       style="opacity:1;fill:#3f3f3f;fill-opacity:0.86666667;stroke:none;stroke-width:1.46501946;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4712"
-       width="52.206699"
-       height="35.866219"
-       x="-1.3992016"
-       y="254.87126"
-       transform="matrix(0.99990505,-0.01378015,0.00643904,0.99997927,0,0)" />
-    <g
-       id="g4581"
-       style="fill:#080808;fill-opacity:1;stroke-width:0.82573813"
-       transform="matrix(1.2119871,0,0,1.2100891,-82.577875,-32.337926)">
-      <rect
-         transform="rotate(-0.94645665)"
-         y="239.28041"
-         x="65.156158"
-         height="27.75024"
-         width="41.471352"
-         id="rect4524"
-         style="opacity:1;fill:#080808;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       style="opacity:1;fill:#9cbc28;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4518"
-       width="10.338528"
-       height="23.042738"
-       x="8.7463942"
-       y="260.34518"
-       transform="matrix(0.99995865,0.00909414,-0.00926779,0.99995705,0,0)" />
-    <ellipse
-       style="opacity:1;fill:#a1a1a1;fill-opacity:0.86792453;stroke:none;stroke-width:1.46499991;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4568"
-       cx="44.118061"
-       cy="263.32062"
-       rx="2.4216392"
-       ry="2.3988426" />
-    <ellipse
-       cy="275.02563"
-       cx="44.765343"
-       id="circle4570"
-       style="opacity:1;fill:#a1a1a1;fill-opacity:0.86792453;stroke:none;stroke-width:1.46499991;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="2.4216392"
-       ry="2.3988426" />
-    <g
-       id="g1705">
-      <rect
-         transform="matrix(0.99967585,0.02545985,-0.02594573,0.99966335,0,0)"
-         style="opacity:1;fill:#289bbc;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect4520"
-         width="10.338468"
-         height="23.042864"
-         x="23.424755"
-         y="259.99872" />
-    </g>
-    <rect
-       transform="matrix(0.99837418,-0.05699994,0.05808481,0.99831165,0,0)"
-       y="261.80557"
-       x="10.394932"
-       height="23.043449"
-       width="10.33821"
-       id="rect4522"
-       style="opacity:1;fill:#bc289b;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.03992438px;line-height:125%;font-family:'Liberation Serif';-inkscape-font-specification:'Liberation Serif';letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:0.264584px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="16.934374"
-       y="288.46368"
-       id="text1730"
-       transform="rotate(-1.2296789)"><tspan
-         sodipodi:role="line"
-         id="tspan1728"
-         x="16.934374"
-         y="288.46368"
-         style="fill:#e6e6e6;fill-opacity:1;stroke-width:0.264584px">dizqueTV</tspan></text>
-  </g>
-</svg>