diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index e3d1ff74..dcb9af1d 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -21,7 +21,7 @@
         <input type="password" name="Password" class="form-control" placeholder="Password" bind="@Password" />
     </div>
     <button type="button" class="btn btn-primary" onclick="@Login">Login</button>
-    <NavLink class="btn btn" href="/">Cancel</NavLink>
+    <NavLink class="btn btn-secondary" href="/">Cancel</NavLink>
 </div>
 
 @functions {
diff --git a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
index c323d4a9..aab99dc7 100644
--- a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
@@ -64,7 +64,7 @@
     </tr>
 </table>
 <button class="btn btn-success" onclick="@SaveModule">Save</button>
-<NavLink class="btn btn" href="@NavigateUrl()">Cancel</NavLink>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @functions {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Edit; } }
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 91371a4e..e78398ee 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -113,7 +113,7 @@
     </tr>
 </table>
 <button class="btn btn-success" onclick="@SavePage">Save</button>
-<NavLink class="btn btn" href="@NavigateUrl()">Cancel</NavLink>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @functions {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }
diff --git a/Oqtane.Client/Modules/Admin/Pages/Delete.razor b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
index e3d04920..8192315e 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Delete.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
@@ -112,8 +112,8 @@
         </td>
     </tr>
 </table>
-<button class="btn btn-success" onclick="@DeletePage">Delete</button>
-<NavLink class="btn btn" href="@NavigateUrl()">Cancel</NavLink>
+<button class="btn btn-danger" onclick="@DeletePage">Delete</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @functions {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index 9a1abda6..3be0d431 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -113,7 +113,7 @@
     </tr>
 </table>
 <button class="btn btn-success" onclick="@SavePage">Save</button>
-<NavLink class="btn btn" href="@NavigateUrl()">Cancel</NavLink>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @functions {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }
diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor
index b34495ae..d94f1bc1 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor
@@ -25,7 +25,7 @@ else
             {
                 <tr>
                     <td><ActionLink Action="Edit" Parameters="@($"id=" + p.PageId.ToString())" /></td>
-                    <td><ActionLink Action="Delete" Parameters="@($"id=" + p.PageId.ToString())" /></td>
+                    <td><ActionLink Action="Delete" Parameters="@($"id=" + p.PageId.ToString())" ButtonClass="btn-danger" /></td>
                     <td>@p.Path</td>
                     <td>@p.Name</td>
                 </tr>
diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
index 5d4dfbeb..c1d6eaab 100644
--- a/Oqtane.Client/Modules/Admin/Register/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -18,7 +18,7 @@
         <input type="password" name="Password" class="form-control" placeholder="Password" bind="@Password" />
     </div>
     <button type="button" class="btn btn-primary">Register</button>
-    <NavLink class="btn btn" href="/">Cancel</NavLink>
+    <NavLink class="btn btn-secondary" href="/">Cancel</NavLink>
 </div>
 
 @functions {
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index 5baa85dd..dbd821af 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -26,7 +26,7 @@
     </tr>
 </table>
 <button class="btn btn-success" onclick="@SaveSite">Save</button>
-<NavLink class="btn btn" href="@NavigateUrl()">Cancel</NavLink>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @functions {
     public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } }
diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor
index baf34acc..6b8ba4cc 100644
--- a/Oqtane.Client/Modules/Controls/ActionLink.razor
+++ b/Oqtane.Client/Modules/Controls/ActionLink.razor
@@ -7,7 +7,7 @@
 
 @if (authorized)
 {
-    <NavLink class="btn btn-primary" href="@url">@text</NavLink>
+    <NavLink class="@buttonClass" href="@url">@text</NavLink>
 }
 
 @functions {
@@ -20,9 +20,13 @@
     [Parameter]
     private string Parameters { get; set; } // optional
 
+    [Parameter]
+    private string ButtonClass { get; set; } // optional
+
     string text = "";
     string url = "";
     string parameters = "";
+    string buttonClass = "btn btn-primary";
     bool authorized = false;
 
     protected override void OnInit()
@@ -32,10 +36,17 @@
         {
             text = Text;
         }
+
         if (!String.IsNullOrEmpty(Parameters))
         {
             parameters = Parameters;
         }
+
+        if (!string.IsNullOrEmpty(ButtonClass))
+        {
+            buttonClass = "btn " + ButtonClass;
+        }
+
         url = EditUrl(Action, parameters);
 
         string typename = ModuleState.ModuleType.Replace(Utilities.GetTypeNameClass(ModuleState.ModuleType) + ",", Action + ",");
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index 7c216f5a..e6c74b7d 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -20,7 +20,7 @@
         </tr>
     </table>
     <button class="btn btn-success" onclick="@SaveContent">Save</button>
-    <NavLink class="btn btn" href="@NavigateUrl()">Cancel</NavLink>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 </form>
 
 @functions {