diff --git a/addons/point_of_sale/views/point_of_sale.xml b/addons/point_of_sale/views/point_of_sale.xml
index e6428ca8611..b63a063f03d 100644
--- a/addons/point_of_sale/views/point_of_sale.xml
+++ b/addons/point_of_sale/views/point_of_sale.xml
@@ -6,9 +6,7 @@
             <link rel="stylesheet" href="/point_of_sale/static/src/css/pos.css" id="pos-stylesheet"/>
             <link rel="stylesheet" href="/point_of_sale/static/src/css/keyboard.css"/>
 
-            <t t-if="request and request.env['res.lang'].search([('code', '=', request.env.lang)]).direction == 'rtl'">
-                <link rel="stylesheet" type="text/less" href="/web/static/src/scss/fontawesome_overriden.scss"/>
-            </t>
+            <link rel="stylesheet" type="text/less" href="/web/static/src/scss/fontawesome_overriden.scss"/>
 
             <script type="text/javascript" src="/point_of_sale/static/lib/waitfont.js"></script>
             <script type="text/javascript" src="/point_of_sale/static/src/js/main.js"></script>
diff --git a/addons/web/static/src/scss/fontawesome_overriden.scss b/addons/web/static/src/scss/fontawesome_overriden.scss
index 5fde7a750cd..a234dbc9f81 100644
--- a/addons/web/static/src/scss/fontawesome_overriden.scss
+++ b/addons/web/static/src/scss/fontawesome_overriden.scss
@@ -1,36 +1,38 @@
 // This is rtl language specific fix
 // It will override the font awesome symbols and flip them 180 degree
-.fa {
-    &.fa-align-right,
-    &.fa-align-left,
-    &.fa-chevron-right,
-    &.fa-chevron-left,
-    &.fa-arrow-right,
-    &.fa-arrow-left,
-    &.fa-hand-o-right,
-    &.fa-hand-o-left,
-    &.fa-arrow-circle-right,
-    &.fa-arrow-circle-left,
-    &.fa-caret-right,
-    &.fa-caret-left,
-    &.fa-rotate-right,
-    &.fa-rotate-left,
-    &.fa-angle-double-right,
-    &.fa-angle-double-left,
-    &.fa-angle-right,
-    &.fa-angle-left,
-    &.fa-quote-right,
-    &.fa-quote-left,
-    &.fa-chevron-circle-right,
-    &.fa-chevron-circle-left,
-    &.fa-long-arrow-right,
-    &.fa-long-arrow-left,
-    &.fa-toggle-right,
-    &.fa-toggle-left,
-    &.fa-caret-square-o-right,
-    &.fa-arrow-circle-o-left,
-    &.fa-arrow-circle-o-right,
-    &.fa-caret-square-o-left {
-        transform: rotate(180deg);
+.o_rtl {
+    .fa {
+        &.fa-align-right,
+        &.fa-align-left,
+        &.fa-chevron-right,
+        &.fa-chevron-left,
+        &.fa-arrow-right,
+        &.fa-arrow-left,
+        &.fa-hand-o-right,
+        &.fa-hand-o-left,
+        &.fa-arrow-circle-right,
+        &.fa-arrow-circle-left,
+        &.fa-caret-right,
+        &.fa-caret-left,
+        &.fa-rotate-right,
+        &.fa-rotate-left,
+        &.fa-angle-double-right,
+        &.fa-angle-double-left,
+        &.fa-angle-right,
+        &.fa-angle-left,
+        &.fa-quote-right,
+        &.fa-quote-left,
+        &.fa-chevron-circle-right,
+        &.fa-chevron-circle-left,
+        &.fa-long-arrow-right,
+        &.fa-long-arrow-left,
+        &.fa-toggle-right,
+        &.fa-toggle-left,
+        &.fa-caret-square-o-right,
+        &.fa-arrow-circle-o-left,
+        &.fa-arrow-circle-o-right,
+        &.fa-caret-square-o-left {
+            transform: rotate(180deg);
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index cb1184e3565..b65daaa58e7 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -65,9 +65,7 @@
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/colorpicker.scss"/>
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/keyboard.scss"/>
 
-        <t t-if="request and request.env['res.lang'].search([('code', '=', request.env.lang)]).direction == 'rtl'">
-            <link rel="stylesheet" type="text/less" href="/web/static/src/scss/fontawesome_overriden.scss"/>
-        </t>
+        <link rel="stylesheet" type="text/less" href="/web/static/src/scss/fontawesome_overriden.scss"/>
 
         <script type="text/javascript" src="/web/static/lib/es5-shim/es5-shim.min.js"></script>
         <script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>