diff --git a/app/res/drawable-large/commcare_logo.png b/app/res/drawable-large/commcare_logo.png
deleted file mode 100644
index c7970c0bec..0000000000
Binary files a/app/res/drawable-large/commcare_logo.png and /dev/null differ
diff --git a/app/res/drawable/commcare_by_dimagi.xml b/app/res/drawable/commcare_by_dimagi.xml
new file mode 100644
index 0000000000..2e5e014834
--- /dev/null
+++ b/app/res/drawable/commcare_by_dimagi.xml
@@ -0,0 +1,57 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="877dp"
+    android:height="191dp"
+    android:viewportWidth="877"
+    android:viewportHeight="191">
+  <path
+      android:pathData="M673.18,154.32C680.24,154.32 685.94,160.07 685.94,167.09C685.94,174.16 680.24,179.91 673.18,179.91C669.97,179.91 667.07,178.74 664.78,176.8H664.84V178.28C664.84,179 664.22,179.55 663.52,179.6H661.68C660.97,179.55 660.41,179.04 660.36,178.33V145.62C660.46,144.95 661.01,144.4 661.68,144.4H663.52C664.23,144.4 664.84,145.01 664.84,145.72V157.38C664.84,157.38 664.84,157.43 664.78,157.43L664.84,157.38C667.07,155.5 669.97,154.32 673.18,154.32ZM673.18,175.48C677.76,175.48 681.52,171.72 681.52,167.09C681.52,162.51 677.76,158.75 673.18,158.75C668.54,158.75 664.84,162.51 664.84,167.09C664.84,171.72 668.54,175.48 673.18,175.48Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M709.97,154.73H711.91C712.77,154.73 713.13,155.24 713.13,155.8C713.13,155.95 713.13,156.1 713.08,156.21L701.64,182.76C698.29,189.63 693.19,190.85 689.38,191C688.72,190.95 688.16,190.35 688.16,189.63V187.89C688.16,186.62 689.23,186.52 689.49,186.52C692.28,186.37 695.39,185.25 697.62,180.87L697.98,179.96C698.08,179.71 698.13,179.4 698.13,179.21C698.13,178.95 698.08,178.69 697.98,178.49C694.77,171.16 691.42,163.59 688.16,156.26C688.11,156.1 688.06,155.95 688.06,155.8C688.06,155.24 688.47,154.73 689.28,154.73H691.26C691.87,154.73 692.37,154.94 692.73,155.69L700.66,173.7C700.71,173.7 700.71,173.65 700.71,173.65L708.4,155.8C708.74,154.99 709.31,154.73 709.97,154.73Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M752.57,145.79V178.35C752.57,179.05 752,179.62 751.3,179.67H749.42C748.71,179.62 748.16,179.05 748.16,178.35V176.82V176.87C745.92,178.74 742.97,179.98 739.82,179.98C732.75,179.98 727,174.23 727,167.15C727,160.08 732.75,154.38 739.82,154.38C742.97,154.38 745.87,155.5 748.1,157.44L748.16,157.49C748.16,157.44 748.16,157.44 748.16,157.44V145.73C748.21,145.03 748.77,144.46 749.48,144.46H751.26C752.02,144.46 752.57,145.07 752.57,145.79ZM739.8,175.48C744.38,175.48 748.14,171.77 748.14,167.14C748.14,162.56 744.38,158.8 739.8,158.8C735.17,158.8 731.47,162.56 731.47,167.14C731.47,171.77 735.18,175.48 739.8,175.48Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M763.02,145.79V148.02C763.02,148.74 762.41,149.34 761.7,149.34H759.92C759.16,149.34 758.55,148.72 758.55,148.02V145.79C758.55,145.03 759.16,144.41 759.92,144.41H761.7C762.41,144.41 763.02,145.01 763.02,145.79ZM763.02,156V178.23C763.02,178.99 762.41,179.6 761.7,179.6H759.92C759.16,179.6 758.55,178.99 758.55,178.23V156C758.55,155.24 759.16,154.63 759.92,154.63H761.7C762.41,154.63 763.02,155.24 763.02,156Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M796.27,154.32C802.07,154.32 806.8,159.06 806.8,164.86V178.33C806.8,178.99 806.19,179.55 805.53,179.6H803.65C802.93,179.55 802.38,178.99 802.38,178.28V164.86C802.38,161.49 799.63,158.75 796.27,158.75C792.92,158.75 790.16,161.49 790.16,164.86V178.33C790.11,179.04 789.55,179.55 788.84,179.6H787.01C786.29,179.55 785.69,178.99 785.69,178.28V164.86C785.69,161.49 782.94,158.75 779.58,158.75C776.22,158.75 773.47,161.49 773.47,164.86V178.28C773.47,179 772.91,179.55 772.2,179.6H770.32C769.65,179.55 769.05,178.99 769.05,178.33V155.95C769.05,155.24 769.66,154.63 770.37,154.63H772.15C772.87,154.63 773.47,155.24 773.47,155.95V156.26C775.21,155.04 777.33,154.32 779.58,154.32C782.93,154.32 785.93,155.85 787.92,158.34H787.97C789.92,155.95 792.92,154.32 796.27,154.32Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M832.05,154.68H833.84C834.56,154.68 835.11,155.24 835.16,155.9V178.38C835.11,179.1 834.54,179.6 833.89,179.6H832.05C831.3,179.6 830.73,178.99 830.73,178.28V176.86C830.73,176.81 830.73,176.81 830.73,176.81V176.86C828.9,178.59 825.5,179.91 822.39,179.91C815.33,179.91 809.58,174.21 809.58,167.14C809.58,160.07 815.33,154.32 822.39,154.32C825.5,154.32 828.45,155.49 830.73,157.43V156C830.73,155.3 831.34,154.68 832.05,154.68ZM822.39,175.48C826.97,175.48 830.73,171.72 830.73,167.14C830.73,162.51 826.97,158.8 822.39,158.8C817.76,158.8 814.05,162.51 814.05,167.14C814.05,171.72 817.76,175.48 822.39,175.48Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M860.45,154.63H862.24C862.89,154.63 863.46,155.19 863.56,155.85V181.73C863.56,188.14 859.44,190.74 853.59,190.88C852.83,190.88 852.27,190.32 852.27,189.56V187.8C852.27,187.09 852.83,186.48 853.59,186.48C857,186.38 859.08,185.62 859.08,181.75V176.81C856.85,178.74 853.95,179.91 850.74,179.91C843.72,179.91 837.98,174.16 837.98,167.09C837.98,160.07 843.72,154.32 850.74,154.32C853.85,154.32 856.75,155.44 858.98,157.27C859.03,157.38 859.08,157.38 859.08,157.43L859.13,156C859.13,155.24 859.7,154.63 860.45,154.63ZM850.74,175.48C855.37,175.48 859.08,171.72 859.08,167.09C859.08,162.51 855.37,158.75 850.74,158.75C846.16,158.75 842.4,162.51 842.4,167.09C842.4,171.72 846.16,175.48 850.74,175.48Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M873.76,145.79V148.02C873.76,148.74 873.14,149.34 872.44,149.34H870.65C869.88,149.34 869.28,148.72 869.28,148.02V145.79C869.28,145.03 869.9,144.41 870.65,144.41H872.44C873.16,144.41 873.76,145.01 873.76,145.79ZM873.76,156V178.23C873.76,178.99 873.14,179.6 872.44,179.6H870.65C869.88,179.6 869.28,178.99 869.28,178.23V156C869.28,155.24 869.9,154.63 870.65,154.63H872.44C873.16,154.63 873.76,155.24 873.76,156Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M140.06,60.55C137.33,50.93 131.01,42.93 122.28,38.06C117.79,35.55 112.93,34.04 107.96,33.51C107.73,31.42 107.36,29.33 106.78,27.26C104.05,17.64 97.74,9.64 89,4.77C80.26,-0.11 70.15,-1.29 60.53,1.44C50.91,4.17 42.92,10.49 38.04,19.23C35.54,23.72 34.03,28.59 33.5,33.55C31.41,33.78 29.32,34.16 27.25,34.73C17.63,37.47 9.64,43.78 4.76,52.52C-0.11,61.26 -1.29,71.37 1.44,81C4.17,90.63 10.49,98.62 19.22,103.5C23.71,106 28.57,107.51 33.54,108.04C33.77,110.13 34.14,112.22 34.72,114.29C37.45,123.92 43.76,131.91 52.5,136.79C61.24,141.67 71.35,142.85 80.97,140.11C90.59,137.38 98.58,131.07 103.46,122.32C105.96,117.83 107.47,112.97 108,108C110.09,107.77 112.18,107.4 114.25,106.82C123.87,104.09 131.86,97.77 136.74,89.03C141.6,80.29 142.78,70.18 140.06,60.55ZM49.4,25.57C52.58,19.87 57.79,15.74 64.07,13.95C70.36,12.17 76.95,12.94 82.66,16.12C88.37,19.31 92.49,24.52 94.27,30.81C94.62,32.01 94.84,33.23 94.99,34.46C95.53,38.75 94.95,43.07 93.23,47.08C92.9,47.86 92.53,48.64 92.1,49.4C91.14,51.13 89.37,54.07 87.24,57.54C78.65,52.1 61.4,41.23 55.72,38.06C52.78,36.41 49.68,35.23 46.5,34.44C46.87,31.36 47.84,28.35 49.4,25.57ZM80.37,70.78C80.37,76.1 76.06,80.41 70.74,80.41C65.43,80.41 61.12,76.1 61.12,70.78C61.12,65.47 65.43,61.16 70.74,61.16C76.06,61.16 80.37,65.47 80.37,70.78ZM38.03,85.81C36.39,88.75 35.21,91.86 34.41,95.04C31.33,94.65 28.33,93.68 25.55,92.13C19.85,88.94 15.72,83.73 13.94,77.44C12.15,71.16 12.92,64.56 16.1,58.85C19.29,53.14 24.49,49.02 30.78,47.23C31.99,46.89 33.21,46.67 34.44,46.51C38.72,45.98 43.05,46.55 47.05,48.27C47.83,48.61 48.61,48.99 49.37,49.41C51.1,50.38 54.04,52.15 57.5,54.28C52.06,62.88 41.21,80.14 38.03,85.81ZM92.09,115.99C88.91,121.68 83.7,125.82 77.41,127.6C71.13,129.38 64.53,128.61 58.83,125.43C53.12,122.25 49,117.04 47.22,110.75C46.87,109.54 46.65,108.32 46.5,107.09C45.96,102.81 46.54,98.48 48.24,94.48C48.58,93.69 48.95,92.91 49.38,92.15C50.35,90.42 52.12,87.48 54.25,84.02C62.84,89.46 80.08,100.33 85.77,103.5C88.7,105.14 91.81,106.32 94.99,107.12C94.62,110.2 93.64,113.2 92.09,115.99ZM125.37,82.69C122.19,88.4 116.98,92.52 110.69,94.31C109.49,94.65 108.27,94.87 107.04,95.03C102.75,95.57 98.43,94.99 94.43,93.27C93.64,92.94 92.86,92.56 92.1,92.13C90.37,91.16 87.43,89.39 83.97,87.26C89.41,78.66 100.28,61.41 103.44,55.73C105.09,52.79 106.27,49.68 107.06,46.5C110.14,46.89 113.14,47.86 115.93,49.41C121.62,52.6 125.75,57.81 127.54,64.1C129.32,70.39 128.55,77 125.37,82.69Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M186.12,72.93C186.12,94.59 203.82,112.29 225.46,112.29C239.08,112.29 251.61,105.35 258.82,93.9C258.82,93.9 259.23,93.22 260.18,93.22C260.45,93.22 260.86,93.36 261.41,93.63L266.17,96.35C266.17,96.35 267.94,97.44 266.85,99.07C257.87,113.24 242.35,121.81 225.46,121.81C198.51,121.81 176.59,99.88 176.59,72.91C176.59,45.81 198.51,23.89 225.46,23.89C242.49,23.89 258.28,32.6 267.13,46.91C267.81,48.13 266.99,49.36 266.45,49.63L261.55,52.49C261.02,52.64 260.6,52.76 260.32,52.76C259.37,52.76 258.96,52.08 258.96,52.08C251.88,40.51 239.22,33.42 225.46,33.42C203.81,33.42 186.12,51.13 186.12,72.93Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M274.18,86.95C274.18,68.02 289.56,52.64 308.5,52.64C327.42,52.64 342.67,68.02 342.67,86.95C342.67,105.89 327.42,121.29 308.5,121.29C289.58,121.29 274.18,105.89 274.18,86.95ZM283.71,86.95C283.71,100.57 294.87,111.61 308.5,111.61C322.11,111.61 333.14,100.57 333.14,86.95C333.14,73.34 322.11,62.3 308.5,62.3C294.89,62.3 283.71,73.34 283.71,86.95Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M458.67,81.1V118.55C458.67,119.78 457.72,120.73 456.49,120.73H451.32C450.1,120.73 449.14,119.64 449.14,118.42V81.1C449.14,70.89 440.84,62.58 430.75,62.58C420.54,62.58 412.24,70.89 412.24,81.1V118.55C412.1,119.78 411.15,120.73 410.06,120.73H404.89C403.66,120.73 402.71,119.64 402.71,118.42V81.1C402.71,70.89 394.41,62.58 384.2,62.58C374.13,62.58 365.81,70.89 365.81,81.1V118.42C365.81,119.66 364.86,120.73 363.63,120.73H358.46C357.24,120.73 356.28,119.78 356.28,118.55V56.17C356.28,54.95 357.37,53.98 358.59,53.98H363.49C364.72,53.98 365.8,54.93 365.8,56.17V57.12C365.8,58.06 366.35,58.62 367.03,58.62C367.3,58.62 367.71,58.48 367.98,58.21C372.61,54.93 378.19,53.03 384.18,53.03C393.17,53.03 401.07,57.12 406.24,63.66C406.51,64.07 407.06,64.34 407.47,64.34C408.01,64.34 408.42,64.07 408.69,63.66C413.86,57.26 421.76,53.03 430.74,53.03C446.15,53.03 458.67,65.57 458.67,81.1Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M577.25,81.1V118.55C577.25,119.78 576.3,120.73 575.07,120.73H569.9C568.67,120.73 567.72,119.64 567.72,118.42V81.1C567.72,70.89 559.42,62.58 549.34,62.58C539.13,62.58 530.82,70.89 530.82,81.1V118.55C530.68,119.78 529.73,120.73 528.64,120.73H523.47C522.25,120.73 521.29,119.64 521.29,118.42V81.1C521.29,70.89 512.99,62.58 502.78,62.58C492.7,62.58 484.39,70.89 484.39,81.1V118.42C484.39,119.66 483.44,120.73 482.21,120.73H477.04C475.81,120.73 474.86,119.78 474.86,118.55V56.17C474.86,54.95 475.95,53.98 477.17,53.98H482.07C483.3,53.98 484.38,54.93 484.38,56.17V57.12C484.38,58.06 484.92,58.62 485.6,58.62C485.87,58.62 486.28,58.48 486.55,58.21C491.18,54.93 496.76,53.03 502.75,53.03C511.73,53.03 519.63,57.12 524.8,63.66C525.07,64.07 525.62,64.34 526.03,64.34C526.59,64.34 526.98,64.07 527.27,63.66C532.44,57.26 540.34,53.03 549.32,53.03C564.73,53.03 577.25,65.57 577.25,81.1Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M598.49,72.93C598.49,94.59 616.18,112.29 637.84,112.29C651.45,112.29 663.98,105.35 671.19,93.9C671.19,93.9 671.6,93.22 672.55,93.22C672.82,93.22 673.23,93.36 673.77,93.63L678.53,96.35C678.53,96.35 680.3,97.44 679.21,99.07C670.23,113.24 654.71,121.81 637.82,121.81C610.87,121.81 588.95,99.88 588.95,72.91C588.95,45.81 610.87,23.89 637.82,23.89C654.85,23.89 670.64,32.6 679.48,46.91C680.16,48.13 679.34,49.36 678.8,49.63L673.9,52.49C673.35,52.64 672.95,52.76 672.67,52.76C671.72,52.76 671.31,52.08 671.31,52.08C664.23,40.51 651.56,33.42 637.81,33.42C616.19,33.42 598.49,51.13 598.49,72.93Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M755.2,56.17V118.68C755.2,119.91 754.25,120.72 753.02,120.72H747.97C746.74,120.72 745.67,119.63 745.67,118.41C745.67,118.41 745.67,115.42 745.67,114.46C745.67,113.64 745.11,112.83 744.31,112.83C744.04,112.83 743.63,112.97 743.22,113.38C738.46,118.14 729.46,121.68 721.02,121.68C702.1,121.68 686.7,106.29 686.7,87.35C686.7,68.42 702.09,53.03 721.02,53.03C729.46,53.03 737.22,56.17 743.22,61.34C743.63,61.61 744.04,61.75 744.43,61.75C745.11,61.75 745.67,61.2 745.67,60.25C745.67,59.3 745.67,56.29 745.67,56.29C745.67,55.06 746.76,53.98 747.97,53.98H752.88C754.11,54 755.2,54.95 755.2,56.17ZM745.67,87.36C745.67,73.75 734.63,62.71 721.02,62.71C707.41,62.71 696.23,73.75 696.23,87.36C696.23,100.98 707.4,112.02 721.02,112.02C734.63,112.02 745.67,100.98 745.67,87.36Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M803.24,55.36V60.4C803.24,61.63 802.16,62.58 800.94,62.71C789.36,63.94 780.38,73.61 780.38,85.45V118.68C780.24,119.77 779.29,120.72 778.2,120.72H773.03C771.8,120.72 770.85,119.63 770.85,118.41V56.31C770.85,54.95 771.94,54 773.16,54H778.06C779.28,54 780.24,54.82 780.37,56.04V59.58C780.51,60.26 781.05,60.67 781.73,60.67C782.14,60.67 782.55,60.53 782.82,60.26C787.86,56.17 794.12,53.59 800.92,53.03C802.16,53.18 803.24,54.12 803.24,55.36Z"
+      android:fillColor="#5D70D2"/>
+  <path
+      android:pathData="M876.36,89.41C876.22,90.77 875.27,91.72 873.91,91.86H819.59C818.5,91.86 817.96,92.68 818.09,93.49C820.95,103.97 830.61,111.74 841.91,111.74C849.8,111.74 857.44,107.78 861.93,101.52C862.34,100.97 863.02,100.57 863.83,100.57C864.24,100.57 864.65,100.71 864.92,100.84L869.41,103.42C870.36,104.1 870.77,105.46 870.23,106.41C863.7,115.81 853.22,121.39 841.91,121.39C822.99,121.39 807.61,106 807.61,87.07C807.61,68.14 822.99,52.74 841.91,52.74C860.16,52.76 876.63,67.07 876.36,89.41ZM818.08,80.55C817.94,81.37 818.49,82.18 819.58,82.32H864.24C865.33,82.18 865.87,81.37 865.74,80.55C862.88,70.06 853.34,62.3 841.91,62.3C830.61,62.3 820.94,70.06 818.08,80.55Z"
+      android:fillColor="#5D70D2"/>
+</vector>
diff --git a/app/res/drawable/commcare_logo.png b/app/res/drawable/commcare_logo.png
deleted file mode 100644
index b3ec53544f..0000000000
Binary files a/app/res/drawable/commcare_logo.png and /dev/null differ
diff --git a/app/res/drawable/home_incomplete.xml b/app/res/drawable/home_incomplete.xml
index b7481fda92..b5115fbd1c 100644
--- a/app/res/drawable/home_incomplete.xml
+++ b/app/res/drawable/home_incomplete.xml
@@ -1,12 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="232dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="232.5">
-    <path
-        android:pathData="M219.8,93V58.1l-34.9,-34.8H80.3V93L57,139.5v69.8h186v-69.8L219.8,93zM80.3,119v20.5H70L80.3,119zM173.3,174.4h-46.5l-23.3,-34.9H91.8v-34.9V34.9H180l28.1,28v41.7v34.8h-11.6L173.3,174.4zM219.8,139.5V119l10.3,20.5H219.8zM161.6,58.1h-58.1V46.5h58.1V58.1zM131.2,81.4h-27.7V69.8h27.7V81.4z"
-        android:fillColor="#FFE3C2"/>
-    <path
-        android:pathData="M180.1,34.9l28.1,28v41.7v34.8h-11.6l-23.3,34.9h-46.5l-23.3,-34.9H91.8H80.2H70L80.3,119V93L57,139.5v69.8h186v-69.8L219.8,93V58.1l-34.9,-34.8M219.8,139.5V119l10.3,20.5H219.8z"
-        android:fillColor="#995324"/>
+    android:width="167dp"
+    android:height="168dp"
+    android:viewportWidth="167"
+    android:viewportHeight="168">
+  <path
+      android:pathData="M54.73,22.85C58.9,10.98 70.23,2.49 83.53,2.49C96.83,2.49 108.16,10.98 112.33,22.85H124.26C135.5,22.85 144.63,31.98 144.63,43.22V145.04C144.63,156.28 135.5,165.41 124.26,165.41H42.8C31.57,165.41 22.44,156.28 22.44,145.04V43.22C22.44,31.98 31.57,22.85 42.8,22.85H54.73ZM90.73,25.83C88.82,23.92 86.23,22.85 83.53,22.85C80.83,22.85 78.24,23.92 76.33,25.83C74.42,27.74 73.35,30.33 73.35,33.03C73.35,35.73 74.42,38.32 76.33,40.23C78.24,42.14 80.83,43.22 83.53,43.22C86.23,43.22 88.82,42.14 90.73,40.23C92.64,38.32 93.72,35.73 93.72,33.03C93.72,30.33 92.64,27.74 90.73,25.83ZM47.58,71.95C46.15,73.38 45.35,75.32 45.35,77.35C45.35,79.38 46.15,81.32 47.58,82.75C49.02,84.18 50.96,84.99 52.98,84.99C55.01,84.99 56.95,84.18 58.38,82.75C59.82,81.32 60.62,79.38 60.62,77.35C60.62,75.32 59.82,73.38 58.38,71.95C56.95,70.52 55.01,69.71 52.98,69.71C50.96,69.71 49.02,70.52 47.58,71.95ZM119.17,72.26H78.44C75.64,72.26 73.35,74.55 73.35,77.35C73.35,80.15 75.64,82.44 78.44,82.44H119.17C121.97,82.44 124.26,80.15 124.26,77.35C124.26,74.55 121.97,72.26 119.17,72.26ZM128.84,124.26C128.84,135.51 119.72,144.63 108.47,144.63C97.22,144.63 88.1,135.51 88.1,124.26C88.1,113.01 97.22,103.9 108.47,103.9C119.72,103.9 128.84,113.01 128.84,124.26ZM110.38,115.99C110.38,114.93 109.53,114.08 108.47,114.08C107.41,114.08 106.56,114.93 106.56,115.99V124.9C106.56,125.96 107.41,126.81 108.47,126.81C109.53,126.81 110.38,125.96 110.38,124.9V115.99ZM108.47,134.45C109.88,134.45 111.02,133.31 111.02,131.9C111.02,130.49 109.88,129.35 108.47,129.35C107.06,129.35 105.92,130.49 105.92,131.9C105.92,133.31 107.06,134.45 108.47,134.45Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/res/drawable/home_logout.xml b/app/res/drawable/home_logout.xml
index 39e7ef5bf8..a5e310ef93 100644
--- a/app/res/drawable/home_logout.xml
+++ b/app/res/drawable/home_logout.xml
@@ -1,15 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="210dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="210.0">
-    <path
-        android:pathData="M153.3,106.9l0,14.2l54.1,0l0,-14.2z"
-        android:fillColor="#D9D8D5"/>
-    <path
-        android:pathData="M234.5,114l-28.6,-21.4l0,42.8z"
-        android:fillColor="#D9D8D5"/>
-    <path
-        android:pathData="M176.8,164l-53.6,0l0,-100l53.6,0l0,28.6l14.3,0l0,-42.9l0,0l-82.2,0l0,128.6l82.2,0l0,-42.9l-14.3,0z"
-        android:fillColor="#D9D8D5"/>
+    android:width="748dp"
+    android:height="748dp"
+    android:viewportWidth="748"
+    android:viewportHeight="748">
+  <path
+      android:pathData="M522.21,145.36C526.28,148.26 529.77,151.64 533.23,155.23C535.02,157.02 536.88,158.67 538.81,160.31C542.02,163.08 545.02,165.99 548,169C550.92,171.95 553.85,174.8 557,177.5C561.08,180.98 564.8,184.78 568.56,188.59C570.65,190.65 572.77,192.6 575,194.5C579.08,197.98 582.8,201.78 586.56,205.59C588.65,207.65 590.77,209.6 593,211.5C597.08,214.98 600.8,218.78 604.56,222.59C606.65,224.65 608.77,226.6 611,228.5C615.08,231.98 618.8,235.78 622.56,239.59C624.65,241.65 626.77,243.6 629,245.5C633.08,248.98 636.8,252.78 640.56,256.59C642.65,258.65 644.77,260.6 647,262.5C651.08,265.98 654.8,269.78 658.56,273.59C660.65,275.65 662.77,277.6 665,279.5C669.08,282.98 672.8,286.78 676.56,290.59C678.65,292.65 680.77,294.6 683,296.5C687.08,299.98 690.8,303.78 694.56,307.59C696.65,309.65 698.77,311.6 701,313.5C705.08,316.98 708.8,320.78 712.56,324.59C714.65,326.65 716.77,328.6 719,330.5C723.07,333.98 726.8,337.77 730.55,341.6C732.7,343.7 734.9,345.57 737.25,347.44C742.6,351.99 746.83,359.01 748,366C748.86,378.84 747.6,388.4 739.18,398.65C735.65,402.46 731.8,405.91 727.93,409.36C725.45,411.59 723.08,413.87 720.75,416.25C718.29,418.75 715.78,421.1 713.13,423.38C709.93,426.12 706.96,429.01 704,432C700.48,435.56 696.87,438.9 693.06,442.16C690.61,444.35 688.31,446.66 686,449C682.48,452.56 678.87,455.9 675.06,459.16C672.61,461.35 670.31,463.66 668,466C664.48,469.56 660.87,472.9 657.06,476.16C654.61,478.35 652.31,480.66 650,483C646.48,486.56 642.87,489.9 639.06,493.16C636.61,495.35 634.31,497.66 632,500C628.48,503.56 624.87,506.9 621.06,510.16C618.61,512.35 616.31,514.66 614,517C610.48,520.56 606.87,523.9 603.06,527.16C600.61,529.35 598.31,531.66 596,534C592.48,537.56 588.87,540.9 585.06,544.16C582.61,546.35 580.31,548.66 578,551C574.48,554.56 570.87,557.9 567.06,561.16C564.61,563.35 562.31,565.66 560,568C556.48,571.56 552.87,574.9 549.06,578.16C546.61,580.35 544.31,582.66 542,585C538.4,588.63 534.75,592.11 530.85,595.41C529.66,596.44 528.5,597.49 527.37,598.59C520.52,605.09 512.35,608.26 502.94,608.56C491.94,608.11 482.89,604.22 475.32,596.22C468.37,587.75 466.39,578.27 466.55,567.56C466.55,566.48 466.54,565.39 466.54,564.28C466.55,560.73 466.58,557.19 466.61,553.64C466.62,551.17 466.62,548.7 466.63,546.23C466.64,539.75 466.68,533.27 466.73,526.79C466.77,520.17 466.78,513.54 466.8,506.92C466.85,493.95 466.91,480.97 467,468C465.52,468 465.52,468 464.02,468.01C440.04,468.08 416.06,468.12 392.08,468.16C380.48,468.17 368.88,468.19 357.29,468.23C347.18,468.26 337.07,468.28 326.96,468.28C321.61,468.29 316.26,468.3 310.91,468.32C305.86,468.34 300.82,468.34 295.78,468.34C293.93,468.34 292.09,468.35 290.24,468.36C274.06,468.45 259.25,466.57 246.88,455C235.96,443.36 232.86,430.62 232.84,415.05C232.83,414.07 232.83,413.1 232.82,412.09C232.81,408.88 232.8,405.67 232.8,402.46C232.79,401.36 232.79,400.26 232.79,399.12C232.77,393.28 232.76,387.44 232.76,381.61C232.75,375.61 232.73,369.6 232.7,363.6C232.68,358.96 232.68,354.32 232.68,349.68C232.67,347.47 232.67,345.26 232.65,343.05C232.55,324.82 233.14,307.83 246.25,293.62C256.42,284.18 268.17,279.83 281.93,279.88C282.72,279.88 283.51,279.88 284.33,279.88C286.98,279.88 289.63,279.88 292.28,279.89C294.19,279.89 296.09,279.89 297.99,279.89C303.15,279.89 308.32,279.89 313.48,279.9C318.88,279.9 324.27,279.91 329.67,279.91C339.88,279.91 350.1,279.92 360.32,279.93C371.95,279.94 383.58,279.94 395.22,279.95C419.14,279.96 443.07,279.98 467,280C467,279.44 466.99,278.88 466.99,278.31C466.93,264.7 466.88,251.1 466.84,237.49C466.83,230.91 466.81,224.33 466.77,217.75C466.74,211.4 466.72,205.04 466.72,198.69C466.71,196.27 466.7,193.85 466.68,191.43C466.66,188.03 466.66,184.63 466.66,181.23C466.65,180.24 466.64,179.25 466.63,178.22C466.68,166.91 469.88,157.59 477.63,149.25C489.91,137.88 508.08,136.71 522.21,145.36Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M143.68,45.84C145.19,45.83 145.19,45.83 146.73,45.82C150.01,45.81 153.3,45.8 156.59,45.8C157.72,45.79 158.85,45.79 160.02,45.79C166,45.77 171.99,45.76 177.98,45.76C184.13,45.75 190.28,45.73 196.43,45.7C201.19,45.68 205.95,45.68 210.72,45.68C212.98,45.67 215.25,45.67 217.52,45.65C235.9,45.55 253.05,46.02 267.38,59.25C277.29,69.93 281.36,82.21 281.21,96.59C280.44,108.89 274.99,120.57 266,129C254.4,138.7 242.37,141.15 227.67,141.14C226.14,141.15 226.14,141.15 224.59,141.15C222.39,141.16 220.19,141.17 218,141.17C214.51,141.18 211.02,141.19 207.54,141.21C197.63,141.26 187.72,141.31 177.81,141.33C171.74,141.34 165.67,141.37 159.6,141.41C157.29,141.42 154.99,141.42 152.69,141.42C135.89,141.18 135.89,141.18 120,146C118.37,146.78 118.37,146.78 116.7,147.57C105.55,154.64 98.59,164.34 95.45,177.26C94.93,180.43 94.87,183.43 94.87,186.64C94.86,187.3 94.86,187.95 94.86,188.63C94.85,190.83 94.85,193.04 94.85,195.24C94.85,196.84 94.85,198.43 94.84,200.03C94.83,204.42 94.83,208.81 94.83,213.19C94.82,217.92 94.81,222.65 94.8,227.39C94.78,238.81 94.77,250.24 94.76,261.67C94.76,267.05 94.75,272.43 94.75,277.81C94.73,295.71 94.72,313.61 94.71,331.5C94.71,336.15 94.71,340.79 94.7,345.43C94.7,347.17 94.7,347.17 94.7,348.93C94.7,367.62 94.67,386.32 94.64,405.01C94.6,424.2 94.59,443.4 94.58,462.6C94.58,473.37 94.57,484.15 94.55,494.92C94.52,504.1 94.52,513.28 94.53,522.46C94.53,527.14 94.53,531.82 94.51,536.5C94.49,540.79 94.49,545.08 94.51,549.37C94.51,550.91 94.51,552.46 94.49,554.01C94.39,568.16 96.86,580.78 106,592C116.4,602.38 127.78,606.14 142.09,606.16C143.11,606.16 144.12,606.17 145.16,606.17C147.36,606.18 149.56,606.19 151.76,606.2C155.25,606.21 158.74,606.23 162.23,606.25C172.16,606.31 182.08,606.37 192.01,606.4C198.08,606.42 204.16,606.46 210.23,606.5C212.54,606.52 214.84,606.52 217.15,606.53C235.62,606.56 252.97,606.95 267.38,620.25C277.29,630.93 281.36,643.21 281.21,657.59C280.44,669.89 274.99,681.57 266,690C254.5,699.61 242.51,702.15 227.85,702.15C226.36,702.15 226.36,702.15 224.83,702.16C221.55,702.16 218.26,702.17 214.98,702.17C212.68,702.17 210.38,702.17 208.08,702.18C203.25,702.18 198.43,702.19 193.6,702.19C187.46,702.19 181.32,702.2 175.19,702.22C170.43,702.23 165.67,702.23 160.91,702.23C158.65,702.23 156.39,702.23 154.13,702.24C137.78,702.29 121.17,702.27 105.31,697.75C104.53,697.53 103.74,697.32 102.93,697.09C79.5,690.41 59.67,678.7 42,662C40.78,660.88 40.78,660.88 39.54,659.74C21.97,643 10.54,621.18 4,598C3.81,597.35 3.62,596.7 3.42,596.03C-1.55,578.31 -0.57,559.75 -0.51,541.52C-0.5,536.57 -0.51,531.63 -0.52,526.68C-0.53,517.02 -0.52,507.36 -0.51,497.7C-0.49,486.43 -0.5,475.16 -0.5,463.89C-0.51,443.77 -0.49,423.65 -0.47,403.54C-0.44,384.05 -0.44,364.56 -0.45,345.07C-0.46,323.81 -0.46,302.55 -0.44,281.28C-0.44,279.01 -0.44,276.74 -0.44,274.47C-0.44,273.36 -0.44,272.24 -0.44,271.09C-0.43,263.25 -0.44,255.4 -0.44,247.56C-0.44,238 -0.44,228.43 -0.42,218.87C-0.41,214 -0.4,209.12 -0.41,204.25C-0.42,199.78 -0.41,195.31 -0.39,190.84C-0.39,189.23 -0.39,187.62 -0.4,186.02C-0.51,156.71 8.2,127.54 26,104C26.66,103.12 27.32,102.24 28,101.33C50.67,72.44 82.46,53 118.9,47.36C127.17,46.4 135.35,45.85 143.68,45.84Z"
+      android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/res/drawable/home_saved.xml b/app/res/drawable/home_saved.xml
index 80def3660e..25b33040c4 100644
--- a/app/res/drawable/home_saved.xml
+++ b/app/res/drawable/home_saved.xml
@@ -1,12 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="232dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="232.5">
-    <path
-        android:pathData="M219.8,93V58.1l-34.9,-34.8H80.3V93L57,139.5v69.8h186v-69.8L219.8,93zM80.3,119v20.5H70L80.3,119zM173.3,174.4h-46.5l-23.3,-34.9H91.8v-34.9V34.9H180l28.1,28v41.7v34.8h-11.6L173.3,174.4zM219.8,139.5V119l10.3,20.5H219.8zM161.6,58.1h-58.1V46.5h58.1V58.1zM184.9,81.4h-81.4V69.8h81.4V81.4zM103.5,93h93v11.7h-93V93zM103.5,116.3h93v11.7h-93V116.3z"
-        android:fillColor="#CFEBEF"/>
-    <path
-        android:pathData="M180.1,34.9l28.1,28v41.7v34.8h-11.6l-23.3,34.9h-46.5l-23.3,-34.9H91.8H80.2H70L80.3,119V93L57,139.5v69.8h186v-69.8L219.8,93V58.1l-34.9,-34.8M219.8,139.5V119l10.3,20.5H219.8z"
-        android:fillColor="#0F7A9A"/>
+<vector android:height="48dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
 </vector>
diff --git a/app/res/drawable/home_start.xml b/app/res/drawable/home_start.xml
index 1241219c2b..c66a93bd48 100644
--- a/app/res/drawable/home_start.xml
+++ b/app/res/drawable/home_start.xml
@@ -1,9 +1,15 @@
-<vector android:autoMirrored="true" android:height="232dp"
-    android:viewportHeight="232.5" android:viewportWidth="300.0"
-    android:width="300dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#34843f" android:pathData="M127.12,94.55 L56.95,148.35L56.95,161.94l78.86,-60.56c-1.76,-2.22 -6.84,-8.32 -8.69,-6.84z"/>
-    <path android:fillColor="#34843f" android:pathData="M172.14,152.42 L114.27,197.07L129.52,197.07l50.66,-38.64c-1.76,-2.22 -6.19,-7.4 -8.04,-6.01z"/>
-    <path android:fillColor="#34843f" android:pathData="m194.33,181.36 l-20.34,15.72L189.62,197.07l12.76,-9.61c-1.76,-2.4 -6.19,-7.58 -8.04,-6.1z"/>
-    <path android:fillColor="#2c7238" android:pathData="m71.83,184.96c-0.46,-1.76 -1.39,-3.7 -1.2,-5.64L56.95,189.68l0,7.3l3.14,0c0.74,0 1.48,-0.18 2.03,-0.65l12.67,-9.71c-0.55,0 -0.65,0 -1.2,0 -1.02,0 -1.57,-0.65 -1.76,-1.66z"/>
-    <path android:fillColor="#d6eacd" android:pathData="m241.39,68.38c0.09,-0.09 0.18,-0.18 0.28,-0.37 1.85,-2.13 2.77,-4.44 2.96,-7.3 -0.28,-10.35 -12.85,-19.41 -22,-12.11L205.33,63.67c-5.18,4.44 -10.45,8.88 -15.72,13.41 -23.21,19.69 -46.32,39.38 -69.43,59.17 -6.56,5.64 -13.22,11.28 -19.88,16.92 -2.03,1.76 -3.61,3.61 -4.99,5.92 -2.5,4.07 -4.9,8.41 -6.66,12.85 -1.02,2.5 -2.68,6.01 -2.5,9.06 4.99,0 10.08,-0.74 14.98,-1.57 3.88,-0.65 8.69,-0.92 12.39,-2.4 2.03,-0.74 3.24,-1.76 4.81,-3.05 4.25,-3.61 8.6,-7.3 12.85,-11 30.97,-26.35 61.94,-52.79 92.82,-79.14z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="704dp"
+    android:height="704dp"
+    android:viewportWidth="704"
+    android:viewportHeight="704">
+  <path
+      android:pathData="M132.05,87.6C133.59,87.59 135.12,87.58 136.65,87.58C140.75,87.56 144.86,87.56 148.96,87.56C152.41,87.57 155.85,87.56 159.3,87.56C167.42,87.54 175.55,87.54 183.68,87.55C192.04,87.57 200.39,87.55 208.75,87.52C215.96,87.5 223.17,87.5 230.38,87.5C234.67,87.5 238.96,87.5 243.25,87.49C247.28,87.47 251.31,87.47 255.34,87.49C256.81,87.5 258.29,87.49 259.76,87.48C273.26,87.39 284.54,90.23 294.69,99.44C295.45,100.28 296.21,101.13 297,102C297.85,102.93 298.69,103.86 299.56,104.81C308.11,115.29 309.21,128 308,141C305.97,150.36 301.09,158.6 294,165C293.07,165.85 292.14,166.69 291.19,167.56C281.54,175.43 271.33,176.3 259.3,176.27C257.91,176.28 256.53,176.28 255.14,176.29C252.16,176.3 249.18,176.3 246.2,176.3C241.48,176.31 236.76,176.33 232.04,176.35C220.31,176.39 208.58,176.43 196.84,176.45C187.73,176.46 178.62,176.49 169.5,176.53C164.82,176.55 160.14,176.56 155.46,176.56C152.53,176.56 149.6,176.57 146.67,176.59C144.69,176.6 142.72,176.59 140.74,176.59C128.86,176.68 116.89,177.95 107,185C105.86,185.8 105.86,185.8 104.7,186.61C94.67,194.5 90.58,205.71 89,218C88.73,222.91 88.72,227.82 88.74,232.74C88.74,234.21 88.73,235.68 88.73,237.15C88.72,241.15 88.72,245.16 88.72,249.17C88.73,253.5 88.72,257.83 88.71,262.17C88.7,270.64 88.7,279.12 88.7,287.6C88.7,294.49 88.7,301.38 88.69,308.28C88.69,309.26 88.69,310.24 88.69,311.25C88.69,313.25 88.69,315.24 88.69,317.24C88.68,335.95 88.68,354.65 88.69,373.36C88.69,390.45 88.68,407.54 88.66,424.64C88.64,442.21 88.63,459.78 88.64,477.35C88.64,487.21 88.64,497.07 88.62,506.93C88.61,515.32 88.61,523.71 88.62,532.1C88.63,536.38 88.63,540.66 88.62,544.93C88.6,548.86 88.61,552.78 88.62,556.7C88.62,558.12 88.62,559.53 88.61,560.94C88.55,573.56 89.47,586.44 97,597C97.53,597.76 98.06,598.52 98.61,599.3C106.5,609.33 117.71,613.42 130,615C134.91,615.27 139.82,615.28 144.74,615.26C146.21,615.26 147.68,615.27 149.15,615.27C153.15,615.28 157.16,615.28 161.17,615.28C165.5,615.27 169.83,615.28 174.17,615.29C182.64,615.3 191.12,615.3 199.6,615.3C206.49,615.3 213.38,615.3 220.28,615.31C221.75,615.31 221.75,615.31 223.25,615.31C225.25,615.31 227.24,615.31 229.24,615.31C247.95,615.32 266.65,615.32 285.36,615.31C302.45,615.31 319.54,615.32 336.64,615.34C354.21,615.36 371.78,615.37 389.35,615.36C399.21,615.36 409.07,615.36 418.93,615.38C427.32,615.39 435.71,615.39 444.1,615.38C448.38,615.37 452.66,615.37 456.93,615.38C460.86,615.4 464.78,615.39 468.7,615.38C470.12,615.38 471.53,615.38 472.94,615.39C485.56,615.45 498.44,614.53 509,607C509.76,606.47 510.52,605.94 511.3,605.39C521.34,597.5 525.41,586.29 527,574C527.27,569.26 527.27,564.54 527.26,559.8C527.26,558.41 527.26,557.01 527.27,555.62C527.27,552.64 527.28,549.67 527.27,546.69C527.27,541.97 527.29,537.26 527.3,532.54C527.35,519.13 527.37,505.73 527.38,492.32C527.38,484.9 527.4,477.48 527.44,470.06C527.46,465.38 527.46,460.7 527.45,456.02C527.45,453.1 527.46,450.18 527.48,447.26C527.49,445.28 527.47,443.3 527.46,441.32C527.57,429.01 531.11,418.5 539.44,409.31C540.28,408.55 541.13,407.79 542,407C542.93,406.15 543.86,405.31 544.81,404.44C555.29,395.89 568,394.79 581,396C590.36,398.03 598.6,402.91 605,410C605.85,410.93 606.69,411.86 607.56,412.81C613.39,419.96 616.24,428.47 616.27,437.67C616.28,438.97 616.28,440.27 616.29,441.61C616.29,443.04 616.29,444.46 616.29,445.89C616.3,447.4 616.3,448.92 616.31,450.44C616.33,454.54 616.33,458.65 616.33,462.75C616.34,465.33 616.34,467.9 616.35,470.48C616.36,479.49 616.37,488.5 616.37,497.51C616.37,505.86 616.39,514.21 616.42,522.56C616.45,529.76 616.46,536.96 616.46,544.16C616.46,548.45 616.46,552.74 616.48,557.02C616.66,594.29 610.94,627.73 586,657C585.26,657.88 584.52,658.76 583.76,659.66C561.71,685.01 529.8,701.92 496.04,704.28C491.9,704.39 487.77,704.41 483.63,704.39C482.05,704.39 480.47,704.4 478.88,704.4C474.58,704.42 470.28,704.41 465.97,704.41C461.31,704.4 456.65,704.41 451.99,704.42C442.88,704.44 433.77,704.44 424.66,704.44C417.25,704.43 409.83,704.44 402.42,704.44C401.37,704.44 400.31,704.44 399.22,704.44C397.07,704.44 394.92,704.45 392.77,704.45C372.64,704.46 352.52,704.46 332.39,704.44C314.02,704.43 295.64,704.45 277.26,704.47C258.36,704.5 239.45,704.51 220.54,704.5C209.94,704.49 199.34,704.5 188.74,704.51C179.72,704.53 170.69,704.53 161.67,704.51C157.07,704.5 152.48,704.5 147.88,704.52C110.27,704.63 76.58,699.2 47,674C46.12,673.26 45.24,672.52 44.34,671.76C18.99,649.71 2.08,617.8 -0.28,584.04C-0.39,579.9 -0.41,575.77 -0.39,571.63C-0.39,570.05 -0.4,568.47 -0.4,566.88C-0.42,562.58 -0.41,558.28 -0.41,553.97C-0.4,549.31 -0.41,544.65 -0.42,539.99C-0.44,530.88 -0.44,521.77 -0.44,512.66C-0.43,505.25 -0.44,497.83 -0.44,490.42C-0.44,488.84 -0.44,488.84 -0.44,487.22C-0.44,485.07 -0.45,482.92 -0.45,480.77C-0.46,460.64 -0.46,440.52 -0.44,420.39C-0.43,402.02 -0.45,383.64 -0.47,365.26C-0.5,346.36 -0.51,327.45 -0.5,308.54C-0.49,297.94 -0.5,287.34 -0.51,276.74C-0.53,267.72 -0.53,258.69 -0.51,249.67C-0.5,245.07 -0.5,240.48 -0.52,235.88C-0.63,198.27 4.8,164.58 30,135C30.74,134.12 31.48,133.24 32.24,132.34C57.57,103.22 93.61,87.46 132.05,87.6Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M466,102C469.86,103.79 472.53,106.25 475.49,109.25C476.03,109.79 476.58,110.33 477.14,110.89C478.95,112.7 480.76,114.52 482.57,116.34C483.87,117.65 485.17,118.95 486.47,120.25C490.01,123.78 493.53,127.32 497.06,130.86C500.75,134.56 504.44,138.25 508.13,141.94C515.11,148.93 522.1,155.93 529.08,162.93C537.03,170.9 544.98,178.87 552.93,186.83C569.3,203.22 585.65,219.61 602,236C600.55,239.34 598.72,241.54 596.15,244.11C595.35,244.92 594.54,245.73 593.71,246.57C592.82,247.46 591.93,248.35 591.01,249.27C590.05,250.22 589.1,251.18 588.15,252.14C585.53,254.78 582.9,257.4 580.27,260.03C577.44,262.87 574.61,265.71 571.79,268.54C565.6,274.75 559.41,280.96 553.21,287.16C549.34,291.03 545.47,294.91 541.6,298.79C530.88,309.53 520.15,320.27 509.42,331C508.74,331.69 508.05,332.37 507.34,333.08C505.95,334.48 504.56,335.87 503.16,337.26C502.13,338.3 502.13,338.3 501.07,339.36C500.38,340.05 499.69,340.74 498.97,341.45C487.78,352.65 476.59,363.87 465.41,375.08C453.92,386.61 442.43,398.12 430.92,409.63C424.46,416.09 418.01,422.55 411.57,429.02C406.08,434.53 400.58,440.04 395.07,445.53C392.27,448.33 389.46,451.14 386.67,453.95C373.27,467.46 360.83,479.93 342.49,486.42C341.79,486.67 341.09,486.92 340.37,487.17C339.19,487.58 339.19,487.58 338,488C336.64,488.48 336.64,488.48 335.26,488.96C327.32,491.72 319.36,494.39 311.4,497.05C310.12,497.47 308.85,497.9 307.58,498.33C300.92,500.56 294.26,502.78 287.59,505.01C281.43,507.06 275.26,509.13 269.1,511.21C263.76,513 258.43,514.78 253.09,516.56C249.92,517.62 246.75,518.68 243.58,519.75C240.05,520.94 236.52,522.12 232.98,523.29C231.44,523.81 231.44,523.81 229.88,524.34C218.08,528.22 206.05,531.13 194.3,525.77C184.85,520.5 179.4,513.19 176,503C173.71,487.87 179.62,473.91 184.42,459.82C185.62,456.3 186.79,452.77 187.96,449.25C189.93,443.33 191.93,437.41 193.93,431.5C196.24,424.71 198.51,417.91 200.78,411.11C202.97,404.51 205.18,397.92 207.4,391.33C208.33,388.55 209.26,385.77 210.19,382.99C218.19,359.03 226.6,341.04 244.73,323.03C245.69,322.07 246.65,321.11 247.61,320.14C250.22,317.53 252.84,314.92 255.46,312.31C258.29,309.49 261.12,306.66 263.94,303.83C268.83,298.94 273.73,294.05 278.63,289.16C285.71,282.1 292.78,275.03 299.85,267.96C311.33,256.49 322.81,245.02 334.3,233.55C345.45,222.42 356.6,211.28 367.75,200.14C368.43,199.46 369.12,198.77 369.83,198.06C373.28,194.61 376.73,191.16 380.18,187.72C408.78,159.14 437.39,130.57 466,102Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M629.38,14.69C630.28,15.12 630.28,15.12 631.21,15.57C643.1,21.76 652.62,32.22 662.01,41.58C664.12,43.68 666.24,45.76 668.37,47.83C685.75,65 697.14,84.21 697.44,109.25C697.23,140.62 680.09,160.42 658.75,181.49C657.78,182.45 656.81,183.41 655.84,184.36C653.37,186.8 650.91,189.26 648.44,191.71C643.64,196.48 638.82,201.24 634,206C630.07,204.41 627.43,201.71 624.51,198.75C623.97,198.21 623.42,197.67 622.86,197.11C621.05,195.3 619.24,193.48 617.43,191.66C616.13,190.35 614.83,189.05 613.53,187.75C609.99,184.22 606.47,180.68 602.94,177.14C599.25,173.44 595.56,169.75 591.87,166.06C584.89,159.07 577.9,152.07 570.92,145.07C562.97,137.1 555.02,129.13 547.07,121.17C530.7,104.78 514.35,88.39 498,72C499.6,68.62 501.37,66.37 504.02,63.71C504.84,62.87 505.67,62.03 506.53,61.17C507.42,60.27 508.32,59.37 509.25,58.45C510.18,57.52 511.11,56.58 512.06,55.62C514.03,53.65 516,51.68 517.97,49.71C520.48,47.21 522.97,44.7 525.46,42.19C527.4,40.24 529.34,38.29 531.29,36.35C532.65,34.99 534.01,33.62 535.36,32.25C560.77,7.03 596.55,-1.15 629.38,14.69Z"
+      android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/res/drawable/home_sync.xml b/app/res/drawable/home_sync.xml
index 07d6596a72..42b25c3333 100644
--- a/app/res/drawable/home_sync.xml
+++ b/app/res/drawable/home_sync.xml
@@ -1,9 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="210dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="210.0">
-    <path
-        android:pathData="M162.5,82.6c0,-6.9 -5.6,-12.5 -12.5,-12.5c-6.9,0 -12.5,5.6 -12.5,12.5c0,5.1 3.1,9.5 7.5,11.5c-3.1,27.9 -14.4,54.4 -32.5,76.1c11.9,-5.6 24.7,-8.3 37.5,-8.3s25.6,2.8 37.5,8.3c-18.1,-21.7 -29.4,-48.2 -32.5,-76.1C159.4,92.1 162.5,87.7 162.5,82.6zM166.6,154.9c-5.5,-1 -11.1,-1.5 -16.7,-1.5c-5.6,0 -11.1,0.5 -16.7,1.5c7.5,-12.9 13.2,-26.9 16.7,-41.4C153.5,128.1 159.1,142 166.6,154.9zM122.9,57.5l8.8,8.8c-8.9,8.9 -8.9,23.5 0,32.4l-8.8,8.8C109,93.9 109,71.4 122.9,57.5zM114,116.5l-8.8,8.8c-11.4,-11.4 -17.7,-26.6 -17.7,-42.7s6.3,-31.3 17.7,-42.7l8.8,8.8c-9,9 -14,21.1 -14,33.9C100,95.4 104.9,107.5 114,116.5zM168.3,98.8c4.3,-4.3 6.7,-10.1 6.7,-16.2c0,-6.1 -2.4,-11.9 -6.7,-16.2l8.8,-8.8c6.7,6.7 10.4,15.6 10.4,25.1c0,9.4 -3.7,18.4 -10.4,25.1L168.3,98.8zM212.5,82.6c0,16.1 -6.3,31.3 -17.7,42.7l-8.8,-8.8c9,-9 14.1,-21.1 14.1,-33.9s-5,-24.9 -14.1,-33.9l8.8,-8.8C206.2,51.3 212.5,66.4 212.5,82.6z"
-        android:fillColor="#C1DFF5"/>
+    android:width="748dp"
+    android:height="664dp"
+    android:viewportWidth="748"
+    android:viewportHeight="664">
+  <path
+      android:pathData="M427.48,100.89C444.14,114.86 455.82,134.03 458,156C459.55,177.02 455.78,195.33 444,213C444.34,217.46 446.37,221.32 448.25,225.32C448.59,226.03 448.92,226.75 449.26,227.48C449.98,229.03 450.7,230.58 451.42,232.13C453.38,236.32 455.32,240.51 457.26,244.71C457.66,245.57 458.06,246.43 458.47,247.32C462.03,255.03 465.49,262.79 468.91,270.56C475.76,286.1 482.83,301.52 490,316.92C495.56,328.88 501.06,340.88 506.51,352.9C507.12,354.24 507.72,355.57 508.33,356.91C508.78,357.9 508.78,357.9 509.24,358.91C511.45,363.8 513.68,368.68 515.92,373.56C522.98,388.95 529.96,404.37 536.8,419.86C542.62,433.01 548.64,446.07 554.72,459.11C560.6,471.75 566.35,484.44 571.97,497.2C577.34,509.37 582.88,521.45 588.5,533.5C596.34,550.31 603.94,567.22 611.43,584.19C613.24,588.31 615.09,592.41 616.96,596.51C617.38,597.45 617.81,598.38 618.25,599.35C619.01,601 619.76,602.64 620.53,604.28C624.99,614.04 625.87,625.62 622.38,635.88C617.64,647.07 610.62,655.66 599.63,660.96C589.39,665.03 577.82,665.79 567.33,662.03C555.88,656.97 548.79,650.12 543.3,638.86C542.96,638.16 542.62,637.47 542.26,636.76C538.12,628.31 534.22,619.75 530.31,611.19C529.57,609.57 528.83,607.95 528.09,606.34C524.38,598.23 520.69,590.12 517,582C422.95,581.67 328.9,581.34 232,581C231.34,582.98 230.68,584.96 230,587C228.92,589.48 227.83,591.94 226.69,594.4C226.21,595.45 226.21,595.45 225.71,596.53C224.67,598.81 223.62,601.09 222.56,603.38C221.1,606.54 219.65,609.7 218.19,612.86C217.83,613.64 217.47,614.43 217.1,615.23C214.94,619.91 212.84,624.61 210.78,629.33C210.06,630.94 210.06,630.94 209.34,632.59C208.48,634.54 207.63,636.49 206.8,638.45C202.16,648.89 195.23,655.96 185,661C183.99,661.51 183.99,661.51 182.96,662.03C174.1,665.72 162.03,665.42 153,662.38C140.84,657.11 133.13,649.6 127.95,637.42C126.01,632.46 125.72,628.39 125.63,623.13C125.59,622.34 125.55,621.56 125.51,620.75C125.33,608.18 132.53,596.42 137.73,585.27C139.63,581.19 141.52,577.1 143.4,573.01C143.79,572.17 144.18,571.34 144.57,570.47C148.43,562.1 152.16,553.68 155.88,545.25C161.99,531.39 168.32,517.62 174.72,503.89C180.27,491.98 185.7,480.02 191,468C196.75,454.95 202.67,441.99 208.69,429.06C214.63,416.3 220.5,403.53 226.23,390.67C230.36,381.4 234.58,372.16 238.81,362.94C244.23,351.12 249.56,339.27 254.81,327.38C260.57,314.35 266.49,301.41 272.5,288.5C279.34,273.83 286.03,259.1 292.57,244.3C292.88,243.61 293.18,242.93 293.49,242.23C294.08,240.88 294.67,239.54 295.26,238.19C296.88,234.48 298.56,230.81 300.31,227.16C300.69,226.35 301.07,225.54 301.46,224.7C302.2,223.14 302.95,221.58 303.72,220.03C305.79,215.66 305.79,215.66 305.24,210.94C303.69,208.42 301.88,206.28 300,204C289.79,183.8 288.24,160.79 295.25,139.31C298.92,128.96 303.98,120.4 311,112C311.78,111 311.78,111 312.58,109.98C340.78,75.27 393.89,74.94 427.48,100.89ZM374,268C365.14,287.16 356.35,306.35 347.83,325.67C342.45,337.86 336.89,349.96 331.16,361.99C330.61,363.15 330.07,364.31 329.5,365.51C329.02,366.53 328.53,367.54 328.03,368.59C326.87,370.87 326.87,370.87 327,373C358.35,373 389.7,373 422,373C421.06,368.3 419.55,364.52 417.53,360.25C417.17,359.49 416.82,358.72 416.45,357.94C415.69,356.3 414.92,354.65 414.15,353.01C412.08,348.62 410.04,344.21 407.99,339.8C407.57,338.9 407.15,338 406.72,337.07C402.57,328.11 398.55,319.1 394.56,310.06C393.26,307.12 391.96,304.18 390.65,301.23C390.34,300.54 390.03,299.84 389.71,299.12C386.71,292.34 383.69,285.57 380.63,278.81C380.18,277.81 379.73,276.82 379.27,275.79C378.86,274.89 378.46,274 378.04,273.08C377.69,272.31 377.34,271.54 376.98,270.75C376.12,268.82 376.12,268.82 374,268ZM288,457C285.73,461.89 283.47,466.78 281.22,471.68C280.45,473.34 279.68,475.01 278.91,476.67C277.8,479.06 276.7,481.46 275.6,483.86C275.08,484.97 275.08,484.97 274.55,486.1C274.07,487.15 274.07,487.15 273.58,488.22C273.3,488.83 273.02,489.44 272.73,490.07C271.77,492.46 271.77,492.46 271,497C339.64,497 408.28,497 479,497C475.34,488.22 471.61,479.5 467.75,470.81C467.2,469.57 466.66,468.34 466.11,467.1C465.59,465.94 465.08,464.78 464.55,463.58C464.08,462.53 463.62,461.48 463.14,460.4C462.21,458.1 462.21,458.1 461,457C458.77,456.9 456.54,456.88 454.31,456.88C453.25,456.88 453.25,456.88 452.17,456.88C449.78,456.88 447.39,456.88 445.01,456.89C443.3,456.89 441.6,456.89 439.89,456.89C435.25,456.89 430.61,456.89 425.96,456.9C421.12,456.9 416.27,456.91 411.43,456.91C402.24,456.91 393.06,456.92 383.88,456.93C373.42,456.94 362.97,456.94 352.52,456.95C331.01,456.96 309.51,456.98 288,457Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M89.49,5.54C98.86,12.44 105.76,21.01 108.61,32.46C109.05,35.33 109.24,38.1 109.31,41C109.37,42.52 109.37,42.52 109.43,44.06C108.44,53.14 104.74,61.84 101.75,70.42C94.49,91.46 89.39,112.86 87,135C86.91,135.87 86.81,136.74 86.71,137.63C85.84,146.77 85.76,155.89 85.75,165.06C85.75,165.9 85.75,166.73 85.75,167.59C85.79,203.9 92.69,239.14 105.78,273.03C110.55,285.39 110.39,297.76 105,310C99.15,320.4 90.62,327.61 79.25,331.34C67.38,333.75 55.36,332.97 44.84,326.71C42.74,325.26 40.88,323.72 39,322C38,321.1 38,321.1 36.98,320.18C3.88,286.89 0.68,210.12 0.69,166.06C0.87,121.72 5.3,46.86 36.56,11.56C50.76,-1.38 72.91,-4.73 89.49,5.54Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M707.81,7.63C733.27,27.69 739.35,76.89 744.25,106.88C744.4,107.8 744.55,108.72 744.71,109.68C745.18,112.78 745.6,115.89 746,119C746.09,119.68 746.17,120.36 746.26,121.05C748.11,135.87 748.36,150.59 748.31,165.5C748.31,167.29 748.31,167.29 748.31,169.12C748.26,186.58 747.93,203.74 745,221C744.8,222.23 744.59,223.45 744.38,224.71C730.38,306.62 730.38,306.62 709,324C697.88,330.98 686.15,334.8 673,332C660.39,328 650.81,321.05 644.25,309.5C639.06,298.46 639.16,286.9 642.8,275.48C643.73,272.95 644.7,270.44 645.69,267.94C670.81,201.34 669.04,129.03 644.9,62.49C639.87,48.54 638.15,36.72 644.69,22.81C650.43,12.12 657.88,5.74 669.13,1.13C682.45,-2.81 696.47,0.01 707.81,7.63Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M579.8,54.71C596.49,64.52 601.19,86.48 606,104C619.21,155.52 617.68,215.84 593,264C588.71,271.04 583.23,276.97 575.2,279.5C565.53,281.69 556.94,281.69 548.38,276.38C540.72,270.88 535.87,264.63 533.31,255.56C532.19,246.38 534.24,239.45 537.58,230.95C554.9,186.51 553.64,137.77 534.76,94.04C531.29,84.74 533.07,75.88 537,67C546.58,52.92 563.98,47.04 579.8,54.71Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M199.86,54.74C208.34,59.72 213.24,66.61 216,76C217.14,86.1 215.1,94.04 211.31,103.31C195.9,143.54 195.65,188.21 211.21,228.45C215.6,239.84 218.57,249.31 214.44,261.38C209.86,271.04 203.02,276.38 193,280C183.9,282.07 176.02,280.86 167.88,276.44C149.46,264.39 144.64,234.58 140.27,214.33C139.43,210.24 138.69,206.12 138,202C137.88,201.33 137.76,200.65 137.64,199.96C130.43,157.17 135.92,101.37 159,64C168.43,51.54 185.83,48.09 199.86,54.74Z"
+      android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/res/drawable/install_start.xml b/app/res/drawable/install_start.xml
index 1b9ebaf11d..0a4839930a 100644
--- a/app/res/drawable/install_start.xml
+++ b/app/res/drawable/install_start.xml
@@ -1,9 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="232dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="232.5">
-    <path
-        android:pathData="M238.1,74.1l-117.2,109.2l-0.8,-0.9l-23,-24.6l-34,-36.6l25.2,-23.4l34,36.4l91.9,-85.7z"
-        android:fillColor="#D6EACC"/>
-</vector>
+    android:height="156dp"
+    android:viewportHeight="156"
+    android:viewportWidth="155"
+    android:width="155dp">
+
+    <group>
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M87.2 10.1333C87.2 4.78647 82.8802 0.466675 77.5333 0.466675C72.1864 0.466675 67.8666 4.78647 67.8666 10.1333V83.449L45.6937 61.2761C41.9177 57.5 35.7854 57.5 32.0093 61.2761C28.2333 65.0521 28.2333 71.1844 32.0093 74.9604L70.676 113.627C74.452 117.403 80.5843 117.403 84.3604 113.627L123.027 74.9604C126.803 71.1844 126.803 65.0521 123.027 61.2761C119.251 57.5 113.119 57.5 109.343 61.2761L87.2 83.449V10.1333ZM19.5333 106.8C8.86974 106.8 0.199951 115.47 0.199951 126.133V135.8C0.199951 146.464 8.86974 155.133 19.5333 155.133H135.533C146.197 155.133 154.867 146.464 154.867 135.8V126.133C154.867 115.47 146.197 106.8 135.533 106.8H104.872L91.1875 120.484C83.6354 128.036 71.401 128.036 63.8489 120.484L50.1947 106.8H19.5333ZM130.7 123.717C132.623 123.717 134.467 124.481 135.826 125.84C137.186 127.2 137.95 129.044 137.95 130.967C137.95 132.889 137.186 134.734 135.826 136.093C134.467 137.453 132.623 138.217 130.7 138.217C128.777 138.217 126.933 137.453 125.573 136.093C124.214 134.734 123.45 132.889 123.45 130.967C123.45 129.044 124.214 127.2 125.573 125.84C126.933 124.481 128.777 123.717 130.7 123.717Z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/res/drawable/install_stop.xml b/app/res/drawable/install_stop.xml
index c5147ad783..ef2b97a49f 100644
--- a/app/res/drawable/install_stop.xml
+++ b/app/res/drawable/install_stop.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="232dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="232.5">
-    <path
-        android:pathData="M213.8,153.8l-38.4,-38.3l38.4,-38.2l-25.5,-25.5l-38.3,38.2l-38.2,-38.2l-25.5,25.5l38.2,38.2l-38.2,38.3l25.5,25.5l38.2,-38.3l38.3,38.3z"
-        android:fillColor="#D7D6D4"/>
+    android:width="232dp"
+    android:height="232dp"
+    android:viewportWidth="232"
+    android:viewportHeight="232">
+  <path
+      android:pathData="M180.03,36.51C182.4,38.63 184.72,40.78 187,43C192.04,38.79 196.72,34.38 201.31,29.69C202.54,28.44 203.76,27.19 204.99,25.95C205.79,25.13 205.79,25.13 206.6,24.3C209.4,21.7 212.14,21.61 215.89,21.64C219.62,22.28 221.4,24.34 224,27C225.39,29.79 225.14,32.09 225.16,35.21C225.17,36.51 225.18,37.82 225.19,39.16C225.2,40.59 225.2,42.03 225.2,43.46C225.21,44.92 225.21,46.39 225.22,47.85C225.23,50.93 225.24,54 225.24,57.07C225.25,61.01 225.27,64.94 225.3,68.88C225.32,71.9 225.32,74.93 225.32,77.96C225.33,79.41 225.33,80.86 225.35,82.31C225.36,84.34 225.36,86.37 225.36,88.41C225.36,90.14 225.36,90.14 225.37,91.91C224.95,95.4 224.16,97.23 222,100C218.71,102.38 215.56,102.27 211.58,102.31C209.63,102.33 209.63,102.33 207.64,102.35C206.22,102.36 204.8,102.37 203.38,102.37C201.92,102.38 200.46,102.39 199,102.4C195.95,102.41 192.89,102.42 189.83,102.43C185.92,102.43 182.01,102.47 178.1,102.51C175.09,102.54 172.07,102.55 169.06,102.55C167.62,102.56 166.18,102.57 164.74,102.59C152.07,102.76 152.07,102.76 148.13,99.59C145.36,96.23 144.34,93.84 144.41,89.4C146.7,80.08 158.22,71.55 165,65C152.2,51.8 135.23,45.61 117.04,45.01C97.17,44.75 79.57,52.67 65.25,66.19C51.73,80.33 45.14,98.05 44.97,117.53C45.9,138.17 54.23,155.92 69.13,170.13C85.46,183.99 104.97,188.46 126,187C141.16,185.15 154.29,177.96 165.63,167.98C170.65,163.78 174.08,162.42 180.57,162.66C184.33,163.19 186.26,164.39 189,167C191.78,170.82 193.38,174.35 193,179.13C191.1,188.44 182.68,194.64 175.32,199.92C151.48,215.52 124.13,221.84 95.94,216.5C76.04,212.32 59.64,202.99 45,189C44.32,188.4 43.65,187.8 42.95,187.18C26.85,172.3 15.98,148.15 14.86,126.31C14.17,105.26 16.48,87.83 26,69C26.53,67.94 27.07,66.88 27.62,65.79C40.44,42.34 62.59,25.64 88,18C89.12,17.66 90.23,17.32 91.38,16.98C121.72,9.44 155.89,16.51 180.03,36.51Z"
+      android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/res/drawable/startup_barcode.xml b/app/res/drawable/startup_barcode.xml
index 7b955103b1..d65cfcfec4 100644
--- a/app/res/drawable/startup_barcode.xml
+++ b/app/res/drawable/startup_barcode.xml
@@ -1,78 +1,24 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="232dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="232.5">
-    <path
-        android:pathData="M131.4,96.9V59.8v-9.3H94.3H85v9.3v27.9V97h37.2L131.4,96.9L131.4,96.9zM94.3,87.6V59.8h27.8v27.9H94.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M103.6,69.1h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M159.3,69.1l-9.3,0l0,-9.3l9.3,0l0,-9.3l-9.3,0l-9.3,0l0,9.3l0,18.6l9.3,0l0,9.2l9.3,0z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M150,115.5l9.3,0l0,-18.6l-9.3,0l0,-9.3l-9.3,0l0,18.6l9.3,0z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M177.9,50.5h-9.3v46.4h9.3h27.9h9.3V59.8v-9.3H177.9zM205.7,87.6h-27.9V59.8h27.9V87.6L205.7,87.6z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M187.1,69.1h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M85,106.2l0,9.3l0,9.3l9.3,0l0,-9.3l9.3,0l0,-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M159.3,134.1l0,-9.3l-9.3,0l0,-9.3l-9.3,0l0,-9.3l-27.9,0l0,9.3l-9.2,0l0,9.3l18.6,0l0,-9.3l9.2,0l0,9.3l9.3,0l0,9.3l9.3,0l0,9.3l9.3,0z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M168.6,161.9l9.3,0l0,-9.3l-9.3,0l0,-9.2l-9.3,0l0,9.2l-9.3,0l0,-9.2l-9.3,0l0,18.5l9.3,0l0,9.3l9.3,0l0,-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M177.9,143.4h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M168.6,134.1h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M168.6,124.8l9.3,0l0,9.3l9.2,0l0,9.3l9.3,0l0,-18.6l-9.3,0l0,-9.3l-9.2,0l0,-9.3l-9.3,0l0,9.3l-9.3,0l0,9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M205.7,124.8h9.3v18.6h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M187.1,106.2h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M196.4,115.5h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M205.7,106.2h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M196.4,143.4h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M205.7,152.6h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M205.7,171.2h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M187.1,161.9l-9.2,0l0,9.3l9.2,0l0,9.3l9.3,0l0,-27.9l-9.3,0z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M159.3,171.2h18.6v9.3h-18.6z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M140.7,171.2h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M85,143.4v37.1h9.3h37.2v-9.3v-27.9V134H85V143.4zM122.2,143.4v27.9H94.3v-27.9H122.2z"
-        android:fillColor="#C0DEF4"/>
-    <path
-        android:pathData="M103.6,152.6h9.3v9.3h-9.3z"
-        android:fillColor="#C0DEF4"/>
+    android:width="342dp"
+    android:height="394dp"
+    android:viewportWidth="342"
+    android:viewportHeight="394">
+  <path
+      android:pathData="M40.03,220.84C41.22,220.83 41.22,220.83 42.43,220.82C45.05,220.81 47.67,220.8 50.29,220.8C52.12,220.79 53.95,220.79 55.78,220.78C59.62,220.77 63.45,220.76 67.29,220.76C72.18,220.75 77.08,220.73 81.97,220.7C85.75,220.68 89.53,220.68 93.31,220.68C95.12,220.67 96.92,220.67 98.72,220.65C113.26,220.55 126.23,221.52 137.27,232.19C147.48,243.98 147.61,257 147.53,271.82C147.53,273.72 147.54,275.63 147.54,277.54C147.55,281.52 147.54,285.49 147.52,289.47C147.5,294.54 147.51,299.62 147.54,304.69C147.55,308.62 147.55,312.55 147.54,316.48C147.53,318.35 147.54,320.22 147.55,322.09C147.6,336.05 146.4,347.89 137,359C128.43,367.11 118.6,370.13 107.02,370.18C106.23,370.18 105.44,370.19 104.63,370.2C102.02,370.22 99.42,370.23 96.81,370.24C95.47,370.24 95.47,370.24 94.1,370.25C89.36,370.27 84.62,370.29 79.88,370.3C75.01,370.31 70.14,370.34 65.27,370.38C61.51,370.41 57.74,370.41 53.97,370.42C52.18,370.42 50.39,370.43 48.59,370.45C34.82,370.59 21.56,370.08 11,360C3.74,352.81 -0.07,345.09 -0.17,334.84C-0.17,333.61 -0.17,333.61 -0.18,332.35C-0.18,331.48 -0.19,330.61 -0.2,329.71C-0.22,326.82 -0.23,323.94 -0.24,321.05C-0.24,320.07 -0.25,319.08 -0.25,318.06C-0.27,312.83 -0.29,307.6 -0.3,302.37C-0.31,296.98 -0.34,291.6 -0.38,286.21C-0.41,282.05 -0.41,277.9 -0.42,273.74C-0.42,271.76 -0.43,269.77 -0.45,267.79C-0.59,252.55 0.77,241.8 11.59,230.31C19.52,222.85 29.46,220.85 40.03,220.84ZM49,271C49,287.17 49,303.34 49,320C64.84,320 80.68,320 97,320C97,303.83 97,287.66 97,271C81.16,271 65.32,271 49,271Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M234.98,23.82C236.16,23.81 236.16,23.81 237.37,23.8C239.98,23.78 242.58,23.77 245.19,23.76C246.08,23.76 246.98,23.75 247.9,23.75C252.64,23.73 257.38,23.71 262.12,23.7C266.99,23.69 271.86,23.66 276.73,23.62C280.49,23.59 284.26,23.59 288.03,23.58C289.82,23.58 291.61,23.57 293.41,23.55C307.18,23.41 320.44,23.92 331,34C338.26,41.19 342.07,48.91 342.17,59.16C342.17,59.98 342.17,60.8 342.18,61.65C342.18,62.52 342.19,63.39 342.2,64.29C342.22,67.18 342.23,70.06 342.24,72.95C342.24,73.93 342.25,74.92 342.25,75.94C342.27,81.17 342.29,86.4 342.3,91.63C342.31,97.02 342.34,102.4 342.38,107.79C342.41,111.95 342.41,116.1 342.42,120.26C342.42,122.24 342.43,124.23 342.45,126.21C342.59,141.45 341.23,152.2 330.41,163.69C322.48,171.15 312.54,173.15 301.97,173.16C301.18,173.17 300.38,173.17 299.57,173.18C296.95,173.19 294.33,173.2 291.71,173.2C289.88,173.21 288.05,173.21 286.22,173.22C282.38,173.23 278.55,173.24 274.71,173.24C269.82,173.25 264.92,173.27 260.03,173.3C256.25,173.32 252.47,173.32 248.69,173.32C246.88,173.33 245.08,173.33 243.28,173.35C228.74,173.45 215.77,172.48 204.73,161.81C194.52,150.02 194.39,137 194.47,122.18C194.47,120.28 194.46,118.37 194.46,116.46C194.45,112.48 194.46,108.51 194.48,104.53C194.5,99.46 194.49,94.38 194.46,89.31C194.45,85.38 194.45,81.45 194.46,77.52C194.47,75.65 194.46,73.78 194.45,71.91C194.4,57.95 195.6,46.11 205,35C213.57,26.89 223.4,23.87 234.98,23.82ZM245,74C245,90.17 245,106.34 245,123C260.84,123 276.68,123 293,123C293,106.83 293,90.66 293,74C277.16,74 261.32,74 245,74Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M40.03,23.84C41.22,23.83 41.22,23.83 42.43,23.82C45.05,23.81 47.67,23.8 50.29,23.8C52.12,23.79 53.95,23.79 55.78,23.78C59.62,23.77 63.45,23.76 67.29,23.76C72.18,23.75 77.08,23.73 81.97,23.7C85.75,23.68 89.53,23.68 93.31,23.68C95.12,23.67 96.92,23.67 98.72,23.65C113.26,23.55 126.23,24.52 137.27,35.19C147.48,46.98 147.61,60 147.53,74.82C147.53,76.72 147.54,78.63 147.54,80.54C147.55,84.52 147.54,88.49 147.52,92.47C147.5,97.54 147.51,102.62 147.54,107.69C147.55,111.62 147.55,115.55 147.54,119.48C147.53,121.35 147.54,123.22 147.55,125.09C147.6,139.05 146.4,150.89 137,162C128.43,170.11 118.6,173.13 107.02,173.18C106.23,173.18 105.44,173.19 104.63,173.2C102.02,173.22 99.42,173.23 96.81,173.24C95.47,173.24 95.47,173.24 94.1,173.25C89.36,173.27 84.62,173.29 79.88,173.3C75.01,173.31 70.14,173.34 65.27,173.38C61.51,173.41 57.74,173.41 53.97,173.42C52.18,173.42 50.39,173.43 48.59,173.45C34.82,173.59 21.56,173.08 11,163C3.74,155.81 -0.07,148.09 -0.17,137.84C-0.17,136.61 -0.17,136.61 -0.18,135.35C-0.18,134.48 -0.19,133.61 -0.2,132.71C-0.22,129.82 -0.23,126.94 -0.24,124.05C-0.24,123.07 -0.25,122.08 -0.25,121.06C-0.27,115.83 -0.29,110.6 -0.3,105.37C-0.31,99.98 -0.34,94.6 -0.38,89.21C-0.41,85.05 -0.41,80.9 -0.42,76.74C-0.42,74.76 -0.43,72.77 -0.45,70.79C-0.59,55.55 0.77,44.8 11.59,33.31C19.52,25.85 29.46,23.85 40.03,23.84ZM49,74C49,90.17 49,106.34 49,123C64.84,123 80.68,123 97,123C97,106.83 97,90.66 97,74C81.16,74 65.32,74 49,74Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M195,221C219.42,221 243.84,221 269,221C269,229.25 269,237.5 269,246C284.84,246 300.68,246 317,246C317,237.75 317,229.5 317,221C325.25,221 333.5,221 342,221C342,254 342,287 342,321C329.98,321.02 317.95,321.04 305.56,321.06C299.86,321.08 299.86,321.08 294.04,321.09C289.41,321.09 289.41,321.09 287.25,321.1C285.73,321.1 284.21,321.1 282.7,321.11C280.4,321.11 278.11,321.11 275.81,321.11C273.87,321.12 273.87,321.12 271.89,321.12C269,321 269,321 268,320C267.91,318.22 267.89,316.44 267.9,314.65C267.91,313.03 267.91,313.03 267.91,311.38C267.92,309.68 267.92,309.68 267.94,307.94C267.94,306.8 267.95,305.66 267.95,304.48C267.96,301.65 267.98,298.83 268,296C260.41,296 252.82,296 245,296C245,320.42 245,344.84 245,370C228.5,370 212,370 195,370C195,320.83 195,271.66 195,221Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M268,344C276.58,344 285.16,344 294,344C294,352.58 294,361.16 294,370C285.42,370 276.84,370 268,370C268,361.42 268,352.84 268,344Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M317,344C325.25,344 333.5,344 342,344C342,352.58 342,361.16 342,370C333.75,370 325.5,370 317,370C317,361.42 317,352.84 317,344Z"
+      android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/res/drawable/startup_url.xml b/app/res/drawable/startup_url.xml
index fa08e75f9f..442e6b7bd9 100644
--- a/app/res/drawable/startup_url.xml
+++ b/app/res/drawable/startup_url.xml
@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="300dp"
-        android:height="232dp"
-        android:viewportWidth="300.0"
-        android:viewportHeight="232.5">
-    <path
-        android:pathData="M152.5,138.6l-58.1,-22.6L85,92.3l11.8,-30.4l22.2,-8l57.4,22.3l9.9,20.5L174.5,127L152.5,138.6zM102.6,108.2l49.1,19.1l16.2,-7.1l8.5,-22l-7.6,-13.8l-49.8,-19.4l-14.4,5.3l-8.5,22L102.6,108.2z"
-        android:fillColor="#CFEBEF"/>
-    <path
-        android:pathData="M126.2,128.4l-1.4,3.7l5.2,16.1l49.1,19.1l16,-7.9l8.5,-22l-7.4,-13.1L146.4,105l-13.1,5.1l-3.3,8.7l-11.2,-4.3l5.1,-13.2l23.1,-8.9l57.4,22.3l10.6,22L203.2,167l-23.4,11.6l-58.1,-22.6l-9.6,-24.5l2.9,-7.5L126.2,128.4z"
-        android:fillColor="#0A799A"/>
+    android:width="400dp"
+    android:height="325dp"
+    android:viewportWidth="400"
+    android:viewportHeight="325">
+  <path
+      android:pathData="M235.42,82.44C251.99,98.76 262,122 262.38,145.23C262.34,167.32 257.23,188.52 243,206C237.68,211.02 232.5,212.39 225.37,212.27C219.67,211.62 215.48,208.83 211.63,204.69C207.45,199.31 206.32,193.68 207.12,187C208.3,182.98 210.25,179.65 212.38,176.06C219.95,163.22 222.46,149.85 218.81,135.13C214.51,121.87 207.09,111.61 194.94,104.47C182.82,98.4 170.23,96.95 157.13,100.69C142.54,105.81 132.98,115.84 122.23,126.64C120.81,128.07 119.38,129.49 117.95,130.92C117.02,131.84 116.1,132.77 115.14,133.72C113.91,134.96 113.91,134.96 112.66,136.22C110.61,138.36 108.68,140.52 106.75,142.76C102.67,147.46 98.26,151.79 93.81,156.14C92.04,157.89 90.28,159.64 88.51,161.38C85.75,164.1 83,166.81 80.23,169.52C77.54,172.16 74.86,174.81 72.19,177.46C71.37,178.25 70.55,179.04 69.71,179.86C58.25,191.27 51.7,203.77 51.5,220.06C51.66,233.24 56.33,245.23 64.96,255.29C74.55,264.54 87.25,269.81 100.5,270.25C112.23,269.92 122.61,266.07 132.09,259.27C136.89,256.08 142.46,256.46 148,257C153.94,258.75 157.52,261.99 161,267C163.74,272.83 164.13,279.06 162.35,285.28C157.34,296.45 144.41,302.36 133.69,306.75C109.95,315.24 84.66,314.27 61.74,303.9C40.3,293.62 24.05,275.75 15.29,253.73C6.69,228.81 7.45,201.71 18.95,177.83C23.56,168.89 29.66,160.78 37.01,153.92C38.9,152.1 40.61,150.21 42.31,148.21C45.68,144.33 49.19,140.64 52.81,136.99C53.46,136.34 54.1,135.69 54.76,135.02C56.86,132.9 58.96,130.78 61.07,128.66C61.79,127.93 62.52,127.2 63.27,126.44C67.11,122.57 70.96,118.7 74.81,114.84C77.97,111.66 81.13,108.48 84.28,105.29C88.1,101.41 91.95,97.55 95.8,93.69C97.25,92.23 98.7,90.77 100.14,89.3C138.25,50.59 194.05,43.93 235.42,82.44Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M354.36,31.63C373.3,47.46 386.01,68.18 389,93C391.15,119.98 385.15,143.91 368,165C366.06,167.11 364.09,169.12 361.99,171.08C360.1,172.9 358.39,174.79 356.69,176.79C353.32,180.67 349.81,184.36 346.19,188.01C345.22,188.98 345.22,188.98 344.24,189.98C342.14,192.1 340.04,194.22 337.93,196.34C337.21,197.07 336.48,197.8 335.73,198.56C331.89,202.43 328.04,206.3 324.19,210.16C321.03,213.34 317.87,216.52 314.72,219.71C310.9,223.59 307.05,227.45 303.2,231.31C301.75,232.77 300.3,234.23 298.86,235.7C279.59,255.27 257.25,268.29 229.23,269.04C207.03,269.12 185.62,261.78 169,247C168.26,246.41 167.51,245.82 166.75,245.21C151.34,232.62 142.01,213.16 138,194C137.81,193.09 137.62,192.18 137.42,191.24C134.13,165.92 139.84,142.5 154.01,121.45C157.67,116.95 161.34,114.33 167,113C172.87,112.53 177.87,112.93 183,116C188.59,120.88 191.49,125.63 192.2,133.1C192.17,139.33 189.71,143.72 186.63,148.94C179.05,161.78 176.54,175.15 180.19,189.88C184.49,203.13 191.91,213.39 204.06,220.53C216.18,226.6 228.77,228.05 241.88,224.31C256.63,219.13 266.33,208.84 277.19,197.94C278.04,197.09 278.89,196.24 279.76,195.37C280.6,194.54 281.43,193.7 282.29,192.84C283.4,191.73 283.4,191.73 284.53,190.6C286.49,188.54 288.34,186.45 290.19,184.3C294.43,179.42 299.01,174.93 303.63,170.42C305.48,168.58 307.34,166.74 309.2,164.9C312.1,162.04 315,159.18 317.91,156.33C320.74,153.56 323.56,150.77 326.38,147.98C327.24,147.14 328.1,146.31 328.98,145.44C340.57,133.91 347.29,121.45 347.5,104.94C347.42,97.4 346.16,90.9 343,84C342.64,83.2 342.28,82.41 341.9,81.59C335.65,69.26 325.51,61.18 312.52,56.84C299.05,53.46 286.5,54.83 274,61C271.57,62.5 269.23,64.07 266.91,65.73C262.11,68.92 256.54,68.54 251,68C245.06,66.25 241.48,63.01 238,58C235.26,52.17 234.87,45.94 236.65,39.72C241.66,28.55 254.59,22.64 265.31,18.25C295.14,7.58 329.28,11.68 354.36,31.63Z"
+      android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/res/layout/activity_crash_warning.xml b/app/res/layout/activity_crash_warning.xml
index 5b7206eff0..31cf7fda08 100644
--- a/app/res/layout/activity_crash_warning.xml
+++ b/app/res/layout/activity_crash_warning.xml
@@ -22,7 +22,7 @@
             android:paddingLeft="@dimen/content_min_margin"
             android:paddingTop="@dimen/content_min_margin"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/commcare_logo"
+            app:srcCompat="@drawable/commcare_by_dimagi"
             android:layout_marginEnd="@dimen/content_min_margin"
             android:paddingStart="@dimen/content_min_margin" />
 
diff --git a/app/res/layout/activity_report_problem.xml b/app/res/layout/activity_report_problem.xml
index d5b815a465..35648f2e81 100644
--- a/app/res/layout/activity_report_problem.xml
+++ b/app/res/layout/activity_report_problem.xml
@@ -20,7 +20,7 @@
             android:paddingTop="@dimen/content_min_margin"
             android:scaleType="fitCenter"
             android:adjustViewBounds="true"
-            app:srcCompat="@drawable/commcare_logo"
+            app:srcCompat="@drawable/commcare_by_dimagi"
             android:layout_marginEnd="@dimen/content_min_margin"
             android:paddingStart="@dimen/content_min_margin"></ImageView>
 
diff --git a/app/res/layout/app_manager.xml b/app/res/layout/app_manager.xml
index 5811cdbdc3..a0af3a65b6 100644
--- a/app/res/layout/app_manager.xml
+++ b/app/res/layout/app_manager.xml
@@ -10,7 +10,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:paddingTop="@dimen/activity_vertical_margin"
+        android:padding="@dimen/activity_vertical_margin"
         android:id="@+id/screen_manager_banner_pane">
 
         <ImageView
@@ -18,7 +18,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitStart"
-            app:srcCompat="@drawable/commcare_logo"
+            app:srcCompat="@drawable/commcare_by_dimagi"
             android:adjustViewBounds="true"/>
 
     </FrameLayout>
diff --git a/app/res/layout/connection_diagnostic.xml b/app/res/layout/connection_diagnostic.xml
index d94b34f28c..3e3e9631fd 100644
--- a/app/res/layout/connection_diagnostic.xml
+++ b/app/res/layout/connection_diagnostic.xml
@@ -16,17 +16,11 @@
         <ImageView
             android:id="@+id/screen_bulk_image1"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="20dp"
-            android:maxHeight="135dp"
-            android:maxWidth="663dp"
-            android:paddingBottom="0dp"
-            android:paddingLeft="20dp"
-            android:paddingTop="20dp"
+            android:layout_height="120dp"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ccbanner"
-            android:paddingStart="20dp"
-            android:layout_marginEnd="20dp" />
+            android:padding="16dp"
+            app:srcCompat="@drawable/commcare_by_dimagi"
+            />
 
         <TextView
             android:id="@+id/connection_test_prompt"
diff --git a/app/res/layout/grid_header_top_banner.xml b/app/res/layout/grid_header_top_banner.xml
index 722acccd98..fe4810acc5 100644
--- a/app/res/layout/grid_header_top_banner.xml
+++ b/app/res/layout/grid_header_top_banner.xml
@@ -19,7 +19,7 @@
         android:paddingLeft="@dimen/standard_spacer"
         android:paddingRight="@dimen/standard_spacer"
         android:scaleType="fitCenter"
-        app:srcCompat="@drawable/commcare_logo"
+        app:srcCompat="@drawable/commcare_by_dimagi"
         android:visibility="visible"
         android:paddingStart="@dimen/standard_spacer"
         android:paddingEnd="@dimen/standard_spacer" />
diff --git a/app/res/layout/install_confirm_fragment.xml b/app/res/layout/install_confirm_fragment.xml
index 9074e446ff..cfbd735eca 100644
--- a/app/res/layout/install_confirm_fragment.xml
+++ b/app/res/layout/install_confirm_fragment.xml
@@ -25,24 +25,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/screen_first_start_banner"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="@dimen/content_min_margin"
-                    android:layout_marginEnd="@dimen/content_start"
-                    android:layout_marginRight="@dimen/content_start"
-                    android:adjustViewBounds="true"
-                    android:paddingBottom="@dimen/content_start"
-                    android:paddingLeft="@dimen/content_start"
-                    android:paddingRight="@dimen/content_start"
-                    android:paddingTop="@dimen/content_start"
-                    android:scaleType="fitCenter"
-                    app:srcCompat="@drawable/commcare_logo"
-                    android:paddingEnd="@dimen/content_start"
-                    android:paddingStart="@dimen/content_start" />
+                <include layout="@layout/grid_header_top_banner"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -92,6 +75,7 @@
                                 android:id="@+id/btn_start_install"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:padding="16dp"
                                 SquareButtonWithText:backgroundColor="@color/cc_attention_positive_color"
                                 SquareButtonWithText:img="@drawable/install_start"
                                 SquareButtonWithText:subtitle="Start install"
@@ -112,7 +96,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
                                 android:gravity="end"
-
+                                android:padding="16dp"
                                 SquareButtonWithText:backgroundColor="@color/cc_neutral_color"
                                 SquareButtonWithText:img="@drawable/install_stop"
                                 SquareButtonWithText:subtitle="Start over"
diff --git a/app/res/layout/select_install_mode_fragment.xml b/app/res/layout/select_install_mode_fragment.xml
index f5adb50624..bc81e76544 100644
--- a/app/res/layout/select_install_mode_fragment.xml
+++ b/app/res/layout/select_install_mode_fragment.xml
@@ -72,6 +72,7 @@
                             android:id="@+id/btn_fetch_uri"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
+                            android:paddingHorizontal="24dp"
                             SquareButtonWithText:backgroundColor="@color/cc_brand_color"
                             SquareButtonWithText:img="@drawable/startup_barcode"
                             SquareButtonWithText:subtitle="Scan Application Barcode"
@@ -92,6 +93,7 @@
                             android:layout_height="match_parent"
                             android:background="@drawable/tile_drop_shadow_small_margins"
                             android:gravity="end"
+                            android:paddingHorizontal="18dp"
                             SquareButtonWithText:backgroundColor="@color/cc_light_cool_accent_color"
                             SquareButtonWithText:img="@drawable/startup_url"
                             SquareButtonWithText:subtitle="Enter Code"
diff --git a/app/res/layout/square_card.xml b/app/res/layout/square_card.xml
index 2c3e711671..95bbfebae4 100644
--- a/app/res/layout/square_card.xml
+++ b/app/res/layout/square_card.xml
@@ -23,13 +23,15 @@
             android:id="@+id/card"
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_width="wrap_content"
+            android:layout_height="170dp">
 
             <org.commcare.views.SquareImageView
                 android:id="@+id/card_image"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_width="130dp"
+                android:layout_centerHorizontal="true"
+                android:paddingVertical="24dp"
+                android:layout_height="150dp"/>
 
             <org.commcare.views.ResizingTextView
                 android:id="@+id/card_text"
@@ -41,8 +43,8 @@
                 android:paddingBottom="@dimen/standard_spacer"
                 android:paddingLeft="@dimen/standard_spacer"
                 android:paddingRight="@dimen/standard_spacer"
-                android:textSize="@dimen/font_size_large"
-                app:text_size_small="@dimen/font_size_medium"
+                android:textSize="@dimen/font_size_xlarger"
+                app:text_size_small="@dimen/font_size_xlargest"
                 android:paddingStart="@dimen/standard_spacer"
                 android:paddingEnd="@dimen/standard_spacer" />
         </RelativeLayout>
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index 5f9214660f..0b3bdd1533 100644
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -61,6 +61,7 @@
     <color name="very_light_blue">#AAE3ECFF</color>
     <color name="solid_dark_red">#BF3D3D</color>
     <color name="solid_dark_orange">#F57E20</color>
+    <color name="red_incomplete">#E44434</color>
 
     <color name="dark_brown">#5C4033</color>
 
@@ -146,4 +147,12 @@
     <!-- Button colors -->
     <color name="button_primary">#005ab2</color>
     <color name="button_disabled">#d0e3ff</color>
+
+    <color name="start_home_button">#6AB849</color>
+    <color name="start_save_button">#1B998B</color>
+    <color name="start_sync_button">#5D70D2</color>
+    <color name="start_sync_dark_button">#3b4fb6</color>
+    <color name="start_logout_button">#373534</color>
+
+
 </resources>
diff --git a/app/src/org/commcare/activities/HomeButtons.java b/app/src/org/commcare/activities/HomeButtons.java
index ca6cb6957f..a9904f9472 100644
--- a/app/src/org/commcare/activities/HomeButtons.java
+++ b/app/src/org/commcare/activities/HomeButtons.java
@@ -51,7 +51,7 @@ public static HomeCardDisplayData[] buildButtonData(StandardHomeActivity activit
                 HomeCardDisplayData.homeCardDataWithStaticText(Localization.get(homeMessageKey),
                         R.color.white,
                         R.drawable.home_start,
-                        R.color.cc_attention_positive_color,
+                        R.color.start_home_button,
                         getStartButtonListener(activity)),
                 HomeCardDisplayData.homeCardDataWithStaticText(Localization.get("training.root.title"), R.color.white,
                         R.drawable.home_training, R.color.cc_dark_cool_accent_color,
@@ -59,19 +59,19 @@ public static HomeCardDisplayData[] buildButtonData(StandardHomeActivity activit
                 HomeCardDisplayData.homeCardDataWithStaticText(Localization.get("home.forms.saved"),
                         R.color.white,
                         R.drawable.home_saved,
-                        R.color.cc_light_cool_accent_color,
+                        R.color.start_save_button,
                         getViewOldFormsListener(activity)),
                 HomeCardDisplayData.homeCardDataWithDynamicText(Localization.get("home.forms.incomplete"), R.color.white,
                         R.drawable.home_incomplete,
-                        R.color.solid_dark_orange,
+                        R.color.red_incomplete,
                         getIncompleteButtonListener(activity),
                         null,
                         getIncompleteButtonTextSetter(activity)),
                 HomeCardDisplayData.homeCardDataWithNotification(Localization.get(syncKey), R.color.white,
                         R.color.white,
                         R.drawable.home_sync,
-                        R.color.cc_brand_color,
-                        R.color.cc_brand_text,
+                        R.color.start_sync_button,
+                        R.color.start_sync_dark_button,
                         getSyncButtonListener(activity),
                         getSyncButtonSubTextListener(activity),
                         getSyncButtonTextSetter(activity)),
@@ -80,7 +80,7 @@ public static HomeCardDisplayData[] buildButtonData(StandardHomeActivity activit
                         getReportButtonListener(activity)),
                 HomeCardDisplayData.homeCardDataWithNotification(Localization.get(logoutMessageKey), R.color.white,
                         R.color.white,
-                        R.drawable.home_logout, R.color.cc_neutral_color, R.color.cc_neutral_text,
+                        R.drawable.home_logout, R.color.start_logout_button, R.color.cc_neutral_text,
                         getLogoutButtonListener(activity),
                         null,
                         getLogoutButtonTextSetter(activity)),
diff --git a/app/src/org/commcare/activities/LoginActivityUIController.java b/app/src/org/commcare/activities/LoginActivityUIController.java
index e955a7721a..1c2562d9b0 100644
--- a/app/src/org/commcare/activities/LoginActivityUIController.java
+++ b/app/src/org/commcare/activities/LoginActivityUIController.java
@@ -474,7 +474,7 @@ private void updateBanner() {
         ImageView topBannerImageView =
                 banner.findViewById(R.id.main_top_banner);
         if (!CustomBanner.useCustomBannerFitToActivity(activity, topBannerImageView, CustomBanner.Banner.LOGIN)) {
-            topBannerImageView.setImageResource(R.drawable.commcare_logo);
+            topBannerImageView.setImageResource(R.drawable.commcare_by_dimagi);
         }
     }
 
diff --git a/app/src/org/commcare/adapters/HomeScreenAdapter.java b/app/src/org/commcare/adapters/HomeScreenAdapter.java
index 1add94c1ef..ad37fe0e5a 100755
--- a/app/src/org/commcare/adapters/HomeScreenAdapter.java
+++ b/app/src/org/commcare/adapters/HomeScreenAdapter.java
@@ -108,7 +108,7 @@ private void bindHeader(HeaderViewHolder headerHolder) {
         boolean noCustomBanner =
                 !CustomBanner.useCustomBanner(context, screenHeight, screenWidth, headerHolder.headerImage, CustomBanner.Banner.HOME);
         if (noCustomBanner) {
-            headerHolder.headerImage.setImageResource(R.drawable.commcare_logo);
+            headerHolder.headerImage.setImageResource(R.drawable.commcare_by_dimagi);
         }
     }