diff --git a/client/themes/default/scss/app.scss b/client/themes/default/scss/app.scss
index c679aeee..ebe7283e 100644
--- a/client/themes/default/scss/app.scss
+++ b/client/themes/default/scss/app.scss
@@ -480,9 +480,9 @@ ul {
       color: mc('grey', '600');
       display: inline-block;
       width: 1.35rem;
-      
+
       @at-root .is-rtl & {
-        content: '\25C0' ;
+        content: '\25C3' ;
       }
     }
     > li {
@@ -645,6 +645,11 @@ ul {
       right: 1rem;
       height: calc(90px - 32px);
       width: auto;
+
+      @at-root .is-rtl & {
+        left: 1rem;
+        right: initial;
+      }
     }
     &.decor-shadow {
       box-shadow: 0 3px 8px 0 rgba(116, 129, 141, 0.1);
diff --git a/server/controllers/common.js b/server/controllers/common.js
index e915946c..29ddfedf 100644
--- a/server/controllers/common.js
+++ b/server/controllers/common.js
@@ -47,7 +47,7 @@ router.get(['/e', '/e/*'], async (req, res, next) => {
   }
 
   _.set(res, 'locals.siteConfig.lang', pageArgs.locale)
-  _.set(res, 'locals.siteConfig.rtl', req.i18n.dir())
+  _.set(res, 'locals.siteConfig.rtl', req.i18n.dir() === 'rtl')
 
   if (pageHelper.isReservedPath(pageArgs.path)) {
     return next(new Error('Cannot create this page because it starts with a system reserved path.'))
@@ -111,7 +111,7 @@ router.get(['/h', '/h/*'], async (req, res, next) => {
   }
 
   _.set(res, 'locals.siteConfig.lang', pageArgs.locale)
-  _.set(res, 'locals.siteConfig.rtl', req.i18n.dir())
+  _.set(res, 'locals.siteConfig.rtl', req.i18n.dir() === 'rtl')
 
   const page = await WIKI.models.pages.getPageFromDb({
     path: pageArgs.path,
@@ -197,7 +197,7 @@ router.get(['/s', '/s/*'], async (req, res, next) => {
   }
 
   _.set(res, 'locals.siteConfig.lang', pageArgs.locale)
-  _.set(res, 'locals.siteConfig.rtl', req.i18n.dir())
+  _.set(res, 'locals.siteConfig.rtl', req.i18n.dir() === 'rtl')
 
   if (!WIKI.auth.checkAccess(req.user, ['read:source'], pageArgs)) {
     return res.render('unauthorized', { action: 'source' })
@@ -255,7 +255,7 @@ router.get('/*', async (req, res, next) => {
       }
 
       _.set(res, 'locals.siteConfig.lang', pageArgs.locale)
-      _.set(res, 'locals.siteConfig.rtl', req.i18n.dir())
+      _.set(res, 'locals.siteConfig.rtl', req.i18n.dir() === 'rtl')
 
       if (page) {
         _.set(res.locals, 'pageMeta.title', page.title)