diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitToggleButton/BitToggleButton.razor b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitToggleButton/BitToggleButton.razor
index 3d8cbd0c63..b1bb092bc8 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitToggleButton/BitToggleButton.razor
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitToggleButton/BitToggleButton.razor
@@ -18,7 +18,11 @@
         }
         else
         {
-            <i style="@Styles?.Icon" class="bit-icon bit-icon--@GetIconName() @Classes?.Icon" />
+            var iconName = GetIconName();
+            if (iconName.HasValue())
+            {
+                <i style="@Styles?.Icon" class="bit-icon bit-icon--@iconName @Classes?.Icon" />
+            }
             <span style="@Styles?.Text" class="bit-tgb-txt @Classes?.Text">@GetText()</span>
         }
     </span>
diff --git a/src/BlazorUI/Demo/Client/Core/Pages/Components/Inputs/Toggle/BitToggleDemo.razor b/src/BlazorUI/Demo/Client/Core/Pages/Components/Inputs/Toggle/BitToggleDemo.razor
index 91e29413ed..f91ce0a112 100644
--- a/src/BlazorUI/Demo/Client/Core/Pages/Components/Inputs/Toggle/BitToggleDemo.razor
+++ b/src/BlazorUI/Demo/Client/Core/Pages/Components/Inputs/Toggle/BitToggleDemo.razor
@@ -48,13 +48,13 @@
         <ExamplePreview>
             <div class="example-box">
                 <div style="display:flex; align-items:flex-end">
-                    <BitToggle Value="OneWayValue" Label="One-way" OnText="Off" OffText="On" />
-                    <BitToggleButton @bind-IsChecked="OneWayValue" Text="@(OneWayValue ? "Off" : "On")" />
+                    <BitToggle Value="OneWayValue" Label="One-way" OnText="On" OffText="Off" />
+                    <BitToggleButton @bind-IsChecked="OneWayValue" OnText="On" OffText="Off" />
                 </div>
                 <br />
                 <div style="display:flex; align-items:flex-end">
-                    <BitToggle @bind-Value="TwoWayValue" Label="Two-way" OnText="Off" OffText="On" />
-                    <BitToggleButton @bind-IsChecked="TwoWayValue" Text="@(TwoWayValue ? "Off" : "On")" />
+                    <BitToggle @bind-Value="TwoWayValue" Label="Two-way" OnText="On" OffText="Off" />
+                    <BitToggleButton @bind-IsChecked="TwoWayValue" OnText="On" OffText="Off" />
                 </div>
             </div>
         </ExamplePreview>
diff --git a/src/BlazorUI/Demo/Client/Core/Pages/Components/Inputs/Toggle/BitToggleDemo.razor.cs b/src/BlazorUI/Demo/Client/Core/Pages/Components/Inputs/Toggle/BitToggleDemo.razor.cs
index 2e0dddef5d..f435d83678 100644
--- a/src/BlazorUI/Demo/Client/Core/Pages/Components/Inputs/Toggle/BitToggleDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Core/Pages/Components/Inputs/Toggle/BitToggleDemo.razor.cs
@@ -93,11 +93,11 @@ public partial class BitToggleDemo
 private bool LabelTemplateValue;";
 
     private readonly string example4HtmlCode = @"
-<BitToggle Value=""OneWayValue"" Label=""One-way"" OnText=""Off"" OffText=""On"" />
-<BitToggleButton @bind-IsChecked=""OneWayValue"" Text=""@(OneWayValue ? ""Off"" : ""On"")"" />
+<BitToggle Value=""OneWayValue"" Label=""One-way"" OnText=""On"" OffText=""Off"" />
+<BitToggleButton @bind-IsChecked=""OneWayValue"" OnText=""On"" OffText=""Off"" />
 
-<BitToggle @bind-Value=""TwoWayValue"" Label=""Two-way"" OnText=""Off"" OffText=""On"" />
-<BitToggleButton @bind-IsChecked=""TwoWayValue"" Text=""@(TwoWayValue ? ""Off"" : ""On"")"" />";
+<BitToggle @bind-Value=""TwoWayValue"" Label=""Two-way"" OnText=""On"" OffText=""Off"" />
+<BitToggleButton @bind-IsChecked=""TwoWayValue"" OnText=""On"" OffText=""Off"" />";
     private readonly string example4CsharpCode = @"
 private bool OneWayValue;
 private bool TwoWayValue;";
diff --git a/src/BlazorUI/Demo/Client/Core/Pages/Home/PopularComponents.razor b/src/BlazorUI/Demo/Client/Core/Pages/Home/PopularComponents.razor
index e72d3c4372..e8f1dbf06c 100644
--- a/src/BlazorUI/Demo/Client/Core/Pages/Home/PopularComponents.razor
+++ b/src/BlazorUI/Demo/Client/Core/Pages/Home/PopularComponents.razor
@@ -105,8 +105,8 @@
                                  IconName="@BitIconName.CodeEdit"
                                  ButtonStyle="BitButtonStyle.Standard"
                                  Style="border:none"
-                                 Text="@(showCode ? "Hide code" : "Show code")"
-                                 Title="@(showCode ? "Hide code" : "Show code")" />
+                                 OnText="Hide code" OffText="Show code"
+                                 OnTitle="Hide code" offTitle="Show code" />
             </div>
         </div>
         @if (showCode)