build: update post-build.bat (autogenerate) and clarify README (windows)

Turns out post-build.bat cannot be edited manually because it is a
generated file, so I'm adding some clarifications about this in the
README.txt file and on the file itself with a REM comment.

I've also auto-generated the file now, which has re-fixed the 2 issues I
fixed recently in it (but in a different way), and has added some copy
lines of more resources I wasn't aware of.

3 files changed, 66 insertions, 44 deletions

diff --git a/build/windows/README.txt b/build/windows/README.txt
index e15741f25..c2b154f5c 100644
--- a/build/windows/README.txt
+++ b/build/windows/README.txt
@@ -13,8 +13,13 @@ With that, you should be able to run build-installer.js (inside a Windows comman
 line shell, not simply running it in an explorer window) and have it produce the
 installer.
 
-== Updating Bundled Deps ==
+== Maintenance ==
 
-The bundle-deps.bat script will copy Gtk# and GStreamer into Banshee's bin/
-directory.  It only needs to be run by maintainers updating the bundled deps.
-See the script for which packages you need to have installed.
+To update the bundled dependencies, use the bundle-deps.bat script, which will
+copy Gtk# and GStreamer into Banshee's bin/ directory.  It only needs to be run
+by maintainers updating the bundled deps. See the script for which packages you
+need to have installed.
+
+Before packaging a release, make sure always that the post-build.bat script is
+updated (via running ./update-scripts); otherwise the build will fail or have
+some resources missing. (And don't forget to commit the changes.)
diff --git a/build/windows/post-build.bat b/build/windows/post-build.bat
index 3a5f7b3a1..9a34c07cd 100644
--- a/build/windows/post-build.bat
+++ b/build/windows/post-build.bat
@@ -1,3 +1,5 @@
+REM This is a generated file, do not edit manually
+
 REM This file is called/ran after Banshee.Core.dll is built, see src/Core/Banshee.Core/Banshee.Core.csproj
 
 mkdir bin\share\icons\hicolor\128x128\devices
@@ -20,7 +22,6 @@ mkdir bin\share\icons\hicolor\48x48
 mkdir bin\share\icons\hicolor\48x48\actions
 mkdir bin\share\icons\hicolor\48x48\categories
 mkdir bin\share\icons\hicolor\48x48\devices
-
 copy /Y "src\Backends\Banshee.Gnome\ThemeIcons\16x16\actions\media-write-cd.png" bin\share\icons\hicolor\16x16\actions\media-write-cd.png
 copy /Y "src\Backends\Banshee.Gnome\ThemeIcons\22x22\actions\media-write-cd.png" bin\share\icons\hicolor\22x22\actions\media-write-cd.png
 copy /Y "src\Backends\Banshee.Gnome\ThemeIcons\32x32\actions\media-write-cd.png" bin\share\icons\hicolor\32x32\actions\media-write-cd.png
@@ -38,71 +39,84 @@ copy /Y "src\Core\Banshee.ThickClient\ThemeIcons\16x16\emblems\creative-commons-
 copy /Y "src\Core\Banshee.ThickClient\ThemeIcons\22x22\actions\encode.png" bin\share\icons\hicolor\22x22\actions\encode.png
 copy /Y "src\Core\Banshee.ThickClient\ThemeIcons\22x22\categories\source-playlist.png" bin\share\icons\hicolor\22x22\categories\source-playlist.png
 copy /Y "src\Core\Banshee.ThickClient\ThemeIcons\22x22\categories\source-smart-playlist.png" bin\share\icons\hicolor\22x22\categories\source-smart-playlist.png
-
-set APPLEDEVICE_ICONS_PATH=src\Dap\Banshee.Dap.AppleDevice\ThemeIcons
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-U2-color.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-U2-color.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-U2-monochrome.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-U2-monochrome.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-mini-blue.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-mini-blue.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-mini-gold.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-mini-gold.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-mini-green.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-mini-green.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-mini-pink.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-mini-pink.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-mini-silver.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-mini-silver.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-nano-black.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-nano-black.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-nano-white.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-nano-white.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-shuffle.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-shuffle.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-standard-color.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-standard-color.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-standard-monochrome.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-standard-monochrome.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-video-black.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-video-black.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\16x16\devices\multimedia-player-ipod-video-white.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-video-white.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-U2-color.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-U2-color.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-U2-monochrome.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-U2-monochrome.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-mini-blue.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-mini-blue.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-mini-gold.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-mini-gold.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-mini-green.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-mini-green.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-mini-pink.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-mini-pink.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-mini-silver.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-mini-silver.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-nano-black.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-nano-black.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-nano-white.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-nano-white.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-shuffle.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-shuffle.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-standard-color.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-standard-color.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-standard-monochrome.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-standard-monochrome.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-video-black.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-video-black.png
-copy /Y "%APPLEDEVICE_ICONS_PATH%\22x22\devices\multimedia-player-ipod-video-white.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-video-white.png
-
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-mini-blue.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-mini-blue.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-mini-gold.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-mini-gold.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-mini-green.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-mini-green.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-mini-pink.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-mini-pink.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-mini-silver.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-mini-silver.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-nano-black.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-nano-black.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-nano-white.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-nano-white.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-shuffle.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-shuffle.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-standard-color.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-standard-color.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-standard-monochrome.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-standard-monochrome.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-U2-color.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-U2-color.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-U2-monochrome.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-U2-monochrome.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-video-black.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-video-black.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\16x16\devices\multimedia-player-ipod-video-white.png" bin\share\icons\hicolor\16x16\devices\multimedia-player-ipod-video-white.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-mini-blue.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-mini-blue.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-mini-gold.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-mini-gold.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-mini-green.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-mini-green.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-mini-pink.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-mini-pink.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-mini-silver.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-mini-silver.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-nano-black.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-nano-black.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-nano-white.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-nano-white.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-shuffle.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-shuffle.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-standard-color.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-standard-color.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-standard-monochrome.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-standard-monochrome.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-U2-color.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-U2-color.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-U2-monochrome.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-U2-monochrome.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-video-black.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-video-black.png
+copy /Y "src\Dap\Banshee.Dap.AppleDevice\ThemeIcons\22x22\devices\multimedia-player-ipod-video-white.png" bin\share\icons\hicolor\22x22\devices\multimedia-player-ipod-video-white.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\128x128\devices\phone-google-nexus-one.png" bin\share\icons\hicolor\128x128\devices\phone-google-nexus-one.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\128x128\devices\phone-htc-g1-white.png" bin\share\icons\hicolor\128x128\devices\phone-htc-g1-white.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\128x128\devices\phone-nokia-n900.png" bin\share\icons\hicolor\128x128\devices\phone-nokia-n900.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\128x128\devices\phone-nokia-n95.png" bin\share\icons\hicolor\128x128\devices\phone-nokia-n95.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\128x128\devices\phone-nook.png" bin\share\icons\hicolor\128x128\devices\phone-nook.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\128x128\devices\phone-xperia-arc.png" bin\share\icons\hicolor\128x128\devices\phone-xperia-arc.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\16x16\categories\amazon-mp3-source.png" bin\share\icons\hicolor\16x16\categories\amazon-mp3-source.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\16x16\devices\phone-google-nexus-one.png" bin\share\icons\hicolor\16x16\devices\phone-google-nexus-one.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\16x16\devices\phone-htc-g1-white.png" bin\share\icons\hicolor\16x16\devices\phone-htc-g1-white.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\16x16\devices\phone-nokia-n900.png" bin\share\icons\hicolor\16x16\devices\phone-nokia-n900.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\16x16\devices\phone-nokia-n95.png" bin\share\icons\hicolor\16x16\devices\phone-nokia-n95.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\16x16\devices\phone-nook.png" bin\share\icons\hicolor\16x16\devices\phone-nook.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\16x16\devices\phone-palm-pre.png" bin\share\icons\hicolor\16x16\devices\phone-palm-pre.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\16x16\devices\phone-xperia-arc.png" bin\share\icons\hicolor\16x16\devices\phone-xperia-arc.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\22x22\categories\amazon-mp3-source.png" bin\share\icons\hicolor\22x22\categories\amazon-mp3-source.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\22x22\devices\phone-google-nexus-one.png" bin\share\icons\hicolor\22x22\devices\phone-google-nexus-one.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\22x22\devices\phone-htc-g1-white.png" bin\share\icons\hicolor\22x22\devices\phone-htc-g1-white.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\22x22\devices\phone-nokia-n900.png" bin\share\icons\hicolor\22x22\devices\phone-nokia-n900.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\22x22\devices\phone-nokia-n95.png" bin\share\icons\hicolor\22x22\devices\phone-nokia-n95.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\22x22\devices\phone-nook.png" bin\share\icons\hicolor\22x22\devices\phone-nook.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\22x22\devices\phone-palm-pre.png" bin\share\icons\hicolor\22x22\devices\phone-palm-pre.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\22x22\devices\phone-xperia-arc.png" bin\share\icons\hicolor\22x22\devices\phone-xperia-arc.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\24x24\devices\phone-google-nexus-one.png" bin\share\icons\hicolor\24x24\devices\phone-google-nexus-one.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\24x24\devices\phone-htc-g1-white.png" bin\share\icons\hicolor\24x24\devices\phone-htc-g1-white.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\24x24\devices\phone-nokia-n900.png" bin\share\icons\hicolor\24x24\devices\phone-nokia-n900.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\24x24\devices\phone-nokia-n95.png" bin\share\icons\hicolor\24x24\devices\phone-nokia-n95.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\24x24\devices\phone-nook.png" bin\share\icons\hicolor\24x24\devices\phone-nook.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\24x24\devices\phone-palm-pre.png" bin\share\icons\hicolor\24x24\devices\phone-palm-pre.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\24x24\devices\phone-xperia-arc.png" bin\share\icons\hicolor\24x24\devices\phone-xperia-arc.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\256x256\devices\phone-google-nexus-one.png" bin\share\icons\hicolor\256x256\devices\phone-google-nexus-one.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\256x256\devices\phone-nokia-n95.png" bin\share\icons\hicolor\256x256\devices\phone-nokia-n95.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\256x256\devices\phone-nook.png" bin\share\icons\hicolor\256x256\devices\phone-nook.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\256x256\devices\phone-palm-pre.png" bin\share\icons\hicolor\256x256\devices\phone-palm-pre.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\256x256\devices\phone-xperia-arc.png" bin\share\icons\hicolor\256x256\devices\phone-xperia-arc.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\32x32\devices\phone-google-nexus-one.png" bin\share\icons\hicolor\32x32\devices\phone-google-nexus-one.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\32x32\devices\phone-htc-g1-white.png" bin\share\icons\hicolor\32x32\devices\phone-htc-g1-white.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\32x32\devices\phone-nokia-n900.png" bin\share\icons\hicolor\32x32\devices\phone-nokia-n900.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\32x32\devices\phone-nokia-n95.png" bin\share\icons\hicolor\32x32\devices\phone-nokia-n95.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\32x32\devices\phone-nook.png" bin\share\icons\hicolor\32x32\devices\phone-nook.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\32x32\devices\phone-palm-pre.png" bin\share\icons\hicolor\32x32\devices\phone-palm-pre.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\32x32\devices\phone-xperia-arc.png" bin\share\icons\hicolor\32x32\devices\phone-xperia-arc.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\48x48\devices\phone-google-nexus-one.png" bin\share\icons\hicolor\48x48\devices\phone-google-nexus-one.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\48x48\devices\phone-htc-g1-white.png" bin\share\icons\hicolor\48x48\devices\phone-htc-g1-white.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\48x48\devices\phone-nokia-n900.png" bin\share\icons\hicolor\48x48\devices\phone-nokia-n900.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\48x48\devices\phone-nokia-n95.png" bin\share\icons\hicolor\48x48\devices\phone-nokia-n95.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\48x48\devices\phone-nook.png" bin\share\icons\hicolor\48x48\devices\phone-nook.png
 copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\48x48\devices\phone-palm-pre.png" bin\share\icons\hicolor\48x48\devices\phone-palm-pre.png
+copy /Y "src\Dap\Banshee.Dap.MassStorage\ThemeIcons\48x48\devices\phone-xperia-arc.png" bin\share\icons\hicolor\48x48\devices\phone-xperia-arc.png
 copy /Y "src\Extensions\Banshee.AmazonMp3.Store\ThemeIcons\16x16\categories\amazon-mp3-store-source.png" bin\share\icons\hicolor\16x16\categories\amazon-mp3-store-source.png
 copy /Y "src\Extensions\Banshee.AmazonMp3.Store\ThemeIcons\22x22\categories\amazon-mp3-store-source.png" bin\share\icons\hicolor\22x22\categories\amazon-mp3-store-source.png
-
-set OPTICALDISC_ICONS_PATH=src\Extensions\Banshee.OpticalDisc\ThemeIcons
-copy /Y "%OPTICALDISC_ICONS_PATH%\16x16\actions\media-import-audio-cd.png" bin\share\icons\hicolor\16x16\actions\media-import-audio-cd.png
-copy /Y "%OPTICALDISC_ICONS_PATH%\22x22\actions\media-import-audio-cd.png" bin\share\icons\hicolor\22x22\actions\media-import-audio-cd.png
-
 copy /Y "src\Extensions\Banshee.Audiobook\ThemeIcons\16x16\categories\audiobook.png" bin\share\icons\hicolor\16x16\categories\audiobook.png
 copy /Y "src\Extensions\Banshee.Audiobook\ThemeIcons\22x22\categories\audiobook.png" bin\share\icons\hicolor\22x22\categories\audiobook.png
 copy /Y "src\Extensions\Banshee.Audiobook\ThemeIcons\256x256\categories\audiobook.png" bin\share\icons\hicolor\256x256\categories\audiobook.png
@@ -128,6 +142,8 @@ copy /Y "src\Extensions\Banshee.MiroGuide\ThemeIcons\22x22\categories\miro-guide
 copy /Y "src\Extensions\Banshee.MiroGuide\ThemeIcons\24x24\categories\miro-guide-source.png" bin\share\icons\hicolor\24x24\categories\miro-guide-source.png
 copy /Y "src\Extensions\Banshee.MiroGuide\ThemeIcons\32x32\categories\miro-guide-source.png" bin\share\icons\hicolor\32x32\categories\miro-guide-source.png
 copy /Y "src\Extensions\Banshee.MiroGuide\ThemeIcons\48x48\categories\miro-guide-source.png" bin\share\icons\hicolor\48x48\categories\miro-guide-source.png
+copy /Y "src\Extensions\Banshee.OpticalDisc\ThemeIcons\16x16\actions\media-import-audio-cd.png" bin\share\icons\hicolor\16x16\actions\media-import-audio-cd.png
+copy /Y "src\Extensions\Banshee.OpticalDisc\ThemeIcons\22x22\actions\media-import-audio-cd.png" bin\share\icons\hicolor\22x22\actions\media-import-audio-cd.png
 copy /Y "src\Extensions\Banshee.Podcasting\ThemeIcons\16x16\categories\podcast.png" bin\share\icons\hicolor\16x16\categories\podcast.png
 copy /Y "src\Extensions\Banshee.Podcasting\ThemeIcons\16x16\status\podcast-new.png" bin\share\icons\hicolor\16x16\status\podcast-new.png
 copy /Y "src\Extensions\Banshee.Podcasting\ThemeIcons\22x22\categories\podcast.png" bin\share\icons\hicolor\22x22\categories\podcast.png
@@ -141,14 +157,12 @@ copy /Y "src\Extensions\Banshee.Wikipedia\ThemeIcons\48x48\categories\wikipedia.
 copy /Y "src\Extensions\Banshee.YouTube\ThemeIcons\16x16\categories\youtube.png" bin\share\icons\hicolor\16x16\categories\youtube.png
 copy /Y "src\Extensions\Banshee.YouTube\ThemeIcons\22x22\categories\youtube.png" bin\share\icons\hicolor\22x22\categories\youtube.png
 copy /Y "src\Extensions\Banshee.YouTube\ThemeIcons\24x24\categories\youtube.png" bin\share\icons\hicolor\24x24\categories\youtube.png
-
 mkdir bin\share\icons\hicolor\16x16\apps
 mkdir bin\share\icons\hicolor\192x192\apps
 mkdir bin\share\icons\hicolor\22x22\apps
 mkdir bin\share\icons\hicolor\24x24\apps
 mkdir bin\share\icons\hicolor\32x32\apps
 mkdir bin\share\icons\hicolor\48x48\apps
-
 copy /Y data\icon-theme-hicolor\media-player-banshee-16.png bin\share\icons\hicolor\16x16\apps\media-player-banshee.png
 copy /Y data\icon-theme-hicolor\media-player-banshee-192.png bin\share\icons\hicolor\192x192\apps\media-player-banshee.png
 copy /Y data\icon-theme-hicolor\media-player-banshee-22.png bin\share\icons\hicolor\22x22\apps\media-player-banshee.png
diff --git a/build/windows/update-scripts b/build/windows/update-scripts
index 4e1aad3f8..8f353447b 100755
--- a/build/windows/update-scripts
+++ b/build/windows/update-scripts
@@ -2,9 +2,12 @@
 
 cd ../..
 
-echo "REM This file is called/ran after Banshee.Core.dll is built, see src/Core/Banshee.Core/Banshee.Core.csproj
+echo "REM This is a generated file, do not edit manually
 "> build/windows/post-build.bat
 
+echo "REM This file is called/ran after Banshee.Core.dll is built, see src/Core/Banshee.Core/Banshee.Core.csproj
+">> build/windows/post-build.bat
+
 # Find all ThemeIcon PNGs and produce a Windows BAT script
 # to move them into bin/share/icon/hicolor, creating
 # all necessary directories