diff --git a/components/nav/NavBottomMoreMenu.vue b/components/nav/NavBottomMoreMenu.vue
index ab45b763..a4b549a3 100644
--- a/components/nav/NavBottomMoreMenu.vue
+++ b/components/nav/NavBottomMoreMenu.vue
@@ -83,7 +83,7 @@ onBeforeUnmount(() => {
               hover="bg-gray-100 dark:(bg-gray-700 text-white)"
               @click="toggleDark()"
             >
-              <span class="i-ri:sun-line dark:i-ri:moon-line flex-shrink-0 text-xl mr-4 !align-middle" />
+              <span class="i-ri:sun-line dark:i-ri:moon-line flex-shrink-0 text-xl mr-4 rtl-mr-0 rtl-ml-4 !align-middle" />
               {{ colorMode === 'light' ? $t('menu.toggle_theme.dark') : $t('menu.toggle_theme.light') }}
             </button>
             <NuxtLink
@@ -94,7 +94,7 @@ onBeforeUnmount(() => {
               hover="bg-gray-100 dark:(bg-gray-700 text-white)"
               to="/settings"
             >
-              <span class="i-ri:settings-2-line flex-shrink-0 text-xl mr-4 !align-middle" />
+              <span class="i-ri:settings-2-line flex-shrink-0 text-xl mr-4 rtl-mr-0 rtl-ml-4 !align-middle" />
               {{ $t('nav.settings') }}
             </NuxtLink>
           </div>
diff --git a/components/settings/SettingsNavItem.vue b/components/settings/SettingsNavItem.vue
index 73fde113..74ac04dd 100644
--- a/components/settings/SettingsNavItem.vue
+++ b/components/settings/SettingsNavItem.vue
@@ -54,7 +54,7 @@ if (props.command) {
           </p>
         </div>
       </div>
-      <div i-ri:arrow-right-s-line text-xl text-secondary-light />
+      <div i-ri:arrow-right-s-line rtl-i-ri:arrow-left-s-line text-xl text-secondary-light />
     </div>
   </NuxtLink>
 </template>
diff --git a/layouts/default.vue b/layouts/default.vue
index 64f517c0..466e335f 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -14,7 +14,7 @@ const wideLayout = computed(() => route.meta.wideLayout ?? false)
             <div flex="~ col" overflow-y-auto justify-between h-full max-w-full>
               <div flex flex-col>
                 <NavSide />
-                <PublishButton m="y5 xa" lg:m="x5 l3" />
+                <PublishButton m="y5 xa" lg:m="r5 l3" lg:rtl-m="l5 r3" />
               </div>
               <div v-if="isMastoInitialised" flex flex-col>
                 <UserSignInEntry v-if="!currentUser" sm:hidden />