diff --git a/Makefile b/Makefile
index ebc33e2b5..89f7855b3 100644
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,14 @@ cordova-base:
 # 	make -C cordova release-android
 #
 wp8:
-	cordova/build.sh WP8 
+	cordova/build.sh WP8
 	cordova/wp/fix-svg.sh
 	echo -e "\a"
 
+wp8-debug:
+	cordova/build.sh WP8 --dbgjs
+	cordova/wp/fix-svg.sh
+	echo -e "\a"
 
 ios:
 	cordova/build.sh IOS --clear
diff --git a/cordova/build.sh b/cordova/build.sh
index 6d28f60a3..ab3e964d0 100755
--- a/cordova/build.sh
+++ b/cordova/build.sh
@@ -171,12 +171,14 @@ if [ $CURRENT_OS == "WP8" ]; then
   echo "Wp8 project!!!"
   cp -R $PROJECT/www/* $PROJECT/platforms/wp8/www
   checkOK
-
-  mkdir -p  $PROJECT/platforms/res/wp
-	  cp -v wp/res/* $PROJECT/platforms/wp8/Assets
-	  cp -v wp/res/SplashScreenImage.jpg $PROJECT/platforms/wp8/
+  cp -vf wp/Properties/* $PROJECT/platforms/wp8/Properties/
+  cp -vf wp/Package.appxmanifest $PROJECT/platforms/wp8/
+  checkOK
+  cp -vf wp/Assets/* $PROJECT/platforms/wp8/Assets/
+  cp -vf wp/SplashScreenImage.jpg $PROJECT/platforms/wp8/
+  cp -vf wp/ApplicationIcon.png $PROJECT/platforms/wp8/
+  cp -vf wp/Background.png $PROJECT/platforms/wp8/
   checkOK
-
 fi
 
 
diff --git a/cordova/wp/Assets/ApplicationIcon.png b/cordova/wp/ApplicationIcon.png
old mode 100644
new mode 100755
similarity index 100%
rename from cordova/wp/Assets/ApplicationIcon.png
rename to cordova/wp/ApplicationIcon.png
diff --git a/cordova/wp/Assets/173x173@1.png b/cordova/wp/Assets/173x173@1.png
new file mode 100755
index 000000000..131b0018a
Binary files /dev/null and b/cordova/wp/Assets/173x173@1.png differ
diff --git a/cordova/wp/Assets/173x173@2.png b/cordova/wp/Assets/173x173@2.png
new file mode 100755
index 000000000..88ae68c8e
Binary files /dev/null and b/cordova/wp/Assets/173x173@2.png differ
diff --git a/cordova/wp/Assets/62x62@1.png b/cordova/wp/Assets/62x62@1.png
new file mode 100755
index 000000000..093b8e4ac
Binary files /dev/null and b/cordova/wp/Assets/62x62@1.png differ
diff --git a/cordova/wp/Assets/62x62@2.png b/cordova/wp/Assets/62x62@2.png
new file mode 100755
index 000000000..28148de00
Binary files /dev/null and b/cordova/wp/Assets/62x62@2.png differ
diff --git a/cordova/wp/Assets/99x99@1.png b/cordova/wp/Assets/99x99@1.png
new file mode 100755
index 000000000..a813b5122
Binary files /dev/null and b/cordova/wp/Assets/99x99@1.png differ
diff --git a/cordova/wp/Assets/99x99@2.png b/cordova/wp/Assets/99x99@2.png
new file mode 100755
index 000000000..e9a930b04
Binary files /dev/null and b/cordova/wp/Assets/99x99@2.png differ
diff --git a/cordova/wp/Assets/Default@2x~iphone.png b/cordova/wp/Assets/Default@2x~iphone.png
deleted file mode 100644
index ed48409a9..000000000
Binary files a/cordova/wp/Assets/Default@2x~iphone.png and /dev/null differ
diff --git a/cordova/wp/Assets/Default~iphone.png b/cordova/wp/Assets/Default~iphone.png
deleted file mode 100644
index 1499ac825..000000000
Binary files a/cordova/wp/Assets/Default~iphone.png and /dev/null differ
diff --git a/cordova/wp/Assets/SplashScreenImage.png b/cordova/wp/Assets/SplashScreenImage.png
deleted file mode 100644
index ba02850ca..000000000
Binary files a/cordova/wp/Assets/SplashScreenImage.png and /dev/null differ
diff --git a/cordova/wp/Assets/icon@1.png b/cordova/wp/Assets/icon@1.png
new file mode 100755
index 000000000..c070f8b26
Binary files /dev/null and b/cordova/wp/Assets/icon@1.png differ
diff --git a/cordova/wp/Assets/Background.png b/cordova/wp/Background.png
old mode 100644
new mode 100755
similarity index 100%
rename from cordova/wp/Assets/Background.png
rename to cordova/wp/Background.png
diff --git a/cordova/wp/Properties/WMAppManifest.xml b/cordova/wp/Properties/WMAppManifest.xml
index 0b7fef935..e36ebbd67 100644
--- a/cordova/wp/Properties/WMAppManifest.xml
+++ b/cordova/wp/Properties/WMAppManifest.xml
@@ -5,7 +5,7 @@
     <Language code="en-US" />
   </Languages>
   <App Author="Bitpay Inc." BitsPerPixel="32" Description="A multisignature Bitcoin Wallet" Genre="apps.normal" ProductID="{5381aa50-9069-11e4-84cc-293caf9cbdc8}" Publisher="Copay Wallet" PublisherID="{31cdd08b-457c-413d-b440-f6665eec847d}" RuntimeType="Silverlight" Title="Copay Wallet" Version="0.9.4.0" xmlns="" SDOptOut="false" NotificationService="MPN">
-    <IconPath IsRelative="true" IsResource="false">icon@2.png</IconPath>
+    <IconPath IsRelative="true" IsResource="false">Assets/icon@2.png</IconPath>
     <Capabilities>
       <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
       <Capability Name="ID_CAP_NETWORKING" />
@@ -17,9 +17,9 @@
     <Tokens>
       <PrimaryToken TaskName="_default" TokenID="CopayToken">
         <TemplateFlip>
-          <SmallImageURI IsRelative="true" IsResource="false">200x200@1.png</SmallImageURI>
+          <SmallImageURI IsRelative="true" IsResource="false">Assets/200x200@1.png</SmallImageURI>
           <Count>0</Count>
-          <BackgroundImageURI IsRelative="true" IsResource="false">200x200@2.png</BackgroundImageURI>
+          <BackgroundImageURI IsRelative="true" IsResource="false">Assets/200x200@2.png</BackgroundImageURI>
           <Title>Copay Wallet</Title>
           <BackContent />
           <BackBackgroundImageURI />
diff --git a/cordova/wp/Assets/SplashScreenImage.jpg b/cordova/wp/SplashScreenImage.jpg
similarity index 100%
rename from cordova/wp/Assets/SplashScreenImage.jpg
rename to cordova/wp/SplashScreenImage.jpg
diff --git a/cordova/wp/fix-svg.sh b/cordova/wp/fix-svg.sh
old mode 100644
new mode 100755
diff --git a/cordova/wp/res/ApplicationIcon.png b/cordova/wp/res/ApplicationIcon.png
deleted file mode 100644
index 6db598fa9..000000000
Binary files a/cordova/wp/res/ApplicationIcon.png and /dev/null differ
diff --git a/cordova/wp/res/Background.png b/cordova/wp/res/Background.png
deleted file mode 100644
index 31f4d63d3..000000000
Binary files a/cordova/wp/res/Background.png and /dev/null differ
diff --git a/cordova/wp/res/SplashScreenImage.jpg b/cordova/wp/res/SplashScreenImage.jpg
deleted file mode 100644
index 4942eaf03..000000000
Binary files a/cordova/wp/res/SplashScreenImage.jpg and /dev/null differ
diff --git a/cordova/wp/res/SplashScreenImage.png b/cordova/wp/res/SplashScreenImage.png
deleted file mode 100644
index ba02850ca..000000000
Binary files a/cordova/wp/res/SplashScreenImage.png and /dev/null differ
diff --git a/cordova/wp/wxga.png b/cordova/wp/wxga.png
deleted file mode 100644
index 489c22b62..000000000
Binary files a/cordova/wp/wxga.png and /dev/null differ
diff --git a/cordova/wp/wxga2.png b/cordova/wp/wxga2.png
deleted file mode 100644
index 048b45810..000000000
Binary files a/cordova/wp/wxga2.png and /dev/null differ
diff --git a/cordova/wp/wxga3.png b/cordova/wp/wxga3.png
deleted file mode 100644
index d94226aa5..000000000
Binary files a/cordova/wp/wxga3.png and /dev/null differ
diff --git a/js/controllers/home.js b/js/controllers/home.js
index 415fdd65e..d36179160 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -33,7 +33,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
     });
     $scope.usingLocalStorage = config.plugins.EncryptedLocalStorage;
 
-    if (isCordova && 0) {
+    if (isCordova) {
       ls.getItem(KEY, function(err, value) {
         $scope.showDisclaimer = value ? null : true;
       });