diff --git a/examples/FluentUI.Demo.Shared/Microsoft.Fast.Components.FluentUI.xml b/examples/FluentUI.Demo.Shared/Microsoft.Fast.Components.FluentUI.xml
index 34bc69fa40..53e2d5d0c0 100644
--- a/examples/FluentUI.Demo.Shared/Microsoft.Fast.Components.FluentUI.xml
+++ b/examples/FluentUI.Demo.Shared/Microsoft.Fast.Components.FluentUI.xml
@@ -3117,6 +3117,11 @@
             Callback function for when the menu group is expanded
             </summary>
         </member>
+        <member name="M:Microsoft.Fast.Components.FluentUI.FluentNavMenuGroup.Dispose">
+            <summary>
+            Dispose of this navmenu group.
+            </summary>
+        </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavMenuLink.ChildContent">
             <summary>
             Gets or sets the content to be rendered inside the component.
@@ -3173,6 +3178,11 @@
             Gets or sets the width of the link (in pixels).
             </summary>
         </member>
+        <member name="M:Microsoft.Fast.Components.FluentUI.FluentNavMenuLink.Dispose">
+            <summary>
+            Dispose of this navmenu link.
+            </summary>
+        </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNumberField`1.HideStep">
             <summary>
             When true, spin buttons will not be rendered
diff --git a/src/Microsoft.Fast.Components.FluentUI/Components/NavMenu/FluentNavMenu.razor.css b/src/Microsoft.Fast.Components.FluentUI/Components/NavMenu/FluentNavMenu.razor.css
index 0329cd3487..6e4c80dece 100644
--- a/src/Microsoft.Fast.Components.FluentUI/Components/NavMenu/FluentNavMenu.razor.css
+++ b/src/Microsoft.Fast.Components.FluentUI/Components/NavMenu/FluentNavMenu.razor.css
@@ -67,10 +67,11 @@
 ::deep .navmenu-group::part(expand-collapse-button) {
     left: unset;
     right: 0;
-    margin-right: calc(var(--expand-collapse-button-size) * -1);
+    margin-inline-end: calc(var(--expand-collapse-button-size) * -1 + (var(--design-unit) * 2px));
 }
 
 [dir="rtl"] * ::deep .navmenu-group.nested::part(expand-collapse-button) {
     left: 0;
     right: unset;
+    margin-inline-start: calc(var(--expand-collapse-button-size) - (var(--design-unit) * 2px));
 }
\ No newline at end of file