diff --git a/client/components/comments.vue b/client/components/comments.vue
index 4091c9025..2513b88a7 100644
--- a/client/components/comments.vue
+++ b/client/components/comments.vue
@@ -514,6 +514,11 @@ export default {
     right: 16px;
     opacity: 0;
     transition: opacity .4s ease;
+
+    @at-root .is-rtl & {
+      right: unset;
+      left: 16px;
+    }
   }
 
   &-content {
diff --git a/client/components/editor.vue b/client/components/editor.vue
index 7cd577b11..cf262fe35 100644
--- a/client/components/editor.vue
+++ b/client/components/editor.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  v-app.editor(:dark='$vuetify.theme.dark')
+  v-app.editor(:dark='$vuetify.theme.dark' :class='$vuetify.rtl ? `is-rtl` : `is-ltr`')
     nav-header(dense)
       template(slot='mid')
         v-text-field.editor-title-input(
diff --git a/client/themes/default/scss/app.scss b/client/themes/default/scss/app.scss
index 88380963f..14b26bc70 100644
--- a/client/themes/default/scss/app.scss
+++ b/client/themes/default/scss/app.scss
@@ -1,5 +1,22 @@
 /* THEME SPECIFIC STYLES */
-
+  // ---------------------------------
+  // FIX VUETIFY BROKEN RTL MARGIN
+  // ---------------------------------
+.is-rtl {
+  @for $i from 1 through 8 {
+    .ml-#{$i} {
+      margin-left: 0px !important;
+      margin-right: ($i * 4px) !important;
+    }
+    .mr-#{$i} {
+      margin-left: ($i * 4px) !important;
+      margin-right: 0px !important;
+    }
+  }
+  .text-left {
+    text-align: right !important;
+  }
+}
 .v-main .contents {
   color: mc('grey', '800');
   padding: .5rem 0 50px;
@@ -72,6 +89,11 @@
       font-size: 1.25rem;
       text-decoration: none;
       color: mc('grey', '500');
+
+      @at-root .is-rtl & {
+        right: unset;
+        left: 1rem;
+      }
     }
 
     & + h2, & + h3, & + h4, & + h5, & + h6 {
@@ -162,6 +184,10 @@
       width: 100%;
       height: 1px;
       background: linear-gradient(to right, mc('grey', '500'), rgba(mc('grey', '500'), 0) 90%);
+
+      @at-root .is-rtl & {
+        background: linear-gradient(to left, mc('grey', '500'), rgba(mc('grey', '500'), 0) 90%);
+      }
     }
   }
   h4, h5, h6 {
@@ -182,16 +208,28 @@
       width: 100%;
       height: 1px;
       background: linear-gradient(to right, mc('grey', '500'), rgba(mc('grey', '500'), 0) 70%);
+
+      @at-root .is-rtl & {
+        background: linear-gradient(to left, mc('grey', '500'), rgba(mc('grey', '500'), 0) 70%);
+      }
     }
   }
   h5 {
     &::after {
       background: linear-gradient(to right, mc('grey', '500'), rgba(mc('grey', '500'), 0) 50%);
+
+      @at-root .is-rtl & {
+        background: linear-gradient(to left, mc('grey', '500'), rgba(mc('grey', '500'), 0) 50%);
+      }
     }
   }
   h6 {
     &::after {
       background: linear-gradient(to right, mc('grey', '500'), rgba(mc('grey', '500'), 0) 30%);
+
+      @at-root .is-rtl & {
+        background: linear-gradient(to left, mc('grey', '500'), rgba(mc('grey', '500'), 0) 30%);
+      }
     }
   }