diff --git a/TransactionProcessor.Mobile.BusinessLogic.Tests/DatabaseTests/DatabaseContextTests.cs b/TransactionProcessor.Mobile.BusinessLogic.Tests/DatabaseTests/DatabaseContextTests.cs
new file mode 100644
index 000000000..ff3d2cf45
--- /dev/null
+++ b/TransactionProcessor.Mobile.BusinessLogic.Tests/DatabaseTests/DatabaseContextTests.cs
@@ -0,0 +1,36 @@
+using TransactionProcessor.Mobile.BusinessLogic.Database;
+using Shouldly;
+
+namespace TransactionProcessor.Mobile.BusinessLogic.Tests.DatabaseTests;
+
+public class DatabaseContextTests
+{
+    [Fact]
+    public async Task DatabaseContext_SaveApplicationOption_OptionCanBeReadBack()
+    {
+        Func<LogLevel> logLevelFunc = () => LogLevel.Debug;
+        IDatabaseContext databaseContext = new DatabaseContext(":memory:", logLevelFunc);
+
+        await databaseContext.InitialiseDatabase();
+        await databaseContext.SaveApplicationOption("DarkThemeEnabled", "True");
+
+        String? optionValue = await databaseContext.GetApplicationOption("DarkThemeEnabled");
+
+        optionValue.ShouldBe("True");
+    }
+
+    [Fact]
+    public async Task DatabaseContext_SaveApplicationOption_ExistingValueIsUpdated()
+    {
+        Func<LogLevel> logLevelFunc = () => LogLevel.Debug;
+        IDatabaseContext databaseContext = new DatabaseContext(":memory:", logLevelFunc);
+
+        await databaseContext.InitialiseDatabase();
+        await databaseContext.SaveApplicationOption("DarkThemeEnabled", "True");
+        await databaseContext.SaveApplicationOption("DarkThemeEnabled", "False");
+
+        String? optionValue = await databaseContext.GetApplicationOption("DarkThemeEnabled");
+
+        optionValue.ShouldBe("False");
+    }
+}
diff --git a/TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/MyAccount/MyAccountPageViewModelTests.cs b/TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/MyAccount/MyAccountPageViewModelTests.cs
index 4f1f829be..705958529 100644
--- a/TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/MyAccount/MyAccountPageViewModelTests.cs
+++ b/TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/MyAccount/MyAccountPageViewModelTests.cs
@@ -25,6 +25,7 @@ public class MyAccountPageViewModelTests
     private readonly Mock<IDialogService> DialogService;
 
     private readonly Mock<IMediator> Mediator;
+    private readonly Mock<IApplicationThemeService> ApplicationThemeService;
 
     private readonly MyAccountPageViewModel ViewModel;
 
@@ -37,24 +38,35 @@ public MyAccountPageViewModelTests() {
         this.DialogService = new Mock<IDialogService>();
         this.DeviceService = new Mock<IDeviceService>();
         this.Mediator = new Mock<IMediator>();
+        this.ApplicationThemeService = new Mock<IApplicationThemeService>();
         this.ViewModel = new MyAccountPageViewModel(this.NavigationService.Object, this.ApplicationCache.Object,
-                                                                      this.DialogService.Object, this.DeviceService.Object,
-                                                                      this.Mediator.Object,
-                                                                      this.NavigationParameterService.Object);
+                                                                       this.DialogService.Object, this.DeviceService.Object,
+                                                                       this.ApplicationThemeService.Object,
+                                                                       this.Mediator.Object,
+                                                                       this.NavigationParameterService.Object);
     }
 
     [Fact]
     public async Task MyAccountPageViewModel_Initialise_IsInitialised() {
-        
+        this.ApplicationThemeService.Setup(s => s.GetDarkThemeEnabled()).ReturnsAsync(true);
         this.Mediator.Setup(m => m.Send(It.IsAny<GetMerchantDetailsRequest>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success( TestData.MerchantDetailsModel));
 
         await this.ViewModel.Initialise(CancellationToken.None);
 
         this.ViewModel.MerchantName.ShouldBe(TestData.MerchantDetailsModel.MerchantName);
         this.ViewModel.LastLogin.ShouldBe(DateTime.Now, TimeSpan.FromSeconds(30));
+        this.ViewModel.IsDarkThemeEnabled.ShouldBeTrue();
         this.ApplicationCache.Verify(a => a.SetMerchantDetails(It.IsAny<MerchantDetailsModel>(), It.IsAny<MemoryCacheEntryOptions>()), Times.Once);
     }
 
+    [Fact]
+    public async Task MyAccountPageViewModel_SetDarkTheme_ThemeStoredAndPropertyUpdated() {
+        await this.ViewModel.SetDarkTheme(true);
+
+        this.ViewModel.IsDarkThemeEnabled.ShouldBeTrue();
+        this.ApplicationThemeService.Verify(s => s.SetDarkTheme(true), Times.Once);
+    }
+
     [Fact]
     public void MyAccountPageViewModel_OptionSelectedCommand_AccountInfo_Execute_IsExecuted() {
         this.ViewModel.OptionSelectedCommand.Execute(this.CreateItemSelected(MyAccountPageViewModel.AccountOptions.AccountInfo));
@@ -117,4 +129,4 @@ private ItemSelected<ListViewItem> CreateItemSelected(MyAccountPageViewModel.Acc
     }
 
     #endregion
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/Reports/ReportsPageViewModelTests.cs b/TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/Reports/ReportsPageViewModelTests.cs
index d6f8a5907..5cedf829d 100644
--- a/TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/Reports/ReportsPageViewModelTests.cs
+++ b/TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/Reports/ReportsPageViewModelTests.cs
@@ -89,7 +89,6 @@ public class ReportsSalesAnalysisPageViewModelTests{
         private readonly Mock<IApplicationCache> ApplicationCache;
         private readonly Mock<IDialogService> DialogService;
         private readonly Mock<IDeviceService> DeviceService;
-        private readonly Mock<IMediator> Mediator;
 
         public ReportsSalesAnalysisPageViewModelTests(){
             this.NavigationService = new Mock<INavigationService>();
@@ -97,13 +96,11 @@ public ReportsSalesAnalysisPageViewModelTests(){
             this.ApplicationCache = new Mock<IApplicationCache>();
             this.DialogService = new Mock<IDialogService>();
             this.DeviceService = new Mock<IDeviceService>();
-            this.Mediator = new Mock<IMediator>();
 
             this.ViewModel = new ReportsSalesAnalysisPageViewModel(this.NavigationService.Object,
                                                                    this.ApplicationCache.Object,
                                                                    this.DialogService.Object,
                                                                    this.DeviceService.Object,
-                                                                   this.Mediator.Object,
                                                                    this.NavigationParameterService.Object);
         }
 
@@ -124,6 +121,15 @@ public async Task ReportsSalesAnalysisPageViewModel_ComparisonDatePickerSelected
             this.ViewModel.SalesAnalysisList.Count.ShouldBe(2);
         }
 
+        [Fact]
+        public void ReportsSalesAnalysisPageViewModel_ComparisonDatePickerSelectedIndexChangedCommand_WithoutSelectedItem_ReturnsEmptyList()
+        {
+            this.ViewModel.ComparisonDatePickerSelectedIndexChangedCommand.Execute(null);
+
+            this.ViewModel.SalesAnalysisList.ShouldNotBeNull();
+            this.ViewModel.SalesAnalysisList.ShouldBeEmpty();
+        }
+
         [Fact]
         public async Task ReportsSalesAnalysisPageViewModel_BackButtonCommand_HomePageIsShown()
         {
@@ -141,7 +147,6 @@ public class ReportsBalanceAnalysisPageViewModelTests
         private Mock<IApplicationCache> ApplicationCache;
         private Mock<IDialogService> DialogService;
         private readonly Mock<IDeviceService> DeviceService;
-        private Mock<IMediator> Mediator;
 
         public ReportsBalanceAnalysisPageViewModelTests()
         {
@@ -150,13 +155,11 @@ public ReportsBalanceAnalysisPageViewModelTests()
             this.ApplicationCache = new Mock<IApplicationCache>();
             this.DialogService = new Mock<IDialogService>();
             this.DeviceService = new Mock<IDeviceService>();
-            this.Mediator = new Mock<IMediator>();
 
             this.ViewModel = new ReportsBalanceAnalysisPageViewModel(this.NavigationService.Object,
                                                                      this.ApplicationCache.Object,
                                                                      this.DialogService.Object,
                                                                      this.DeviceService.Object,
-                                                                     this.Mediator.Object,
                                                                      this.NavigationParameterService.Object);
         }
 
diff --git a/TransactionProcessor.Mobile.BusinessLogic/Database/ApplicationOption.cs b/TransactionProcessor.Mobile.BusinessLogic/Database/ApplicationOption.cs
new file mode 100644
index 000000000..ea6bdc013
--- /dev/null
+++ b/TransactionProcessor.Mobile.BusinessLogic/Database/ApplicationOption.cs
@@ -0,0 +1,14 @@
+using System.Diagnostics.CodeAnalysis;
+using SQLite;
+
+namespace TransactionProcessor.Mobile.BusinessLogic.Database
+{
+    [ExcludeFromCodeCoverage]
+    public class ApplicationOption
+    {
+        [PrimaryKey]
+        public String OptionName { get; set; } = String.Empty;
+
+        public String OptionValue { get; set; } = String.Empty;
+    }
+}
diff --git a/TransactionProcessor.Mobile.BusinessLogic/Database/DatabaseContext.cs b/TransactionProcessor.Mobile.BusinessLogic/Database/DatabaseContext.cs
index 8018d16d0..f656faaf1 100644
--- a/TransactionProcessor.Mobile.BusinessLogic/Database/DatabaseContext.cs
+++ b/TransactionProcessor.Mobile.BusinessLogic/Database/DatabaseContext.cs
@@ -38,6 +38,12 @@ public async Task<Int64> CreateTransaction(TransactionRecord transactionRecord)
             return SQLite3.LastInsertRowid(this.Connection.Handle);
         }
 
+        public Task<String?> GetApplicationOption(String optionName) {
+            ApplicationOption option = this.Connection.Find<ApplicationOption>(optionName);
+
+            return Task.FromResult(option?.OptionValue);
+        }
+
         public async Task<List<LogMessage>> GetLogMessages(Int32 batchSize, Boolean isTrainingMode) {
             if (this.Connection == null)
                 return new List<LogMessage>();
@@ -55,6 +61,7 @@ public async Task<List<TransactionRecord>> GetTransactions(Boolean isTrainingMod
         }
         
         public async Task InitialiseDatabase() {
+            this.Connection.CreateTable<ApplicationOption>();
             this.Connection.CreateTable<TransactionRecord>();
             this.Connection.CreateTable<LogMessage>();
         }
@@ -83,10 +90,20 @@ public async Task RemoveUploadedMessages(List<LogMessage> logMessagesToRemove) {
             }
         }
 
+        public Task SaveApplicationOption(String optionName,
+                                         String optionValue) {
+            this.Connection.InsertOrReplace(new ApplicationOption {
+                                                                  OptionName = optionName,
+                                                                  OptionValue = optionValue
+                                                              });
+
+            return Task.CompletedTask;
+        }
+
         public async Task UpdateTransaction(TransactionRecord transactionRecord) {
             this.Connection.Update(transactionRecord);
         }
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile.BusinessLogic/Database/IDatabaseContext.cs b/TransactionProcessor.Mobile.BusinessLogic/Database/IDatabaseContext.cs
index 02590fbc7..9a432fb3c 100644
--- a/TransactionProcessor.Mobile.BusinessLogic/Database/IDatabaseContext.cs
+++ b/TransactionProcessor.Mobile.BusinessLogic/Database/IDatabaseContext.cs
@@ -4,6 +4,10 @@ public interface IDatabaseContext
     {
         Task InitialiseDatabase();
 
+        Task<String?> GetApplicationOption(String optionName);
+
+        Task SaveApplicationOption(String optionName, String optionValue);
+
         Task<Int64> CreateTransaction(TransactionRecord transactionRecord);
 
         Task UpdateTransaction(TransactionRecord transactionRecord);
diff --git a/TransactionProcessor.Mobile.BusinessLogic/UIServices/IApplicationThemeService.cs b/TransactionProcessor.Mobile.BusinessLogic/UIServices/IApplicationThemeService.cs
new file mode 100644
index 000000000..588c83591
--- /dev/null
+++ b/TransactionProcessor.Mobile.BusinessLogic/UIServices/IApplicationThemeService.cs
@@ -0,0 +1,10 @@
+namespace TransactionProcessor.Mobile.BusinessLogic.UIServices;
+
+public interface IApplicationThemeService
+{
+    Task ApplyConfiguredTheme();
+
+    Task<Boolean> GetDarkThemeEnabled();
+
+    Task SetDarkTheme(Boolean isEnabled);
+}
diff --git a/TransactionProcessor.Mobile.BusinessLogic/ViewModels/MyAccount/MyAccountPageViewModel.cs b/TransactionProcessor.Mobile.BusinessLogic/ViewModels/MyAccount/MyAccountPageViewModel.cs
index 65128398a..cf5a1d405 100644
--- a/TransactionProcessor.Mobile.BusinessLogic/ViewModels/MyAccount/MyAccountPageViewModel.cs
+++ b/TransactionProcessor.Mobile.BusinessLogic/ViewModels/MyAccount/MyAccountPageViewModel.cs
@@ -21,8 +21,10 @@ public partial class MyAccountPageViewModel : ExtendedBaseViewModel
         private DateTime lastLogin;
 
         private readonly IMediator Mediator;
+        private readonly IApplicationThemeService ApplicationThemeService;
 
         private String merchantName;
+        private Boolean isDarkThemeEnabled;
 
         #endregion
 
@@ -32,8 +34,10 @@ public MyAccountPageViewModel(INavigationService navigationService,
                                       IApplicationCache applicationCache,
                                       IDialogService dialogService,
                                       IDeviceService deviceService,
+                                      IApplicationThemeService applicationThemeService,
                                       IMediator mediator,
                                       INavigationParameterService navigationParameterService) : base(applicationCache, dialogService, navigationService, deviceService,navigationParameterService) {
+            this.ApplicationThemeService = applicationThemeService;
             this.Mediator = mediator;
             this.Title = "My Account";
         }
@@ -47,6 +51,11 @@ public DateTime LastLogin {
             set => this.SetProperty(ref this.lastLogin, value);
         }
 
+        public Boolean IsDarkThemeEnabled {
+            get => this.isDarkThemeEnabled;
+            set => this.SetProperty(ref this.isDarkThemeEnabled, value);
+        }
+
         public String MerchantName {
             get => this.merchantName;
             set => this.SetProperty(ref this.merchantName, value);
@@ -93,6 +102,13 @@ public async Task Initialise(CancellationToken cancellationToken) {
             this.ApplicationCache.SetMerchantDetails(merchantDetailsResult.Data, cacheEntryOptions);
 
             this.LastLogin = DateTime.Now; // TODO: might cache this in the application
+            this.IsDarkThemeEnabled = await this.ApplicationThemeService.GetDarkThemeEnabled();
+        }
+
+        public async Task SetDarkTheme(Boolean isEnabled) {
+            this.IsDarkThemeEnabled = isEnabled;
+
+            await this.ApplicationThemeService.SetDarkTheme(isEnabled);
         }
 
         private async Task LogoutCommandExecute() {
@@ -136,4 +152,4 @@ public enum AccountOptions
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile.BusinessLogic/ViewModels/Reports/ReportsSalesAnalysisPageViewModel.cs b/TransactionProcessor.Mobile.BusinessLogic/ViewModels/Reports/ReportsSalesAnalysisPageViewModel.cs
index 8997a1fcb..b08b9a8d4 100644
--- a/TransactionProcessor.Mobile.BusinessLogic/ViewModels/Reports/ReportsSalesAnalysisPageViewModel.cs
+++ b/TransactionProcessor.Mobile.BusinessLogic/ViewModels/Reports/ReportsSalesAnalysisPageViewModel.cs
@@ -4,7 +4,6 @@
 using LiveChartsCore.Kernel.Sketches;
 using LiveChartsCore.Measure;
 using LiveChartsCore.SkiaSharpView;
-using MediatR;
 using System.Diagnostics.CodeAnalysis;
 using TransactionProcessor.Mobile.BusinessLogic.Common;
 using TransactionProcessor.Mobile.BusinessLogic.Services;
@@ -14,15 +13,12 @@ namespace TransactionProcessor.Mobile.BusinessLogic.ViewModels.Reports;
 
 public partial class ReportsSalesAnalysisPageViewModel : ExtendedBaseViewModel
 {
-
-    private readonly IMediator Mediator;
     public ReportsSalesAnalysisPageViewModel(INavigationService navigationService,
                                              IApplicationCache applicationCache,
                                              IDialogService dialogService,
                                              IDeviceService deviceService,
-                                             IMediator mediator, INavigationParameterService navigationParameterService) : base(applicationCache, dialogService, navigationService, deviceService, navigationParameterService)
+                                             INavigationParameterService navigationParameterService) : base(applicationCache, dialogService, navigationService, deviceService, navigationParameterService)
     {
-        this.Mediator = mediator;
         this.Title = "Sales Analysis";
     }
 
@@ -34,6 +30,12 @@ private async Task ComparisonDatePickerSelectedIndexChanged()
 
     private async Task GetApiData()
     {
+        if (this.SelectedItem is null)
+        {
+            this.SalesAnalysisList = new List<SalesAnalysis>();
+            return;
+        }
+
         // TODO: Initial api call to get data would be done here
         List<SalesAnalysis> salesAnalysisList = new List<SalesAnalysis>();
         salesAnalysisList.Add(new SalesAnalysis("100.00 KES", "90.00 KES", "10%", "Sales Value", "Today's Sales", this.SelectedItem.DisplayText, "Variance:", "salesvalue.png"));
@@ -84,21 +86,25 @@ public record ComparisonDate(DateTime DateTime, String DisplayText);
 [ExcludeFromCodeCoverage]
 public record SalesAnalysis(String TodaysValue, String ComparisonValue, String VarianceValue, String MainTitle, String TodaysTitle, String ComparisonTitle, String VarianceTitle, String Icon);
 
-public class ReportsBalanceAnalysisPageViewModel : ExtendedBaseViewModel{
-    private readonly IMediator Mediator;
+public class ReportsBalanceAnalysisPageViewModel : ExtendedBaseViewModel
+{
+    private TooltipPosition tooltipPosition;
+    private List<ICartesianAxis> yAxes;
+    private List<ICartesianAxis> xAxes;
+    private ISeries[] series;
+    private TooltipFindingStrategy tooltipFindingStrategy;
     
     public ReportsBalanceAnalysisPageViewModel(INavigationService navigationService,
                                                IApplicationCache applicationCache,
                                                IDialogService dialogService,
                                                IDeviceService deviceService,
-                                               IMediator mediator,
-                                               INavigationParameterService navigationParameterService) : base(applicationCache, dialogService, navigationService, deviceService, navigationParameterService, Orientation.Landscape)
+                                               INavigationParameterService navigationParameterService) : base(applicationCache, dialogService, navigationService, deviceService, navigationParameterService)
     {
-        this.Mediator = mediator;
         this.Title = "Balance Analysis";
     }
 
-    public async Task Initialise(CancellationToken cancellationToken){
+    public override async Task Initialise(CancellationToken cancellationToken)
+    {
         await base.Initialise(cancellationToken);
 
         DateTimeAxis axis1 = new DateTimeAxis(TimeSpan.FromDays(1), (d) => d.ToString("dd/MM/yyyy"));
@@ -134,15 +140,35 @@ public async Task Initialise(CancellationToken cancellationToken){
                                          };
     }
 
-    public TooltipPosition TooltipPosition{ get; set; }
+    public TooltipPosition TooltipPosition
+    {
+        get => this.tooltipPosition;
+        set => this.SetProperty(ref this.tooltipPosition, value);
+    }
 
-    public List<ICartesianAxis> YAxes{ get; set; }
+    public List<ICartesianAxis> YAxes
+    {
+        get => this.yAxes;
+        set => this.SetProperty(ref this.yAxes, value);
+    }
 
-    public List<ICartesianAxis> XAxes{ get; set; }
+    public List<ICartesianAxis> XAxes
+    {
+        get => this.xAxes;
+        set => this.SetProperty(ref this.xAxes, value);
+    }
 
-    public ISeries[] Series { get; set; }
+    public ISeries[] Series
+    {
+        get => this.series;
+        set => this.SetProperty(ref this.series, value);
+    }
 
-    public TooltipFindingStrategy TooltipFindingStrategy { get; set; }
+    public TooltipFindingStrategy TooltipFindingStrategy
+    {
+        get => this.tooltipFindingStrategy;
+        set => this.SetProperty(ref this.tooltipFindingStrategy, value);
+    }
 
 
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile.UITests/Common/DockerHelper.cs b/TransactionProcessor.Mobile.UITests/Common/DockerHelper.cs
index bff23fd3e..5eeb324ea 100644
--- a/TransactionProcessor.Mobile.UITests/Common/DockerHelper.cs
+++ b/TransactionProcessor.Mobile.UITests/Common/DockerHelper.cs
@@ -124,8 +124,11 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do
             this.Trace(this.LocalIPAddress);
 
             await base.StartContainersForScenarioRun(scenarioName, dockerServices);
-            var c = await this.StartContainer2(this.SetupConfigHostContainer,this.TestNetworks, (DockerServices)512);
-            this.ConfigHostPort = c.GetMappedPublicPort(ConfigHostDockerPort);
+
+            var c = this.Containers.SingleOrDefault(c => c.Item1 == DockerServices.ConfigurationHost);
+
+            //var c = await this.StartContainer2(this.SetupConfigHostContainer,this.TestNetworks, DockerServices.ConfigurationHost);
+            this.ConfigHostPort = c.Item2.GetMappedPublicPort(ConfigHostDockerPort);
 
             // Setup the base address resolvers
 
diff --git a/TransactionProcessor.Mobile.UITests/Common/GenericSteps.cs b/TransactionProcessor.Mobile.UITests/Common/GenericSteps.cs
index bce0dce10..a2bc83eb8 100644
--- a/TransactionProcessor.Mobile.UITests/Common/GenericSteps.cs
+++ b/TransactionProcessor.Mobile.UITests/Common/GenericSteps.cs
@@ -36,7 +36,7 @@ public async Task StartSystem(){
             DockerServices dockerServices = DockerServices.EventStore |
                                             DockerServices.MessagingService | DockerServices.SecurityService |
                                             DockerServices.TestHost | DockerServices.SqlServer | DockerServices.TransactionProcessor |
-                                            DockerServices.TransactionProcessorAcl | (DockerServices)512;
+                                            DockerServices.TransactionProcessorAcl | DockerServices.ConfigurationHost;
 
             //dockerServices = DockerServices.EventStore | DockerServices.SqlServer | (DockerServices)512;
 
diff --git a/TransactionProcessor.Mobile.UITests/Features/EndToEndTests.feature b/TransactionProcessor.Mobile.UITests/Features/EndToEndTests.feature
index 2924feab9..20f2fe07f 100644
--- a/TransactionProcessor.Mobile.UITests/Features/EndToEndTests.feature
+++ b/TransactionProcessor.Mobile.UITests/Features/EndToEndTests.feature
@@ -82,8 +82,8 @@ Background:
 	| Test Estate 1 | PataPawa PrePay  | PataPawa PrePay Contract  | Pre Pay Bill Pay  | Percentage      | Merchant Commission | 0.50  |
 
 	Given I create the following merchants
-	| MerchantName    | AddressLine1        | AddressLine2        | AddressLine3        | AddressLine4        | Town     | Region      | Country        | ContactName    | EmailAddress                 | EstateName    |
-	| Test Merchant 1 | test address line 1 | test address line 2 | test address line 3 | test address line 4 | TestTown | Test Region | United Kingdom | Test Contact 1 | testcontact1@merchant1.co.uk | Test Estate 1 |
+	| MerchantName    | AddressLine1        | AddressLine2        | AddressLine3        | AddressLine4        | Town     | Region      | PostalCode | Country        | ContactName    | EmailAddress                 | EstateName    |
+	| Test Merchant 1 | test address line 1 | test address line 2 | test address line 3 | test address line 4 | TestTown | Test Region | TE57 1NG   | United Kingdom | Test Contact 1 | testcontact1@merchant1.co.uk | Test Estate 1 |
 
 	Given I have assigned the following  operator to the merchants
 	| OperatorName     | MerchantName    | MerchantNumber | TerminalNumber | EstateName    |
diff --git a/TransactionProcessor.Mobile.UITests/Features/EndToEndTests.feature.cs b/TransactionProcessor.Mobile.UITests/Features/EndToEndTests.feature.cs
index 5f7d2e2ad..f520849fd 100644
--- a/TransactionProcessor.Mobile.UITests/Features/EndToEndTests.feature.cs
+++ b/TransactionProcessor.Mobile.UITests/Features/EndToEndTests.feature.cs
@@ -404,6 +404,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "AddressLine4",
                         "Town",
                         "Region",
+                        "PostalCode",
                         "Country",
                         "ContactName",
                         "EmailAddress",
@@ -416,6 +417,7 @@ await testRunner.GivenAsync("I have a token to access the estate management and
                         "test address line 4",
                         "TestTown",
                         "Test Region",
+                        "TE57 1NG",
                         "United Kingdom",
                         "Test Contact 1",
                         "testcontact1@merchant1.co.uk",
diff --git a/TransactionProcessor.Mobile.UITests/Pages/Extenstions.cs b/TransactionProcessor.Mobile.UITests/Pages/Extenstions.cs
index 189db81df..7754fb0e8 100644
--- a/TransactionProcessor.Mobile.UITests/Pages/Extenstions.cs
+++ b/TransactionProcessor.Mobile.UITests/Pages/Extenstions.cs
@@ -1,4 +1,5 @@
-using OpenQA.Selenium;
+using System.Diagnostics;
+using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
 using Shared.IntegrationTesting;
@@ -10,6 +11,19 @@ namespace TransactionProcessor.Mobile.UITests.Pages;
 
 public static class Extenstions
 {
+    private static IWebElement? TryScrollIntoView(AppiumDriver driver, string selector, string automationId)
+    {
+        try
+        {
+            return driver.FindElement(MobileBy.AndroidUIAutomator(selector));
+        }
+        catch (WebDriverException ex)
+        {
+            Debug.WriteLine($"Unable to scroll to element [{automationId}]: {ex.Message}");
+            return null;
+        }
+    }
+
     /*
         // TODO: Mac & Windows Extensions
         // TODO: May need a platform switch
@@ -130,6 +144,22 @@ await Retry.For(async () =>
                     }
                 }
 
+                if (element == null && platform == "android")
+                {
+                    string fullResourceId = $"{androidPackage}:id/{automationId}";
+
+                    element = TryScrollIntoView(driver,
+                                                $"new UiScrollable(new UiSelector().scrollable(true)).scrollIntoView(new UiSelector().resourceId(\"{fullResourceId}\"))",
+                                                automationId);
+
+                    if (element == null)
+                    {
+                        element = TryScrollIntoView(driver,
+                                                    $"new UiScrollable(new UiSelector().scrollable(true)).scrollIntoView(new UiSelector().description(\"{automationId}\"))",
+                                                    automationId);
+                    }
+                }
+
                 element.ShouldNotBeNull($"element not found. used automationId [{automationId}]");
             }
             catch (WebDriverException ex)
@@ -205,4 +235,4 @@ public static async Task<String> GetPageSource(this AppiumDriver driver)
     {
         return driver.PageSource;
     }
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile.UITests/TransactionProcessor.Mobile.UITests.csproj b/TransactionProcessor.Mobile.UITests/TransactionProcessor.Mobile.UITests.csproj
index 17cced275..d8940fac9 100644
--- a/TransactionProcessor.Mobile.UITests/TransactionProcessor.Mobile.UITests.csproj
+++ b/TransactionProcessor.Mobile.UITests/TransactionProcessor.Mobile.UITests.csproj
@@ -9,30 +9,30 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="coverlet.collector" Version="6.0.4">
+	  <PackageReference Include="coverlet.collector" Version="8.0.1">
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		  <PrivateAssets>all</PrivateAssets>
 	  </PackageReference>
-	  <PackageReference Include="Appium.WebDriver" Version="8.0.1" />
-	  <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="10.0.1" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.1" />
-	  <PackageReference Include="Shared.IntegrationTesting" Version="2025.12.1" />
+	  <PackageReference Include="Appium.WebDriver" Version="8.2.0" />
+	  <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="10.0.5" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.5" />
+	  <PackageReference Include="Shared.IntegrationTesting" Version="2026.3.1" />
 	  <PackageReference Include="Shouldly" Version="4.3.0" />
-	  <PackageReference Include="NUnit.ConsoleRunner" Version="3.21.0" />
-	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageReference Include="NUnit" Version="4.4.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
+	  <PackageReference Include="NUnit.ConsoleRunner" Version="3.22.0" />
+	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="NUnit" Version="4.5.1" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.12.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-	  <PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
-	  <PackageReference Include="Reqnroll.NUnit" Version="3.2.1" />
-	  <PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="3.2.1" />
-	  <PackageReference Include="TransactionProcessor.Client" Version="2025.12.1" />
-	  <PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.12.1" />
+	  <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
+	  <PackageReference Include="Reqnroll.NUnit" Version="3.3.4" />
+	  <PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="3.3.4" />
+	  <PackageReference Include="TransactionProcessor.Client" Version="2026.4.1" />
+	  <PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2026.4.1" />
 	  <PackageReference Include="SecurityService.Client" Version="2025.12.1" />
 	  <PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.12.1" />
-	  <PackageReference Include="TransactionProcessor.Database" Version="2025.12.1" />
+	  <PackageReference Include="TransactionProcessor.Database" Version="2026.4.1" />
 	  <PackageReference Include="EventStoreProjections" Version="2023.12.3" />
   </ItemGroup>
 
diff --git a/TransactionProcessor.Mobile/App.xaml b/TransactionProcessor.Mobile/App.xaml
index 1ab5229bc..366a963a7 100644
--- a/TransactionProcessor.Mobile/App.xaml
+++ b/TransactionProcessor.Mobile/App.xaml
@@ -3,12 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:TransactionProcessor.Mobile"
              x:Class="TransactionProcessor.Mobile.App">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
-                <ResourceDictionary Source="Resources/Styles/LightTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
+     <Application.Resources>
+         <ResourceDictionary>
+             <ResourceDictionary.MergedDictionaries>
+                 <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
+                 <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
+                 <ResourceDictionary Source="Resources/Styles/LightTheme.xaml"/>
+             </ResourceDictionary.MergedDictionaries>
+         </ResourceDictionary>
+     </Application.Resources>
+ </Application>
diff --git a/TransactionProcessor.Mobile/App.xaml.cs b/TransactionProcessor.Mobile/App.xaml.cs
index 678605e49..318875cba 100644
--- a/TransactionProcessor.Mobile/App.xaml.cs
+++ b/TransactionProcessor.Mobile/App.xaml.cs
@@ -8,6 +8,8 @@
 using TransactionProcessor.Mobile.Pages.Transactions.BillPayment;
 using TransactionProcessor.Mobile.Pages.Transactions.MobileTopup;
 using TransactionProcessor.Mobile.Pages.Transactions.Voucher;
+using TransactionProcessor.Mobile.BusinessLogic.UIServices;
+using Microsoft.Maui.ApplicationModel;
 
 #if ANDROID
 using AndroidX.Core.View;
@@ -47,9 +49,10 @@ void ApplyAutomationIdMapping<TVirtualView, THandlerInterface>(
         }
 #endif
 
-        public App()
+        public App(IApplicationThemeService applicationThemeService)
         {
             InitializeComponent();
+            MainThread.BeginInvokeOnMainThread(async () => await applicationThemeService.ApplyConfiguredTheme());
 
 #if ANDROID
             ApplyAutomationIdMapping(ViewHandler.ViewMapper);
@@ -209,4 +212,4 @@ public override void OnInitializeAccessibilityNodeInfo(Android.Views.View host,
 
 
 #endif
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile/AppShell.xaml b/TransactionProcessor.Mobile/AppShell.xaml
index d8fe7a2a9..30490d028 100644
--- a/TransactionProcessor.Mobile/AppShell.xaml
+++ b/TransactionProcessor.Mobile/AppShell.xaml
@@ -10,7 +10,11 @@
     xmlns:reports="clr-namespace:TransactionProcessor.Mobile.Pages.Reports"
     xmlns:myAccount="clr-namespace:TransactionProcessor.Mobile.Pages.MyAccount"
     xmlns:support="clr-namespace:TransactionProcessor.Mobile.Pages.Support"
-    Title="TransactionProcessor.Mobile">
+    Title="TransactionProcessor.Mobile"
+    Shell.TabBarBackgroundColor="{DynamicResource shellTabBarBackgroundColor}"
+    Shell.TabBarForegroundColor="{DynamicResource shellTabBarForegroundColor}"
+    Shell.TabBarTitleColor="{DynamicResource shellTabBarForegroundColor}"
+    Shell.TabBarUnselectedColor="{DynamicResource shellTabBarUnselectedColor}">
 
     <ShellContent
         Title="Loading"
diff --git a/TransactionProcessor.Mobile/Extensions/MauiAppBuilderExtensions.cs b/TransactionProcessor.Mobile/Extensions/MauiAppBuilderExtensions.cs
index 83e669132..0dc5bfe36 100644
--- a/TransactionProcessor.Mobile/Extensions/MauiAppBuilderExtensions.cs
+++ b/TransactionProcessor.Mobile/Extensions/MauiAppBuilderExtensions.cs
@@ -211,6 +211,7 @@ public static MauiAppBuilder ConfigureUIServices(this MauiAppBuilder builder) {
             builder.Services.AddSingleton<IDialogService, DialogService>();
             builder.Services.AddSingleton<INavigationService, ShellNavigationService>();
             builder.Services.AddSingleton<IApplicationInfoService, ApplicationInfoService>();
+            builder.Services.AddSingleton<IApplicationThemeService, ApplicationThemeService>();
             builder.Services.AddSingleton<INavigationParameterService, NavigationParameterService>();
             return builder;
         }
@@ -351,4 +352,4 @@ protected override IHostnameVerifier GetSSLHostnameVerifier(HttpsURLConnection c
         }
     }
 #endif
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile/Pages/AppHome/HomePage.xaml b/TransactionProcessor.Mobile/Pages/AppHome/HomePage.xaml
index d6fad0a57..443128f3e 100644
--- a/TransactionProcessor.Mobile/Pages/AppHome/HomePage.xaml
+++ b/TransactionProcessor.Mobile/Pages/AppHome/HomePage.xaml
@@ -51,7 +51,7 @@
                             <TapGestureRecognizer Command="{Binding GoToMobileTopupCommand}" AutomationId="MobileTopupCard"/>
                         </Frame.GestureRecognizers>
                         <VerticalStackLayout Spacing="8" HorizontalOptions="Center">
-                            <Image Source="transactionsbutton.svg" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
+                            <Image Source="{AppThemeBinding Light=transactionsbutton.svg, Dark=transactionsbutton_dark.svg}" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
                             <Label Text="Mobile Topup"
                                    FontSize="13"
                                    FontAttributes="Bold"
@@ -66,7 +66,7 @@
                             <TapGestureRecognizer Command="{Binding GoToBillPaymentCommand}" AutomationId="BillPaymentCard"/>
                         </Frame.GestureRecognizers>
                         <VerticalStackLayout Spacing="8" HorizontalOptions="Center">
-                            <Image Source="transactionsbutton.svg" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
+                            <Image Source="{AppThemeBinding Light=transactionsbutton.svg, Dark=transactionsbutton_dark.svg}" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
                             <Label Text="Bill Payment"
                                    FontSize="13"
                                    FontAttributes="Bold"
@@ -81,7 +81,7 @@
                             <TapGestureRecognizer Command="{Binding GoToVoucherCommand}" AutomationId="VoucherCard"/>
                         </Frame.GestureRecognizers>
                         <VerticalStackLayout Spacing="8" HorizontalOptions="Center">
-                            <Image Source="transactionsbutton.svg" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
+                            <Image Source="{AppThemeBinding Light=transactionsbutton.svg, Dark=transactionsbutton_dark.svg}" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
                             <Label Text="Voucher"
                                    FontSize="13"
                                    FontAttributes="Bold"
@@ -96,7 +96,7 @@
                             <TapGestureRecognizer Command="{Binding GoToAdminCommand}" AutomationId="AdminCard"/>
                         </Frame.GestureRecognizers>
                         <VerticalStackLayout Spacing="8" HorizontalOptions="Center">
-                            <Image Source="transactionsbutton.svg" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
+                            <Image Source="{AppThemeBinding Light=transactionsbutton.svg, Dark=transactionsbutton_dark.svg}" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
                             <Label Text="Admin"
                                    FontSize="13"
                                    FontAttributes="Bold"
@@ -124,4 +124,4 @@
 
         </VerticalStackLayout>
     </ScrollView>
-</common:NoBackWithoutLogoutPage>
\ No newline at end of file
+</common:NoBackWithoutLogoutPage>
diff --git a/TransactionProcessor.Mobile/Pages/Common/ThemeButtonImageSource.cs b/TransactionProcessor.Mobile/Pages/Common/ThemeButtonImageSource.cs
new file mode 100644
index 000000000..4db565a1e
--- /dev/null
+++ b/TransactionProcessor.Mobile/Pages/Common/ThemeButtonImageSource.cs
@@ -0,0 +1,17 @@
+namespace TransactionProcessor.Mobile.Pages.Common;
+
+internal static class ThemeButtonImageSource
+{
+    public static String Get(String imageSource)
+    {
+        if (Application.Current?.RequestedTheme != AppTheme.Dark)
+        {
+            return imageSource;
+        }
+
+        String imageExtension = Path.GetExtension(imageSource);
+        String imageName = Path.GetFileNameWithoutExtension(imageSource);
+
+        return $"{imageName}_dark{imageExtension}";
+    }
+}
diff --git a/TransactionProcessor.Mobile/Pages/LoginPage.xaml b/TransactionProcessor.Mobile/Pages/LoginPage.xaml
index 635af861a..2d41640c5 100644
--- a/TransactionProcessor.Mobile/Pages/LoginPage.xaml
+++ b/TransactionProcessor.Mobile/Pages/LoginPage.xaml
@@ -42,9 +42,9 @@
                 <Frame CornerRadius="30"
                        Padding="30,30,30,40"
                        HasShadow="True"
-                       BackgroundColor="White"
+                       BackgroundColor="{DynamicResource cardBackgroundColor}"
                        Margin="0"
-                       BorderColor="Transparent">
+                       BorderColor="{DynamicResource cardBorderColor}">
                     <VerticalStackLayout Spacing="8">
 
                         <!-- Username field -->
@@ -114,4 +114,4 @@
             </VerticalStackLayout>
         </ScrollView>
     </ContentPage.Content>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/TransactionProcessor.Mobile/Pages/MyAccount/MyAccountPage.xaml b/TransactionProcessor.Mobile/Pages/MyAccount/MyAccountPage.xaml
index c17e081d1..f04bc9e0e 100644
--- a/TransactionProcessor.Mobile/Pages/MyAccount/MyAccountPage.xaml
+++ b/TransactionProcessor.Mobile/Pages/MyAccount/MyAccountPage.xaml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <common:NoBackWithoutLogoutPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-                               xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                               x:Class="TransactionProcessor.Mobile.Pages.MyAccount.MyAccountPage"
-                               xmlns:common="clr-namespace:TransactionProcessor.Mobile.Pages.Common"
-                               Shell.NavBarIsVisible="False"
+                                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                                x:Class="TransactionProcessor.Mobile.Pages.MyAccount.MyAccountPage"
+                                xmlns:common="clr-namespace:TransactionProcessor.Mobile.Pages.Common"
+                                Shell.NavBarIsVisible="False"
                                Padding="0">
     <ScrollView>
         <VerticalStackLayout Spacing="0">
@@ -17,7 +17,7 @@
                     </LinearGradientBrush>
                 </Grid.Background>
                 <VerticalStackLayout VerticalOptions="Center" HorizontalOptions="Center" Spacing="4" Padding="20">
-                    <Image Source="profilebutton.svg" HeightRequest="52" WidthRequest="52" HorizontalOptions="Center"/>
+                    <Image Source="{AppThemeBinding Light=profilebutton.svg, Dark=profilebutton_dark.svg}" HeightRequest="52" WidthRequest="52" HorizontalOptions="Center"/>
                     <Label Text="{Binding Title}"
                            AutomationId="{Binding Title}"
                            FontSize="20"
@@ -34,28 +34,28 @@
 
             <!-- Account info card -->
             <VerticalStackLayout Padding="20,20,20,0" Spacing="16">
-                <Frame Style="{StaticResource HomeCardFrame}">
+                <Frame Style="{DynamicResource HomeCardFrame}">
                     <Grid ColumnDefinitions="*,*" RowDefinitions="Auto,Auto" ColumnSpacing="8" RowSpacing="4">
                         <Label Grid.Row="0" Grid.Column="0"
                                Text="Merchant Name"
                                FontSize="12"
                                FontAttributes="Bold"
-                               TextColor="{StaticResource labelTextColor}"/>
+                               TextColor="{DynamicResource labelTextColor}"/>
                         <Label Grid.Row="1" Grid.Column="0"
                                Text="{Binding MerchantName}"
                                FontSize="14"
                                AutomationId="MerchantNameLabel"
-                               TextColor="{StaticResource labelTextColor}"/>
+                               TextColor="{DynamicResource labelTextColor}"/>
                         <Label Grid.Row="0" Grid.Column="1"
                                Text="Last Login"
                                FontSize="12"
                                FontAttributes="Bold"
-                               TextColor="{StaticResource labelTextColor}"/>
+                               TextColor="{DynamicResource labelTextColor}"/>
                         <Label Grid.Row="1" Grid.Column="1"
                                Text="{Binding LastLogin, StringFormat='{0:dd/MM/yyyy HH:mm}'}"
                                FontSize="14"
                                AutomationId="LastLoginLabel"
-                               TextColor="{StaticResource labelTextColor}"/>
+                               TextColor="{DynamicResource labelTextColor}"/>
                     </Grid>
                 </Frame>
             </VerticalStackLayout>
@@ -65,7 +65,30 @@
                 <Label Text="Account Options"
                        FontSize="16"
                        FontAttributes="Bold"
-                       TextColor="{StaticResource labelTextColor}"/>
+                       TextColor="{DynamicResource labelTextColor}"/>
+
+                <Frame Style="{DynamicResource HomeCardFrame}">
+                    <Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto" ColumnSpacing="12" RowSpacing="4">
+                        <Label Grid.Row="0"
+                               Grid.Column="0"
+                               Text="Dark Theme"
+                               FontSize="14"
+                               FontAttributes="Bold"
+                               TextColor="{DynamicResource labelTextColor}"/>
+                        <Switch Grid.RowSpan="2"
+                                Grid.Column="1"
+                                VerticalOptions="Center"
+                                AutomationId="DarkThemeSwitch"
+                                IsToggled="{Binding IsDarkThemeEnabled}"
+                                Toggled="DarkThemeSwitch_Toggled"/>
+                        <Label Grid.Row="1"
+                               Grid.Column="0"
+                               FontSize="12"
+                               Text="Save your theme preference on this device."
+                               TextColor="{DynamicResource labelTextColor}"
+                               Opacity="0.8"/>
+                    </Grid>
+                </Frame>
 
                 <FlexLayout x:Name="MyAccountOptionsList"
                             Wrap="Wrap"
@@ -74,10 +97,10 @@
 
                 <Button Text="Back"
                         AutomationId="BackButton"
-                        Style="{StaticResource StandardButton}"
+                        Style="{DynamicResource StandardButton}"
                         Command="{Binding BackButtonCommand}"/>
             </VerticalStackLayout>
 
         </VerticalStackLayout>
     </ScrollView>
-</common:NoBackWithoutLogoutPage>
\ No newline at end of file
+</common:NoBackWithoutLogoutPage>
diff --git a/TransactionProcessor.Mobile/Pages/MyAccount/MyAccountPage.xaml.cs b/TransactionProcessor.Mobile/Pages/MyAccount/MyAccountPage.xaml.cs
index 22fc0d17d..8e03adffc 100644
--- a/TransactionProcessor.Mobile/Pages/MyAccount/MyAccountPage.xaml.cs
+++ b/TransactionProcessor.Mobile/Pages/MyAccount/MyAccountPage.xaml.cs
@@ -53,7 +53,7 @@ private Frame CreateOptionTile(ListViewItem modelOption, Int32 rowCount)
 
         Image icon = new Image
         {
-            Source = iconSource,
+            Source = ThemeButtonImageSource.Get(iconSource),
             HeightRequest = 36,
             WidthRequest = 36,
             HorizontalOptions = LayoutOptions.Center
@@ -95,4 +95,16 @@ private Frame CreateOptionTile(ListViewItem modelOption, Int32 rowCount)
 
         return tile;
     }
-}
\ No newline at end of file
+
+    private async void DarkThemeSwitch_Toggled(Object sender,
+                                               ToggledEventArgs e)
+    {
+        if (this.viewModel == null)
+        {
+            return;
+        }
+
+        await this.viewModel.SetDarkTheme(e.Value);
+        this.LoadOptions(this.viewModel);
+    }
+}
diff --git a/TransactionProcessor.Mobile/Pages/Reports/ReportsBalanceAnalysisPage.xaml b/TransactionProcessor.Mobile/Pages/Reports/ReportsBalanceAnalysisPage.xaml
index 89f1bafca..26080b078 100644
--- a/TransactionProcessor.Mobile/Pages/Reports/ReportsBalanceAnalysisPage.xaml
+++ b/TransactionProcessor.Mobile/Pages/Reports/ReportsBalanceAnalysisPage.xaml
@@ -7,21 +7,28 @@
              Shell.NavBarIsVisible="False">
 
     <ScrollView>
-        <VerticalStackLayout>
-            <controls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
+        <VerticalStackLayout Style="{DynamicResource Layout}">
+            <controls:TitleLabel Text="{Binding Title}"
+                                 AutomationId="{Binding Title}"
+                                 FontSize="20"
+                                 HorizontalTextAlignment="Center"
+                                 VerticalOptions="End"
+                                 FontAttributes="Bold"
+                                 TextColor="{DynamicResource labelTextColor}"
+                                 Padding="20,0,20,20"/>
 
-            <liveChartsCore:CartesianChart x:Name="Chart"
-                                           Series="{Binding Series}" 
-                                           YAxes="{Binding YAxes}"
-                                           XAxes="{Binding XAxes}"
-                                           TooltipFindingStrategy="{Binding TooltipFindingStrategy}"
-                                           TooltipPosition="{Binding TooltipPosition}"
-                                           HeightRequest="200" HorizontalOptions="FillAndExpand">
-            </liveChartsCore:CartesianChart>
+            <Frame Style="{StaticResource TransactionFormCard}">
+                <liveChartsCore:CartesianChart x:Name="Chart"
+                                               Series="{Binding Series}"
+                                               YAxes="{Binding YAxes}"
+                                               XAxes="{Binding XAxes}"
+                                               TooltipFindingStrategy="{Binding TooltipFindingStrategy}"
+                                               TooltipPosition="{Binding TooltipPosition}"
+                                               HeightRequest="260"
+                                               HorizontalOptions="FillAndExpand" />
+            </Frame>
 
-            <VerticalStackLayout Style="{DynamicResource Layout}">
             <Button Text="Back" AutomationId="BackButton" Style="{StaticResource ReportsButtonStyle}" Command="{Binding BackButtonCommand}"/>
-            </VerticalStackLayout>
         </VerticalStackLayout>
     </ScrollView>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/TransactionProcessor.Mobile/Pages/Reports/ReportsBalanceAnalysisPage.xaml.cs b/TransactionProcessor.Mobile/Pages/Reports/ReportsBalanceAnalysisPage.xaml.cs
index f62ffae32..67de5e18b 100644
--- a/TransactionProcessor.Mobile/Pages/Reports/ReportsBalanceAnalysisPage.xaml.cs
+++ b/TransactionProcessor.Mobile/Pages/Reports/ReportsBalanceAnalysisPage.xaml.cs
@@ -1,55 +1,21 @@
-using LiveChartsCore;
-using LiveChartsCore.Defaults;
-using LiveChartsCore.Kernel.Sketches;
-using LiveChartsCore.SkiaSharpView;
 using TransactionProcessor.Mobile.BusinessLogic.ViewModels.Reports;
 
 namespace TransactionProcessor.Mobile.Pages.Reports;
 
-public partial class ReportsBalanceAnalysisPage : ContentPage{
+public partial class ReportsBalanceAnalysisPage : ContentPage
+{
     private ReportsBalanceAnalysisPageViewModel viewModel => this.BindingContext as ReportsBalanceAnalysisPageViewModel;
 
-    public ReportsBalanceAnalysisPage(ReportsBalanceAnalysisPageViewModel vm){
+    public ReportsBalanceAnalysisPage(ReportsBalanceAnalysisPageViewModel vm)
+    {
         this.InitializeComponent();
 
         this.BindingContext = vm;
     }
 
-    protected override async void OnAppearing(){
+    protected override async void OnAppearing()
+    {
         base.OnAppearing();
         await this.viewModel.Initialise(CancellationToken.None);
-
-        DateTimeAxis axis1 = new DateTimeAxis(TimeSpan.FromDays(1), (d) => d.ToString("dd/MM/yyyy"));
-        this.Chart.XAxes = new List<ICartesianAxis>{
-                                                       axis1
-                                                   };
-
-        var axis2 = new Axis();
-        axis2.Labeler = Labelers.Currency;
-
-        this.Chart.YAxes = new List<ICartesianAxis>{
-                                                       axis2
-                                                   };
-
-        this.Chart.TooltipFindingStrategy = LiveChartsCore.Measure.TooltipFindingStrategy.CompareOnlyX;
-        this.Chart.TooltipPosition = LiveChartsCore.Measure.TooltipPosition.Top;
-
-        this.Chart.Series = new ISeries[]{
-                                             new LineSeries<DateTimePoint>{
-                                                                              
-                                                                              Values = new List<DateTimePoint>{
-                                                                                                                  new DateTimePoint(new DateTime(2024, 1, 7), 1985),
-                                                                                                                  new DateTimePoint(new DateTime(2024, 1, 8), 3882),
-                                                                                                                  new DateTimePoint(new DateTime(2024, 1, 11), 2511),
-                                                                                                                  new DateTimePoint(new DateTime(2024, 1, 15), 3905),
-                                                                                                                  new DateTimePoint(new DateTime(2024, 1, 20), 4256)
-                                                                                                              },
-                                                                              Fill = null,
-                                                                              Name = "Balance",
-                                                                              TooltipLabelFormatter =
-                                                                                  (chartPoint) => $"{chartPoint.Context.Series.Name}: {chartPoint.PrimaryValue}"
-                                                                          }
-                                         };
     }
-
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile/Pages/Reports/ReportsPage.xaml b/TransactionProcessor.Mobile/Pages/Reports/ReportsPage.xaml
index a82871220..b5fad8526 100644
--- a/TransactionProcessor.Mobile/Pages/Reports/ReportsPage.xaml
+++ b/TransactionProcessor.Mobile/Pages/Reports/ReportsPage.xaml
@@ -17,7 +17,7 @@
                     </LinearGradientBrush>
                 </Grid.Background>
                 <VerticalStackLayout VerticalOptions="Center" HorizontalOptions="Center" Spacing="4" Padding="20">
-                    <Image Source="reportbutton.svg" HeightRequest="44" WidthRequest="44" HorizontalOptions="Center"/>
+                    <Image Source="{AppThemeBinding Light=reportbutton.svg, Dark=reportbutton_dark.svg}" HeightRequest="44" WidthRequest="44" HorizontalOptions="Center"/>
                     <Label Text="{Binding Title}"
                            AutomationId="{Binding Title}"
                            FontSize="20"
@@ -46,4 +46,4 @@
 
         </VerticalStackLayout>
     </ScrollView>
-</common:NoBackWithoutLogoutPage>
\ No newline at end of file
+</common:NoBackWithoutLogoutPage>
diff --git a/TransactionProcessor.Mobile/Pages/Reports/ReportsPage.xaml.cs b/TransactionProcessor.Mobile/Pages/Reports/ReportsPage.xaml.cs
index a84eb49d0..9d9cfd52e 100644
--- a/TransactionProcessor.Mobile/Pages/Reports/ReportsPage.xaml.cs
+++ b/TransactionProcessor.Mobile/Pages/Reports/ReportsPage.xaml.cs
@@ -50,7 +50,7 @@ private Frame CreateReportTile(ListViewItem modelOption, Int32 rowCount)
 
         Image icon = new Image
         {
-            Source = iconSource,
+            Source = ThemeButtonImageSource.Get(iconSource),
             HeightRequest = 36,
             WidthRequest = 36,
             HorizontalOptions = LayoutOptions.Center
@@ -92,4 +92,4 @@ private Frame CreateReportTile(ListViewItem modelOption, Int32 rowCount)
 
         return tile;
     }
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile/Pages/Reports/ReportsSalesAnalysisPage.xaml b/TransactionProcessor.Mobile/Pages/Reports/ReportsSalesAnalysisPage.xaml
index 15a5dcc0c..be9eeb19b 100644
--- a/TransactionProcessor.Mobile/Pages/Reports/ReportsSalesAnalysisPage.xaml
+++ b/TransactionProcessor.Mobile/Pages/Reports/ReportsSalesAnalysisPage.xaml
@@ -13,67 +13,97 @@
             <toolkit:SelectedItemEventArgsConverter x:Key="SelectedItemEventArgsConverter" />
         </ResourceDictionary>
 
-        <DataTemplate x:Key="CardTemplate">
-            <Frame
-            Padding="0"
-            CornerRadius="20"
-            HasShadow="False"
-            x:DataType="reports1:SalesAnalysis"
-            BackgroundColor="{StaticResource LightGray}">
-                <Grid
-                            RowDefinitions="42,40,*"
-                            Padding="20">
+         <DataTemplate x:Key="CardTemplate">
+            <Frame x:DataType="reports1:SalesAnalysis"
+                   Style="{StaticResource TransactionFormCard}"
+                   BackgroundColor="{DynamicResource salesAnalysisCardBackgroundColor}"
+                   BorderColor="{DynamicResource salesAnalysisCardBorderColor}">
+                <Grid RowDefinitions="Auto,Auto,Auto"
+                      ColumnDefinitions="*,Auto"
+                      RowSpacing="12">
                     <Image
-                                Source="{Binding Icon}"
-                                WidthRequest="36"
-                                HeightRequest="36"
-                                VerticalOptions="Start"
-                                HorizontalOptions="End"/>
-
-                    <Label Text="{Binding MainTitle}" class="LargeTitle"/>
+                        Grid.Column="1"
+                        Source="{Binding Icon}"
+                        WidthRequest="36"
+                        HeightRequest="36"
+                        VerticalOptions="Start"
+                        HorizontalOptions="End"/>
+
+                    <Label Text="{Binding MainTitle}"
+                           FontSize="18"
+                           FontAttributes="Bold"
+                           TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"/>
 
                     <VerticalStackLayout
-                                Spacing="0"
-                                Grid.RowSpan="3" 
-                                VerticalOptions="Center">
-                        <Label Text="{Binding TodaysTitle}" class="Subhead" />
-                        <Label Text="{Binding TodaysValue}" class="Subhead" />
+                        Grid.Row="1"
+                        Grid.ColumnSpan="2"
+                        Spacing="2">
+                        <Label Text="{Binding TodaysTitle}"
+                               FontSize="14"
+                               TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
+                        <Label Text="{Binding TodaysValue}"
+                               FontSize="20"
+                               FontAttributes="Bold"
+                               TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
                     </VerticalStackLayout>
 
                     <HorizontalStackLayout
-                            Grid.Row="2"
-                            Spacing="10"
-                            VerticalOptions="End">
-                        <Label Text="{Binding ComparisonTitle}" class="Small" VerticalOptions="Center"/>
-                        <Label Text="{Binding ComparisonValue}" class="Small" VerticalOptions="Center"/>
+                        Grid.Row="2"
+                        Spacing="8"
+                        VerticalOptions="End">
+                        <Label Text="{Binding ComparisonTitle}"
+                               FontSize="12"
+                               TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"
+                               Opacity="0.8"
+                               VerticalOptions="Center"/>
+                        <Label Text="{Binding ComparisonValue}"
+                               FontSize="12"
+                               TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"
+                               Opacity="0.8"
+                               VerticalOptions="Center"/>
                     </HorizontalStackLayout>
 
                     <HorizontalStackLayout
-                                Grid.Row="2"
-                                Spacing="10"
-                                HorizontalOptions="End"
-                                VerticalOptions="End">
-                        <Label Text="{Binding VarianceTitle}" class="Small" VerticalOptions="Center"/>
-                        <Label Text="{Binding VarianceValue}" class="Small" VerticalOptions="Center"/>
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Spacing="8"
+                        HorizontalOptions="End"
+                        VerticalOptions="End">
+                        <Label Text="{Binding VarianceTitle}"
+                               FontSize="12"
+                               TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"
+                               Opacity="0.8"
+                               VerticalOptions="Center"/>
+                        <Label Text="{Binding VarianceValue}"
+                               FontSize="12"
+                               TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"
+                               Opacity="0.8"
+                               VerticalOptions="Center"/>
                     </HorizontalStackLayout>
                 </Grid>
             </Frame>
-
-
-
         </DataTemplate>
 
     </ContentPage.Resources>
 
     <ScrollView>
         <VerticalStackLayout Style="{DynamicResource Layout}">
-            <controls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
+            <controls:TitleLabel Text="{Binding Title}"
+                                 AutomationId="{Binding Title}"
+                                 FontSize="20"
+                                 HorizontalTextAlignment="Center"
+                                 VerticalOptions="End"
+                                 FontAttributes="Bold"
+                                 TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"
+                                 Padding="20,0,20,20"/>
 
             <Picker x:Name="ComparisonDate"
                     Title="Select Date for Comparison"
                     ItemDisplayBinding="{Binding DisplayText}"
                     ItemsSource="{Binding ComparisonDates}"
-                    SelectedItem="{Binding SelectedItem}">
+                    SelectedItem="{Binding SelectedItem}"
+                    TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"
+                    TitleColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource Gray200}}">
                 <Picker.Behaviors>
                     <toolkit:EventToCommandBehavior
                         EventName="SelectedIndexChanged"
@@ -82,28 +112,12 @@
                 </Picker.Behaviors>
             </Picker>
 
-            <ScrollView>
-                <VerticalStackLayout>
-
-                    <!-- Actual Content -->
-                    <CollectionView
-                        Margin="15"
-                        ItemsSource="{Binding SalesAnalysisList}"
-                        ItemTemplate="{StaticResource CardTemplate}">
-                        <CollectionView.ItemsLayout>
-                            <GridItemsLayout Orientation="Vertical"
-                                             Span="1"
-                                             VerticalItemSpacing="8"
-                                             HorizontalItemSpacing="8"/>
-                        </CollectionView.ItemsLayout>
-                    </CollectionView>
-
-                </VerticalStackLayout>
-            </ScrollView>
-
-
+            <VerticalStackLayout Margin="15,0,15,0"
+                                 Spacing="0"
+                                 BindableLayout.ItemsSource="{Binding SalesAnalysisList}"
+                                 BindableLayout.ItemTemplate="{StaticResource CardTemplate}" />
             <Button Text="Back" AutomationId="BackButton" Style="{StaticResource ReportsButtonStyle}" Command="{Binding BackButtonCommand}"/>
 
         </VerticalStackLayout>
     </ScrollView>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/TransactionProcessor.Mobile/Pages/Support/SupportPage.xaml b/TransactionProcessor.Mobile/Pages/Support/SupportPage.xaml
index b264453c7..60745d935 100644
--- a/TransactionProcessor.Mobile/Pages/Support/SupportPage.xaml
+++ b/TransactionProcessor.Mobile/Pages/Support/SupportPage.xaml
@@ -17,7 +17,7 @@
                     </LinearGradientBrush>
                 </Grid.Background>
                 <VerticalStackLayout VerticalOptions="Center" HorizontalOptions="Center" Spacing="4" Padding="20">
-                    <Image Source="supportbutton.svg" HeightRequest="52" WidthRequest="52" HorizontalOptions="Center"/>
+                    <Image Source="{AppThemeBinding Light=supportbutton.svg, Dark=supportbutton_dark.svg}" HeightRequest="52" WidthRequest="52" HorizontalOptions="Center"/>
                     <Label Text="{Binding Title}"
                            AutomationId="{Binding Title}"
                            FontSize="20"
@@ -65,4 +65,4 @@
 
         </VerticalStackLayout>
     </ScrollView>
-</common:NoBackWithoutLogoutPage>
\ No newline at end of file
+</common:NoBackWithoutLogoutPage>
diff --git a/TransactionProcessor.Mobile/Pages/Support/SupportPage.xaml.cs b/TransactionProcessor.Mobile/Pages/Support/SupportPage.xaml.cs
index 8842d68d7..d55b883fa 100644
--- a/TransactionProcessor.Mobile/Pages/Support/SupportPage.xaml.cs
+++ b/TransactionProcessor.Mobile/Pages/Support/SupportPage.xaml.cs
@@ -42,7 +42,7 @@ private Frame CreateSupportTile(String title, String iconSource, String automati
 
             Image icon = new Image
             {
-                Source = iconSource,
+                Source = ThemeButtonImageSource.Get(iconSource),
                 HeightRequest = 36,
                 WidthRequest = 36,
                 HorizontalOptions = LayoutOptions.Center
@@ -72,4 +72,4 @@ private Frame CreateSupportTile(String title, String iconSource, String automati
             return tile;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile/Pages/Transactions/Admin/AdminPage.xaml b/TransactionProcessor.Mobile/Pages/Transactions/Admin/AdminPage.xaml
index 9ec98f9cf..c6b367fc3 100644
--- a/TransactionProcessor.Mobile/Pages/Transactions/Admin/AdminPage.xaml
+++ b/TransactionProcessor.Mobile/Pages/Transactions/Admin/AdminPage.xaml
@@ -41,7 +41,7 @@
                         <TapGestureRecognizer Command="{Binding ReconciliationCommand}"/>
                     </Frame.GestureRecognizers>
                     <HorizontalStackLayout Spacing="10" HorizontalOptions="Center">
-                        <Image Source="transactionsbutton.svg" HeightRequest="36" WidthRequest="36" VerticalOptions="Center"/>
+                        <Image Source="{AppThemeBinding Light=transactionsbutton.svg, Dark=transactionsbutton_dark.svg}" HeightRequest="36" WidthRequest="36" VerticalOptions="Center"/>
                         <Label Text="Reconciliation"
                                FontSize="15"
                                FontAttributes="Bold"
@@ -58,4 +58,4 @@
             </VerticalStackLayout>
         </VerticalStackLayout>
     </ScrollView>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/TransactionProcessor.Mobile/Pages/Transactions/BillPayment/BillPaymentSelectOperatorPage.xaml.cs b/TransactionProcessor.Mobile/Pages/Transactions/BillPayment/BillPaymentSelectOperatorPage.xaml.cs
index ef36d3a9f..c3253c8cc 100644
--- a/TransactionProcessor.Mobile/Pages/Transactions/BillPayment/BillPaymentSelectOperatorPage.xaml.cs
+++ b/TransactionProcessor.Mobile/Pages/Transactions/BillPayment/BillPaymentSelectOperatorPage.xaml.cs
@@ -2,6 +2,7 @@
 using TransactionProcessor.Mobile.BusinessLogic.Common;
 using TransactionProcessor.Mobile.BusinessLogic.Models;
 using TransactionProcessor.Mobile.BusinessLogic.ViewModels.Transactions;
+using TransactionProcessor.Mobile.Pages.Common;
 
 namespace TransactionProcessor.Mobile.Pages.Transactions.BillPayment;
 
@@ -43,7 +44,7 @@ private Frame CreateOperatorTile(ContractOperatorModel modelOperator, Int32 rowC
 
         Image icon = new Image
         {
-            Source = "transactionsbutton.svg",
+            Source = ThemeButtonImageSource.Get("transactionsbutton.svg"),
             HeightRequest = 36,
             WidthRequest = 36,
             HorizontalOptions = LayoutOptions.Center
@@ -77,4 +78,4 @@ private Frame CreateOperatorTile(ContractOperatorModel modelOperator, Int32 rowC
 
         return tile;
     }
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile/Pages/Transactions/BillPayment/BillPaymentSelectProductPage.xaml.cs b/TransactionProcessor.Mobile/Pages/Transactions/BillPayment/BillPaymentSelectProductPage.xaml.cs
index 3b4fd1cc8..804936e81 100644
--- a/TransactionProcessor.Mobile/Pages/Transactions/BillPayment/BillPaymentSelectProductPage.xaml.cs
+++ b/TransactionProcessor.Mobile/Pages/Transactions/BillPayment/BillPaymentSelectProductPage.xaml.cs
@@ -2,6 +2,7 @@
 using TransactionProcessor.Mobile.BusinessLogic.Common;
 using TransactionProcessor.Mobile.BusinessLogic.Models;
 using TransactionProcessor.Mobile.BusinessLogic.ViewModels.Transactions;
+using TransactionProcessor.Mobile.Pages.Common;
 
 namespace TransactionProcessor.Mobile.Pages.Transactions.BillPayment;
 
@@ -43,7 +44,7 @@ private Frame CreateProductTile(ContractProductModel modelProduct, Int32 rowCoun
 
         Image icon = new Image
         {
-            Source = "transactionsbutton.svg",
+            Source = ThemeButtonImageSource.Get("transactionsbutton.svg"),
             HeightRequest = 36,
             WidthRequest = 36,
             HorizontalOptions = LayoutOptions.Center
@@ -77,4 +78,4 @@ private Frame CreateProductTile(ContractProductModel modelProduct, Int32 rowCoun
 
         return tile;
     }
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile/Pages/Transactions/MobileTopup/MobileTopupSelectOperatorPage.xaml.cs b/TransactionProcessor.Mobile/Pages/Transactions/MobileTopup/MobileTopupSelectOperatorPage.xaml.cs
index c82041db8..ad1b1253a 100644
--- a/TransactionProcessor.Mobile/Pages/Transactions/MobileTopup/MobileTopupSelectOperatorPage.xaml.cs
+++ b/TransactionProcessor.Mobile/Pages/Transactions/MobileTopup/MobileTopupSelectOperatorPage.xaml.cs
@@ -2,6 +2,7 @@
 using TransactionProcessor.Mobile.BusinessLogic.Common;
 using TransactionProcessor.Mobile.BusinessLogic.Models;
 using TransactionProcessor.Mobile.BusinessLogic.ViewModels.Transactions;
+using TransactionProcessor.Mobile.Pages.Common;
 
 namespace TransactionProcessor.Mobile.Pages.Transactions.MobileTopup;
 
@@ -43,7 +44,7 @@ private Frame CreateOperatorTile(ContractOperatorModel modelOperator, Int32 rowC
 
         Image icon = new Image
         {
-            Source = "transactionsbutton.svg",
+            Source = ThemeButtonImageSource.Get("transactionsbutton.svg"),
             HeightRequest = 36,
             WidthRequest = 36,
             HorizontalOptions = LayoutOptions.Center
@@ -85,4 +86,4 @@ private Frame CreateOperatorTile(ContractOperatorModel modelOperator, Int32 rowC
 
         return tile;
     }
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile/Pages/Transactions/MobileTopup/MobileTopupSelectProductPage.xaml.cs b/TransactionProcessor.Mobile/Pages/Transactions/MobileTopup/MobileTopupSelectProductPage.xaml.cs
index 5dd9aa4ce..bc297b290 100644
--- a/TransactionProcessor.Mobile/Pages/Transactions/MobileTopup/MobileTopupSelectProductPage.xaml.cs
+++ b/TransactionProcessor.Mobile/Pages/Transactions/MobileTopup/MobileTopupSelectProductPage.xaml.cs
@@ -2,6 +2,7 @@
 using TransactionProcessor.Mobile.BusinessLogic.Common;
 using TransactionProcessor.Mobile.BusinessLogic.Models;
 using TransactionProcessor.Mobile.BusinessLogic.ViewModels.Transactions;
+using TransactionProcessor.Mobile.Pages.Common;
 
 namespace TransactionProcessor.Mobile.Pages.Transactions.MobileTopup;
 
@@ -48,7 +49,7 @@ private Frame CreateProductTile(ContractProductModel modelProduct, Int32 rowCoun
 
         Image icon = new Image
         {
-            Source = "transactionsbutton.svg",
+            Source = ThemeButtonImageSource.Get("transactionsbutton.svg"),
             HeightRequest = 36,
             WidthRequest = 36,
             HorizontalOptions = LayoutOptions.Center
@@ -92,4 +93,4 @@ private Frame CreateProductTile(ContractProductModel modelProduct, Int32 rowCoun
     }
 
     #endregion
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile/Pages/Transactions/TransactionsPage.xaml b/TransactionProcessor.Mobile/Pages/Transactions/TransactionsPage.xaml
index ca8f41bdf..0ccee9888 100644
--- a/TransactionProcessor.Mobile/Pages/Transactions/TransactionsPage.xaml
+++ b/TransactionProcessor.Mobile/Pages/Transactions/TransactionsPage.xaml
@@ -18,7 +18,7 @@
                     </LinearGradientBrush>
                 </Grid.Background>
                 <VerticalStackLayout VerticalOptions="Center" HorizontalOptions="Center" Spacing="6" Padding="20">
-                    <Image Source="transactionsbutton.svg" HeightRequest="60" WidthRequest="60" HorizontalOptions="Center"/>
+                    <Image Source="{AppThemeBinding Light=transactionsbutton.svg, Dark=transactionsbutton_dark.svg}" HeightRequest="60" WidthRequest="60" HorizontalOptions="Center"/>
                     <Label Text="Select Transaction Type"
                            AutomationId="SelectTransactionType"
                            FontSize="20"
@@ -44,7 +44,7 @@
                             <TapGestureRecognizer Command="{Binding MobileTopupCommand}"/>
                         </Frame.GestureRecognizers>
                         <VerticalStackLayout Spacing="8" HorizontalOptions="Center">
-                            <Image Source="transactionsbutton.svg" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
+                            <Image Source="{AppThemeBinding Light=transactionsbutton.svg, Dark=transactionsbutton_dark.svg}" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
                             <Label Text="Mobile Topup"
                                    FontSize="13"
                                    FontAttributes="Bold"
@@ -62,7 +62,7 @@
                             <TapGestureRecognizer Command="{Binding MobileWalletCommand}"/>
                         </Frame.GestureRecognizers>
                         <VerticalStackLayout Spacing="8" HorizontalOptions="Center">
-                            <Image Source="transactionsbutton.svg" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
+                            <Image Source="{AppThemeBinding Light=transactionsbutton.svg, Dark=transactionsbutton_dark.svg}" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
                             <Label Text="Mobile Wallet"
                                    FontSize="13"
                                    FontAttributes="Bold"
@@ -80,7 +80,7 @@
                             <TapGestureRecognizer Command="{Binding BillPaymentCommand}"/>
                         </Frame.GestureRecognizers>
                         <VerticalStackLayout Spacing="8" HorizontalOptions="Center">
-                            <Image Source="transactionsbutton.svg" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
+                            <Image Source="{AppThemeBinding Light=transactionsbutton.svg, Dark=transactionsbutton_dark.svg}" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
                             <Label Text="Bill Payment"
                                    FontSize="13"
                                    FontAttributes="Bold"
@@ -98,7 +98,7 @@
                             <TapGestureRecognizer Command="{Binding VoucherCommand}"/>
                         </Frame.GestureRecognizers>
                         <VerticalStackLayout Spacing="8" HorizontalOptions="Center">
-                            <Image Source="transactionsbutton.svg" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
+                            <Image Source="{AppThemeBinding Light=transactionsbutton.svg, Dark=transactionsbutton_dark.svg}" HeightRequest="40" WidthRequest="40" HorizontalOptions="Center"/>
                             <Label Text="Voucher"
                                    FontSize="13"
                                    FontAttributes="Bold"
@@ -116,7 +116,7 @@
                             <TapGestureRecognizer Command="{Binding AdminCommand}"/>
                         </Frame.GestureRecognizers>
                         <HorizontalStackLayout Spacing="10" HorizontalOptions="Center">
-                            <Image Source="transactionsbutton.svg" HeightRequest="36" WidthRequest="36" VerticalOptions="Center"/>
+                            <Image Source="{AppThemeBinding Light=transactionsbutton.svg, Dark=transactionsbutton_dark.svg}" HeightRequest="36" WidthRequest="36" VerticalOptions="Center"/>
                             <Label Text="Admin"
                                    FontSize="15"
                                    FontAttributes="Bold"
@@ -135,4 +135,4 @@
             </VerticalStackLayout>
         </VerticalStackLayout>
     </ScrollView>
-</common:NoBackWithoutLogoutPage>
\ No newline at end of file
+</common:NoBackWithoutLogoutPage>
diff --git a/TransactionProcessor.Mobile/Pages/Transactions/Voucher/VoucherSelectOperatorPage.xaml.cs b/TransactionProcessor.Mobile/Pages/Transactions/Voucher/VoucherSelectOperatorPage.xaml.cs
index 3619d5dd1..041f44a20 100644
--- a/TransactionProcessor.Mobile/Pages/Transactions/Voucher/VoucherSelectOperatorPage.xaml.cs
+++ b/TransactionProcessor.Mobile/Pages/Transactions/Voucher/VoucherSelectOperatorPage.xaml.cs
@@ -2,6 +2,7 @@
 using TransactionProcessor.Mobile.BusinessLogic.Common;
 using TransactionProcessor.Mobile.BusinessLogic.Models;
 using TransactionProcessor.Mobile.BusinessLogic.ViewModels.Transactions;
+using TransactionProcessor.Mobile.Pages.Common;
 
 namespace TransactionProcessor.Mobile.Pages.Transactions.Voucher;
 
@@ -43,7 +44,7 @@ private Frame CreateOperatorTile(ContractOperatorModel modelOperator, Int32 rowC
 
         Image icon = new Image
         {
-            Source = "transactionsbutton.svg",
+            Source = ThemeButtonImageSource.Get("transactionsbutton.svg"),
             HeightRequest = 36,
             WidthRequest = 36,
             HorizontalOptions = LayoutOptions.Center
@@ -85,4 +86,4 @@ private Frame CreateOperatorTile(ContractOperatorModel modelOperator, Int32 rowC
 
         return tile;
     }
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile/Pages/Transactions/Voucher/VoucherSelectProductPage.xaml.cs b/TransactionProcessor.Mobile/Pages/Transactions/Voucher/VoucherSelectProductPage.xaml.cs
index fe238fbb6..888ac1c29 100644
--- a/TransactionProcessor.Mobile/Pages/Transactions/Voucher/VoucherSelectProductPage.xaml.cs
+++ b/TransactionProcessor.Mobile/Pages/Transactions/Voucher/VoucherSelectProductPage.xaml.cs
@@ -2,6 +2,7 @@
 using TransactionProcessor.Mobile.BusinessLogic.Common;
 using TransactionProcessor.Mobile.BusinessLogic.Models;
 using TransactionProcessor.Mobile.BusinessLogic.ViewModels.Transactions;
+using TransactionProcessor.Mobile.Pages.Common;
 
 namespace TransactionProcessor.Mobile.Pages.Transactions.Voucher;
 
@@ -43,7 +44,7 @@ private Frame CreateProductTile(ContractProductModel modelProduct, Int32 rowCoun
 
         Image icon = new Image
         {
-            Source = "transactionsbutton.svg",
+            Source = ThemeButtonImageSource.Get("transactionsbutton.svg"),
             HeightRequest = 36,
             WidthRequest = 36,
             HorizontalOptions = LayoutOptions.Center
@@ -85,4 +86,4 @@ private Frame CreateProductTile(ContractProductModel modelProduct, Int32 rowCoun
 
         return tile;
     }
-}
\ No newline at end of file
+}
diff --git a/TransactionProcessor.Mobile/Resources/Images/backbutton_dark.svg b/TransactionProcessor.Mobile/Resources/Images/backbutton_dark.svg
new file mode 100644
index 000000000..b76c34577
--- /dev/null
+++ b/TransactionProcessor.Mobile/Resources/Images/backbutton_dark.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 219.151 219.151" style="enable-background:new 0 0 219.151 219.151;" xml:space="preserve">
+<g>
+	<path fill="#FFFFFF" d="M109.576,219.151c60.419,0,109.573-49.156,109.573-109.576C219.149,49.156,169.995,0,109.576,0S0.002,49.156,0.002,109.575
+		C0.002,169.995,49.157,219.151,109.576,219.151z M109.576,15c52.148,0,94.573,42.426,94.574,94.575
+		c0,52.149-42.425,94.575-94.574,94.576c-52.148-0.001-94.573-42.427-94.573-94.577C15.003,57.427,57.428,15,109.576,15z"/>
+	<path fill="#FFFFFF" d="M94.861,156.507c2.929,2.928,7.678,2.927,10.606,0c2.93-2.93,2.93-7.678-0.001-10.608l-28.82-28.819l83.457-0.008
+		c4.142-0.001,7.499-3.358,7.499-7.502c-0.001-4.142-3.358-7.498-7.5-7.498l-83.46,0.008l28.827-28.825
+		c2.929-2.929,2.929-7.679,0-10.607c-1.465-1.464-3.384-2.197-5.304-2.197c-1.919,0-3.838,0.733-5.303,2.196l-41.629,41.628
+		c-1.407,1.406-2.197,3.313-2.197,5.303c0.001,1.99,0.791,3.896,2.198,5.305L94.861,156.507z"/>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/TransactionProcessor.Mobile/Resources/Images/homebutton_dark.svg b/TransactionProcessor.Mobile/Resources/Images/homebutton_dark.svg
new file mode 100644
index 000000000..0669d290a
--- /dev/null
+++ b/TransactionProcessor.Mobile/Resources/Images/homebutton_dark.svg
@@ -0,0 +1,6 @@
+<?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(100%,100%,100%);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/TransactionProcessor.Mobile/Resources/Images/profilebutton_dark.svg b/TransactionProcessor.Mobile/Resources/Images/profilebutton_dark.svg
new file mode 100644
index 000000000..c03b52e3f
--- /dev/null
+++ b/TransactionProcessor.Mobile/Resources/Images/profilebutton_dark.svg
@@ -0,0 +1,6 @@
+<?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(100%,100%,100%);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/TransactionProcessor.Mobile/Resources/Images/reportbutton_dark.svg b/TransactionProcessor.Mobile/Resources/Images/reportbutton_dark.svg
new file mode 100644
index 000000000..0ba40a8b8
--- /dev/null
+++ b/TransactionProcessor.Mobile/Resources/Images/reportbutton_dark.svg
@@ -0,0 +1,6 @@
+<?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(100%,100%,100%);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/TransactionProcessor.Mobile/Resources/Images/supportbutton_dark.svg b/TransactionProcessor.Mobile/Resources/Images/supportbutton_dark.svg
new file mode 100644
index 000000000..506832cf4
--- /dev/null
+++ b/TransactionProcessor.Mobile/Resources/Images/supportbutton_dark.svg
@@ -0,0 +1,6 @@
+<?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(100%,100%,100%);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/TransactionProcessor.Mobile/Resources/Images/transactionsbutton_dark.svg b/TransactionProcessor.Mobile/Resources/Images/transactionsbutton_dark.svg
new file mode 100644
index 000000000..d95b6f5b0
--- /dev/null
+++ b/TransactionProcessor.Mobile/Resources/Images/transactionsbutton_dark.svg
@@ -0,0 +1,6 @@
+<?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(100%,100%,100%);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>
diff --git a/TransactionProcessor.Mobile/Resources/Styles/DarkTheme.xaml b/TransactionProcessor.Mobile/Resources/Styles/DarkTheme.xaml
new file mode 100644
index 000000000..d48f8cbdc
--- /dev/null
+++ b/TransactionProcessor.Mobile/Resources/Styles/DarkTheme.xaml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<?xaml-comp compile="true" ?>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                    x:Class="TransactionProcessor.Mobile.Resources.Styles.DarkTheme">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="LightTheme.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <Color x:Key="pageBackgroundColor">#121212</Color>
+    <Color x:Key="labelTextColor">#F5F7FA</Color>
+    <Color x:Key="entryTextColor">#F5F7FA</Color>
+    <Color x:Key="entryPlaceHolderColorDark">#B6C2D9</Color>
+    <Color x:Key="buttonTextColor">#FFFFFF</Color>
+
+    <Color x:Key="primary">#5A84D6</Color>
+    <Color x:Key="transactions">#4ED8F0</Color>
+    <Color x:Key="reports">#F3A66A</Color>
+    <Color x:Key="profile">#74E6BF</Color>
+    <Color x:Key="support">#F08CA0</Color>
+
+    <Color x:Key="mobileTopup">#8CE63C</Color>
+    <Color x:Key="admin">#FF7070</Color>
+    <Color x:Key="mobileWallet">#FF9B6C</Color>
+    <Color x:Key="billPayment">#6AD5FF</Color>
+    <Color x:Key="voucher">#B58CFF</Color>
+
+    <Color x:Key="MidGray">#6B7280</Color>
+    <Color x:Key="LightGray">#1F2937</Color>
+    <Color x:Key="cardBackgroundColor">#1E1E1E</Color>
+    <Color x:Key="cardBorderColor">#2F3640</Color>
+    <Color x:Key="entryContainerBorderColor">#374151</Color>
+    <Color x:Key="entryContainerBackgroundColor">#111827</Color>
+    <Color x:Key="salesAnalysisCardBackgroundColor">#223247</Color>
+    <Color x:Key="salesAnalysisCardBorderColor">#2D435B</Color>
+    <Color x:Key="shellTabBarBackgroundColor">#1F2937</Color>
+    <Color x:Key="shellTabBarForegroundColor">#F5F7FA</Color>
+    <Color x:Key="shellTabBarUnselectedColor">#9CA3AF</Color>
+</ResourceDictionary>
diff --git a/TransactionProcessor.Mobile/Resources/Styles/DarkTheme.xaml.cs b/TransactionProcessor.Mobile/Resources/Styles/DarkTheme.xaml.cs
new file mode 100644
index 000000000..7701bbeb9
--- /dev/null
+++ b/TransactionProcessor.Mobile/Resources/Styles/DarkTheme.xaml.cs
@@ -0,0 +1,9 @@
+namespace TransactionProcessor.Mobile.Resources.Styles;
+
+public partial class DarkTheme : ResourceDictionary
+{
+    public DarkTheme()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/TransactionProcessor.Mobile/Resources/Styles/LightTheme.xaml b/TransactionProcessor.Mobile/Resources/Styles/LightTheme.xaml
index af1709ad2..57b5e3046 100644
--- a/TransactionProcessor.Mobile/Resources/Styles/LightTheme.xaml
+++ b/TransactionProcessor.Mobile/Resources/Styles/LightTheme.xaml
@@ -34,61 +34,69 @@
     <Color x:Key="DarkGray">#212125</Color>
     <Color x:Key="MidGray">#CFCFD3</Color>
     <Color x:Key="LightGray">#EFEFEF</Color>
+    <Color x:Key="cardBackgroundColor">#FFFFFF</Color>
+    <Color x:Key="cardBorderColor">#E1E1E1</Color>
+    <Color x:Key="entryContainerBorderColor">#CFCFD3</Color>
+    <Color x:Key="entryContainerBackgroundColor">#EFEFEF</Color>
+    <Color x:Key="salesAnalysisCardBackgroundColor">#FFFFFF</Color>
+    <Color x:Key="salesAnalysisCardBorderColor">#E1E1E1</Color>
+    <Color x:Key="shellTabBarBackgroundColor">#FFFFFF</Color>
+    <Color x:Key="shellTabBarForegroundColor">#4267B2</Color>
+    <Color x:Key="shellTabBarUnselectedColor">#212125</Color>
 
     <!-- Styles -->
     <Style TargetType="Page" ApplyToDerivedTypes="True">
-        <Setter Property="BackgroundColor" Value="{StaticResource pageBackgroundColor}"/>
+        <Setter Property="BackgroundColor" Value="{DynamicResource pageBackgroundColor}"/>
         <Setter Property="Padding" Value="20,20,20, 20"/>
     </Style>
 
     <Style x:Key="LabelStyle" TargetType="Label">
-        <Setter Property="TextColor" Value="{StaticResource labelTextColor}"/>
+        <Setter Property="TextColor" Value="{DynamicResource labelTextColor}"/>
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
     </Style>
 
     <Style x:Key="SmallLabelStyle" TargetType="Label">
-        <Setter Property="TextColor" Value="{StaticResource labelTextColor}"/>
+        <Setter Property="TextColor" Value="{DynamicResource labelTextColor}"/>
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="12" />
         <Setter Property="LineHeight" Value="1.25" />
     </Style>
 
     <Style x:Key="AmountEntryStyle" TargetType="Entry">
-        <Setter Property="PlaceholderColor" Value="{StaticResource entryPlaceHolderColorDark}" />
-        <Setter Property="TextColor" Value="{StaticResource entryTextColor}" />
+        <Setter Property="PlaceholderColor" Value="{DynamicResource entryPlaceHolderColorDark}" />
+        <Setter Property="TextColor" Value="{DynamicResource entryTextColor}" />
         <Setter Property="HeightRequest" Value="50"></Setter>
         <Setter Property="Margin" Value="0,0,0,0"></Setter>
         <Setter Property="ReturnType" Value="Done" />
     </Style>
 
     <Style x:Key="MobileNumberEntryStyle" TargetType="Entry">
-        <Setter Property="PlaceholderColor" Value="{StaticResource entryPlaceHolderColorDark}" />
-        <Setter Property="TextColor" Value="{StaticResource entryTextColor}" />
-        <Setter Property="TextColor" Value="Blue"></Setter>
+        <Setter Property="PlaceholderColor" Value="{DynamicResource entryPlaceHolderColorDark}" />
+        <Setter Property="TextColor" Value="{DynamicResource entryTextColor}" />
         <Setter Property="HeightRequest" Value="50"></Setter>
         <Setter Property="Margin" Value="0,0,0,0"></Setter>
         <Setter Property="ReturnType" Value="Done" />
     </Style>
 
     <Style x:Key="EmailAddressEntryStyle" TargetType="Entry">
-        <Setter Property="PlaceholderColor" Value="{StaticResource entryPlaceHolderColorDark}" />
-        <Setter Property="TextColor" Value="{StaticResource entryTextColor}" />
+        <Setter Property="PlaceholderColor" Value="{DynamicResource entryPlaceHolderColorDark}" />
+        <Setter Property="TextColor" Value="{DynamicResource entryTextColor}" />
         <Setter Property="HeightRequest" Value="50"></Setter>
         <Setter Property="Margin" Value="0,0,0,0"></Setter>
         <Setter Property="ReturnType" Value="Done" />
     </Style>
 
     <Style x:Key="UserNameEntryStyle" TargetType="Entry">
-        <Setter Property="PlaceholderColor" Value="{StaticResource entryPlaceHolderColorDark}" />
-        <Setter Property="TextColor" Value="{StaticResource entryTextColor}"></Setter>
+        <Setter Property="PlaceholderColor" Value="{DynamicResource entryPlaceHolderColorDark}" />
+        <Setter Property="TextColor" Value="{DynamicResource entryTextColor}"></Setter>
         <Setter Property="HeightRequest" Value="50"></Setter>
         <Setter Property="Margin" Value="0,0,0,0"></Setter>
         <Setter Property="ReturnType" Value="Done" />
     </Style>
 
     <Style x:Key="PasswordEntryStyle" TargetType="Entry">
-        <Setter Property="PlaceholderColor" Value="{StaticResource entryPlaceHolderColorDark}" />
-        <Setter Property="TextColor" Value="{StaticResource entryTextColor}"></Setter>
+        <Setter Property="PlaceholderColor" Value="{DynamicResource entryPlaceHolderColorDark}" />
+        <Setter Property="TextColor" Value="{DynamicResource entryTextColor}"></Setter>
         <Setter Property="HeightRequest" Value="50"></Setter>
         <Setter Property="Margin" Value="0,0,0,0"></Setter>
         <Setter Property="IsPassword" Value="True"></Setter>
@@ -96,9 +104,9 @@
     </Style>
 
     <Style TargetType="Button" x:Key="StandardButton">
-        <Setter Property="TextColor" Value="{StaticResource buttonTextColor}"/>
+        <Setter Property="TextColor" Value="{DynamicResource buttonTextColor}"/>
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="BackgroundColor" Value="{StaticResource primary}"/>
+        <Setter Property="BackgroundColor" Value="{DynamicResource primary}"/>
         <Setter Property="CornerRadius" Value="10"/>
         <Setter Property="Padding" Value="15, 10"/>
         <Setter Property="HeightRequest" Value="40" />
@@ -106,9 +114,9 @@
     </Style>
 
     <Style TargetType="Button" x:Key="StandardButtonSmall">
-        <Setter Property="TextColor" Value="{StaticResource buttonTextColor}"/>
+        <Setter Property="TextColor" Value="{DynamicResource buttonTextColor}"/>
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="BackgroundColor" Value="{StaticResource primary}"/>
+        <Setter Property="BackgroundColor" Value="{DynamicResource primary}"/>
         <Setter Property="CornerRadius" Value="10"/>
         <Setter Property="Padding" Value="15, 10"/>
         <Setter Property="HeightRequest" Value="30" />
@@ -207,11 +215,11 @@
         <Setter Property="VerticalOptions" Value="Center"/>
         <Setter Property="CornerRadius" Value="20"></Setter>
         <Setter Property="Opacity" Value="0.9"></Setter>
-        <Setter Property="BackgroundColor" Value="#f5f8fa"></Setter>
+        <Setter Property="BackgroundColor" Value="{DynamicResource cardBackgroundColor}"></Setter>
     </Style>
 
     <Style x:Key="LoginFieldLabel" TargetType="Label">
-        <Setter Property="TextColor" Value="{StaticResource labelTextColor}"/>
+        <Setter Property="TextColor" Value="{DynamicResource labelTextColor}"/>
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="13"/>
         <Setter Property="FontAttributes" Value="Bold"/>
@@ -221,23 +229,23 @@
         <Setter Property="CornerRadius" Value="12"/>
         <Setter Property="Padding" Value="10,0"/>
         <Setter Property="HasShadow" Value="False"/>
-        <Setter Property="BorderColor" Value="{StaticResource MidGray}"/>
-        <Setter Property="BackgroundColor" Value="{StaticResource LightGray}"/>
+        <Setter Property="BorderColor" Value="{DynamicResource entryContainerBorderColor}"/>
+        <Setter Property="BackgroundColor" Value="{DynamicResource entryContainerBackgroundColor}"/>
         <Setter Property="Margin" Value="0"/>
     </Style>
 
     <Style x:Key="LoginEntryCardStyle" TargetType="Entry">
-        <Setter Property="PlaceholderColor" Value="{StaticResource Gray400}"/>
-        <Setter Property="TextColor" Value="{StaticResource DarkGray}"/>
+        <Setter Property="PlaceholderColor" Value="{DynamicResource entryPlaceHolderColorDark}"/>
+        <Setter Property="TextColor" Value="{DynamicResource entryTextColor}"/>
         <Setter Property="HeightRequest" Value="45"/>
         <Setter Property="BackgroundColor" Value="Transparent"/>
         <Setter Property="ReturnType" Value="Done"/>
     </Style>
 
     <Style x:Key="LoginButton" TargetType="Button">
-        <Setter Property="TextColor" Value="{StaticResource buttonTextColor}"/>
+        <Setter Property="TextColor" Value="{DynamicResource buttonTextColor}"/>
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="BackgroundColor" Value="{StaticResource primary}"/>
+        <Setter Property="BackgroundColor" Value="{DynamicResource primary}"/>
         <Setter Property="CornerRadius" Value="25"/>
         <Setter Property="FontSize" Value="16"/>
         <Setter Property="FontAttributes" Value="Bold"/>
@@ -248,18 +256,18 @@
     <Style x:Key="HomeCardFrame" TargetType="Frame">
         <Setter Property="CornerRadius" Value="16"/>
         <Setter Property="HasShadow" Value="True"/>
-        <Setter Property="BackgroundColor" Value="White"/>
+        <Setter Property="BackgroundColor" Value="{DynamicResource cardBackgroundColor}"/>
         <Setter Property="Padding" Value="16,20"/>
-        <Setter Property="BorderColor" Value="{StaticResource Gray100}"/>
+        <Setter Property="BorderColor" Value="{DynamicResource cardBorderColor}"/>
         <Setter Property="Margin" Value="0"/>
     </Style>
 
     <Style x:Key="SelectionTileFrame" TargetType="Frame">
         <Setter Property="CornerRadius" Value="16"/>
         <Setter Property="HasShadow" Value="True"/>
-        <Setter Property="BackgroundColor" Value="White"/>
+        <Setter Property="BackgroundColor" Value="{DynamicResource cardBackgroundColor}"/>
         <Setter Property="Padding" Value="12,16"/>
-        <Setter Property="BorderColor" Value="{StaticResource Gray100}"/>
+        <Setter Property="BorderColor" Value="{DynamicResource cardBorderColor}"/>
         <Setter Property="Margin" Value="4"/>
         <Setter Property="WidthRequest" Value="150"/>
         <Setter Property="HeightRequest" Value="110"/>
@@ -268,24 +276,24 @@
     <Style x:Key="TransactionFormCard" TargetType="Frame">
         <Setter Property="CornerRadius" Value="16"/>
         <Setter Property="HasShadow" Value="True"/>
-        <Setter Property="BackgroundColor" Value="White"/>
+        <Setter Property="BackgroundColor" Value="{DynamicResource cardBackgroundColor}"/>
         <Setter Property="Padding" Value="20,16"/>
-        <Setter Property="BorderColor" Value="{StaticResource Gray100}"/>
+        <Setter Property="BorderColor" Value="{DynamicResource cardBorderColor}"/>
         <Setter Property="Margin" Value="0,8,0,8"/>
     </Style>
 
     <Style x:Key="StatusCardFrame" TargetType="Frame">
         <Setter Property="CornerRadius" Value="16"/>
         <Setter Property="HasShadow" Value="True"/>
-        <Setter Property="BackgroundColor" Value="White"/>
+        <Setter Property="BackgroundColor" Value="{DynamicResource cardBackgroundColor}"/>
         <Setter Property="Padding" Value="24,20"/>
-        <Setter Property="BorderColor" Value="{StaticResource Gray100}"/>
+        <Setter Property="BorderColor" Value="{DynamicResource cardBorderColor}"/>
         <Setter Property="Margin" Value="0,8,0,8"/>
     </Style>
 
     <Style x:Key="StatusMessageLabel" TargetType="Label">
         <Setter Property="FontSize" Value="15"/>
-        <Setter Property="TextColor" Value="{StaticResource labelTextColor}"/>
+        <Setter Property="TextColor" Value="{DynamicResource labelTextColor}"/>
         <Setter Property="HorizontalTextAlignment" Value="Center"/>
         <Setter Property="LineHeight" Value="1.4"/>
         <Setter Property="Margin" Value="0,8,0,16"/>
@@ -294,8 +302,8 @@
     <Style x:Key="SectionTitleLabel" TargetType="Label">
         <Setter Property="FontSize" Value="16"/>
         <Setter Property="FontAttributes" Value="Bold"/>
-        <Setter Property="TextColor" Value="{StaticResource labelTextColor}"/>
+        <Setter Property="TextColor" Value="{DynamicResource labelTextColor}"/>
         <Setter Property="Margin" Value="0,0,0,8"/>
     </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/TransactionProcessor.Mobile/Resources/Styles/Styles.xaml b/TransactionProcessor.Mobile/Resources/Styles/Styles.xaml
index 86f574d8c..211475cf0 100644
--- a/TransactionProcessor.Mobile/Resources/Styles/Styles.xaml
+++ b/TransactionProcessor.Mobile/Resources/Styles/Styles.xaml
@@ -161,7 +161,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="Label">
+    <Style TargetType="Label" ApplyToDerivedTypes="True">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
         <Setter Property="FontFamily" Value="OpenSansRegular" />
diff --git a/TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj b/TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj
index 64c750509..9a7d052a8 100644
--- a/TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj
+++ b/TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj
@@ -55,6 +55,9 @@
 		<Compile Update="Resources\Styles\LightTheme.xaml.cs">
 			<DependentUpon>LightTheme.xaml</DependentUpon>
 		</Compile>
+		<Compile Update="Resources\Styles\DarkTheme.xaml.cs">
+			<DependentUpon>DarkTheme.xaml</DependentUpon>
+		</Compile>
 		<MauiXaml Update="Pages\MyAccount\MyAccountAddressesPage.xaml">
 		  <Generator>MSBuild:Compile</Generator>
 		</MauiXaml>
@@ -142,6 +145,9 @@
 		<MauiXaml Update="Resources\Styles\LightTheme.xaml">
 			<Generator>MSBuild:Compile</Generator>
 		</MauiXaml>
+		<MauiXaml Update="Resources\Styles\DarkTheme.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</MauiXaml>
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/TransactionProcessor.Mobile/UIServices/ApplicationThemeService.cs b/TransactionProcessor.Mobile/UIServices/ApplicationThemeService.cs
new file mode 100644
index 000000000..f2256e8c6
--- /dev/null
+++ b/TransactionProcessor.Mobile/UIServices/ApplicationThemeService.cs
@@ -0,0 +1,93 @@
+using TransactionProcessor.Mobile.BusinessLogic.Database;
+using TransactionProcessor.Mobile.BusinessLogic.UIServices;
+using TransactionProcessor.Mobile.Resources.Styles;
+
+namespace TransactionProcessor.Mobile.UIServices;
+
+public class ApplicationThemeService : IApplicationThemeService
+{
+    private const String DarkThemeEnabledOptionName = "DarkThemeEnabled";
+
+    private readonly IDatabaseContext DatabaseContext;
+
+    public ApplicationThemeService(IDatabaseContext databaseContext)
+    {
+        this.DatabaseContext = databaseContext;
+    }
+
+    public async Task ApplyConfiguredTheme()
+    {
+        Boolean isDarkThemeEnabled = await this.GetDarkThemeEnabled();
+        this.ApplyTheme(isDarkThemeEnabled);
+    }
+
+    public async Task<Boolean> GetDarkThemeEnabled()
+    {
+        String? optionValue = await this.DatabaseContext.GetApplicationOption(DarkThemeEnabledOptionName);
+
+        return Boolean.TryParse(optionValue, out Boolean isDarkThemeEnabled) && isDarkThemeEnabled;
+    }
+
+    public async Task SetDarkTheme(Boolean isEnabled)
+    {
+        await this.DatabaseContext.SaveApplicationOption(DarkThemeEnabledOptionName, isEnabled.ToString());
+        this.ApplyTheme(isEnabled);
+    }
+
+    private void ApplyTheme(Boolean isDarkThemeEnabled)
+    {
+        if (Application.Current == null)
+        {
+            return;
+        }
+
+        Application.Current.UserAppTheme = isDarkThemeEnabled ? AppTheme.Dark : AppTheme.Light;
+
+        ICollection<ResourceDictionary> mergedDictionaries = Application.Current.Resources.MergedDictionaries;
+        ResourceDictionary? existingTheme = mergedDictionaries.FirstOrDefault(d => d is LightTheme or DarkTheme);
+        ResourceDictionary selectedTheme = isDarkThemeEnabled ? new DarkTheme() : new LightTheme();
+
+        if (existingTheme == null)
+        {
+            mergedDictionaries.Add(selectedTheme);
+            return;
+        }
+
+        ReplaceThemeDictionary(mergedDictionaries, existingTheme, selectedTheme);
+    }
+
+    private static void ReplaceThemeDictionary(ICollection<ResourceDictionary> mergedDictionaries,
+                                               ResourceDictionary existingTheme,
+                                               ResourceDictionary selectedTheme)
+    {
+        if (mergedDictionaries is IList<ResourceDictionary> dictionaryList)
+        {
+            Int32 themeIndex = dictionaryList.IndexOf(existingTheme);
+            if (themeIndex < 0)
+            {
+                mergedDictionaries.Add(selectedTheme);
+                return;
+            }
+
+            dictionaryList.RemoveAt(themeIndex);
+            dictionaryList.Insert(themeIndex, selectedTheme);
+            return;
+        }
+
+        List<ResourceDictionary> dictionaries = mergedDictionaries.ToList();
+        Int32 replacementIndex = dictionaries.IndexOf(existingTheme);
+        if (replacementIndex < 0)
+        {
+            mergedDictionaries.Add(selectedTheme);
+            return;
+        }
+
+        dictionaries[replacementIndex] = selectedTheme;
+
+        mergedDictionaries.Clear();
+        foreach (ResourceDictionary resourceDictionary in dictionaries)
+        {
+            mergedDictionaries.Add(resourceDictionary);
+        }
+    }
+}