diff --git a/TransactionMobile.Maui/AppShell.xaml b/TransactionMobile.Maui/AppShell.xaml
index 1ae4af7c..ed1df41c 100644
--- a/TransactionMobile.Maui/AppShell.xaml
+++ b/TransactionMobile.Maui/AppShell.xaml
@@ -16,37 +16,23 @@
 
     <TabBar Route="main">
 
-        <!--ShellContent ContentTemplate="{DataTemplate home:HomePage}" Title="Home"
-                       Icon="homebutton.svg" Route="home"/>
-
-        <ShellContent ContentTemplate="{DataTemplate transactions:TransactionsPage}" Title="Transactions"
-                      Route="transactions" Icon="transactionsbutton.svg" />
-
-        <ShellContent ContentTemplate="{DataTemplate reports:ReportsPage}" Title="Reports"
-                      Route="reports" Icon="reportbutton.svg"/>
-
-        <ShellContent ContentTemplate="{DataTemplate myaccount:MyAccountPage}" Title="My Account"
-                      Route="myaccount" Icon="profilebutton.svg"/>
-
-        <ShellContent ContentTemplate="{DataTemplate support:SupportPage}" Title="Support"
-                      Route="support" Icon="supportbutton.svg"/>-->
-
         <ShellContent ContentTemplate="{DataTemplate home:HomePage}" Title="Home"
-                       Route="home"/>
+                       Route="home" Icon="homebutton"/>
 
         <ShellContent ContentTemplate="{DataTemplate transactions:TransactionsPage}" Title="Transactions"
-                      Route="transactions" />
+                      Route="transactions" Icon="transactionsbutton"/>
 
         <ShellContent ContentTemplate="{DataTemplate reports:ReportsPage}" Title="Reports"
-                      Route="reports" />
+                      Route="reports" Icon="reportbutton"  />
 
         <ShellContent ContentTemplate="{DataTemplate myaccount:MyAccountPage}" Title="My Account"
-                      Route="myaccount" />
+                      Route="myaccount" Icon="profilebutton"/>
 
         <ShellContent ContentTemplate="{DataTemplate support:SupportPage}" Title="Support"
-                      Route="support" />
+                      Route="support" Icon="supportbutton" />
     </TabBar>
 
+
     <ShellItem Route="loginpage">
         <ShellContent ContentTemplate="{DataTemplate login:LoginPage}" />
     </ShellItem>
diff --git a/TransactionMobile.Maui/Pages/LoginPage.xaml b/TransactionMobile.Maui/Pages/LoginPage.xaml
index 57f69a14..11927399 100644
--- a/TransactionMobile.Maui/Pages/LoginPage.xaml
+++ b/TransactionMobile.Maui/Pages/LoginPage.xaml
@@ -9,7 +9,7 @@
         <!-- Main structure-->
         <VerticalStackLayout x:Name="MainLayout">
             <!--Main image-->
-            <Image Source="Resources/loginimage.jpg" VerticalOptions="Start" Aspect="AspectFit"/>
+            <Image Source="loginimage.jpg" VerticalOptions="Start" Aspect="AspectFit"/>
 
             <!-- Title-->
             <Label Text="Log In" FontSize="34" HorizontalOptions="Center" FontAttributes="Bold" Padding="20,0,0,20" 
diff --git a/TransactionMobile.Maui/Pages/Support/SupportPage.xaml b/TransactionMobile.Maui/Pages/Support/SupportPage.xaml
index 253b1510..c188c1e1 100644
--- a/TransactionMobile.Maui/Pages/Support/SupportPage.xaml
+++ b/TransactionMobile.Maui/Pages/Support/SupportPage.xaml
@@ -9,7 +9,7 @@
         <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
         
         <!--Main image-->
-        <Image Source="Resources/techsupport.jpg" VerticalOptions="Start" Aspect="AspectFit"/>
+        <Image Source="techsupport.jpg" VerticalOptions="Start" Aspect="AspectFit"/>
         
         
         <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" 
diff --git a/TransactionMobile.Maui/Resources/Images/homebutton.svg b/TransactionMobile.Maui/Resources/Images/homebutton.svg
index cba50cef..8352a8eb 100644
--- a/TransactionMobile.Maui/Resources/Images/homebutton.svg
+++ b/TransactionMobile.Maui/Resources/Images/homebutton.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Pro 6.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M575.8 255.5C575.8 273.5 560.8 287.6 543.8 287.6H511.8L512.5 447.7C512.5 450.5 512.3 453.1 512 455.8V472C512 494.1 494.1 512 472 512H456C454.9 512 453.8 511.1 452.7 511.9C451.3 511.1 449.9 512 448.5 512H392C369.9 512 352 494.1 352 472V384C352 366.3 337.7 352 320 352H256C238.3 352 224 366.3 224 384V472C224 494.1 206.1 512 184 512H128.1C126.6 512 125.1 511.9 123.6 511.8C122.4 511.9 121.2 512 120 512H104C81.91 512 64 494.1 64 472V360C64 359.1 64.03 358.1 64.09 357.2V287.6H32.05C14.02 287.6 0 273.5 0 255.5C0 246.5 3.004 238.5 10.01 231.5L266.4 8.016C273.4 1.002 281.4 0 288.4 0C295.4 0 303.4 2.004 309.5 7.014L564.8 231.5C572.8 238.5 576.9 246.5 575.8 255.5L575.8 255.5z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="28px" height="31px" viewBox="0 0 28 24" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 27.992188 11.976562 C 27.992188 12.820312 27.261719 13.480469 26.433594 13.480469 L 24.878906 13.480469 L 24.914062 20.984375 C 24.914062 21.117188 24.902344 21.238281 24.890625 21.367188 L 24.890625 22.125 C 24.890625 23.160156 24.019531 24 22.945312 24 L 22.167969 24 C 22.113281 24 22.058594 23.957031 22.007812 23.996094 C 21.9375 23.957031 21.871094 24 21.800781 24 L 19.054688 24 C 17.980469 24 17.109375 23.160156 17.109375 22.125 L 17.109375 18 C 17.109375 17.171875 16.414062 16.5 15.554688 16.5 L 12.445312 16.5 C 11.585938 16.5 10.890625 17.171875 10.890625 18 L 10.890625 22.125 C 10.890625 23.160156 10.019531 24 8.945312 24 L 6.226562 24 C 6.152344 24 6.082031 23.996094 6.007812 23.992188 C 5.949219 23.996094 5.890625 24 5.832031 24 L 5.054688 24 C 3.980469 24 3.109375 23.160156 3.109375 22.125 L 3.109375 16.875 C 3.109375 16.832031 3.113281 16.785156 3.117188 16.742188 L 3.117188 13.480469 L 1.558594 13.480469 C 0.679688 13.480469 0 12.820312 0 11.976562 C 0 11.554688 0.144531 11.179688 0.488281 10.851562 L 12.949219 0.375 C 13.289062 0.046875 13.679688 0 14.019531 0 C 14.359375 0 14.75 0.09375 15.046875 0.328125 L 27.457031 10.851562 C 27.84375 11.179688 28.042969 11.554688 27.992188 11.976562 Z M 27.992188 11.976562 "/>
+</g>
+</svg>
diff --git a/TransactionMobile.Maui/Resources/Images/profilebutton.svg b/TransactionMobile.Maui/Resources/Images/profilebutton.svg
index ca666ec2..14ccb2f4 100644
--- a/TransactionMobile.Maui/Resources/Images/profilebutton.svg
+++ b/TransactionMobile.Maui/Resources/Images/profilebutton.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M224 256c70.7 0 128-57.31 128-128s-57.3-128-128-128C153.3 0 96 57.31 96 128S153.3 256 224 256zM274.7 304H173.3C77.61 304 0 381.6 0 477.3c0 19.14 15.52 34.67 34.66 34.67h378.7C432.5 512 448 496.5 448 477.3C448 381.6 370.4 304 274.7 304z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="28px" height="31px" viewBox="0 0 28 32" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 14 16 C 18.417969 16 22 12.417969 22 8 C 22 3.582031 18.417969 0 14 0 C 9.582031 0 6 3.582031 6 8 C 6 12.417969 9.582031 16 14 16 Z M 17.167969 19 L 10.832031 19 C 4.851562 19 0 23.851562 0 29.832031 C 0 31.027344 0.96875 32 2.167969 32 L 25.835938 32 C 27.03125 32 28 31.03125 28 29.832031 C 28 23.851562 23.148438 19 17.167969 19 Z M 17.167969 19 "/>
+</g>
+</svg>
diff --git a/TransactionMobile.Maui/Resources/Images/reportbutton.svg b/TransactionMobile.Maui/Resources/Images/reportbutton.svg
index 8a9ef910..c32ba008 100644
--- a/TransactionMobile.Maui/Resources/Images/reportbutton.svg
+++ b/TransactionMobile.Maui/Resources/Images/reportbutton.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M32 32C49.67 32 64 46.33 64 64V400C64 408.8 71.16 416 80 416H480C497.7 416 512 430.3 512 448C512 465.7 497.7 480 480 480H80C35.82 480 0 444.2 0 400V64C0 46.33 14.33 32 32 32zM160 224C177.7 224 192 238.3 192 256V320C192 337.7 177.7 352 160 352C142.3 352 128 337.7 128 320V256C128 238.3 142.3 224 160 224zM288 320C288 337.7 273.7 352 256 352C238.3 352 224 337.7 224 320V160C224 142.3 238.3 128 256 128C273.7 128 288 142.3 288 160V320zM352 192C369.7 192 384 206.3 384 224V320C384 337.7 369.7 352 352 352C334.3 352 320 337.7 320 320V224C320 206.3 334.3 192 352 192zM480 320C480 337.7 465.7 352 448 352C430.3 352 416 337.7 416 320V96C416 78.33 430.3 64 448 64C465.7 64 480 78.33 480 96V320z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="28px" height="31px" viewBox="0 0 28 28" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 1.75 1.75 C 2.714844 1.75 3.5 2.535156 3.5 3.5 L 3.5 21.875 C 3.5 22.355469 3.890625 22.75 4.375 22.75 L 26.25 22.75 C 27.21875 22.75 28 23.53125 28 24.5 C 28 25.46875 27.21875 26.25 26.25 26.25 L 4.375 26.25 C 1.957031 26.25 0 24.292969 0 21.875 L 0 3.5 C 0 2.535156 0.785156 1.75 1.75 1.75 Z M 8.75 12.25 C 9.71875 12.25 10.5 13.03125 10.5 14 L 10.5 17.5 C 10.5 18.46875 9.71875 19.25 8.75 19.25 C 7.78125 19.25 7 18.46875 7 17.5 L 7 14 C 7 13.03125 7.78125 12.25 8.75 12.25 Z M 15.75 17.5 C 15.75 18.46875 14.96875 19.25 14 19.25 C 13.03125 19.25 12.25 18.46875 12.25 17.5 L 12.25 8.75 C 12.25 7.78125 13.03125 7 14 7 C 14.96875 7 15.75 7.78125 15.75 8.75 Z M 19.25 10.5 C 20.21875 10.5 21 11.28125 21 12.25 L 21 17.5 C 21 18.46875 20.21875 19.25 19.25 19.25 C 18.28125 19.25 17.5 18.46875 17.5 17.5 L 17.5 12.25 C 17.5 11.28125 18.28125 10.5 19.25 10.5 Z M 26.25 17.5 C 26.25 18.46875 25.46875 19.25 24.5 19.25 C 23.53125 19.25 22.75 18.46875 22.75 17.5 L 22.75 5.25 C 22.75 4.285156 23.53125 3.5 24.5 3.5 C 25.46875 3.5 26.25 4.285156 26.25 5.25 Z M 26.25 17.5 "/>
+</g>
+</svg>
diff --git a/TransactionMobile.Maui/Resources/Images/supportbutton.svg b/TransactionMobile.Maui/Resources/Images/supportbutton.svg
index 613c567a..8c1a7082 100644
--- a/TransactionMobile.Maui/Resources/Images/supportbutton.svg
+++ b/TransactionMobile.Maui/Resources/Images/supportbutton.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M256 0C114.6 0 0 114.6 0 256s114.6 256 256 256s256-114.6 256-256S397.4 0 256 0zM256 128c17.67 0 32 14.33 32 32c0 17.67-14.33 32-32 32S224 177.7 224 160C224 142.3 238.3 128 256 128zM296 384h-80C202.8 384 192 373.3 192 360s10.75-24 24-24h16v-64H224c-13.25 0-24-10.75-24-24S210.8 224 224 224h32c13.25 0 24 10.75 24 24v88h16c13.25 0 24 10.75 24 24S309.3 384 296 384z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="28px" height="31px" viewBox="0 0 28 28" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 14 0 C 6.265625 0 0 6.265625 0 14 C 0 21.734375 6.265625 28 14 28 C 21.734375 28 28 21.734375 28 14 C 28 6.265625 21.734375 0 14 0 Z M 14 7 C 14.964844 7 15.75 7.785156 15.75 8.75 C 15.75 9.714844 14.964844 10.5 14 10.5 C 13.035156 10.5 12.25 9.71875 12.25 8.75 C 12.25 7.78125 13.03125 7 14 7 Z M 16.1875 21 L 11.8125 21 C 11.089844 21 10.5 20.414062 10.5 19.6875 C 10.5 18.960938 11.085938 18.375 11.8125 18.375 L 12.6875 18.375 L 12.6875 14.875 L 12.25 14.875 C 11.523438 14.875 10.9375 14.289062 10.9375 13.5625 C 10.9375 12.835938 11.527344 12.25 12.25 12.25 L 14 12.25 C 14.726562 12.25 15.3125 12.835938 15.3125 13.5625 L 15.3125 18.375 L 16.1875 18.375 C 16.914062 18.375 17.5 18.960938 17.5 19.6875 C 17.5 20.414062 16.914062 21 16.1875 21 Z M 16.1875 21 "/>
+</g>
+</svg>
diff --git a/TransactionMobile.Maui/Resources/Images/transactionsbutton.svg b/TransactionMobile.Maui/Resources/Images/transactionsbutton.svg
index 79b76020..67e954b2 100644
--- a/TransactionMobile.Maui/Resources/Images/transactionsbutton.svg
+++ b/TransactionMobile.Maui/Resources/Images/transactionsbutton.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M288 0C305.7 0 320 14.33 320 32V96C320 113.7 305.7 128 288 128H208V160H424.1C456.6 160 483.5 183.1 488.2 214.4L510.9 364.1C511.6 368.8 512 373.6 512 378.4V448C512 483.3 483.3 512 448 512H64C28.65 512 0 483.3 0 448V378.4C0 373.6 .3622 368.8 1.083 364.1L23.76 214.4C28.5 183.1 55.39 160 87.03 160H143.1V128H63.1C46.33 128 31.1 113.7 31.1 96V32C31.1 14.33 46.33 0 63.1 0L288 0zM96 48C87.16 48 80 55.16 80 64C80 72.84 87.16 80 96 80H256C264.8 80 272 72.84 272 64C272 55.16 264.8 48 256 48H96zM80 448H432C440.8 448 448 440.8 448 432C448 423.2 440.8 416 432 416H80C71.16 416 64 423.2 64 432C64 440.8 71.16 448 80 448zM112 216C98.75 216 88 226.7 88 240C88 253.3 98.75 264 112 264C125.3 264 136 253.3 136 240C136 226.7 125.3 216 112 216zM208 264C221.3 264 232 253.3 232 240C232 226.7 221.3 216 208 216C194.7 216 184 226.7 184 240C184 253.3 194.7 264 208 264zM160 296C146.7 296 136 306.7 136 320C136 333.3 146.7 344 160 344C173.3 344 184 333.3 184 320C184 306.7 173.3 296 160 296zM304 264C317.3 264 328 253.3 328 240C328 226.7 317.3 216 304 216C290.7 216 280 226.7 280 240C280 253.3 290.7 264 304 264zM256 296C242.7 296 232 306.7 232 320C232 333.3 242.7 344 256 344C269.3 344 280 333.3 280 320C280 306.7 269.3 296 256 296zM400 264C413.3 264 424 253.3 424 240C424 226.7 413.3 216 400 216C386.7 216 376 226.7 376 240C376 253.3 386.7 264 400 264zM352 296C338.7 296 328 306.7 328 320C328 333.3 338.7 344 352 344C365.3 344 376 333.3 376 320C376 306.7 365.3 296 352 296z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="28px" height="31px" viewBox="0 0 28 28" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 15.75 0 C 16.71875 0 17.5 0.785156 17.5 1.75 L 17.5 5.25 C 17.5 6.21875 16.71875 7 15.75 7 L 11.375 7 L 11.375 8.75 L 23.191406 8.75 C 24.96875 8.75 26.441406 10.011719 26.699219 11.726562 L 27.941406 19.910156 C 27.976562 20.167969 28 20.429688 28 20.695312 L 28 24.5 C 28 26.429688 26.429688 28 24.5 28 L 3.5 28 C 1.566406 28 0 26.429688 0 24.5 L 0 20.695312 C 0 20.429688 0.0195312 20.167969 0.0585938 19.910156 L 1.300781 11.726562 C 1.558594 10.011719 3.027344 8.75 4.757812 8.75 L 7.824219 8.75 L 7.824219 7 L 3.449219 7 C 2.535156 7 1.699219 6.21875 1.699219 5.25 L 1.699219 1.75 C 1.699219 0.785156 2.535156 0 3.449219 0 Z M 5.25 2.625 C 4.765625 2.625 4.375 3.015625 4.375 3.5 C 4.375 3.984375 4.765625 4.375 5.25 4.375 L 14 4.375 C 14.480469 4.375 14.875 3.984375 14.875 3.5 C 14.875 3.015625 14.480469 2.625 14 2.625 Z M 4.375 24.5 L 23.625 24.5 C 24.105469 24.5 24.5 24.105469 24.5 23.625 C 24.5 23.144531 24.105469 22.75 23.625 22.75 L 4.375 22.75 C 3.890625 22.75 3.5 23.144531 3.5 23.625 C 3.5 24.105469 3.890625 24.5 4.375 24.5 Z M 6.125 11.8125 C 5.398438 11.8125 4.8125 12.398438 4.8125 13.125 C 4.8125 13.851562 5.398438 14.4375 6.125 14.4375 C 6.851562 14.4375 7.4375 13.851562 7.4375 13.125 C 7.4375 12.398438 6.851562 11.8125 6.125 11.8125 Z M 11.375 14.4375 C 12.101562 14.4375 12.6875 13.851562 12.6875 13.125 C 12.6875 12.398438 12.101562 11.8125 11.375 11.8125 C 10.648438 11.8125 10.0625 12.398438 10.0625 13.125 C 10.0625 13.851562 10.648438 14.4375 11.375 14.4375 Z M 8.75 16.1875 C 8.023438 16.1875 7.4375 16.773438 7.4375 17.5 C 7.4375 18.226562 8.023438 18.8125 8.75 18.8125 C 9.476562 18.8125 10.0625 18.226562 10.0625 17.5 C 10.0625 16.773438 9.476562 16.1875 8.75 16.1875 Z M 16.625 14.4375 C 17.351562 14.4375 17.9375 13.851562 17.9375 13.125 C 17.9375 12.398438 17.351562 11.8125 16.625 11.8125 C 15.898438 11.8125 15.3125 12.398438 15.3125 13.125 C 15.3125 13.851562 15.898438 14.4375 16.625 14.4375 Z M 14 16.1875 C 13.273438 16.1875 12.6875 16.773438 12.6875 17.5 C 12.6875 18.226562 13.273438 18.8125 14 18.8125 C 14.726562 18.8125 15.3125 18.226562 15.3125 17.5 C 15.3125 16.773438 14.726562 16.1875 14 16.1875 Z M 21.875 14.4375 C 22.601562 14.4375 23.1875 13.851562 23.1875 13.125 C 23.1875 12.398438 22.601562 11.8125 21.875 11.8125 C 21.148438 11.8125 20.5625 12.398438 20.5625 13.125 C 20.5625 13.851562 21.148438 14.4375 21.875 14.4375 Z M 19.25 16.1875 C 18.523438 16.1875 17.9375 16.773438 17.9375 17.5 C 17.9375 18.226562 18.523438 18.8125 19.25 18.8125 C 19.976562 18.8125 20.5625 18.226562 20.5625 17.5 C 20.5625 16.773438 19.976562 16.1875 19.25 16.1875 Z M 19.25 16.1875 "/>
+</g>
+</svg>