diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawBrowseModal.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawBrowseModal.razor
index de50996f..bb65b807 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawBrowseModal.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawBrowseModal.razor
@@ -180,7 +180,7 @@
                                                     </text>
                                                 }
                                             </div>
-                                            <div class="d-flex gap-2 mt-2">
+                                            <div class="btn-group btn-group-sm mt-2" role="group">
                                                 <button type="button" class="btn btn-warning btn-sm"
                                                         disabled="@_rebirthBusy" @onclick="ConfirmRebirthAsync">
                                                     @if (_rebirthBusy) { <span class="spinner-border spinner-border-sm me-1"></span> }
@@ -236,12 +236,14 @@
                     }
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-outline-secondary" @onclick="CloseAsync" disabled="@_busy">Cancel</button>
-                    <button type="button" class="btn btn-primary" @onclick="CommitAsync"
-                            disabled="@(_busy || _selected.Count == 0)">
-                        @if (_busy) { <span class="spinner-border spinner-border-sm me-1"></span> }
-                        Add @_selected.Count tag@(_selected.Count == 1 ? "" : "s")
-                    </button>
+                    <div class="btn-group" role="group">
+                        <button type="button" class="btn btn-outline-secondary" @onclick="CloseAsync" disabled="@_busy">Cancel</button>
+                        <button type="button" class="btn btn-primary" @onclick="CommitAsync"
+                                disabled="@(_busy || _selected.Count == 0)">
+                            @if (_busy) { <span class="spinner-border spinner-border-sm me-1"></span> }
+                            Add @_selected.Count tag@(_selected.Count == 1 ? "" : "s")
+                        </button>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawConfirmDialog.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawConfirmDialog.razor
index 2d8ccda4..db245031 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawConfirmDialog.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawConfirmDialog.razor
@@ -17,11 +17,13 @@
                     <p class="mb-0">@Message</p>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-outline-secondary" @onclick="Cancel" disabled="@_busy">Cancel</button>
-                    <button type="button" class="btn btn-danger" @onclick="Confirm" disabled="@_busy">
-                        @if (_busy) { <span class="spinner-border spinner-border-sm me-1"></span> }
-                        @ConfirmLabel
-                    </button>
+                    <div class="btn-group" role="group">
+                        <button type="button" class="btn btn-outline-secondary" @onclick="Cancel" disabled="@_busy">Cancel</button>
+                        <button type="button" class="btn btn-danger" @onclick="Confirm" disabled="@_busy">
+                            @if (_busy) { <span class="spinner-border spinner-border-sm me-1"></span> }
+                            @ConfirmLabel
+                        </button>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawCsvExportModal.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawCsvExportModal.razor
index 674e5876..a7af44d6 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawCsvExportModal.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawCsvExportModal.razor
@@ -47,11 +47,13 @@
                     }
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-outline-secondary" @onclick="Close">Close</button>
-                    @if (!_loading && _error is null)
-                    {
-                        <a class="btn btn-primary" download="@_fileName" href="@_dataUri">Download CSV</a>
-                    }
+                    <div class="btn-group" role="group">
+                        <button type="button" class="btn btn-outline-secondary" @onclick="Close">Close</button>
+                        @if (!_loading && _error is null)
+                        {
+                            <a class="btn btn-primary" download="@_fileName" href="@_dataUri">Download CSV</a>
+                        }
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawCsvImportModal.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawCsvImportModal.razor
index 60c5f650..b755ed7c 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawCsvImportModal.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawCsvImportModal.razor
@@ -119,7 +119,7 @@
                                                 }
                                             </td>
                                             <td>
-                                                <button type="button" class="btn btn-sm btn-outline-danger py-0"
+                                                <button type="button" class="btn btn-sm btn-outline-danger"
                                                         title="Remove this row from the import"
                                                         @onclick="() => RemoveRow(row.RowNumber)">✕</button>
                                             </td>
@@ -144,16 +144,18 @@
                     }
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-outline-secondary" @onclick="Close">Cancel</button>
-                    <button type="button" class="btn btn-primary"
-                            disabled="@(!CanCommit || _committing)"
-                            @onclick="Commit">
-                        @if (_committing)
-                        {
-                            <span class="spinner-border spinner-border-sm"></span>
-                        }
-                        Commit @RemainingCount tag@(RemainingCount == 1 ? "" : "s")
-                    </button>
+                    <div class="btn-group" role="group">
+                        <button type="button" class="btn btn-outline-secondary" @onclick="Close">Cancel</button>
+                        <button type="button" class="btn btn-primary"
+                                disabled="@(!CanCommit || _committing)"
+                                @onclick="Commit">
+                            @if (_committing)
+                            {
+                                <span class="spinner-border spinner-border-sm"></span>
+                            }
+                            Commit @RemainingCount tag@(RemainingCount == 1 ? "" : "s")
+                        </button>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawDriverTypeDialog.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawDriverTypeDialog.razor
index a14c7140..c7170544 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawDriverTypeDialog.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawDriverTypeDialog.razor
@@ -37,8 +37,10 @@
                     }
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                    <button type="button" class="btn btn-primary" @onclick="Submit">Create</button>
+                    <div class="btn-group" role="group">
+                        <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
+                        <button type="button" class="btn btn-primary" @onclick="Submit">Create</button>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawManualTagEntryModal.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawManualTagEntryModal.razor
index 1042c96e..05ef3dbb 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawManualTagEntryModal.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawManualTagEntryModal.razor
@@ -120,11 +120,13 @@
                     }
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-outline-secondary" @onclick="CloseAsync" disabled="@_busy">Cancel</button>
-                    <button type="button" class="btn btn-primary" @onclick="CommitAsync" disabled="@_busy">
-                        @if (_busy) { <span class="spinner-border spinner-border-sm me-1"></span> }
-                        Create @_rows.Count tag@(_rows.Count == 1 ? "" : "s")
-                    </button>
+                    <div class="btn-group" role="group">
+                        <button type="button" class="btn btn-outline-secondary" @onclick="CloseAsync" disabled="@_busy">Cancel</button>
+                        <button type="button" class="btn btn-primary" @onclick="CommitAsync" disabled="@_busy">
+                            @if (_busy) { <span class="spinner-border spinner-border-sm me-1"></span> }
+                            Create @_rows.Count tag@(_rows.Count == 1 ? "" : "s")
+                        </button>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawNameDialog.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawNameDialog.razor
index c7743808..2778dc79 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawNameDialog.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawNameDialog.razor
@@ -27,8 +27,10 @@
                     }
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                    <button type="button" class="btn btn-primary" @onclick="Submit">OK</button>
+                    <div class="btn-group" role="group">
+                        <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
+                        <button type="button" class="btn btn-primary" @onclick="Submit">OK</button>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawTagModal.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawTagModal.razor
index 1337dc8e..6f1438aa 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawTagModal.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawTagModal.razor
@@ -98,11 +98,13 @@
                         }
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-outline-secondary" @onclick="CloseAsync" disabled="@_busy">Cancel</button>
-                        <button type="submit" class="btn btn-primary" disabled="@(_busy || _loadError is not null)">
-                            @if (_busy) { <span class="spinner-border spinner-border-sm me-1"></span> }
-                            Save changes
-                        </button>
+                        <div class="btn-group" role="group">
+                            <button type="button" class="btn btn-outline-secondary" @onclick="CloseAsync" disabled="@_busy">Cancel</button>
+                            <button type="submit" class="btn btn-primary" disabled="@(_busy || _loadError is not null)">
+                                @if (_busy) { <span class="spinner-border spinner-border-sm me-1"></span> }
+                                Save changes
+                            </button>
+                        </div>
                     </div>
                 </EditForm>
             </div>
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawTree.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawTree.razor
index fef10dcd..767dd77c 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawTree.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Raw/RawTree.razor
@@ -173,14 +173,14 @@
         <div @key="node.Key" class="d-flex align-items-center gap-1 py-1" style="@indent">
             @if (hasExpander)
             {
-                <button type="button" class="btn btn-sm btn-link p-0" style="width:18px"
+                <button type="button" class="btn btn-sm btn-link p-0 tree-twist"
                         @onclick="@(() => ToggleAsync(node))">
                     @(node.Expanded ? "▼" : "▶")
                 </button>
             }
             else
             {
-                <span style="width:18px"></span>
+                <span class="tree-twist"></span>
             }
 
             @if (items.Count > 0)