diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png
index 3f84fc1b2..2a90f40f8 100644
Binary files a/resources/android/icon/drawable-hdpi-icon.png and b/resources/android/icon/drawable-hdpi-icon.png differ
diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png
index 3de9b4f79..dd87e2d73 100644
Binary files a/resources/android/icon/drawable-ldpi-icon.png and b/resources/android/icon/drawable-ldpi-icon.png differ
diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png
index 4b455d317..ed9328d64 100644
Binary files a/resources/android/icon/drawable-mdpi-icon.png and b/resources/android/icon/drawable-mdpi-icon.png differ
diff --git a/resources/android/icon/drawable-playstore-512-icon.png b/resources/android/icon/drawable-playstore-512-icon.png
new file mode 100644
index 000000000..a6aac8994
Binary files /dev/null and b/resources/android/icon/drawable-playstore-512-icon.png differ
diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png
index fe47ccce8..c68bc0adc 100644
Binary files a/resources/android/icon/drawable-xhdpi-icon.png and b/resources/android/icon/drawable-xhdpi-icon.png differ
diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png
index 391b4af13..d11d659a1 100644
Binary files a/resources/android/icon/drawable-xxhdpi-icon.png and b/resources/android/icon/drawable-xxhdpi-icon.png differ
diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png
index 09e50b7b3..a51c14623 100644
Binary files a/resources/android/icon/drawable-xxxhdpi-icon.png and b/resources/android/icon/drawable-xxxhdpi-icon.png differ
diff --git a/resources/android/icon/mipmap-hdpi/ic_launcher.png b/resources/android/icon/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..2a90f40f8
Binary files /dev/null and b/resources/android/icon/mipmap-hdpi/ic_launcher.png differ
diff --git a/resources/android/icon/mipmap-ldpi/ic_launcher.png b/resources/android/icon/mipmap-ldpi/ic_launcher.png
new file mode 100644
index 000000000..dd87e2d73
Binary files /dev/null and b/resources/android/icon/mipmap-ldpi/ic_launcher.png differ
diff --git a/resources/android/icon/mipmap-mdpi/ic_launcher.png b/resources/android/icon/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..ed9328d64
Binary files /dev/null and b/resources/android/icon/mipmap-mdpi/ic_launcher.png differ
diff --git a/resources/android/icon/mipmap-xhdpi/ic_launcher.png b/resources/android/icon/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..c68bc0adc
Binary files /dev/null and b/resources/android/icon/mipmap-xhdpi/ic_launcher.png differ
diff --git a/resources/android/icon/mipmap-xxhdpi/ic_launcher.png b/resources/android/icon/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..d11d659a1
Binary files /dev/null and b/resources/android/icon/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/resources/android/icon/mipmap-xxxhdpi/ic_launcher.png b/resources/android/icon/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..a51c14623
Binary files /dev/null and b/resources/android/icon/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png
index 74abe28ea..87077c439 100644
Binary files a/resources/android/splash/drawable-land-hdpi-screen.png and b/resources/android/splash/drawable-land-hdpi-screen.png differ
diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png
index b224ba8c8..87077c439 100644
Binary files a/resources/android/splash/drawable-land-ldpi-screen.png and b/resources/android/splash/drawable-land-ldpi-screen.png differ
diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png
index f18770eb1..adc9bc66c 100644
Binary files a/resources/android/splash/drawable-land-mdpi-screen.png and b/resources/android/splash/drawable-land-mdpi-screen.png differ
diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png
index 76eab0d72..87077c439 100644
Binary files a/resources/android/splash/drawable-land-xhdpi-screen.png and b/resources/android/splash/drawable-land-xhdpi-screen.png differ
diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png
index b15925df5..3ef7b04fe 100644
Binary files a/resources/android/splash/drawable-land-xxhdpi-screen.png and b/resources/android/splash/drawable-land-xxhdpi-screen.png differ
diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png
index 4b22b8b59..f3722dcbd 100644
Binary files a/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/resources/android/splash/drawable-land-xxxhdpi-screen.png differ
diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png
index c0c981b97..d7436dedf 100644
Binary files a/resources/android/splash/drawable-port-hdpi-screen.png and b/resources/android/splash/drawable-port-hdpi-screen.png differ
diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png
index dfba93219..72a7597ba 100644
Binary files a/resources/android/splash/drawable-port-ldpi-screen.png and b/resources/android/splash/drawable-port-ldpi-screen.png differ
diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png
index e5129fd04..d7436dedf 100644
Binary files a/resources/android/splash/drawable-port-mdpi-screen.png and b/resources/android/splash/drawable-port-mdpi-screen.png differ
diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png
index 14ec839e8..6225fe16c 100644
Binary files a/resources/android/splash/drawable-port-xhdpi-screen.png and b/resources/android/splash/drawable-port-xhdpi-screen.png differ
diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png
index 4df256fbf..ced330ca2 100644
Binary files a/resources/android/splash/drawable-port-xxhdpi-screen.png and b/resources/android/splash/drawable-port-xxhdpi-screen.png differ
diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png
index 53f97f9d9..597c652e7 100644
Binary files a/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/resources/android/splash/drawable-port-xxxhdpi-screen.png differ
diff --git a/resources/blackberry10/icon/icon-110.png b/resources/blackberry10/icon/icon-110.png
new file mode 100644
index 000000000..44a3739a3
Binary files /dev/null and b/resources/blackberry10/icon/icon-110.png differ
diff --git a/resources/blackberry10/icon/icon-144.png b/resources/blackberry10/icon/icon-144.png
new file mode 100644
index 000000000..d11d659a1
Binary files /dev/null and b/resources/blackberry10/icon/icon-144.png differ
diff --git a/resources/blackberry10/icon/icon-90.png b/resources/blackberry10/icon/icon-90.png
new file mode 100644
index 000000000..35f87072b
Binary files /dev/null and b/resources/blackberry10/icon/icon-90.png differ
diff --git a/resources/blackberry10/icon/icon-96.png b/resources/blackberry10/icon/icon-96.png
new file mode 100644
index 000000000..c68bc0adc
Binary files /dev/null and b/resources/blackberry10/icon/icon-96.png differ
diff --git a/resources/icon.png b/resources/icon.png
index bee77667f..73421fb35 100644
Binary files a/resources/icon.png and b/resources/icon.png differ
diff --git a/resources/ios/icon/AppIcon-20x20@1x.png b/resources/ios/icon/AppIcon-20x20@1x.png
new file mode 100644
index 000000000..ce7aac50d
Binary files /dev/null and b/resources/ios/icon/AppIcon-20x20@1x.png differ
diff --git a/resources/ios/icon/AppIcon-20x20@2x-1.png b/resources/ios/icon/AppIcon-20x20@2x-1.png
new file mode 100644
index 000000000..6169994b6
Binary files /dev/null and b/resources/ios/icon/AppIcon-20x20@2x-1.png differ
diff --git a/resources/ios/icon/AppIcon-20x20@2x.png b/resources/ios/icon/AppIcon-20x20@2x.png
new file mode 100644
index 000000000..6169994b6
Binary files /dev/null and b/resources/ios/icon/AppIcon-20x20@2x.png differ
diff --git a/resources/ios/icon/AppIcon-20x20@3x.png b/resources/ios/icon/AppIcon-20x20@3x.png
new file mode 100644
index 000000000..20111cd9b
Binary files /dev/null and b/resources/ios/icon/AppIcon-20x20@3x.png differ
diff --git a/resources/ios/icon/AppIcon-29x29@1x.png b/resources/ios/icon/AppIcon-29x29@1x.png
new file mode 100644
index 000000000..6046dfe07
Binary files /dev/null and b/resources/ios/icon/AppIcon-29x29@1x.png differ
diff --git a/resources/ios/icon/AppIcon-29x29@2x-1.png b/resources/ios/icon/AppIcon-29x29@2x-1.png
new file mode 100644
index 000000000..5bd5bf512
Binary files /dev/null and b/resources/ios/icon/AppIcon-29x29@2x-1.png differ
diff --git a/resources/ios/icon/AppIcon-29x29@2x.png b/resources/ios/icon/AppIcon-29x29@2x.png
new file mode 100644
index 000000000..5bd5bf512
Binary files /dev/null and b/resources/ios/icon/AppIcon-29x29@2x.png differ
diff --git a/resources/ios/icon/AppIcon-29x29@3x.png b/resources/ios/icon/AppIcon-29x29@3x.png
new file mode 100644
index 000000000..b5079ae4e
Binary files /dev/null and b/resources/ios/icon/AppIcon-29x29@3x.png differ
diff --git a/resources/ios/icon/AppIcon-40x40@1x.png b/resources/ios/icon/AppIcon-40x40@1x.png
new file mode 100644
index 000000000..6169994b6
Binary files /dev/null and b/resources/ios/icon/AppIcon-40x40@1x.png differ
diff --git a/resources/ios/icon/AppIcon-40x40@2x-1.png b/resources/ios/icon/AppIcon-40x40@2x-1.png
new file mode 100644
index 000000000..192d6e5b0
Binary files /dev/null and b/resources/ios/icon/AppIcon-40x40@2x-1.png differ
diff --git a/resources/ios/icon/AppIcon-40x40@2x.png b/resources/ios/icon/AppIcon-40x40@2x.png
new file mode 100644
index 000000000..192d6e5b0
Binary files /dev/null and b/resources/ios/icon/AppIcon-40x40@2x.png differ
diff --git a/resources/ios/icon/AppIcon-40x40@3x.png b/resources/ios/icon/AppIcon-40x40@3x.png
new file mode 100644
index 000000000..cd1c092f2
Binary files /dev/null and b/resources/ios/icon/AppIcon-40x40@3x.png differ
diff --git a/resources/ios/icon/AppIcon-512@2x.png b/resources/ios/icon/AppIcon-512@2x.png
new file mode 100644
index 000000000..37aa479ee
Binary files /dev/null and b/resources/ios/icon/AppIcon-512@2x.png differ
diff --git a/resources/ios/icon/AppIcon-60x60@2x.png b/resources/ios/icon/AppIcon-60x60@2x.png
new file mode 100644
index 000000000..cd1c092f2
Binary files /dev/null and b/resources/ios/icon/AppIcon-60x60@2x.png differ
diff --git a/resources/ios/icon/AppIcon-60x60@3x.png b/resources/ios/icon/AppIcon-60x60@3x.png
new file mode 100644
index 000000000..8be6ae6b0
Binary files /dev/null and b/resources/ios/icon/AppIcon-60x60@3x.png differ
diff --git a/resources/ios/icon/AppIcon-76x76@1x.png b/resources/ios/icon/AppIcon-76x76@1x.png
new file mode 100644
index 000000000..ef70c6601
Binary files /dev/null and b/resources/ios/icon/AppIcon-76x76@1x.png differ
diff --git a/resources/ios/icon/AppIcon-76x76@2x.png b/resources/ios/icon/AppIcon-76x76@2x.png
new file mode 100644
index 000000000..813528101
Binary files /dev/null and b/resources/ios/icon/AppIcon-76x76@2x.png differ
diff --git a/resources/ios/icon/AppIcon-83.5x83.5@2x.png b/resources/ios/icon/AppIcon-83.5x83.5@2x.png
new file mode 100644
index 000000000..cb8a9b492
Binary files /dev/null and b/resources/ios/icon/AppIcon-83.5x83.5@2x.png differ
diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png
index 5e9edf63f..7535e8d3c 100644
Binary files a/resources/ios/splash/Default-568h@2x~iphone.png and b/resources/ios/splash/Default-568h@2x~iphone.png differ
diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png
index 2843fb37a..902a59f3b 100644
Binary files a/resources/ios/splash/Default-667h.png and b/resources/ios/splash/Default-667h.png differ
diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png
index 21f2d4239..af9e3591a 100644
Binary files a/resources/ios/splash/Default-736h.png and b/resources/ios/splash/Default-736h.png differ
diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png
index 9c069f7cc..5ba2141f8 100644
Binary files a/resources/ios/splash/Default-Landscape-736h.png and b/resources/ios/splash/Default-Landscape-736h.png differ
diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png
index 35407a901..0e00a9881 100644
Binary files a/resources/ios/splash/Default-Landscape@2x~ipad.png and b/resources/ios/splash/Default-Landscape@2x~ipad.png differ
diff --git a/resources/ios/splash/Default-Landscape@~ipadpro.png b/resources/ios/splash/Default-Landscape@~ipadpro.png
index 75de9e0ed..861f736d8 100644
Binary files a/resources/ios/splash/Default-Landscape@~ipadpro.png and b/resources/ios/splash/Default-Landscape@~ipadpro.png differ
diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png
index b74bbf69b..97e3d0d30 100644
Binary files a/resources/ios/splash/Default-Landscape~ipad.png and b/resources/ios/splash/Default-Landscape~ipad.png differ
diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png
index d0c33f786..8870036b6 100644
Binary files a/resources/ios/splash/Default-Portrait@2x~ipad.png and b/resources/ios/splash/Default-Portrait@2x~ipad.png differ
diff --git a/resources/ios/splash/Default-Portrait@~ipadpro.png b/resources/ios/splash/Default-Portrait@~ipadpro.png
index 363dd1c82..fac60e98e 100644
Binary files a/resources/ios/splash/Default-Portrait@~ipadpro.png and b/resources/ios/splash/Default-Portrait@~ipadpro.png differ
diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png
index aad1debb1..c009fd5fb 100644
Binary files a/resources/ios/splash/Default-Portrait~ipad.png and b/resources/ios/splash/Default-Portrait~ipad.png differ
diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png
index f0f16ef9b..7d69214b8 100644
Binary files a/resources/ios/splash/Default@2x~iphone.png and b/resources/ios/splash/Default@2x~iphone.png differ
diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png
index e5129fd04..03d0d2c7b 100644
Binary files a/resources/ios/splash/Default~iphone.png and b/resources/ios/splash/Default~iphone.png differ
diff --git a/resources/windows/icon/Square150x150Logo.scale-100.png b/resources/windows/icon/Square150x150Logo.scale-100.png
new file mode 100644
index 000000000..b37892ad8
Binary files /dev/null and b/resources/windows/icon/Square150x150Logo.scale-100.png differ
diff --git a/resources/windows/icon/Square150x150Logo.scale-125.png b/resources/windows/icon/Square150x150Logo.scale-125.png
new file mode 100644
index 000000000..a2ae97d73
Binary files /dev/null and b/resources/windows/icon/Square150x150Logo.scale-125.png differ
diff --git a/resources/windows/icon/Square150x150Logo.scale-150.png b/resources/windows/icon/Square150x150Logo.scale-150.png
new file mode 100644
index 000000000..848524211
Binary files /dev/null and b/resources/windows/icon/Square150x150Logo.scale-150.png differ
diff --git a/resources/windows/icon/Square150x150Logo.scale-200.png b/resources/windows/icon/Square150x150Logo.scale-200.png
new file mode 100644
index 000000000..af4f7511a
Binary files /dev/null and b/resources/windows/icon/Square150x150Logo.scale-200.png differ
diff --git a/resources/windows/icon/Square150x150Logo.scale-400.png b/resources/windows/icon/Square150x150Logo.scale-400.png
new file mode 100644
index 000000000..61162ccaf
Binary files /dev/null and b/resources/windows/icon/Square150x150Logo.scale-400.png differ
diff --git a/resources/windows/icon/Square44x44Logo.scale-100.png b/resources/windows/icon/Square44x44Logo.scale-100.png
new file mode 100644
index 000000000..d13105c45
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.scale-100.png differ
diff --git a/resources/windows/icon/Square44x44Logo.scale-125.png b/resources/windows/icon/Square44x44Logo.scale-125.png
new file mode 100644
index 000000000..fb2b99b6d
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.scale-125.png differ
diff --git a/resources/windows/icon/Square44x44Logo.scale-150.png b/resources/windows/icon/Square44x44Logo.scale-150.png
new file mode 100644
index 000000000..45eac3c5f
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.scale-150.png differ
diff --git a/resources/windows/icon/Square44x44Logo.scale-200.png b/resources/windows/icon/Square44x44Logo.scale-200.png
new file mode 100644
index 000000000..27de7c0e3
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.scale-200.png differ
diff --git a/resources/windows/icon/Square44x44Logo.scale-400.png b/resources/windows/icon/Square44x44Logo.scale-400.png
new file mode 100644
index 000000000..8e710f4b6
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.scale-400.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-16.png b/resources/windows/icon/Square44x44Logo.targetsize-16.png
new file mode 100644
index 000000000..ca471932e
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-16.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-20.png b/resources/windows/icon/Square44x44Logo.targetsize-20.png
new file mode 100644
index 000000000..ce7aac50d
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-20.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-24.png b/resources/windows/icon/Square44x44Logo.targetsize-24.png
new file mode 100644
index 000000000..20056b5f6
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-24.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-256.png b/resources/windows/icon/Square44x44Logo.targetsize-256.png
new file mode 100644
index 000000000..65acd4ecb
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-256.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-30.png b/resources/windows/icon/Square44x44Logo.targetsize-30.png
new file mode 100644
index 000000000..81ffbecf9
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-30.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-32.png b/resources/windows/icon/Square44x44Logo.targetsize-32.png
new file mode 100644
index 000000000..1f75824ea
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-32.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-36.png b/resources/windows/icon/Square44x44Logo.targetsize-36.png
new file mode 100644
index 000000000..dd87e2d73
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-36.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-40.png b/resources/windows/icon/Square44x44Logo.targetsize-40.png
new file mode 100644
index 000000000..6169994b6
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-40.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-48.png b/resources/windows/icon/Square44x44Logo.targetsize-48.png
new file mode 100644
index 000000000..ed9328d64
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-48.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-60.png b/resources/windows/icon/Square44x44Logo.targetsize-60.png
new file mode 100644
index 000000000..20111cd9b
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-60.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-64.png b/resources/windows/icon/Square44x44Logo.targetsize-64.png
new file mode 100644
index 000000000..947604030
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-64.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-72.png b/resources/windows/icon/Square44x44Logo.targetsize-72.png
new file mode 100644
index 000000000..2a90f40f8
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-72.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-80.png b/resources/windows/icon/Square44x44Logo.targetsize-80.png
new file mode 100644
index 000000000..192d6e5b0
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-80.png differ
diff --git a/resources/windows/icon/Square44x44Logo.targetsize-96.png b/resources/windows/icon/Square44x44Logo.targetsize-96.png
new file mode 100644
index 000000000..c68bc0adc
Binary files /dev/null and b/resources/windows/icon/Square44x44Logo.targetsize-96.png differ
diff --git a/resources/windows/icon/Square71x71Logo.scale-100.png b/resources/windows/icon/Square71x71Logo.scale-100.png
new file mode 100644
index 000000000..83a57792a
Binary files /dev/null and b/resources/windows/icon/Square71x71Logo.scale-100.png differ
diff --git a/resources/windows/icon/Square71x71Logo.scale-125.png b/resources/windows/icon/Square71x71Logo.scale-125.png
new file mode 100644
index 000000000..5c9c35930
Binary files /dev/null and b/resources/windows/icon/Square71x71Logo.scale-125.png differ
diff --git a/resources/windows/icon/Square71x71Logo.scale-150.png b/resources/windows/icon/Square71x71Logo.scale-150.png
new file mode 100644
index 000000000..b6187d3ce
Binary files /dev/null and b/resources/windows/icon/Square71x71Logo.scale-150.png differ
diff --git a/resources/windows/icon/Square71x71Logo.scale-200.png b/resources/windows/icon/Square71x71Logo.scale-200.png
new file mode 100644
index 000000000..af1931c6c
Binary files /dev/null and b/resources/windows/icon/Square71x71Logo.scale-200.png differ
diff --git a/resources/windows/icon/Square71x71Logo.scale-400.png b/resources/windows/icon/Square71x71Logo.scale-400.png
new file mode 100644
index 000000000..dae484fc8
Binary files /dev/null and b/resources/windows/icon/Square71x71Logo.scale-400.png differ
diff --git a/resources/windows/splash/SplashScreen.scale-100.png b/resources/windows/splash/SplashScreen.scale-100.png
new file mode 100644
index 000000000..3b4c6eb16
Binary files /dev/null and b/resources/windows/splash/SplashScreen.scale-100.png differ
diff --git a/resources/windows/splash/SplashScreen.scale-125.png b/resources/windows/splash/SplashScreen.scale-125.png
new file mode 100644
index 000000000..128200175
Binary files /dev/null and b/resources/windows/splash/SplashScreen.scale-125.png differ
diff --git a/resources/windows/splash/SplashScreen.scale-150.png b/resources/windows/splash/SplashScreen.scale-150.png
new file mode 100644
index 000000000..7e28b2b5f
Binary files /dev/null and b/resources/windows/splash/SplashScreen.scale-150.png differ
diff --git a/resources/windows/splash/SplashScreen.scale-200.png b/resources/windows/splash/SplashScreen.scale-200.png
new file mode 100644
index 000000000..f23b0a5c0
Binary files /dev/null and b/resources/windows/splash/SplashScreen.scale-200.png differ
diff --git a/resources/windows/splash/SplashScreen.scale-400.png b/resources/windows/splash/SplashScreen.scale-400.png
new file mode 100644
index 000000000..02643d1af
Binary files /dev/null and b/resources/windows/splash/SplashScreen.scale-400.png differ
diff --git a/resources/windows/splash/Wide310x150Logo.scale-100.png b/resources/windows/splash/Wide310x150Logo.scale-100.png
new file mode 100644
index 000000000..5e1676ce1
Binary files /dev/null and b/resources/windows/splash/Wide310x150Logo.scale-100.png differ
diff --git a/resources/windows/splash/Wide310x150Logo.scale-125.png b/resources/windows/splash/Wide310x150Logo.scale-125.png
new file mode 100644
index 000000000..96eddb75c
Binary files /dev/null and b/resources/windows/splash/Wide310x150Logo.scale-125.png differ
diff --git a/resources/windows/splash/Wide310x150Logo.scale-150.png b/resources/windows/splash/Wide310x150Logo.scale-150.png
new file mode 100644
index 000000000..7ea4ed7ad
Binary files /dev/null and b/resources/windows/splash/Wide310x150Logo.scale-150.png differ
diff --git a/resources/windows/splash/Wide310x150Logo.scale-200.png b/resources/windows/splash/Wide310x150Logo.scale-200.png
new file mode 100644
index 000000000..3b4c6eb16
Binary files /dev/null and b/resources/windows/splash/Wide310x150Logo.scale-200.png differ
diff --git a/resources/windows/splash/Wide310x150Logo.scale-400.png b/resources/windows/splash/Wide310x150Logo.scale-400.png
new file mode 100644
index 000000000..f23b0a5c0
Binary files /dev/null and b/resources/windows/splash/Wide310x150Logo.scale-400.png differ
diff --git a/src/app/pages/events/event-detail/event-detail.page.html b/src/app/pages/events/event-detail/event-detail.page.html
index 616d239d0..714d3aa87 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -29,11 +29,19 @@
Calendário
-
+
+ Pessoal
+ Oficial
+
Tipo do evento
-
+
+ Reunião
+ Viagem
+ Conferência
+ Encontro
+
Data Início
@@ -147,7 +155,7 @@
- Gravar
+ Gravar
diff --git a/src/app/pages/events/event-detail/event-detail.page.scss b/src/app/pages/events/event-detail/event-detail.page.scss
index 6914a454a..ea56dd1bc 100644
--- a/src/app/pages/events/event-detail/event-detail.page.scss
+++ b/src/app/pages/events/event-detail/event-detail.page.scss
@@ -64,15 +64,10 @@ ion-card{
margin: 10px auto;
}
.event-detail-buttons ion-button{
- width: 45%;
- margin-bottom: 15px;
-}
-.ion-button-left{
- float: left;
- background: none;
-}
-.ion-button-right{
- float: right;
+ width: 90%;
+ margin: 0 auto;
+ display: block;
+ margin-bottom: 25px;
}
.ion-icon-delete{
font-size: 22px;
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 20d0fe8bc..fa9238678 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -20,6 +20,13 @@
+
+
+
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss
index 57503a21e..20213b0f6 100644
--- a/src/app/pages/events/events.page.scss
+++ b/src/app/pages/events/events.page.scss
@@ -146,4 +146,91 @@
color: #666666;
font-size: 20px;
}
-
\ No newline at end of file
+
+
+
+
+ .switch {
+ position: relative;
+ display: inline-block;
+ width: 110px;
+ height: 34px;
+ float: right;
+ margin-right: 37px;
+ }
+
+ .switch input {display:none;}
+
+ .slider {
+ position: absolute;
+ cursor: pointer;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: #e16817;
+ -webkit-transition: .4s;
+ transition: .4s;
+ }
+
+ .slider:before {
+ position: absolute;
+ content: "";
+ height: 26px;
+ width: 26px;
+ left: 4px;
+ bottom: 4px;
+ background-color: #e16817;
+ -webkit-transition: .4s;
+ transition: .4s;
+ }
+
+ input:checked + .slider {
+ background-color: #ffffff;
+ border: 1px solid #e16817;
+ }
+
+ input:focus + .slider {
+ box-shadow: 0 0 1px #2196F3;
+ }
+
+ input:checked + .slider:before {
+ -webkit-transform: translateX(55px);
+ -ms-transform: translateX(55px);
+ transform: translateX(55px);
+ }
+
+ /*------ ADDED CSS ---------*/
+ .pr
+ {
+ display: none;
+ text-align: left;
+ }
+
+ .pr, .mdgpr
+ {
+ color: white;
+ position: absolute;
+ transform: translate(-50%,-50%);
+ top: 50%;
+ left: 50%;
+ font-size: 10px;
+ font-family: Verdana, sans-serif;
+ }
+
+ input:checked+ .slider .pr
+ {display: block;}
+
+ input:checked + .slider .mdgpr
+ {display: none;
+ color: white;}
+
+ /*--------- END --------*/
+
+ /* Rounded sliders */
+ .slider.round {
+ border-radius: 34px;
+ }
+
+ .slider.round:before {
+ border-radius: 50%;}
\ No newline at end of file
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index b001b0ef4..c32ead060 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -33,6 +33,8 @@ export class EventsPage implements OnInit {
officialeventsList: Event[];
personaleventsList: Event[];
+ customText = false;
+
showLoader: boolean = true;
constructor(private eventService: EventsService, private router: Router, public activatedRoute: ActivatedRoute) { }
diff --git a/src/assets/icon/favicon.png b/src/assets/icon/favicon.png
index 51888a7bb..3cc43a17f 100644
Binary files a/src/assets/icon/favicon.png and b/src/assets/icon/favicon.png differ
diff --git a/src/assets/icon/favicon_ionic.png b/src/assets/icon/favicon_ionic.png
new file mode 100644
index 000000000..51888a7bb
Binary files /dev/null and b/src/assets/icon/favicon_ionic.png differ
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
index 6a8875962..73421fb35 100644
Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ
diff --git a/src/assets/images/logo_default.png b/src/assets/images/logo_default.png
new file mode 100644
index 000000000..6a8875962
Binary files /dev/null and b/src/assets/images/logo_default.png differ