diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/TimePickers/CircularTimePicker/BitCircularTimePicker.scss b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/TimePickers/CircularTimePicker/BitCircularTimePicker.scss
index cd04f1813e..8365bc212f 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/TimePickers/CircularTimePicker/BitCircularTimePicker.scss
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/TimePickers/CircularTimePicker/BitCircularTimePicker.scss
@@ -67,8 +67,8 @@
 
 .bit-ctp-ico {
     cursor: pointer;
-    padding-right: 0;
-    padding-left: spacing(1);
+    padding-inline-end: 0;
+    padding-inline-start: spacing(1);
     color: $color-foreground-secondary;
 }
 
@@ -102,8 +102,8 @@
     }
 
     .bit-ctp-ico {
-        padding-left: 0;
-        padding-right: spacing(1);
+        padding-inline-start: 0;
+        padding-inline-end: spacing(1);
     }
 }
 
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/TimePickers/TimePicker/BitTimePicker.razor b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/TimePickers/TimePicker/BitTimePicker.razor
index 4efc8785d9..b837451065 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/TimePickers/TimePicker/BitTimePicker.razor
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/TimePickers/TimePicker/BitTimePicker.razor
@@ -4,7 +4,7 @@
 <div @ref="RootElement" @attributes="HtmlAttributes"
      id="@_Id"
      style="@StyleBuilder.Value"
-     class="@ClassBuilder.Value" 
+     class="@ClassBuilder.Value"
      dir="@Dir?.ToString().ToLower()">
 
     @if (LabelTemplate is not null)
@@ -140,14 +140,18 @@
                     </button>
                 </div>
             }
-            <button @onclick="CloseCallout"
-                    type="button"
-                    style="@Styles?.CloseButton"
-                    class="bit-tpc-tbt bit-tpc-cbn @Classes?.CloseButton"
-                    title="@CloseButtonTitle"
-                    aria-label="@CloseButtonTitle">
-                <i style="@Styles?.CloseButtonIcon" class="bit-icon bit-icon--Cancel @Classes?.CloseButtonIcon" aria-hidden="true" />
-            </button>
+
+            @if (ShowCloseButton)
+            {
+                <button @onclick="CloseCallout"
+                        type="button"
+                        style="@Styles?.CloseButton"
+                        class="bit-tpc-tbt bit-tpc-cbn @Classes?.CloseButton"
+                        title="@CloseButtonTitle"
+                        aria-label="@CloseButtonTitle">
+                    <i style="@Styles?.CloseButtonIcon" class="bit-icon bit-icon--Cancel @Classes?.CloseButtonIcon" aria-hidden="true" />
+                </button>
+            }
         </div>
     </div>
 
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/TimePickers/TimePicker/BitTimePicker.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/TimePickers/TimePicker/BitTimePicker.razor.cs
index 8b677983fe..c31818c390 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/TimePickers/TimePicker/BitTimePicker.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/TimePickers/TimePicker/BitTimePicker.razor.cs
@@ -266,6 +266,11 @@ public bool IsOpen
     /// </summary>
     [Parameter] public string? Placeholder { get; set; }
 
+    /// <summary>
+    /// Whether the BitTimePicker's close button should be shown or not.
+    /// </summary>
+    [Parameter] public bool ShowCloseButton { get; set; }
+
     /// <summary>
     /// Custom CSS styles for different parts of the BitTimePicker component.
     /// </summary>
@@ -287,6 +292,7 @@ public bool IsOpen
     [Parameter] public string? ValueFormat { get; set; }
 
 
+
     [JSInvokable("CloseCallout")]
     public void CloseCalloutBeforeAnotherCalloutIsOpened()
     {
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TimePickers/TimePicker/BitTimePickerDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TimePickers/TimePicker/BitTimePickerDemo.razor
index 7c4f2c7924..14e27477f3 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TimePickers/TimePicker/BitTimePickerDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TimePickers/TimePicker/BitTimePickerDemo.razor
@@ -209,6 +209,7 @@
         <ExamplePreview>
             <BitTimePicker Style="max-width: 175px"
                            IsResponsive="true"
+                           ShowCloseButton="true"
                            AriaLabel="Select a time"
                            Placeholder="Select a time..." />
         </ExamplePreview>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TimePickers/TimePicker/BitTimePickerDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TimePickers/TimePicker/BitTimePickerDemo.razor.cs
index b2d43ae2d8..10b4947417 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TimePickers/TimePicker/BitTimePickerDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TimePickers/TimePicker/BitTimePickerDemo.razor.cs
@@ -521,6 +521,13 @@ public partial class BitTimePickerDemo
                     Type = "string?",
                     DefaultValue = "null",
                     Description = "Custom CSS classes/styles for the close button icon of the BitTimePicker."
+                },
+                new()
+                {
+                    Name = "ShowCloseButton",
+                    Type = "bool",
+                    DefaultValue = "false",
+                    Description = "Whether the BitTimePicker's close button should be shown or not."
                 }
             }
         }
@@ -737,6 +744,7 @@ public class FormValidationTimePickerModel
     private readonly string example14RazorCode = @"
 <BitTimePicker Style=""max-width: 175px""
                IsResponsive=""true""
+               ShowCloseButton=""true""
                AriaLabel=""Select a time""
                Placeholder=""Select a time..."" />";
 
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/MauiProgram.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/MauiProgram.cs
index 70a16b6452..0de1e6ea49 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/MauiProgram.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/MauiProgram.cs
@@ -133,5 +133,7 @@ private static void SetupBlazorWebView()
             settings.BlockNetworkLoads = settings.BlockNetworkImage = false;
 #endif
         });
+
+        AppContext.SetSwitch("BlazorWebView.AndroidFireAndForgetAsync", isEnabled: true);
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.cs
index 50c08296d4..525754446c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MauiProgram.cs
@@ -151,6 +151,8 @@ private static void SetupBlazorWebView()
             settings.BlockNetworkLoads = settings.BlockNetworkImage = false;
 #endif
         });
+
+        AppContext.SetSwitch("BlazorWebView.AndroidFireAndForgetAsync", isEnabled: true);
     }
 
 #if IOS || MACCATALYST