diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html
index e4381b7b05..a605e3b4a4 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html
@@ -31,8 +31,10 @@
     <ng-template #abpBody>
       <form (ngSubmit)="service.save()">
         <div class="mt-2">
-          <div class="form-group">
-            <label for="name">{{ 'AbpUiMultiTenancy::Name' | abpLocalization }}</label>
+          <div class="mb-3 form-group">
+            <label for="name" class="form-label">{{
+              'AbpUiMultiTenancy::Name' | abpLocalization
+            }}</label>
             <input
               [(ngModel)]="service.name"
               type="text"
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.html
index 307bc961c1..64a1bb4d6a 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.html
@@ -27,15 +27,15 @@
     <strong>{{ (currentUser$ | async)?.userName }}</strong>
   </a>
   <div
-    class="dropdown-menu dropdown-menu-right border-0 shadow-sm"
+    class="dropdown-menu dropdown-menu-end border-0 shadow-sm"
     aria-labelledby="dropdownMenuLink"
     [class.d-block]="smallScreen && currentUserDropdown.isOpen()"
   >
     <a class="dropdown-item pointer" (click)="navigateToManageProfile()"
-      ><i class="fa fa-cog mr-1"></i>{{ 'AbpAccount::MyAccount' | abpLocalization }}</a
+      ><i class="fa fa-cog me-1"></i>{{ 'AbpAccount::MyAccount' | abpLocalization }}</a
     >
     <a class="dropdown-item" href="javascript:void(0)" (click)="logout()"
-      ><i class="fa fa-power-off mr-1"></i>{{ 'AbpUi::Logout' | abpLocalization }}</a
+      ><i class="fa fa-power-off me-1"></i>{{ 'AbpUi::Logout' | abpLocalization }}</a
     >
   </div>
 </div>
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html
index aae02df783..434f3dafde 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html
@@ -86,7 +86,7 @@
           abpEllipsis="210px"
           [abpEllipsisEnabled]="!smallScreen"
           role="button"
-          class="btn d-block text-left dropdown-toggle"
+          class="btn d-block text-start dropdown-toggle"
         >
           <i *ngIf="child.iconClass" [ngClass]="child.iconClass"></i>
           {{ child.name | abpLocalization }}
@@ -94,7 +94,7 @@
       </div>
       <div
         #childrenContainer
-        class="dropdown-menu border-0 shadow-sm"
+        class="dropdown-menu dropdown-menu-start border-0 shadow-sm"
         [class.d-block]="smallScreen && dropdownSubmenu.isOpen()"
       >
         <ng-container *ngTemplateOutlet="forTemplate; context: { $implicit: child }"></ng-container>
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts b/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts
index 5b82f0ba85..a8b5cb296d 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts
@@ -44,6 +44,11 @@ export default `
     top: 0;
     left: 100%;
 }
+/* work around for rtl. Track https://github.com/ng-bootstrap/ng-bootstrap/issues/4100 issue */
+[dir=rtl] .navbar .dropdown-submenu .dropdown-menu {
+    top: 0;
+    right: 100%;
+}
 .card-header .btn {
     padding: 2px 6px;
 }