diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/service/UPnPService.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/service/UPnPService.java
index 776d1c24..e54d081d 100644
--- a/subsonic-main/src/main/java/net/sourceforge/subsonic/service/UPnPService.java
+++ b/subsonic-main/src/main/java/net/sourceforge/subsonic/service/UPnPService.java
@@ -131,7 +131,7 @@ public class UPnPService {
                 new ModelDetails(serverName, licenseString, versionString),
                 new DLNADoc[]{new DLNADoc("DMS", DLNADoc.Version.V1_5)}, null);
 
-        Icon icon = new Icon("image/png", 512, 512, 32, getClass().getResource("subsonic-512.png"));
+        Icon icon = new Icon("image/png", 512, 512, 32, getClass().getResource("logo-512.png"));
 
         LocalService<FolderBasedContentDirectory> contentDirectoryservice = new AnnotationLocalServiceBinder().read(FolderBasedContentDirectory.class);
         contentDirectoryservice.setManager(new DefaultServiceManager<FolderBasedContentDirectory>(contentDirectoryservice) {
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/service/logo-512.png b/subsonic-main/src/main/resources/net/sourceforge/subsonic/service/logo-512.png
new file mode 100755
index 00000000..9458fdd1
Binary files /dev/null and b/subsonic-main/src/main/resources/net/sourceforge/subsonic/service/logo-512.png differ
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/service/subsonic-512.png b/subsonic-main/src/main/resources/net/sourceforge/subsonic/service/subsonic-512.png
deleted file mode 100644
index 77f183e0..00000000
Binary files a/subsonic-main/src/main/resources/net/sourceforge/subsonic/service/subsonic-512.png and /dev/null differ
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/default_dark.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/default_dark.properties
index 7bc31602..7c9e67aa 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/default_dark.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/default_dark.properties
@@ -22,7 +22,7 @@ helpPopupImage = icons/default_dark/help_small.png
 homeImage = icons/default_dark/home.png
 html5Image = icons/default_dark/html5.png
 logImage = icons/default_dark/log.png
-logoImage = icons/default_dark/subsonic_logo.png
+logoImage = icons/default_dark/logo_light.png
 moreImage = icons/default_dark/more.png
 muteImage = icons/default_dark/mute.png
 nowPlayingImage = icons/default_dark/now_playing.png
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/default_light.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/default_light.properties
index 0a7e7761..3c346cd9 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/default_light.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/default_light.properties
@@ -22,7 +22,7 @@ helpPopupImage = icons/default_light/help_small.png
 homeImage = icons/default_light/home.png
 html5Image = icons/default_light/html5.png
 logImage = icons/default_light/log.png
-logoImage = icons/default_light/subsonic_logo.png
+logoImage = icons/default_light/logo.png
 moreImage = icons/default_light/more.png
 muteImage = icons/default_light/mute.png
 nowPlayingImage = icons/default_light/now_playing.png
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/denim.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/denim.properties
index 3ddc9562..c3a37aa1 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/denim.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/denim.properties
@@ -24,7 +24,7 @@ helpImage = icons/denim/help.png
 helpPopupImage = icons/denim/help_small.png
 homeImage = icons/denim/home.png
 logImage = icons/denim/log.png
-logoImage = icons/denim/logo.png
+logoImage = icons/denim/logo_light.png
 moreImage = icons/denim/more.png
 nowPlayingImage = icons/denim/playing.png
 paypalImage = icons/denim/paypal.gif
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/hicon.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/hicon.properties
index e3442681..471c84af 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/hicon.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/hicon.properties
@@ -9,7 +9,7 @@ textColor = 5c5c5c
 detailColor = 5c5c5c
 linkColor = black
 
-logoImage = icons/hicon/subsonic.png
+logoImage = icons/hicon/logo.png
 nowPlayingImage = icons/hicon/now_playing.png
 helpImage = icons/hicon/help.png
 moreImage = icons/hicon/more.png
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/hiconi.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/hiconi.properties
index 6832f49e..f78c5420 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/hiconi.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/hiconi.properties
@@ -9,7 +9,7 @@ textColor = a3a3a3
 detailColor = a3a3a3
 linkColor = white
 
-logoImage = icons/hiconi/subsonic.png
+logoImage = icons/hiconi/logo_light.png
 nowPlayingImage = icons/hiconi/now_playing.png
 helpImage = icons/hiconi/help.png
 moreImage = icons/hiconi/more.png
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/hitech.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/hitech.properties
index 9ab65aa2..051d180b 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/hitech.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/hitech.properties
@@ -9,7 +9,7 @@ textColor = d2f1d5
 detailColor = d2f1d5
 linkColor = 00d61b
 
-logoImage = icons/hitech/subsonic.png
+logoImage = icons/hitech/logo_light.png
 nowPlayingImage = icons/hitech/now_playing.png
 helpImage = icons/hitech/help.png
 moreImage = icons/hitech/more.png
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/midnightfun.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/midnightfun.properties
index 649fbc11..e6f7f330 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/midnightfun.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/midnightfun.properties
@@ -24,7 +24,7 @@ helpImage = icons/midnightfun/midnightfun_help.png
 helpPopupImage = icons/midnightfun/midnightfun_help_small.png
 homeImage = icons/midnightfun/midnightfun_home.png
 logImage = icons/midnightfun/midnightfun_log.png
-logoImage = icons/midnightfun/midnightfun_logo.png
+logoImage = icons/midnightfun/logo.png
 moreImage = icons/midnightfun/midnightfun_more.png
 nowPlayingImage = icons/midnightfun/midnightfun_playing.png
 paypalImage = icons/midnightfun/midnightfun_paypal.gif
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/monochrome.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/monochrome.properties
index d507d582..19e417e2 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/monochrome.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/monochrome.properties
@@ -8,4 +8,4 @@ textColor = 333333
 detailColor = AAAAAA
 linkColor = 006699
 
-logoImage = icons/monochrome/subdot.png
+logoImage = icons/monochrome/logo.png
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/monochrome_black.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/monochrome_black.properties
index 676c0928..0c898c65 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/monochrome_black.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/monochrome_black.properties
@@ -8,5 +8,5 @@ textColor = CCCCCC
 detailColor = AAAAAA
 linkColor = FFFFFF
 
-logoImage = icons/monochrome/subdot.png
+logoImage = icons/monochrome/logo_light.png
 
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/pinkpanther.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/pinkpanther.properties
index 0587710c..4b4bb621 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/pinkpanther.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/pinkpanther.properties
@@ -24,7 +24,7 @@ helpImage = icons/pinkpanther/help.png
 helpPopupImage = icons/pinkpanther/help_small.png
 homeImage = icons/pinkpanther/home.png
 logImage = icons/pinkpanther/log.png
-logoImage = icons/pinkpanther/logo.png
+logoImage = icons/pinkpanther/logo_light.png
 moreImage = icons/pinkpanther/more.png
 nowPlayingImage = icons/pinkpanther/playing.png
 paypalImage = icons/pinkpanther/paypal.gif
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/simplify.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/simplify.properties
index d640f026..dc0d7714 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/simplify.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/simplify.properties
@@ -24,7 +24,7 @@ helpImage = icons/simplify/help.png
 helpPopupImage = icons/simplify/help_small.png
 homeImage = icons/simplify/home.png
 logImage = icons/simplify/log.png
-logoImage = icons/simplify/logo.png
+logoImage = icons/simplify/logo_light.png
 moreImage = icons/simplify/more.png
 nowPlayingImage = icons/simplify/playing.png
 paypalImage = icons/simplify/paypal.gif
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/slick.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/slick.properties
index 9efe93ed..6625d82f 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/slick.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/slick.properties
@@ -9,7 +9,7 @@ textColor = 1e3127
 detailColor = 1e3127
 linkColor = 1f5e59
 
-logoImage = icons/slick/subsonic.png
+logoImage = icons/slick/logo_light.png
 nowPlayingImage = icons/slick/now_playing.png
 helpImage = icons/slick/help.png
 moreImage = icons/slick/more.png
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/sonic_blue.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/sonic_blue.properties
index 2c445586..d0f2d1fa 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/sonic_blue.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/sonic_blue.properties
@@ -24,7 +24,7 @@ helpImage = icons/sonic_blue/help.png
 helpPopupImage = icons/sonic_blue/help_small.png
 homeImage = icons/sonic_blue/home.png
 logImage = icons/sonic_blue/log.png
-logoImage = icons/sonic_blue/logo.png
+logoImage = icons/sonic_blue/logo_light.png
 moreImage = icons/sonic_blue/more.png
 nowPlayingImage = icons/sonic_blue/playing.png
 paypalImage = icons/sonic_blue/paypal.gif
diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/subStandard.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/subStandard.properties
index c0c86bf2..ee646209 100644
--- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/subStandard.properties
+++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/subStandard.properties
@@ -26,7 +26,7 @@ helpImage = icons/subStandard/help.png
 helpPopupImage = icons/subStandard/help_small.png
 homeImage = icons/subStandard/home.png
 logImage = icons/subStandard/log.png
-logoImage = icons/subStandard/logo.png
+logoImage = icons/subStandard/logo_light.png
 moreImage = icons/subStandard/more.png
 nowPlayingImage = icons/subStandard/playing.png
 paypalImage = icons/subStandard/paypal.gif
diff --git a/subsonic-main/src/main/webapp/icons/buuftheme/logo.png b/subsonic-main/src/main/webapp/icons/buuftheme/logo.png
old mode 100644
new mode 100755
index 0ac76190..badee1bd
Binary files a/subsonic-main/src/main/webapp/icons/buuftheme/logo.png and b/subsonic-main/src/main/webapp/icons/buuftheme/logo.png differ
diff --git a/subsonic-main/src/main/webapp/icons/coolandclean/logo.png b/subsonic-main/src/main/webapp/icons/coolandclean/logo.png
old mode 100644
new mode 100755
index b393527e..badee1bd
Binary files a/subsonic-main/src/main/webapp/icons/coolandclean/logo.png and b/subsonic-main/src/main/webapp/icons/coolandclean/logo.png differ
diff --git a/subsonic-main/src/main/webapp/icons/default_dark/logo_light.png b/subsonic-main/src/main/webapp/icons/default_dark/logo_light.png
new file mode 100755
index 00000000..2a6e10aa
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/default_dark/logo_light.png differ
diff --git a/subsonic-main/src/main/webapp/icons/default_dark/subsonic_logo.png b/subsonic-main/src/main/webapp/icons/default_dark/subsonic_logo.png
deleted file mode 100644
index 98343ca6..00000000
Binary files a/subsonic-main/src/main/webapp/icons/default_dark/subsonic_logo.png and /dev/null differ
diff --git a/subsonic-main/src/main/webapp/icons/sonic_blue/logo.png b/subsonic-main/src/main/webapp/icons/default_light/logo.png
old mode 100644
new mode 100755
similarity index 54%
rename from subsonic-main/src/main/webapp/icons/sonic_blue/logo.png
rename to subsonic-main/src/main/webapp/icons/default_light/logo.png
index 947d6e25..badee1bd
Binary files a/subsonic-main/src/main/webapp/icons/sonic_blue/logo.png and b/subsonic-main/src/main/webapp/icons/default_light/logo.png differ
diff --git a/subsonic-main/src/main/webapp/icons/default_light/subsonic_logo.png b/subsonic-main/src/main/webapp/icons/default_light/subsonic_logo.png
deleted file mode 100644
index 91fcb807..00000000
Binary files a/subsonic-main/src/main/webapp/icons/default_light/subsonic_logo.png and /dev/null differ
diff --git a/subsonic-main/src/main/webapp/icons/denim/logo.png b/subsonic-main/src/main/webapp/icons/denim/logo.png
deleted file mode 100644
index 82191180..00000000
Binary files a/subsonic-main/src/main/webapp/icons/denim/logo.png and /dev/null differ
diff --git a/subsonic-main/src/main/webapp/icons/denim/logo_light.png b/subsonic-main/src/main/webapp/icons/denim/logo_light.png
new file mode 100755
index 00000000..2a6e10aa
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/denim/logo_light.png differ
diff --git a/subsonic-main/src/main/webapp/icons/groove/logo.png b/subsonic-main/src/main/webapp/icons/groove/logo.png
old mode 100644
new mode 100755
index 9f1f5a86..badee1bd
Binary files a/subsonic-main/src/main/webapp/icons/groove/logo.png and b/subsonic-main/src/main/webapp/icons/groove/logo.png differ
diff --git a/subsonic-main/src/main/webapp/icons/hicon/logo.png b/subsonic-main/src/main/webapp/icons/hicon/logo.png
new file mode 100755
index 00000000..badee1bd
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/hicon/logo.png differ
diff --git a/subsonic-main/src/main/webapp/icons/hicon/subsonic.png b/subsonic-main/src/main/webapp/icons/hicon/subsonic.png
deleted file mode 100644
index 083f929e..00000000
Binary files a/subsonic-main/src/main/webapp/icons/hicon/subsonic.png and /dev/null differ
diff --git a/subsonic-main/src/main/webapp/icons/hiconi/logo_light.png b/subsonic-main/src/main/webapp/icons/hiconi/logo_light.png
new file mode 100755
index 00000000..2a6e10aa
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/hiconi/logo_light.png differ
diff --git a/subsonic-main/src/main/webapp/icons/hiconi/subsonic.png b/subsonic-main/src/main/webapp/icons/hiconi/subsonic.png
deleted file mode 100644
index d3aa3d7b..00000000
Binary files a/subsonic-main/src/main/webapp/icons/hiconi/subsonic.png and /dev/null differ
diff --git a/subsonic-main/src/main/webapp/icons/hitech/logo_light.png b/subsonic-main/src/main/webapp/icons/hitech/logo_light.png
new file mode 100755
index 00000000..2a6e10aa
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/hitech/logo_light.png differ
diff --git a/subsonic-main/src/main/webapp/icons/hitech/subsonic.png b/subsonic-main/src/main/webapp/icons/hitech/subsonic.png
deleted file mode 100644
index 44305b32..00000000
Binary files a/subsonic-main/src/main/webapp/icons/hitech/subsonic.png and /dev/null differ
diff --git a/subsonic-main/src/main/webapp/icons/midnightfun/logo.png b/subsonic-main/src/main/webapp/icons/midnightfun/logo.png
new file mode 100755
index 00000000..badee1bd
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/midnightfun/logo.png differ
diff --git a/subsonic-main/src/main/webapp/icons/midnightfun/midnightfun_logo.png b/subsonic-main/src/main/webapp/icons/midnightfun/midnightfun_logo.png
deleted file mode 100644
index d3cbbdf1..00000000
Binary files a/subsonic-main/src/main/webapp/icons/midnightfun/midnightfun_logo.png and /dev/null differ
diff --git a/subsonic-main/src/main/webapp/icons/monochrome/logo.png b/subsonic-main/src/main/webapp/icons/monochrome/logo.png
new file mode 100755
index 00000000..badee1bd
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/monochrome/logo.png differ
diff --git a/subsonic-main/src/main/webapp/icons/monochrome/logo_light.png b/subsonic-main/src/main/webapp/icons/monochrome/logo_light.png
new file mode 100755
index 00000000..2a6e10aa
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/monochrome/logo_light.png differ
diff --git a/subsonic-main/src/main/webapp/icons/monochrome/subdot.png b/subsonic-main/src/main/webapp/icons/monochrome/subdot.png
deleted file mode 100644
index 54623ab6..00000000
Binary files a/subsonic-main/src/main/webapp/icons/monochrome/subdot.png and /dev/null differ
diff --git a/subsonic-main/src/main/webapp/icons/pinkpanther/logo.png b/subsonic-main/src/main/webapp/icons/pinkpanther/logo.png
deleted file mode 100644
index 9bf1eb83..00000000
Binary files a/subsonic-main/src/main/webapp/icons/pinkpanther/logo.png and /dev/null differ
diff --git a/subsonic-main/src/main/webapp/icons/pinkpanther/logo_light.png b/subsonic-main/src/main/webapp/icons/pinkpanther/logo_light.png
new file mode 100755
index 00000000..2a6e10aa
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/pinkpanther/logo_light.png differ
diff --git a/subsonic-main/src/main/webapp/icons/simplify/logo.png b/subsonic-main/src/main/webapp/icons/simplify/logo.png
deleted file mode 100644
index 553a2bf0..00000000
Binary files a/subsonic-main/src/main/webapp/icons/simplify/logo.png and /dev/null differ
diff --git a/subsonic-main/src/main/webapp/icons/simplify/logo_light.png b/subsonic-main/src/main/webapp/icons/simplify/logo_light.png
new file mode 100755
index 00000000..2a6e10aa
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/simplify/logo_light.png differ
diff --git a/subsonic-main/src/main/webapp/icons/slick/logo_light.png b/subsonic-main/src/main/webapp/icons/slick/logo_light.png
new file mode 100755
index 00000000..2a6e10aa
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/slick/logo_light.png differ
diff --git a/subsonic-main/src/main/webapp/icons/slick/subsonic.png b/subsonic-main/src/main/webapp/icons/slick/subsonic.png
deleted file mode 100644
index 7d839665..00000000
Binary files a/subsonic-main/src/main/webapp/icons/slick/subsonic.png and /dev/null differ
diff --git a/subsonic-main/src/main/webapp/icons/sonic/logo.png b/subsonic-main/src/main/webapp/icons/sonic/logo.png
old mode 100644
new mode 100755
index 68aca05c..badee1bd
Binary files a/subsonic-main/src/main/webapp/icons/sonic/logo.png and b/subsonic-main/src/main/webapp/icons/sonic/logo.png differ
diff --git a/subsonic-main/src/main/webapp/icons/sonic_blue/logo_light.png b/subsonic-main/src/main/webapp/icons/sonic_blue/logo_light.png
new file mode 100755
index 00000000..2a6e10aa
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/sonic_blue/logo_light.png differ
diff --git a/subsonic-main/src/main/webapp/icons/sonic_white/logo.png b/subsonic-main/src/main/webapp/icons/sonic_white/logo.png
old mode 100644
new mode 100755
index 68aca05c..badee1bd
Binary files a/subsonic-main/src/main/webapp/icons/sonic_white/logo.png and b/subsonic-main/src/main/webapp/icons/sonic_white/logo.png differ
diff --git a/subsonic-main/src/main/webapp/icons/subStandard/logo.png b/subsonic-main/src/main/webapp/icons/subStandard/logo.png
deleted file mode 100644
index 65db730a..00000000
Binary files a/subsonic-main/src/main/webapp/icons/subStandard/logo.png and /dev/null differ
diff --git a/subsonic-main/src/main/webapp/icons/subStandard/logo_light.png b/subsonic-main/src/main/webapp/icons/subStandard/logo_light.png
new file mode 100755
index 00000000..2a6e10aa
Binary files /dev/null and b/subsonic-main/src/main/webapp/icons/subStandard/logo_light.png differ