diff --git a/fw/decoration.header.png b/fw/decoration.header.png
deleted file mode 100644
index 9bd2d344..00000000
Binary files a/fw/decoration.header.png and /dev/null differ
diff --git a/fw/filebot.logo.png b/fw/filebot.logo.png
deleted file mode 100644
index 1b314b94..00000000
Binary files a/fw/filebot.logo.png and /dev/null differ
diff --git a/fw/filebot.logo.svg b/fw/filebot.logo.svg
deleted file mode 100644
index 2a9c25c1..00000000
--- a/fw/filebot.logo.svg
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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"
-	 width="150px" height="150px" viewBox="0 0 150 150" enable-background="new 0 0 150 150" xml:space="preserve">
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="74.4683" y1="5.5562" x2="74.4683" y2="144.7075">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.1882" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.4766" style="stop-color:#EEEFEF"/>
-	<stop  offset="0.7425" style="stop-color:#E7E9EA"/>
-	<stop  offset="1" style="stop-color:#F4F2F3"/>
-</linearGradient>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="74.4678" y1="4.083" x2="74.4678" y2="146.1802">
-	<stop  offset="0" style="stop-color:#A1B7CB"/>
-	<stop  offset="0.0962" style="stop-color:#899FB3"/>
-	<stop  offset="0.268" style="stop-color:#6B8297"/>
-	<stop  offset="0.4434" style="stop-color:#556E84"/>
-	<stop  offset="0.6218" style="stop-color:#446278"/>
-	<stop  offset="0.805" style="stop-color:#3A5B71"/>
-	<stop  offset="1" style="stop-color:#37596E"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" stroke="url(#SVGID_2_)" stroke-width="2.9459" stroke-miterlimit="10" d="M144.271,132.672
-	c0,6.647-5.39,12.035-12.036,12.035H16.702c-6.647,0-12.036-5.388-12.036-12.035V17.592c0-6.647,5.389-12.036,12.036-12.036h115.532
-	c6.646,0,12.036,5.389,12.036,12.036V132.672z"/>
-<g>
-	<path fill="#E57025" d="M79.124,33.484c0,0.149-0.02,0.382-0.056,0.698c-0.038,0.317-0.084,0.67-0.14,1.061
-		c-0.056,0.391-0.14,0.801-0.252,1.228c-0.111,0.428-0.242,0.829-0.391,1.201s-0.316,0.67-0.502,0.893
-		c-0.187,0.223-0.391,0.335-0.614,0.335c-0.261,0-0.586-0.074-0.977-0.223c-0.392-0.148-0.848-0.307-1.369-0.475
-		c-0.521-0.167-1.136-0.326-1.842-0.475c-0.708-0.148-1.489-0.224-2.345-0.224c-1.601,0-2.969,0.243-4.104,0.726
-		c-1.136,0.484-2.113,1.238-2.931,2.261c-0.819,1.024-1.507,2.317-2.066,3.88c-0.558,1.563-1.042,3.406-1.452,5.527l-0.949,5.025
-		h11.223c0.409,0,0.734,0.14,0.977,0.419c0.242,0.279,0.363,0.735,0.363,1.368c0,0.41-0.038,0.837-0.112,1.284
-		c-0.075,0.447-0.167,0.885-0.279,1.312c-0.111,0.428-0.251,0.837-0.418,1.229c-0.167,0.391-0.354,0.735-0.559,1.033
-		c-0.205,0.298-0.438,0.54-0.698,0.726c-0.261,0.187-0.521,0.279-0.782,0.279H57.573l-9.547,47.57
-		c-0.633,3.126-1.489,5.834-2.568,8.123c-1.08,2.289-2.401,4.188-3.964,5.695c-1.563,1.507-3.369,2.624-5.416,3.35
-		c-2.047,0.726-4.355,1.089-6.923,1.089c-1.675,0-3.043-0.131-4.104-0.391c-1.061-0.261-1.721-0.503-1.982-0.727
-		c-0.148-0.187-0.26-0.391-0.335-0.613c-0.074-0.224-0.111-0.522-0.111-0.894c0-0.149,0.028-0.4,0.083-0.754
-		c0.056-0.354,0.122-0.726,0.195-1.116c0.075-0.392,0.168-0.802,0.279-1.229c0.112-0.429,0.243-0.829,0.391-1.2
-		c0.149-0.373,0.316-0.671,0.502-0.894c0.187-0.224,0.41-0.335,0.67-0.335c0.261,0,0.512,0.027,0.754,0.084
-		c0.242,0.056,0.502,0.111,0.781,0.167c0.279,0.056,0.614,0.111,1.005,0.168c0.391,0.056,0.884,0.083,1.479,0.083
-		c1.563,0,2.913-0.242,4.048-0.726c1.135-0.484,2.102-1.238,2.903-2.261c0.8-1.024,1.47-2.317,2.01-3.881
-		c0.539-1.563,1.033-3.443,1.479-5.639l9.157-45.671h-7.146c-0.373,0-0.662-0.12-0.866-0.363c-0.205-0.242-0.307-0.698-0.307-1.368
-		c0-0.298,0.019-0.661,0.056-1.089c0.037-0.428,0.102-0.865,0.195-1.312c0.092-0.447,0.214-0.874,0.363-1.284
-		c0.148-0.409,0.335-0.782,0.559-1.117c0.223-0.335,0.455-0.604,0.698-0.81c0.242-0.204,0.549-0.307,0.921-0.307h7.035l1.396-6.979
-		c0.595-3.052,1.452-5.723,2.568-8.012c1.116-2.289,2.465-4.178,4.048-5.667c1.582-1.488,3.406-2.596,5.471-3.322
-		c2.066-0.726,4.346-1.089,6.84-1.089c0.818,0,1.675,0.047,2.568,0.14c0.894,0.093,1.721,0.223,2.485,0.391
-		c0.762,0.167,1.432,0.363,2.01,0.586c0.576,0.224,0.977,0.447,1.2,0.67c0.223,0.187,0.391,0.447,0.502,0.782
-		C79.068,32.758,79.124,33.113,79.124,33.484z"/>
-</g>
-<g>
-	<path fill="#69899F" d="M128.96,72.064c0,2.233-0.205,4.699-0.614,7.397c-0.409,2.699-1.07,5.416-1.981,8.151
-		c-0.913,2.736-2.058,5.397-3.434,7.984c-1.378,2.588-3.063,4.877-5.053,6.867c-1.992,1.992-4.281,3.593-6.868,4.802
-		s-5.499,1.814-8.737,1.814c-3.35,0-6.217-0.633-8.599-1.898c-2.382-1.265-4.504-3.089-6.364-5.471l-1.005,4.913
-		c-0.075,0.633-0.475,1.08-1.201,1.34c-0.726,0.26-1.833,0.391-3.321,0.391c-1.563,0-2.606-0.149-3.127-0.446
-		c-0.521-0.298-0.708-0.727-0.559-1.284l14.852-74.592c0.074-0.298,0.195-0.559,0.363-0.782c0.167-0.224,0.446-0.409,0.837-0.559
-		c0.391-0.148,0.894-0.26,1.508-0.335c0.614-0.074,1.386-0.111,2.317-0.111c0.893,0,1.619,0.037,2.177,0.111
-		c0.559,0.075,1.005,0.187,1.34,0.335c0.335,0.149,0.54,0.335,0.614,0.559c0.074,0.223,0.093,0.484,0.057,0.782l-4.467,22.444
-		c-0.187,0.968-0.41,1.974-0.67,3.015c-0.261,1.042-0.53,2.075-0.81,3.099c-0.279,1.024-0.559,1.992-0.838,2.903
-		c-0.279,0.913-0.53,1.703-0.754,2.373c0.595-1.303,1.535-2.652,2.819-4.048c1.284-1.396,2.792-2.68,4.522-3.853
-		c1.731-1.172,3.62-2.149,5.667-2.931s4.113-1.172,6.198-1.172c2.232,0,4.149,0.298,5.75,0.893c1.601,0.596,2.959,1.387,4.076,2.373
-		c1.116,0.986,2.019,2.113,2.708,3.378c0.688,1.266,1.219,2.568,1.591,3.908c0.372,1.34,0.633,2.671,0.782,3.992
-		C128.885,69.729,128.96,70.948,128.96,72.064z M119.301,72.846c0-1.005-0.093-2.158-0.278-3.462
-		c-0.188-1.302-0.55-2.512-1.089-3.629c-0.54-1.117-1.322-2.056-2.346-2.819c-1.023-0.763-2.392-1.145-4.104-1.145
-		c-2.01,0-4.058,0.578-6.142,1.731c-2.085,1.154-4.02,2.746-5.807,4.774c-1.786,2.029-3.378,4.411-4.773,7.146
-		c-1.396,2.735-2.41,5.723-3.043,8.961l-1.842,9.269c1.749,2.568,3.629,4.466,5.639,5.694s4.28,1.843,6.812,1.843
-		c1.935,0,3.685-0.446,5.248-1.34s2.978-2.084,4.243-3.573c1.266-1.488,2.363-3.191,3.295-5.108c0.93-1.917,1.702-3.927,2.316-6.03
-		c0.614-2.103,1.079-4.216,1.396-6.337S119.301,74.708,119.301,72.846z"/>
-</g>
-</svg>
diff --git a/fw/icon.simple.png b/fw/icon.simple.png
deleted file mode 100644
index 454d5a19..00000000
Binary files a/fw/icon.simple.png and /dev/null differ
diff --git a/fw/script.png b/fw/script.png
deleted file mode 100644
index ff39a27d..00000000
Binary files a/fw/script.png and /dev/null differ
diff --git a/fw/search.anidb.png b/fw/search.anidb.png
deleted file mode 100644
index 86909d00..00000000
Binary files a/fw/search.anidb.png and /dev/null differ
diff --git a/fw/search.imdb.png b/fw/search.imdb.png
deleted file mode 100644
index b882b686..00000000
Binary files a/fw/search.imdb.png and /dev/null differ
diff --git a/fw/search.opensubtitles.png b/fw/search.opensubtitles.png
deleted file mode 100644
index f26c669d..00000000
Binary files a/fw/search.opensubtitles.png and /dev/null differ
diff --git a/fw/search.serienjunkies.png b/fw/search.serienjunkies.png
deleted file mode 100644
index 155f0108..00000000
Binary files a/fw/search.serienjunkies.png and /dev/null differ
diff --git a/fw/search.subscene.png b/fw/search.subscene.png
deleted file mode 100644
index 8e748312..00000000
Binary files a/fw/search.subscene.png and /dev/null differ
diff --git a/fw/search.themoviedb.png b/fw/search.themoviedb.png
deleted file mode 100644
index 4df93556..00000000
Binary files a/fw/search.themoviedb.png and /dev/null differ
diff --git a/fw/search.tvdotcom.png b/fw/search.tvdotcom.png
deleted file mode 100644
index 990224ce..00000000
Binary files a/fw/search.tvdotcom.png and /dev/null differ
diff --git a/fw/search.tvrage.png b/fw/search.tvrage.png
deleted file mode 100644
index a9220b79..00000000
Binary files a/fw/search.tvrage.png and /dev/null differ
diff --git a/fw/status.error.png b/fw/status.error.png
deleted file mode 100644
index 827507af..00000000
Binary files a/fw/status.error.png and /dev/null differ
diff --git a/fw/status.ok.png b/fw/status.ok.png
deleted file mode 100644
index a983817c..00000000
Binary files a/fw/status.ok.png and /dev/null differ
diff --git a/fw/status.unknown.png b/fw/status.unknown.png
deleted file mode 100644
index 05d7ac7c..00000000
Binary files a/fw/status.unknown.png and /dev/null differ
diff --git a/fw/status.warning.png b/fw/status.warning.png
deleted file mode 100644
index cb8c2ba2..00000000
Binary files a/fw/status.warning.png and /dev/null differ
diff --git a/fw/tab.close.hover.png b/fw/tab.close.hover.png
deleted file mode 100644
index 43b89c94..00000000
Binary files a/fw/tab.close.hover.png and /dev/null differ
diff --git a/fw/tab.close.png b/fw/tab.close.png
deleted file mode 100644
index da35782b..00000000
Binary files a/fw/tab.close.png and /dev/null differ
diff --git a/fw/tree.closed.png b/fw/tree.closed.png
deleted file mode 100644
index a01c6034..00000000
Binary files a/fw/tree.closed.png and /dev/null differ
diff --git a/fw/tree.collapse.png b/fw/tree.collapse.png
deleted file mode 100644
index 9d561baa..00000000
Binary files a/fw/tree.collapse.png and /dev/null differ
diff --git a/fw/tree.expand.png b/fw/tree.expand.png
deleted file mode 100644
index aa1fdd85..00000000
Binary files a/fw/tree.expand.png and /dev/null differ
diff --git a/fw/tree.leaf.png b/fw/tree.leaf.png
deleted file mode 100644
index 767159d2..00000000
Binary files a/fw/tree.leaf.png and /dev/null differ
diff --git a/fw/tree.open.png b/fw/tree.open.png
deleted file mode 100644
index 27ea983f..00000000
Binary files a/fw/tree.open.png and /dev/null differ
diff --git a/fw/web.hint.tutorial.png b/fw/web.hint.tutorial.png
deleted file mode 100644
index dd20c465..00000000
Binary files a/fw/web.hint.tutorial.png and /dev/null differ
diff --git a/fw/window.icon.big.png b/fw/window.icon.big.png
deleted file mode 100644
index 7ee0fcd6..00000000
Binary files a/fw/window.icon.big.png and /dev/null differ
diff --git a/fw/window.icon.small.png b/fw/window.icon.small.png
deleted file mode 100644
index efc6fd04..00000000
Binary files a/fw/window.icon.small.png and /dev/null differ
diff --git a/source/net/filebot/resources/action.load@2x.png b/source/net/filebot/resources/action.load@2x.png
new file mode 100644
index 00000000..a618a20b
Binary files /dev/null and b/source/net/filebot/resources/action.load@2x.png differ
diff --git a/source/net/filebot/resources/action.preferences@2x.png b/source/net/filebot/resources/action.preferences@2x.png
new file mode 100755
index 00000000..8ad3c148
Binary files /dev/null and b/source/net/filebot/resources/action.preferences@2x.png differ
diff --git a/source/net/filebot/resources/action.save.png b/source/net/filebot/resources/action.save.png
index 510b0a6e..bbb35feb 100644
Binary files a/source/net/filebot/resources/action.save.png and b/source/net/filebot/resources/action.save.png differ
diff --git a/source/net/filebot/resources/action.save@2x.png b/source/net/filebot/resources/action.save@2x.png
new file mode 100644
index 00000000..93a5e977
Binary files /dev/null and b/source/net/filebot/resources/action.save@2x.png differ
diff --git a/source/net/filebot/resources/action.settings@2x.png b/source/net/filebot/resources/action.settings@2x.png
new file mode 100755
index 00000000..2b4b1f6d
Binary files /dev/null and b/source/net/filebot/resources/action.settings@2x.png differ
diff --git a/source/net/filebot/resources/tree.closed@2x.png b/source/net/filebot/resources/tree.closed@2x.png
new file mode 100755
index 00000000..f755df9f
Binary files /dev/null and b/source/net/filebot/resources/tree.closed@2x.png differ
diff --git a/source/net/filebot/resources/tree.leaf.png b/source/net/filebot/resources/tree.leaf.png
index e8a713a0..4fe50c72 100644
Binary files a/source/net/filebot/resources/tree.leaf.png and b/source/net/filebot/resources/tree.leaf.png differ
diff --git a/source/net/filebot/resources/tree.leaf@2x.png b/source/net/filebot/resources/tree.leaf@2x.png
new file mode 100644
index 00000000..b8879916
Binary files /dev/null and b/source/net/filebot/resources/tree.leaf@2x.png differ
diff --git a/source/net/filebot/resources/tree.open@2x.png b/source/net/filebot/resources/tree.open@2x.png
new file mode 100755
index 00000000..b1347285
Binary files /dev/null and b/source/net/filebot/resources/tree.open@2x.png differ