diff --git a/contrib/assets/favicons/favicons-blue/favicon-16x16.png b/contrib/assets/favicons/favicons-blue/favicon-16x16.png
new file mode 100644
index 00000000..dd40b59a
Binary files /dev/null and b/contrib/assets/favicons/favicons-blue/favicon-16x16.png differ
diff --git a/contrib/assets/favicons/favicons-blue/favicon-32x32.png b/contrib/assets/favicons/favicons-blue/favicon-32x32.png
new file mode 100644
index 00000000..45654728
Binary files /dev/null and b/contrib/assets/favicons/favicons-blue/favicon-32x32.png differ
diff --git a/contrib/assets/favicons/favicons-blue/favicon.ico b/contrib/assets/favicons/favicons-blue/favicon.ico
new file mode 100644
index 00000000..d0008a5a
Binary files /dev/null and b/contrib/assets/favicons/favicons-blue/favicon.ico differ
diff --git a/contrib/assets/favicons/favicons-dark/favicon-16x16.png b/contrib/assets/favicons/favicons-dark/favicon-16x16.png
new file mode 100644
index 00000000..0b253e0c
Binary files /dev/null and b/contrib/assets/favicons/favicons-dark/favicon-16x16.png differ
diff --git a/contrib/assets/favicons/favicons-dark/favicon-32x32.png b/contrib/assets/favicons/favicons-dark/favicon-32x32.png
new file mode 100644
index 00000000..3568364a
Binary files /dev/null and b/contrib/assets/favicons/favicons-dark/favicon-32x32.png differ
diff --git a/contrib/assets/favicons/favicons-dark/favicon.ico b/contrib/assets/favicons/favicons-dark/favicon.ico
new file mode 100644
index 00000000..6759fed1
Binary files /dev/null and b/contrib/assets/favicons/favicons-dark/favicon.ico differ
diff --git a/contrib/assets/fonts/Cabin-Bold.otf b/contrib/assets/fonts/Cabin-Bold.otf
new file mode 100644
index 00000000..6b831e5a
Binary files /dev/null and b/contrib/assets/fonts/Cabin-Bold.otf differ
diff --git a/contrib/assets/fonts/Cabin-BoldItalic.otf b/contrib/assets/fonts/Cabin-BoldItalic.otf
new file mode 100644
index 00000000..3f3b166b
Binary files /dev/null and b/contrib/assets/fonts/Cabin-BoldItalic.otf differ
diff --git a/contrib/assets/fonts/Cabin-Italic.otf b/contrib/assets/fonts/Cabin-Italic.otf
new file mode 100644
index 00000000..09269810
Binary files /dev/null and b/contrib/assets/fonts/Cabin-Italic.otf differ
diff --git a/contrib/assets/fonts/Cabin-Medium.otf b/contrib/assets/fonts/Cabin-Medium.otf
new file mode 100644
index 00000000..2724c883
Binary files /dev/null and b/contrib/assets/fonts/Cabin-Medium.otf differ
diff --git a/contrib/assets/fonts/Cabin-MediumItalic.otf b/contrib/assets/fonts/Cabin-MediumItalic.otf
new file mode 100644
index 00000000..5d23b2d6
Binary files /dev/null and b/contrib/assets/fonts/Cabin-MediumItalic.otf differ
diff --git a/contrib/assets/fonts/Cabin-Regular.otf b/contrib/assets/fonts/Cabin-Regular.otf
new file mode 100644
index 00000000..e374a591
Binary files /dev/null and b/contrib/assets/fonts/Cabin-Regular.otf differ
diff --git a/contrib/assets/fonts/Cabin-SemiBold.otf b/contrib/assets/fonts/Cabin-SemiBold.otf
new file mode 100644
index 00000000..33d62dd9
Binary files /dev/null and b/contrib/assets/fonts/Cabin-SemiBold.otf differ
diff --git a/contrib/assets/fonts/Cabin-SemiBoldItalic.otf b/contrib/assets/fonts/Cabin-SemiBoldItalic.otf
new file mode 100644
index 00000000..5c3a1b30
Binary files /dev/null and b/contrib/assets/fonts/Cabin-SemiBoldItalic.otf differ
diff --git a/contrib/assets/fonts/SIL Open Font License.txt b/contrib/assets/fonts/SIL Open Font License.txt
new file mode 100644
index 00000000..db3e6619
--- /dev/null
+++ b/contrib/assets/fonts/SIL Open Font License.txt
@@ -0,0 +1,45 @@
+Copyright (c) 2011, Pablo Impallari (www.impallari.com|impallari@gmail.com),
+Copyright (c) 2011, Igino Marini. (www.ikern.com|mail@iginomarini.com),
+with Reserved Font Name Cabin.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
diff --git a/contrib/assets/icons/png/icon-blue_48x48.png b/contrib/assets/icons/png/icon-blue_48x48.png
new file mode 100644
index 00000000..84c711c8
Binary files /dev/null and b/contrib/assets/icons/png/icon-blue_48x48.png differ
diff --git a/contrib/assets/icons/png/icon-blue_512x512.png b/contrib/assets/icons/png/icon-blue_512x512.png
new file mode 100644
index 00000000..f7cdf18d
Binary files /dev/null and b/contrib/assets/icons/png/icon-blue_512x512.png differ
diff --git a/contrib/assets/icons/png/icon-dark_512x512.png b/contrib/assets/icons/png/icon-dark_512x512.png
new file mode 100644
index 00000000..3c049913
Binary files /dev/null and b/contrib/assets/icons/png/icon-dark_512x512.png differ
diff --git a/contrib/assets/icons/png/icon-grey_512x512.png b/contrib/assets/icons/png/icon-grey_512x512.png
new file mode 100644
index 00000000..3ad5d992
Binary files /dev/null and b/contrib/assets/icons/png/icon-grey_512x512.png differ
diff --git a/contrib/assets/icons/svg/icon-blue_512x512.svg b/contrib/assets/icons/svg/icon-blue_512x512.svg
new file mode 100644
index 00000000..fa89aeca
--- /dev/null
+++ b/contrib/assets/icons/svg/icon-blue_512x512.svg
@@ -0,0 +1,222 @@
+
+
+
+
diff --git a/contrib/assets/icons/svg/icon-dark_512x512.svg b/contrib/assets/icons/svg/icon-dark_512x512.svg
new file mode 100644
index 00000000..11540bf7
--- /dev/null
+++ b/contrib/assets/icons/svg/icon-dark_512x512.svg
@@ -0,0 +1,217 @@
+
+
+
+
diff --git a/contrib/assets/icons/svg/icon-grey_512x512.svg b/contrib/assets/icons/svg/icon-grey_512x512.svg
new file mode 100644
index 00000000..f6da15ab
--- /dev/null
+++ b/contrib/assets/icons/svg/icon-grey_512x512.svg
@@ -0,0 +1,217 @@
+
+
+
+
diff --git a/contrib/assets/icons/xcf/icon-blue_512x512.xcf b/contrib/assets/icons/xcf/icon-blue_512x512.xcf
new file mode 100644
index 00000000..2b266fc9
Binary files /dev/null and b/contrib/assets/icons/xcf/icon-blue_512x512.xcf differ
diff --git a/contrib/assets/icons/xcf/icon-dark_512x512.xcf b/contrib/assets/icons/xcf/icon-dark_512x512.xcf
new file mode 100644
index 00000000..61f8a786
Binary files /dev/null and b/contrib/assets/icons/xcf/icon-dark_512x512.xcf differ
diff --git a/contrib/assets/icons/xcf/icon-grey_512x512.xcf b/contrib/assets/icons/xcf/icon-grey_512x512.xcf
new file mode 100644
index 00000000..e1345ce2
Binary files /dev/null and b/contrib/assets/icons/xcf/icon-grey_512x512.xcf differ
diff --git a/contrib/assets/logo-square_dark.svg b/contrib/assets/logo-square_dark.svg
deleted file mode 100644
index 8d50152e..00000000
--- a/contrib/assets/logo-square_dark.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
diff --git a/contrib/assets/logo-square_light.svg b/contrib/assets/logo-square_light.svg
deleted file mode 100644
index f03dbb1d..00000000
--- a/contrib/assets/logo-square_light.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
diff --git a/contrib/assets/logo/png/logo-dark_1600x512.png b/contrib/assets/logo/png/logo-dark_1600x512.png
new file mode 100644
index 00000000..2a21cf37
Binary files /dev/null and b/contrib/assets/logo/png/logo-dark_1600x512.png differ
diff --git a/contrib/assets/logo/png/logo-grey_1600x512.png b/contrib/assets/logo/png/logo-grey_1600x512.png
new file mode 100644
index 00000000..5d78652c
Binary files /dev/null and b/contrib/assets/logo/png/logo-grey_1600x512.png differ
diff --git a/contrib/assets/logo/png/logo-white_1600x512.png b/contrib/assets/logo/png/logo-white_1600x512.png
new file mode 100644
index 00000000..08946135
Binary files /dev/null and b/contrib/assets/logo/png/logo-white_1600x512.png differ
diff --git a/contrib/assets/logo/svg/logo-dark_1600x512.svg b/contrib/assets/logo/svg/logo-dark_1600x512.svg
new file mode 100644
index 00000000..1281fa13
--- /dev/null
+++ b/contrib/assets/logo/svg/logo-dark_1600x512.svg
@@ -0,0 +1,693 @@
+
+
+
+
diff --git a/contrib/assets/logo/svg/logo-grey_1600x512.svg b/contrib/assets/logo/svg/logo-grey_1600x512.svg
new file mode 100644
index 00000000..0ce62c17
--- /dev/null
+++ b/contrib/assets/logo/svg/logo-grey_1600x512.svg
@@ -0,0 +1,705 @@
+
+
+
+
diff --git a/contrib/assets/logo/svg/logo-white_1600x512.svg b/contrib/assets/logo/svg/logo-white_1600x512.svg
new file mode 100644
index 00000000..7292a571
--- /dev/null
+++ b/contrib/assets/logo/svg/logo-white_1600x512.svg
@@ -0,0 +1,716 @@
+
+
+
+
diff --git a/contrib/assets/logo/xcf/logo-dark_1600x512.xcf b/contrib/assets/logo/xcf/logo-dark_1600x512.xcf
new file mode 100644
index 00000000..cd498ec9
Binary files /dev/null and b/contrib/assets/logo/xcf/logo-dark_1600x512.xcf differ
diff --git a/contrib/assets/logo/xcf/logo-grey_1600x512.xcf b/contrib/assets/logo/xcf/logo-grey_1600x512.xcf
new file mode 100644
index 00000000..45532359
Binary files /dev/null and b/contrib/assets/logo/xcf/logo-grey_1600x512.xcf differ
diff --git a/contrib/assets/logo/xcf/logo-white_1600x512.xcf b/contrib/assets/logo/xcf/logo-white_1600x512.xcf
new file mode 100644
index 00000000..10dbfe60
Binary files /dev/null and b/contrib/assets/logo/xcf/logo-white_1600x512.xcf differ
diff --git a/contrib/assets/logo_dark.svg b/contrib/assets/logo_dark.svg
deleted file mode 100644
index 8465bc6f..00000000
--- a/contrib/assets/logo_dark.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
diff --git a/contrib/assets/logo_light.svg b/contrib/assets/logo_light.svg
deleted file mode 100644
index 6ca0fd44..00000000
--- a/contrib/assets/logo_light.svg
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
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
old mode 100755
new mode 100644
index cda726b5..3c049913
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
old mode 100755
new mode 100644
index 962b5dff..176caffe
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
old mode 100755
new mode 100644
index 962b5dff..176caffe
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 69091b04..5f017386 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
old mode 100755
new mode 100644
index 962b5dff..176caffe
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 69091b04..5f017386 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/favicon.png b/libresonic-main/src/main/webapp/icons/favicon.png
index be9c467d..84c711c8 100644
Binary files a/libresonic-main/src/main/webapp/icons/favicon.png and b/libresonic-main/src/main/webapp/icons/favicon.png differ
diff --git a/libresonic-main/src/main/webapp/icons/groove/logo.png b/libresonic-main/src/main/webapp/icons/groove/logo.png
old mode 100755
new mode 100644
index 962b5dff..176caffe
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
old mode 100755
new mode 100644
index 962b5dff..176caffe
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 69091b04..5f017386 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 69091b04..5f017386 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
old mode 100755
new mode 100644
index 962b5dff..176caffe
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
old mode 100755
new mode 100644
index 962b5dff..176caffe
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 69091b04..5f017386 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 69091b04..5f017386 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/ripserver/logo.png b/libresonic-main/src/main/webapp/icons/ripserver/logo.png
new file mode 100644
index 00000000..176caffe
Binary files /dev/null and b/libresonic-main/src/main/webapp/icons/ripserver/logo.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 69091b04..5f017386 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 69091b04..5f017386 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
old mode 100755
new mode 100644
index 962b5dff..176caffe
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 69091b04..5f017386 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
old mode 100755
new mode 100644
index 962b5dff..176caffe
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 69091b04..5f017386 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