diff --git a/packages/ui/src/elements/Button/index.scss b/packages/ui/src/elements/Button/index.scss
index 403d54b0f..389b40b62 100644
--- a/packages/ui/src/elements/Button/index.scss
+++ b/packages/ui/src/elements/Button/index.scss
@@ -68,11 +68,20 @@
       background-color: var(--bg-color);
       box-shadow: var(--box-shadow);
       border-radius: $style-radius-m;
-      border-left: 1px solid var(--theme-bg);
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
       align-items: center;
 
+      html:not([dir='RTL']) & {
+        border-left: 1px solid var(--theme-bg);
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+      }
+
+      html[dir='RTL'] & {
+        border-right: 1px solid var(--theme-bg);
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+      }
+
       &:hover,
       &:focus-visible,
       &:focus,
@@ -236,8 +245,15 @@
     }
 
     &--withPopup .btn {
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
+      html:not([dir='RTL']) & {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+      }
+
+      html[dir='RTL'] & {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+      }
     }
 
     &--style-icon-label,
diff --git a/packages/ui/src/fields/Tabs/Tab/index.scss b/packages/ui/src/fields/Tabs/Tab/index.scss
index 1adf725e2..4bed16e9f 100644
--- a/packages/ui/src/fields/Tabs/Tab/index.scss
+++ b/packages/ui/src/fields/Tabs/Tab/index.scss
@@ -6,7 +6,8 @@
     @extend %h4;
     display: flex;
     padding-bottom: base(1);
-    margin: 0 $baseline 0 0;
+    margin: 0;
+    margin-inline-end: $baseline;
     cursor: pointer;
     opacity: 0.5;
     position: relative;
diff --git a/templates/website/src/blocks/ArchiveBlock/Component.tsx b/templates/website/src/blocks/ArchiveBlock/Component.tsx
index 3bc027a72..48a57ec5d 100644
--- a/templates/website/src/blocks/ArchiveBlock/Component.tsx
+++ b/templates/website/src/blocks/ArchiveBlock/Component.tsx
@@ -56,7 +56,7 @@ export const ArchiveBlock: React.FC<
     <div className="my-16" id={`block-${id}`}>
       {introContent && (
         <div className="container mb-16">
-          <RichText className="ml-0 max-w-[48rem]" data={introContent} enableGutter={false} />
+          <RichText className="ms-0 max-w-[48rem]" data={introContent} enableGutter={false} />
         </div>
       )}
       <CollectionArchive posts={posts} />
diff --git a/templates/with-vercel-website/src/blocks/ArchiveBlock/Component.tsx b/templates/with-vercel-website/src/blocks/ArchiveBlock/Component.tsx
index 3bc027a72..48a57ec5d 100644
--- a/templates/with-vercel-website/src/blocks/ArchiveBlock/Component.tsx
+++ b/templates/with-vercel-website/src/blocks/ArchiveBlock/Component.tsx
@@ -56,7 +56,7 @@ export const ArchiveBlock: React.FC<
     <div className="my-16" id={`block-${id}`}>
       {introContent && (
         <div className="container mb-16">
-          <RichText className="ml-0 max-w-[48rem]" data={introContent} enableGutter={false} />
+          <RichText className="ms-0 max-w-[48rem]" data={introContent} enableGutter={false} />
         </div>
       )}
       <CollectionArchive posts={posts} />