diff --git a/app/res/drawable/check_update.xml b/app/res/drawable/check_update.xml
index 4c2abb7a4..c963c7cb1 100644
--- a/app/res/drawable/check_update.xml
+++ b/app/res/drawable/check_update.xml
@@ -5,5 +5,5 @@
         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="#FFFFFF"/>
+        android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/home_incomplete.xml b/app/res/drawable/home_incomplete.xml
index 9ed180dc7..394c4221b 100644
--- a/app/res/drawable/home_incomplete.xml
+++ b/app/res/drawable/home_incomplete.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="233">
   <path
       android:pathData="M122.98,58.67C126.89,47.53 137.52,39.56 150,39.56C162.48,39.56 173.11,47.53 177.02,58.67H188.22C198.76,58.67 207.33,67.24 207.33,77.78V173.33C207.33,183.87 198.76,192.44 188.22,192.44H111.78C101.24,192.44 92.67,183.87 92.67,173.33V77.78C92.67,67.24 101.24,58.67 111.78,58.67H122.98ZM156.76,61.47C154.96,59.68 152.53,58.67 150,58.67C147.47,58.67 145.04,59.68 143.24,61.47C141.45,63.26 140.45,65.69 140.45,68.22C140.45,70.76 141.45,73.19 143.24,74.98C145.04,76.77 147.47,77.78 150,77.78C152.53,77.78 154.96,76.77 156.76,74.98C158.55,73.19 159.55,70.76 159.55,68.22C159.55,65.69 158.55,63.26 156.76,61.47ZM116.27,104.74C114.92,106.08 114.17,107.91 114.17,109.81C114.17,111.71 114.92,113.53 116.27,114.88C117.61,116.22 119.43,116.97 121.33,116.97C123.24,116.97 125.06,116.22 126.4,114.88C127.75,113.53 128.5,111.71 128.5,109.81C128.5,107.91 127.75,106.08 126.4,104.74C125.06,103.4 123.24,102.64 121.33,102.64C119.43,102.64 117.61,103.4 116.27,104.74ZM183.44,105.03H145.22C142.6,105.03 140.45,107.18 140.45,109.81C140.45,112.44 142.6,114.59 145.22,114.59H183.44C186.07,114.59 188.22,112.44 188.22,109.81C188.22,107.18 186.07,105.03 183.44,105.03ZM192.51,153.83C192.51,164.38 183.96,172.94 173.4,172.94C162.85,172.94 154.29,164.38 154.29,153.83C154.29,143.27 162.85,134.72 173.4,134.72C183.96,134.72 192.51,143.27 192.51,153.83ZM175.19,146.07C175.19,145.07 174.39,144.27 173.4,144.27C172.41,144.27 171.61,145.07 171.61,146.07V154.43C171.61,155.42 172.41,156.22 173.4,156.22C174.39,156.22 175.19,155.42 175.19,154.43V146.07ZM173.4,163.38C174.72,163.38 175.79,162.32 175.79,161C175.79,159.68 174.72,158.61 173.4,158.61C172.08,158.61 171.01,159.68 171.01,161C171.01,162.32 172.08,163.38 173.4,163.38Z"
-      android:fillColor="#ffffff"
+      android:fillColor="@color/square_button_icon_color"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/res/drawable/home_logout.xml b/app/res/drawable/home_logout.xml
index 9114f6374..e448c752c 100644
--- a/app/res/drawable/home_logout.xml
+++ b/app/res/drawable/home_logout.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="233">
   <path
       android:pathData="M120.75,67.5C126.14,67.5 130.5,63.14 130.5,57.75C130.5,52.36 126.14,48 120.75,48H101.25C85.1,48 72,61.1 72,77.25V155.25C72,171.4 85.1,184.5 101.25,184.5H120.75C126.14,184.5 130.5,180.14 130.5,174.75C130.5,169.36 126.14,165 120.75,165H101.25C95.86,165 91.5,160.64 91.5,155.25V77.25C91.5,71.86 95.86,67.5 101.25,67.5H120.75ZM225.71,121.55C227.18,120.18 228,118.26 228,116.25C228,114.24 227.18,112.32 225.71,110.95L181.84,69.51C179.71,67.5 176.6,66.95 173.92,68.11C171.24,69.27 169.5,71.92 169.5,74.81V96.75H130.5C125.11,96.75 120.75,101.11 120.75,106.5V126C120.75,131.39 125.11,135.75 130.5,135.75H169.5V157.69C169.5,160.61 171.24,163.23 173.92,164.39C176.6,165.55 179.71,165 181.84,162.99L225.71,121.55Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/home_saved.xml b/app/res/drawable/home_saved.xml
index dbbf6b630..d20a0f5b0 100644
--- a/app/res/drawable/home_saved.xml
+++ b/app/res/drawable/home_saved.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="233">
   <path
       android:pathData="M94.21,38C81.96,38 72,48 72,60.3V171.78C72,184.07 81.96,194.07 94.21,194.07H205.29C217.54,194.07 227.5,184.07 227.5,171.78V87.23C227.5,81.3 225.17,75.62 221.01,71.44L194.18,44.51C190.01,40.33 184.36,38 178.46,38H94.21ZM94.21,71.44C94.21,65.28 99.18,60.3 105.32,60.3H171.96C178.11,60.3 183.07,65.28 183.07,71.44V93.74C183.07,99.91 178.11,104.89 171.96,104.89H105.32C99.18,104.89 94.21,99.91 94.21,93.74V71.44ZM149.75,171.78C137.5,171.78 127.54,161.78 127.54,149.48C127.54,137.18 137.5,127.18 149.75,127.18C162,127.18 171.96,137.18 171.96,149.48C171.96,161.78 162,171.78 149.75,171.78Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/home_start.xml b/app/res/drawable/home_start.xml
index ff77a7e3b..044cc9947 100644
--- a/app/res/drawable/home_start.xml
+++ b/app/res/drawable/home_start.xml
@@ -8,6 +8,6 @@
         android:pathData="M72,38h156v156h-156z"/>
     <path
         android:pathData="M215.69,44.61C209.02,37.94 198.23,37.94 191.56,44.61L182.39,53.75L212.22,83.58L221.39,74.41C228.06,67.74 228.06,56.95 221.39,50.28L215.69,44.61ZM124.53,111.64C122.67,113.5 121.24,115.79 120.42,118.32L111.4,145.37C110.51,147.99 111.21,150.89 113.16,152.87C115.11,154.85 118.01,155.52 120.66,154.63L147.71,145.62C150.21,144.76 152.5,143.36 154.39,141.5L205.36,90.5L175.5,60.64L124.53,111.64V111.64ZM101.25,57.5C85.1,57.5 72,70.6 72,86.75V164.75C72,180.9 85.1,194 101.25,194H179.25C195.4,194 208.5,180.9 208.5,164.75V135.5C208.5,130.11 204.14,125.75 198.75,125.75C193.36,125.75 189,130.11 189,135.5V164.75C189,170.14 184.64,174.5 179.25,174.5H101.25C95.86,174.5 91.5,170.14 91.5,164.75V86.75C91.5,81.36 95.86,77 101.25,77H130.5C135.89,77 140.25,72.64 140.25,67.25C140.25,61.86 135.89,57.5 130.5,57.5H101.25Z"
-        android:fillColor="#ffffff"/>
+        android:fillColor="@color/square_button_icon_color"/>
   </group>
 </vector>
diff --git a/app/res/drawable/home_sync.xml b/app/res/drawable/home_sync.xml
index 70c678e9c..072a233b7 100644
--- a/app/res/drawable/home_sync.xml
+++ b/app/res/drawable/home_sync.xml
@@ -8,6 +8,6 @@
         android:pathData="M72,47h156v138.67h-156z"/>
     <path
         android:pathData="M88.95,47.62C84.51,45.84 79.47,47.97 77.66,52.42C74,61.46 72,71.35 72,81.67C72,91.99 74,101.87 77.66,110.92C79.45,115.36 84.51,117.5 88.95,115.71C93.4,113.92 95.54,108.86 93.75,104.42C90.9,97.4 89.33,89.74 89.33,81.67C89.33,73.6 90.9,65.93 93.75,58.92C95.54,54.47 93.4,49.44 88.95,47.62ZM211.05,47.62C206.6,49.44 204.46,54.47 206.25,58.92C209.1,65.93 210.67,73.6 210.67,81.67C210.67,89.74 209.1,97.4 206.25,104.42C204.46,108.86 206.6,113.9 211.05,115.71C215.49,117.53 220.52,115.36 222.34,110.92C226,101.87 228,91.99 228,81.67C228,71.35 226,61.46 222.34,52.42C220.52,47.97 215.49,45.84 211.05,47.62ZM164.11,91.74C166.14,88.9 167.33,85.43 167.33,81.67C167.33,72.11 159.56,64.33 150,64.33C140.44,64.33 132.67,72.11 132.67,81.67C132.67,85.43 133.86,88.9 135.89,91.74L98.79,173.43C96.81,177.79 98.73,182.93 103.09,184.91C107.45,186.88 112.6,184.96 114.57,180.6L120.13,168.33H179.87L185.45,180.57C187.43,184.93 192.57,186.86 196.93,184.88C201.3,182.9 203.22,177.76 201.24,173.4L164.11,91.74ZM171.99,151H128.01L131.93,142.33H168.07L171.99,151ZM150,102.6L160.18,125H139.82L150,102.6ZM116.23,66.93C117.66,63.66 116.17,59.81 112.87,58.37C109.57,56.94 105.75,58.43 104.31,61.73C101.66,67.85 100.17,74.6 100.17,81.67C100.17,88.74 101.66,95.48 104.31,101.6C105.75,104.88 109.59,106.39 112.87,104.96C116.15,103.52 117.66,99.68 116.23,96.4C114.25,91.9 113.17,86.92 113.17,81.67C113.17,76.41 114.25,71.43 116.23,66.93ZM195.69,61.73C194.25,58.46 190.41,56.94 187.13,58.37C183.85,59.81 182.34,63.66 183.77,66.93C185.75,71.43 186.83,76.41 186.83,81.67C186.83,86.92 185.75,91.9 183.77,96.4C182.34,99.68 183.83,103.52 187.13,104.96C190.43,106.39 194.25,104.9 195.69,101.6C198.34,95.48 199.83,88.74 199.83,81.67C199.83,74.6 198.34,67.85 195.69,61.73V61.73Z"
-        android:fillColor="#ffffff"/>
+        android:fillColor="@color/square_button_icon_color"/>
   </group>
 </vector>
diff --git a/app/res/drawable/install_start.xml b/app/res/drawable/install_start.xml
index c7ec083bd..0e1a2a49f 100644
--- a/app/res/drawable/install_start.xml
+++ b/app/res/drawable/install_start.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="233">
   <path
       android:pathData="M160,48.67C160,43.32 155.68,39 150.33,39C144.99,39 140.67,43.32 140.67,48.67V121.98L118.49,99.81C114.72,96.03 108.58,96.03 104.81,99.81C101.03,103.58 101.03,109.72 104.81,113.49L143.48,152.16C147.25,155.94 153.38,155.94 157.16,152.16L195.83,113.49C199.6,109.72 199.6,103.58 195.83,99.81C192.05,96.03 185.92,96.03 182.14,99.81L160,121.98V48.67ZM92.33,145.33C81.67,145.33 73,154 73,164.67V174.33C73,185 81.67,193.67 92.33,193.67H208.33C219,193.67 227.67,185 227.67,174.33V164.67C227.67,154 219,145.33 208.33,145.33H177.67L163.99,159.02C156.43,166.57 144.2,166.57 136.65,159.02L123,145.33H92.33ZM203.5,162.25C205.42,162.25 207.27,163.01 208.63,164.37C209.99,165.73 210.75,167.58 210.75,169.5C210.75,171.42 209.99,173.27 208.63,174.63C207.27,175.99 205.42,176.75 203.5,176.75C201.58,176.75 199.73,175.99 198.37,174.63C197.01,173.27 196.25,171.42 196.25,169.5C196.25,167.58 197.01,165.73 198.37,164.37C199.73,163.01 201.58,162.25 203.5,162.25Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/install_stop.xml b/app/res/drawable/install_stop.xml
index 2ecbdb7fc..af188dfb8 100644
--- a/app/res/drawable/install_stop.xml
+++ b/app/res/drawable/install_stop.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="233">
   <path
       android:pathData="M218.18,105.06H220.95C225.29,105.06 228.78,101.57 228.78,97.23V55.48C228.78,52.32 226.89,49.45 223.95,48.24C221.02,47.04 217.66,47.69 215.41,49.94L201.84,63.51C173.27,35.29 127.24,35.39 98.83,63.83C70.29,92.37 70.29,138.63 98.83,167.17C127.37,195.71 173.63,195.71 202.16,167.17C206.24,163.09 206.24,156.47 202.16,152.39C198.09,148.31 191.47,148.31 187.39,152.39C167,172.78 133.96,172.78 113.58,152.39C93.19,132 93.19,98.96 113.58,78.58C133.87,58.29 166.65,58.19 187.06,78.25L173.66,91.69C171.41,93.94 170.76,97.3 171.96,100.24C173.17,103.17 176.04,105.06 179.2,105.06H218.18Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/startup_barcode.xml b/app/res/drawable/startup_barcode.xml
index ef36b92c8..ac3e33305 100644
--- a/app/res/drawable/startup_barcode.xml
+++ b/app/res/drawable/startup_barcode.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="233">
   <path
       android:pathData="M98.93,50.36C91.24,50.36 85,56.64 85,64.39V92.46C85,100.21 91.24,106.49 98.93,106.49H126.79C134.48,106.49 140.71,100.21 140.71,92.46V64.39C140.71,56.64 134.48,50.36 126.79,50.36H98.93ZM122.14,69.07V87.78H103.57V69.07H122.14ZM98.93,125.21C91.24,125.21 85,131.49 85,139.24V167.31C85,175.05 91.24,181.34 98.93,181.34H126.79C134.48,181.34 140.71,175.05 140.71,167.31V139.24C140.71,131.49 134.48,125.21 126.79,125.21H98.93ZM122.14,143.92V162.63H103.57V143.92H122.14ZM159.29,64.39V92.46C159.29,100.21 165.52,106.49 173.21,106.49H201.07C208.76,106.49 215,100.21 215,92.46V64.39C215,56.64 208.76,50.36 201.07,50.36H173.21C165.52,50.36 159.29,56.64 159.29,64.39ZM177.86,69.07H196.43V87.78H177.86V69.07ZM187.14,171.99V181.34H196.43V171.99H187.14ZM215,171.99H205.71V181.34H215V171.99ZM205.71,125.21V134.56H187.14V125.21H159.29V153.27V181.34H177.86V153.27H187.14V162.63H215V143.92V134.56V125.21H205.71Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/startup_url.xml b/app/res/drawable/startup_url.xml
index e35976d1a..9a0455280 100644
--- a/app/res/drawable/startup_url.xml
+++ b/app/res/drawable/startup_url.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="300.0"
     android:viewportHeight="232.5">
 
-    <path android:fillColor="#ffffff"
+    <path android:fillColor="@color/square_button_icon_color"
         android:pathData="M205.88,118.88C218.04,106.55 218.04,86.58 205.88,74.24C195.13,63.33 178.18,61.91 165.81,70.88L165.47,71.12C162.37,73.37 161.66,77.74 163.87,80.86C166.09,83.98 170.39,84.72 173.47,82.47L173.81,82.23C180.72,77.24 190.16,78.02 196.14,84.11C202.92,90.99 202.92,102.12 196.14,108.99L172.01,133.53C165.23,140.4 154.26,140.4 147.48,133.53C141.48,127.44 140.71,117.86 145.63,110.87L145.87,110.52C148.09,107.38 147.35,103.01 144.28,100.79C141.2,98.56 136.88,99.28 134.68,102.4L134.45,102.75C125.58,115.28 126.98,132.48 137.74,143.39C149.89,155.73 169.57,155.73 181.73,143.39L205.88,118.88ZM94.12,113.77C81.96,126.11 81.96,146.08 94.12,158.41C104.87,169.32 121.82,170.74 134.19,161.77L134.53,161.53C137.63,159.28 138.34,154.92 136.13,151.8C133.91,148.68 129.61,147.93 126.53,150.18L126.19,150.42C119.28,155.42 109.84,154.63 103.86,148.54C97.08,141.65 97.08,130.51 103.86,123.64L128,99.13C134.77,92.25 145.74,92.25 152.52,99.13C158.52,105.22 159.29,114.8 154.37,121.81L154.13,122.15C151.91,125.3 152.65,129.66 155.72,131.89C158.8,134.12 163.12,133.4 165.32,130.27L165.55,129.93C174.41,117.38 173.02,100.18 162.26,89.26C150.11,76.93 130.43,76.93 118.27,89.26L94.12,113.77Z"/>
 </vector>
diff --git a/app/res/drawable/wifi_direct_change_mode.xml b/app/res/drawable/wifi_direct_change_mode.xml
index d25b101c3..a735171ce 100644
--- a/app/res/drawable/wifi_direct_change_mode.xml
+++ b/app/res/drawable/wifi_direct_change_mode.xml
@@ -5,6 +5,6 @@
         android:width="512dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
 </vector>
diff --git a/app/res/drawable/wifi_direct_discover.xml b/app/res/drawable/wifi_direct_discover.xml
index 7b0038d48..2b6ba5b48 100644
--- a/app/res/drawable/wifi_direct_discover.xml
+++ b/app/res/drawable/wifi_direct_discover.xml
@@ -5,9 +5,9 @@
         android:width="512dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M34.6,39c-0.9,0 -1.8,-0.4 -2.4,-1l-8,-8C18,33.9 9.9,33 4.6,27.8c-3,-2.9 -4.6,-6.8 -4.6,-11c0,-4.2 1.6,-8.2 4.6,-11.2c2.9,-3 6.8,-4.6 11,-4.6c4.2,0 8.2,1.6 11.2,4.6c0,0 0,0 0,0C32,10.9 32.9,19 29,25.1l8,8c0.6,0.6 1,1.5 1,2.4c0,0.9 -0.4,1.7 -1,2.4C36.4,38.6 35.6,39 34.6,39C34.7,39 34.6,39 34.6,39zM24.3,27.7c0.3,0 0.5,0.1 0.7,0.3l8.6,8.6c0.3,0.3 0.7,0.5 1,0.4c0.4,0 0.7,-0.2 0.9,-0.4c0.3,-0.3 0.4,-0.7 0.4,-1.1c0,-0.3 -0.1,-0.6 -0.4,-0.9L27,26c-0.3,-0.3 -0.4,-0.9 -0.1,-1.3c3.9,-5.4 3.2,-12.9 -1.5,-17.7c-2.6,-2.6 -6,-4 -9.7,-4c0,0 0,0 0,0C12,3 8.6,4.4 6,7c-2.6,2.6 -4,6.1 -4,9.7c0,3.6 1.4,7 4,9.6c4.8,4.8 12.2,5.4 17.7,1.5C23.9,27.7 24.1,27.7 24.3,27.7z"/>
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M15.7,28.6c-6.6,0 -11.9,-5.3 -11.9,-11.9S9.1,4.8 15.7,4.8s11.9,5.3 11.9,11.9S22.2,28.6 15.7,28.6zM15.7,6.8c-5.5,0 -9.9,4.4 -9.9,9.9s4.4,9.9 9.9,9.9s9.9,-4.4 9.9,-9.9S21.1,6.8 15.7,6.8z"/>
 </vector>
diff --git a/app/res/drawable/wifi_direct_submit.xml b/app/res/drawable/wifi_direct_submit.xml
index ddd62c08c..22d10c7cc 100644
--- a/app/res/drawable/wifi_direct_submit.xml
+++ b/app/res/drawable/wifi_direct_submit.xml
@@ -5,9 +5,9 @@
         android:width="512dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M10,12 L6,12 6,6 2,6 8,0 14,6 10,6z"/>
     <path
-        android:fillColor="#FFF"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="m0,11 l0,5 16,0 0,-5 -2,0 0,3 -12,0 0,-3z"/>
 </vector>
diff --git a/app/res/drawable/wifi_direct_transfer.xml b/app/res/drawable/wifi_direct_transfer.xml
index 2e9f10d8a..376611cdf 100644
--- a/app/res/drawable/wifi_direct_transfer.xml
+++ b/app/res/drawable/wifi_direct_transfer.xml
@@ -5,6 +5,6 @@
         android:width="512dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M78.100006,84.400024c-1.8,0 -3.1,-1.4 -3.1,-3.1s1.4,-3.1 3.1,-3.1s3.1,1.4 3.1,3.1S79.899994,84.400024 78.100006,84.400024zM21.899994,84.400024c-1.8,0 -3.1,-1.4 -3.1,-3.1s1.4,-3.1 3.1,-3.1s3.1,1.4 3.1,3.1S23.600006,84.400024 21.899994,84.400024zM50,34.400024l0,9.4l-15.6,0c-3.1,0 -3.1,0 -3.1,3.1l0,6.2c0,3.1 0,3.1 3.1,3.1l15.6,0l0,9.4l17.2,-15.6L50,34.400024zM56.200012,31.200012l6.2,6.2l0,-15.6l31.2,0L93.60004,75l-31.2,0l0,-12.5l-6.2,6.2l0,15.6c0,3.1 0,3.1 3.1,3.1l37.5,0c3.1,0 3.1,0 3.1,-3.1l0,-68.8c0,-3.1 0,-3.1 -3.1,-3.1l-37.5,0c-3.1,0 -3.1,0 -3.1,3.1L56.200012,31.200012zM43.799988,37.5l0,-21.9c0,-3.1 0,-3.1 -3.1,-3.1l-37.5,0c-3.1,0 -3.1,0 -3.1,3.1l0,68.8c0,3.1 0,3.1 3.1,3.1l37.5,0c3.1,0 3.1,0 3.1,-3.1l0,-21.9l-6.2,0L37.599976,75l-31.2,0l0,-53.1l31.2,0l0,15.6L43.799988,37.5z"/>
 </vector>
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index 43b92f483..2b5413742 100644
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -148,6 +148,7 @@
     <color name="button_disabled">#d0e3ff</color>
     <color name="button_primary_color"> #3A42C7</color>
 
+    <!-- Square button colours -->
     <color name="start_home_button">#6AB849</color>
     <color name="start_save_button">#1B998B</color>
     <color name="start_sync_button">@color/cc_brand_color</color>
@@ -155,6 +156,8 @@
     <color name="start_logout_button">#373534</color>
     <color name="barcode_button_color">#3843D0</color>
     <color name="url_button_color">#8EA1FF</color>
+    <color name="square_button_icon_color">#FFFFFF</color>
+
 
     <!-- Progress bar colors -->
     <color name="progress_bar_bg">#66000000</color>
diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
index 40853542b..02fff7746 100644
--- a/app/res/values/styles.xml
+++ b/app/res/values/styles.xml
@@ -326,9 +326,9 @@
         </style>
     
     <style name="CustomButtonStyleOutline" parent="Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="shapeAppearanceOverlay">@style/RoundedButtonStyle</item>
+        <item name="shapeAppearanceOverlay">@style/OutlinedButtonShapeAppearanceStyle</item>
     </style>
-    <style name="RoundedButtonStyle" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="OutlinedButtonShapeAppearanceStyle" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:background">@drawable/button_background_white</item>
         <item name="cornerFamilyTopLeft">rounded</item>
         <item name="cornerFamilyBottomLeft">rounded</item>