diff --git a/contrib/assets/logo-square_dark.svg b/contrib/assets/logo-square_dark.svg
new file mode 100644
index 00000000..8d50152e
--- /dev/null
+++ b/contrib/assets/logo-square_dark.svg
@@ -0,0 +1,77 @@
+<?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="512"
+   height="512"
+   viewBox="0 0 135.46666 135.46667"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:docname="logo512-dark.svg"
+   inkscape:export-filename="/Users/tiago/Pictures/libresonic/logo.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.77279412"
+     inkscape:cx="-128.02569"
+     inkscape:cy="233.04091"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g4227"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="851"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-161.53332)">
+    <g
+       id="g4227"
+       transform="matrix(0.96843103,0,0,0.96843103,-0.28304865,8.7068755)">
+      <text
+         sodipodi:linespacing="125%"
+         id="text4168"
+         y="251.3284"
+         x="45.718079"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:15.54632759px;line-height:125%;font-family:'DIN Condensed';-inkscape-font-specification:'DIN Condensed, Bold Condensed';letter-spacing:0px;word-spacing:0px;fill:#2d2d2d;fill-opacity:1;stroke:none;stroke-width:0.38865817px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-size:77.05491638px;fill:#000000;fill-opacity:1;stroke-width:0.38865817px"
+           y="251.3284"
+           x="45.718079"
+           id="tspan4170"
+           sodipodi:role="line">)))</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/contrib/assets/logo-square_light.svg b/contrib/assets/logo-square_light.svg
new file mode 100644
index 00000000..f03dbb1d
--- /dev/null
+++ b/contrib/assets/logo-square_light.svg
@@ -0,0 +1,77 @@
+<?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="512"
+   height="512"
+   viewBox="0 0 135.46666 135.46667"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:docname="logo512-light.svg"
+   inkscape:export-filename="/Users/tiago/Pictures/libresonic/logo512-dark.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.77279412"
+     inkscape:cx="-128.02569"
+     inkscape:cy="233.04091"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g4227"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="851"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-161.53332)">
+    <g
+       id="g4227"
+       transform="matrix(0.96843103,0,0,0.96843103,-0.28304865,8.7068755)">
+      <text
+         sodipodi:linespacing="125%"
+         id="text4168"
+         y="251.3284"
+         x="45.718079"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:15.54632759px;line-height:125%;font-family:'DIN Condensed';-inkscape-font-specification:'DIN Condensed, Bold Condensed';letter-spacing:0px;word-spacing:0px;fill:#2d2d2d;fill-opacity:1;stroke:none;stroke-width:0.38865817px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-size:77.05491638px;fill:#ffffff;fill-opacity:1;stroke-width:0.38865817px"
+           y="251.3284"
+           x="45.718079"
+           id="tspan4170"
+           sodipodi:role="line">)))</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/contrib/assets/logo_dark.svg b/contrib/assets/logo_dark.svg
new file mode 100644
index 00000000..8465bc6f
--- /dev/null
+++ b/contrib/assets/logo_dark.svg
@@ -0,0 +1,88 @@
+<?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="170"
+   height="52"
+   viewBox="0 0 44.979166 13.758334"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:docname="logo-dark.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.0911765"
+     inkscape:cx="79.338725"
+     inkscape:cy="26"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="851"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-283.24165)">
+    <g
+       id="g4227"
+       transform="matrix(0.96843103,0,0,0.96843103,-0.48055547,8.7068755)">
+      <text
+         sodipodi:linespacing="125%"
+         id="text3336"
+         y="294.32339"
+         x="2.9642951"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:10.58333302px;line-height:125%;font-family:'DIN Condensed';-inkscape-font-specification:'DIN Condensed, Bold Condensed';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="stroke-width:0.26458332px"
+           y="294.32339"
+           x="2.9642951"
+           id="tspan3338"
+           sodipodi:role="line"><tspan
+   id="tspan3351"
+   style="fill:#2f7bd9;fill-opacity:1">libre</tspan>sonic</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text4168"
+         y="293.82599"
+         x="37.559322"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:10.58333302px;line-height:125%;font-family:'DIN Condensed';-inkscape-font-specification:'DIN Condensed, Bold Condensed';letter-spacing:0px;word-spacing:0px;fill:#2d2d2d;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="fill:#000000;fill-opacity:1;stroke-width:0.26458332px"
+           y="293.82599"
+           x="37.559322"
+           id="tspan4170"
+           sodipodi:role="line">)))</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/contrib/assets/logo_light.svg b/contrib/assets/logo_light.svg
new file mode 100644
index 00000000..6ca0fd44
--- /dev/null
+++ b/contrib/assets/logo_light.svg
@@ -0,0 +1,90 @@
+<?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="170"
+   height="52"
+   viewBox="0 0 44.979166 13.758334"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:docname="logo-light.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.0911765"
+     inkscape:cx="79.338725"
+     inkscape:cy="26"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="851"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-283.24165)">
+    <g
+       id="g4227"
+       transform="matrix(0.96843103,0,0,0.96843103,-0.48055547,8.7068755)">
+      <text
+         sodipodi:linespacing="125%"
+         id="text3336"
+         y="294.32339"
+         x="2.9642951"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:10.58333302px;line-height:125%;font-family:'DIN Condensed';-inkscape-font-specification:'DIN Condensed, Bold Condensed';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="stroke-width:0.26458332px"
+           y="294.32339"
+           x="2.9642951"
+           id="tspan3338"
+           sodipodi:role="line"><tspan
+             id="tspan3351"
+             style="fill:#2f7bd9;fill-opacity:1">libre</tspan><tspan
+             style="fill:#ffffff"
+             id="tspan4723">sonic</tspan></tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text4168"
+         y="293.82599"
+         x="37.559322"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:10.58333302px;line-height:125%;font-family:'DIN Condensed';-inkscape-font-specification:'DIN Condensed, Bold Condensed';letter-spacing:0px;word-spacing:0px;fill:#2d2d2d;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="fill:#ffffff;fill-opacity:1;stroke-width:0.26458332px"
+           y="293.82599"
+           x="37.559322"
+           id="tspan4170"
+           sodipodi:role="line">)))</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/libresonic-booter/src/main/resources/images/libresonic-512.png b/libresonic-booter/src/main/resources/images/libresonic-512.png
index 77f183e0..cda726b5 100644
Binary files a/libresonic-booter/src/main/resources/images/libresonic-512.png and b/libresonic-booter/src/main/resources/images/libresonic-512.png differ
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/service/logo-512.png b/libresonic-main/src/main/resources/org/libresonic/player/service/logo-512.png
index 9458fdd1..cda726b5 100755
Binary files a/libresonic-main/src/main/resources/org/libresonic/player/service/logo-512.png and b/libresonic-main/src/main/resources/org/libresonic/player/service/logo-512.png differ
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/logo.png b/libresonic-main/src/main/webapp/icons/buuftheme/logo.png
index badee1bd..962b5dff 100755
Binary files a/libresonic-main/src/main/webapp/icons/buuftheme/logo.png and b/libresonic-main/src/main/webapp/icons/buuftheme/logo.png differ
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/logo.png b/libresonic-main/src/main/webapp/icons/coolandclean/logo.png
index badee1bd..962b5dff 100755
Binary files a/libresonic-main/src/main/webapp/icons/coolandclean/logo.png and b/libresonic-main/src/main/webapp/icons/coolandclean/logo.png differ
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/logo_light.png b/libresonic-main/src/main/webapp/icons/default_dark/logo_light.png
index 2a6e10aa..69091b04 100755
Binary files a/libresonic-main/src/main/webapp/icons/default_dark/logo_light.png and b/libresonic-main/src/main/webapp/icons/default_dark/logo_light.png differ
diff --git a/libresonic-main/src/main/webapp/icons/default_light/logo.png b/libresonic-main/src/main/webapp/icons/default_light/logo.png
index badee1bd..962b5dff 100755
Binary files a/libresonic-main/src/main/webapp/icons/default_light/logo.png and b/libresonic-main/src/main/webapp/icons/default_light/logo.png differ
diff --git a/libresonic-main/src/main/webapp/icons/denim/logo_light.png b/libresonic-main/src/main/webapp/icons/denim/logo_light.png
index 2a6e10aa..69091b04 100755
Binary files a/libresonic-main/src/main/webapp/icons/denim/logo_light.png and b/libresonic-main/src/main/webapp/icons/denim/logo_light.png differ
diff --git a/libresonic-main/src/main/webapp/icons/groove/logo.png b/libresonic-main/src/main/webapp/icons/groove/logo.png
index badee1bd..962b5dff 100755
Binary files a/libresonic-main/src/main/webapp/icons/groove/logo.png and b/libresonic-main/src/main/webapp/icons/groove/logo.png differ
diff --git a/libresonic-main/src/main/webapp/icons/hicon/logo.png b/libresonic-main/src/main/webapp/icons/hicon/logo.png
index badee1bd..962b5dff 100755
Binary files a/libresonic-main/src/main/webapp/icons/hicon/logo.png and b/libresonic-main/src/main/webapp/icons/hicon/logo.png differ
diff --git a/libresonic-main/src/main/webapp/icons/hiconi/logo_light.png b/libresonic-main/src/main/webapp/icons/hiconi/logo_light.png
index 2a6e10aa..69091b04 100755
Binary files a/libresonic-main/src/main/webapp/icons/hiconi/logo_light.png and b/libresonic-main/src/main/webapp/icons/hiconi/logo_light.png differ
diff --git a/libresonic-main/src/main/webapp/icons/hitech/logo_light.png b/libresonic-main/src/main/webapp/icons/hitech/logo_light.png
index 2a6e10aa..69091b04 100755
Binary files a/libresonic-main/src/main/webapp/icons/hitech/logo_light.png and b/libresonic-main/src/main/webapp/icons/hitech/logo_light.png differ
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/logo.png b/libresonic-main/src/main/webapp/icons/midnightfun/logo.png
index badee1bd..962b5dff 100755
Binary files a/libresonic-main/src/main/webapp/icons/midnightfun/logo.png and b/libresonic-main/src/main/webapp/icons/midnightfun/logo.png differ
diff --git a/libresonic-main/src/main/webapp/icons/monochrome/logo.png b/libresonic-main/src/main/webapp/icons/monochrome/logo.png
index badee1bd..962b5dff 100755
Binary files a/libresonic-main/src/main/webapp/icons/monochrome/logo.png and b/libresonic-main/src/main/webapp/icons/monochrome/logo.png differ
diff --git a/libresonic-main/src/main/webapp/icons/monochrome/logo_light.png b/libresonic-main/src/main/webapp/icons/monochrome/logo_light.png
index 2a6e10aa..69091b04 100755
Binary files a/libresonic-main/src/main/webapp/icons/monochrome/logo_light.png and b/libresonic-main/src/main/webapp/icons/monochrome/logo_light.png differ
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/logo_light.png b/libresonic-main/src/main/webapp/icons/pinkpanther/logo_light.png
index 2a6e10aa..69091b04 100755
Binary files a/libresonic-main/src/main/webapp/icons/pinkpanther/logo_light.png and b/libresonic-main/src/main/webapp/icons/pinkpanther/logo_light.png differ
diff --git a/libresonic-main/src/main/webapp/icons/simplify/logo_light.png b/libresonic-main/src/main/webapp/icons/simplify/logo_light.png
index 2a6e10aa..69091b04 100755
Binary files a/libresonic-main/src/main/webapp/icons/simplify/logo_light.png and b/libresonic-main/src/main/webapp/icons/simplify/logo_light.png differ
diff --git a/libresonic-main/src/main/webapp/icons/slick/logo_light.png b/libresonic-main/src/main/webapp/icons/slick/logo_light.png
index 2a6e10aa..69091b04 100755
Binary files a/libresonic-main/src/main/webapp/icons/slick/logo_light.png and b/libresonic-main/src/main/webapp/icons/slick/logo_light.png differ
diff --git a/libresonic-main/src/main/webapp/icons/sonic/logo.png b/libresonic-main/src/main/webapp/icons/sonic/logo.png
index badee1bd..962b5dff 100755
Binary files a/libresonic-main/src/main/webapp/icons/sonic/logo.png and b/libresonic-main/src/main/webapp/icons/sonic/logo.png differ
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/logo_light.png b/libresonic-main/src/main/webapp/icons/sonic_blue/logo_light.png
index 2a6e10aa..69091b04 100755
Binary files a/libresonic-main/src/main/webapp/icons/sonic_blue/logo_light.png and b/libresonic-main/src/main/webapp/icons/sonic_blue/logo_light.png differ
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/logo.png b/libresonic-main/src/main/webapp/icons/sonic_white/logo.png
index badee1bd..962b5dff 100755
Binary files a/libresonic-main/src/main/webapp/icons/sonic_white/logo.png and b/libresonic-main/src/main/webapp/icons/sonic_white/logo.png differ
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/logo_light.png b/libresonic-main/src/main/webapp/icons/subStandard/logo_light.png
index 2a6e10aa..69091b04 100755
Binary files a/libresonic-main/src/main/webapp/icons/subStandard/logo_light.png and b/libresonic-main/src/main/webapp/icons/subStandard/logo_light.png differ