diff --git a/client/src/sass/custom-markup.scss b/client/src/sass/custom-markup.scss
index cecc946a1..f4b72a066 100644
--- a/client/src/sass/custom-markup.scss
+++ b/client/src/sass/custom-markup.scss
@@ -22,5 +22,5 @@ peertube-container {
 peertube-video-miniature,
 peertube-playlist-miniature,
 peertube-channel-miniature {
-  margin-right: 30px;
+  margin-inline-end: 30px;
 }
diff --git a/client/src/sass/player/settings-menu.scss b/client/src/sass/player/settings-menu.scss
index 1b8068af3..402aaf8fc 100644
--- a/client/src/sass/player/settings-menu.scss
+++ b/client/src/sass/player/settings-menu.scss
@@ -55,7 +55,8 @@ $setting-transition-easing: ease-out;
 
     .vjs-settings-panel {
       position: absolute;
-      right: 0;
+      @include right(0);
+
       overflow-y: auto;
       overflow-x: hidden;
     }
@@ -145,7 +146,7 @@ $setting-transition-easing: ease-out;
               @include icon(15px);
 
               position: absolute;
-              left: 15px;
+              @include left(15px);
               content: ' ';
               margin-top: 1px;
               background-image: url('#{$assets-path}/player/images/tick-white.svg');
@@ -182,3 +183,9 @@ $setting-transition-easing: ease-out;
     }
   }
 }
+
+:root[dir=rtl] {
+  .vjs-back-button::before {
+    transform: rotate(45deg) !important;
+  }
+}