diff --git a/app/views/enhanced_ux/calendars/_custom_calendar.html.erb b/app/views/enhanced_ux/calendars/_custom_calendar.html.erb
index 29d2962..14dbed7 100644
--- a/app/views/enhanced_ux/calendars/_custom_calendar.html.erb
+++ b/app/views/enhanced_ux/calendars/_custom_calendar.html.erb
@@ -29,6 +29,8 @@
       ...(resourcesAll[document.documentElement.lang] || {}),
     };
 
+    const isRtl = $('head link[rel="stylesheet"][href*="/rtl"]').length > 0;
+
     const csrfToken = $('meta[name="csrf-token"]').attr("content");
 
     const homeUrl = $("link[href*='favicon.ico']")
@@ -406,7 +408,13 @@
             });
           }
           $("#countdown_timer .countdown_timer_label").text(
-            direction === "next" ? "⇨" : "⇦"
+            isRtl
+              ? direction === "next"
+                ? "⇦"
+                : "⇨"
+              : direction === "next"
+              ? "⇨"
+              : "⇦"
           );
           $("#countdown_timer").show();
           $(document).on("mousemove.countdown_timer", (e) => {
@@ -705,7 +713,7 @@
       background-repeat: no-repeat;
       padding-left: 20px;
       cursor: pointer;
-      margin-left: 10px;
+      margin: 0 10px;
       font-weight: normal;
     }
 
@@ -922,4 +930,25 @@
       }
     }
   }
+
+  /* Support RTL */
+  html[dir="rtl"],
+  html:has(head link[rel="stylesheet"][href*="/rtl"]) {
+    @media screen and (min-width: 900px) {
+      #content {
+        & > div.contextual {
+          left: 15px;
+          right: auto;
+        }
+      }
+    }
+    #dSwitchNext {
+      left: 0;
+      right: auto;
+    }
+    #dSwitchPrev {
+      left: auto;
+      right: 0;
+    }
+  }
 </style>
diff --git a/app/views/enhanced_ux/gantts/_custom_gantt_chart.html.erb b/app/views/enhanced_ux/gantts/_custom_gantt_chart.html.erb
index 1a0dee3..b6958da 100644
--- a/app/views/enhanced_ux/gantts/_custom_gantt_chart.html.erb
+++ b/app/views/enhanced_ux/gantts/_custom_gantt_chart.html.erb
@@ -3,6 +3,7 @@
 // Insertion position: Head of all pages
 // Type:               HTML
 // Comment:            Custom gantt chart
+// Note: RTL view is not supported.
   -->
 <script>
   var ajaxUpdateIssueList = false;
@@ -646,6 +647,7 @@
       // Create query form open button and append it to h2 tag.
       const $queryFormOpenButton = $("<a>")
         .attr("id", "query_form_open_button")
+        .addClass("icon")
         .text(resources.labelCriteria)
         .css({ backgroundImage: `url(${homeUrl}images/magnifier.png)` })
         .on("click", (e) => {
@@ -906,20 +908,24 @@
       display: none;
     }
 
-    .gantt_subjects > form {
-      .issue-subject img.gravatar.icon-gravatar {
-        vertical-align: top;
-      }
-      :where(.version-name, .project-name, .issue-subject)
-        > span:not(.expander) {
-        display: inline-block;
-        vertical-align: top;
-        padding-top: 0 !important;
-        padding-bottom: 0 !important;
-        height: 16px;
-        &:before {
+    .gantt_subjects {
+      width: 100%;
+
+      & > form {
+        .issue-subject img.gravatar.icon-gravatar {
           vertical-align: top;
         }
+        :where(.version-name, .project-name, .issue-subject)
+          > span:not(.expander) {
+          display: inline-block;
+          vertical-align: top;
+          padding-top: 0 !important;
+          padding-bottom: 0 !important;
+          height: 16px;
+          &:before {
+            vertical-align: top;
+          }
+        }
       }
     }
   }
@@ -993,12 +999,9 @@
     #query_form_open_button {
       display: inline;
       font-size: 0.6em;
-      background-position: left;
+      margin: 0 10px;
       background-repeat: no-repeat;
-      padding-left: 20px;
       cursor: pointer;
-      margin-left: 10px;
-      font-weight: normal;
     }
     #query_form {
       display: none;
@@ -1143,4 +1146,23 @@
       }
     }
   }
+
+  /* Support RTL */
+  html[dir="rtl"],
+  html:has(head link[rel="stylesheet"][href*="/rtl"]) {
+    @media screen and (min-width: 900px) {
+      #content {
+        & > div.contextual {
+          right: auto;
+          left: 16px;
+        }
+      }
+      @media (min-height: 400px) {
+        #content p.other-formats {
+          right: auto;
+          left: 20px;
+        }
+      }
+    }
+  }
 </style>
diff --git a/app/views/enhanced_ux/issues/_custom_issue.html.erb b/app/views/enhanced_ux/issues/_custom_issue.html.erb
index 753648b..9dcc634 100644
--- a/app/views/enhanced_ux/issues/_custom_issue.html.erb
+++ b/app/views/enhanced_ux/issues/_custom_issue.html.erb
@@ -86,7 +86,7 @@
       ...resourcesAll["en"],
       ...(resourcesAll[document.documentElement.lang] || {}),
     };
-
+    const isRtl = $('head link[rel="stylesheet"][href*="/rtl"]').length > 0;
     const isMac = navigator.platform.indexOf("Mac") !== -1;
     const issuePathname = location.pathname;
     const issueUrl = location.origin + location.pathname;
@@ -133,7 +133,7 @@
     const $issueContainer = $("<div>")
       .attr("id", "issue-container")
       .resizable({
-        handles: "e",
+        handles: isRtl ? "w" : "e",
         create: function () {
           $(this)
             .children(".ui-resizable-handle")
@@ -835,14 +835,14 @@
           $("#issue_tracker_id")
             .parent()
             .addClass("header_attribute")
-            .addClass("header_attribute_float-left")
+            .addClass("header_attribute_float-" + (isRtl ? "right" : "left"))
             .css({ clear: "none" })
         )
         .prepend(
           $("#issue_project_id")
             .parent()
             .addClass("header_attribute")
-            .addClass("header_attribute_float-left")
+            .addClass("header_attribute_float-" + (isRtl ? "right" : "left"))
         );
 
       $("#attributes").css("clear: both");
@@ -853,7 +853,7 @@
           $("#issue_subject")
             .parent()
             .addClass("header_attribute")
-            .addClass("header_attribute_float-left")
+            .addClass("header_attribute_float-" + (isRtl ? "right" : "left"))
         )
         .prepend(
           $("#issue_is_private")
@@ -1692,6 +1692,10 @@
       float: left;
     }
 
+    .header_attribute_float-right {
+      float: right;
+    }
+
     #parent_issue {
       clear: right;
       float: right;
@@ -1753,7 +1757,7 @@
           & > .tabs {
             flex: 0 0 auto;
           }
-          & > div.ui-resizable-handle.ui-resizable-e {
+          & > div.ui-resizable-handle {
             display: block;
           }
         }
@@ -1772,6 +1776,7 @@
 
         #history-container {
           margin-left: 10px;
+          margin-right: 10px;
           grid-area: history-container;
           min-width: 350px;
           width: calc(100% - 10px);
@@ -2306,4 +2311,36 @@
       margin-top: 0 !important;
     }
   }
+
+  /* Support RTL */
+  html[dir="rtl"],
+  html:has(head link[rel="stylesheet"][href*="/rtl"]) {
+    #switch-quicknotes2-position-button {
+      right: auto;
+      left: 0;
+    }
+    #notes-dialog .ui-dialog-titlebar-button-group {
+      right: auto;
+      left: 30px;
+    }
+    #issue-container {
+      left: 0 !important;
+    }
+    #issue_is_private_wrap {
+      margin-right: 0;
+      margin-left: 1em;
+      padding-right: 0;
+    }
+    @media screen and (max-width: 899px) {
+      #parent_issue {
+        float: right;
+      }
+    }
+    @media screen and (min-width: 900px) {
+      #parent_issue {
+        clear: left;
+        float: left;
+      }
+    }
+  }
 </style>
diff --git a/app/views/enhanced_ux/issues/_custom_issue_list.html.erb b/app/views/enhanced_ux/issues/_custom_issue_list.html.erb
index d67933c..c1b150a 100644
--- a/app/views/enhanced_ux/issues/_custom_issue_list.html.erb
+++ b/app/views/enhanced_ux/issues/_custom_issue_list.html.erb
@@ -295,6 +295,7 @@
     function setUpQueryForm() {
       const $queryFormOpenButton = $("<a>")
         .attr("id", "query_form_open_button")
+        .addClass("icon")
         .text(resources.labelCriteria)
         .css({ backgroundImage: `url(${homeUrl}images/magnifier.png)` })
         .on("click", (e) => {
@@ -500,10 +501,8 @@
     #query_form_open_button {
       display: inline;
       font-size: 0.6em;
-      margin-left: 20px;
-      background-position: left;
+      margin: 0 10px;
       background-repeat: no-repeat;
-      padding-left: 20px;
       cursor: pointer;
     }
 
@@ -689,4 +688,43 @@
       align-items: start;
     }
   }
+
+  /* Support RTL */
+  html[dir="rtl"],
+  html:has(head link[rel="stylesheet"][href*="/rtl"]) {
+    @media screen and (min-width: 900px) {
+      #content {
+        & > div.contextual {
+          left: 15px;
+          right: auto;
+        }
+        table.list.issues {
+          & > thead > tr {
+            & > th {
+              & > span.icon-close {
+                right: auto;
+                left: 0;
+                padding-right: 14px;
+                padding-left: 0;
+              }
+            }
+            &:hover th[style*="width"]:not(.buttons)::after {
+              left: auto;
+              right: 5px;
+            }
+          }
+        }
+      }
+    }
+    body.theme-Bleuclair {
+      @media screen and (min-width: 900px) {
+        #content
+          > #sidebar-switch-panel:not([style*="display: none;"])
+          + div.contextual {
+          left: 45px;
+          right: auto;
+        }
+      }
+    }
+  }
 </style>
diff --git a/app/views/enhanced_ux/layouts/_compact_notice_bar.html.erb b/app/views/enhanced_ux/layouts/_compact_notice_bar.html.erb
index a216d71..d7039bc 100644
--- a/app/views/enhanced_ux/layouts/_compact_notice_bar.html.erb
+++ b/app/views/enhanced_ux/layouts/_compact_notice_bar.html.erb
@@ -131,7 +131,9 @@
     float: right;
     cursor: pointer;
     margin-left: 0.5em;
-    width: 2em;
+    margin-right: 0.5em;
+    width: 16px;
+    height: 16px;
   }
   #flash_notice.notice.fadeout_notice {
     animation-name: fade_out_notice;
@@ -174,4 +176,21 @@
       }
     }
   }
+
+  /* Support RTL */
+  html[dir="rtl"],
+  html:has(head link[rel="stylesheet"][href*="/rtl"]) {
+    div.flash.notice {
+      background-color: #dfffdf;
+    }
+    .flash_notice_close_button {
+      float: left;
+    }
+    @media (min-width: 900px) {
+      #flash_notice {
+        left: auto;
+        right: 20px;
+      }
+    }
+  }
 </style>
diff --git a/app/views/enhanced_ux/layouts/_simple_menu_bar.html.erb b/app/views/enhanced_ux/layouts/_simple_menu_bar.html.erb
index 14b3485..3e338b2 100644
--- a/app/views/enhanced_ux/layouts/_simple_menu_bar.html.erb
+++ b/app/views/enhanced_ux/layouts/_simple_menu_bar.html.erb
@@ -18,22 +18,25 @@
   window.addEventListener("DOMContentLoaded", () => {
     // ----- i18n -----
     const lang = document.documentElement.lang;
+    const resourcesAll = {
+      en: {
+        menu: "Menu",
+        sideMenu: "Side menu",
+        showHeader: "Show Header",
+        hideHeader: "Hide Header",
+      },
+      ja: {
+        menu: "メニュー",
+        sideMenu: "サイドメニュー",
+        showHeader: "ヘッダーを表示",
+        hideHeader: "ヘッダーを非表示",
+      },
+    };
     const resources = {
-      menu: "Menu",
-      sideMenu: "Side menu",
-      showHeader: "Show Header",
-      hideHeader: "Hide Header",
-      search: "Search",
+      ...resourcesAll["en"],
+      ...(resourcesAll[document.documentElement.lang] || {}),
     };
 
-    if (lang === "ja") {
-      resources.menu = "メニュー";
-      resources.sideMenu = "サイドメニュー";
-      resources.showHeader = "ヘッダーを表示";
-      resources.hideHeader = "ヘッダーを非表示";
-      resources.search = "検索";
-    }
-
     // ----- Define variables -----
     const $header = $("#header");
     const $topMenu = $("#top-menu");
@@ -53,6 +56,7 @@
       .filter((i) => i.match(/^project-/))[0]
       ?.match(/^project-(.+)/)[1];
     const syncHeaderVisibilityItems = [];
+    const searchLabel = $("#quick-search form label[for=q] > a").text();
 
     if ($adminMenu.length > 0) {
       $topMenu.addClass("has-admin-menu");
@@ -295,7 +299,7 @@
         .attr("id", "simple-search-menu")
         .css("cursor", "pointer")
         .addClass("simple-menu")
-        .text(resources.search);
+        .text(searchLabel);
 
       const $simpleSearchForm = $("#quick-search>form").clone();
       if ($simpleSearchForm.length === 0) return;
@@ -381,8 +385,6 @@
         .css({
           cursor: "pointer",
           backgroundImage: "url(" + homePath + "images/arrow_down.png)",
-          paddingLeft: "16px",
-          height: "16px",
         })
         .addClass("icon icon-only");
       $topMenu.children("ul").append($("<li />").append($btn));
@@ -731,4 +733,22 @@
     content: "\f0c0";
     font-family: Font Awesome\5 Solid;
   }
+
+  /* Support RTL */
+  html[dir="rtl"],
+  html:has(head link[rel="stylesheet"][href*="/rtl"]) {
+    #top-menu {
+      & .simple-menu {
+        & + .ui-menu {
+          & .ui-menu-item {
+            & > a {
+              padding-left: 0;
+              padding-right: calc(20px + 2px);
+            }
+          }
+        }
+      }
+    }
+    /* TODO: Position the submenu to the left */
+  }
 </style>
diff --git a/app/views/enhanced_ux/layouts/_two_pane_mode.html.erb b/app/views/enhanced_ux/layouts/_two_pane_mode.html.erb
index c50cfea..86b0ee7 100644
--- a/app/views/enhanced_ux/layouts/_two_pane_mode.html.erb
+++ b/app/views/enhanced_ux/layouts/_two_pane_mode.html.erb
@@ -86,6 +86,8 @@
     const resources =
       resourcesAll[document.documentElement.lang] || resourcesAll["en"];
 
+    const isRtl = $('head link[rel="stylesheet"][href*="/rtl"]').length > 0;
+
     // Do not enable 2-pane mode in the new issue form.
     if ($("#issue-form.new_issue").length > 0) return;
 
@@ -547,7 +549,7 @@
         this.$backButton = $("<button>")
           .addClass("back")
           .button({
-            icon: "ui-icon-caret-1-w",
+            icon: isRtl ? "ui-icon-caret-1-e" : "ui-icon-caret-1-w",
             label: resources.labelBack,
             showLabel: false,
           })
@@ -558,7 +560,7 @@
         this.$forwardButton = $("<button>")
           .addClass("forward")
           .button({
-            icon: "ui-icon-caret-1-e",
+            icon: isRtl ? "ui-icon-caret-1-w" : "ui-icon-caret-1-e",
             label: resources.labelForward,
             showLabel: false,
           })
@@ -626,7 +628,9 @@
         const $hideButton = $("<button>")
           .addClass("hide")
           .button({
-            icon: "ui-icon-arrowthickstop-1-e",
+            icon: isRtl
+              ? "ui-icon-arrowthickstop-1-w"
+              : "ui-icon-arrowthickstop-1-e",
             label: resources.labelHide,
             showLabel: false,
           })
@@ -826,7 +830,7 @@
             backgroundColor: $("#content").css("backgroundColor"),
           })
           .resizable({
-            handles: "w,n",
+            handles: isRtl ? "e,n" : "w,n",
             create: (e) => {
               $(e.target)
                 .children(".ui-resizable-handle")
@@ -1311,6 +1315,7 @@
           return;
         }
         const $checkBox = $("<span>")
+          .addClass("enable_2-pane_mode_box")
           .append(
             $("<input>")
               .attr({ type: "checkbox", id: "enable_2-pane_mode" })
@@ -1592,7 +1597,6 @@
     &.issue-pane-minimize #issue-pane-toggle-minimize span.ui-icon {
       /* ui-icon-triangle-1-w -3px */
       background-position: calc(-96px - 3px) -16px;
-      width: 10px;
     }
   }
 
@@ -1635,16 +1639,16 @@
     }
   }
 
-  #main #issue-pane > :is(.ui-resizable-n, .ui-resizable-w) {
+  #main #issue-pane > :is(.ui-resizable-n, .ui-resizable-w, .ui-resizable-e) {
     display: none;
   }
 
   #main.grid-direction-column:not(.issue-pane-minimize)
     #issue-pane
-    > .ui-resizable-w,
+    > :where(.ui-resizable-w, .ui-resizable-e),
   #main.grid-direction-column.issue-pane-minimize
     #issue-pane.preview
-    > .ui-resizable-w,
+    > :where(.ui-resizable-w, .ui-resizable-e),
   #main.grid-direction-row:not(.issue-pane-minimize)
     #issue-pane
     > .ui-resizable-n,
@@ -1722,15 +1726,23 @@
     }
   }
 
-  #content #enable_2-pane_mode {
-    margin-left: 10px;
-    margin-right: 5px;
-    cursor: pointer;
+  #content {
+    .enable_2-pane_mode_box {
+      display: inline-flex;
+      align-items: center;
 
-    & + label {
-      font-size: 12px;
-      font-weight: normal;
-      cursor: pointer;
+      #enable_2-pane_mode {
+        margin-left: 10px;
+        margin-right: 5px;
+        cursor: pointer;
+        height: 13px;
+
+        & + label {
+          font-size: 12px;
+          font-weight: normal;
+          cursor: pointer;
+        }
+      }
     }
   }
 
@@ -1884,4 +1896,49 @@
       width: 380px;
     }
   }
+
+  /* Support RTL */
+  html[dir="rtl"],
+  html:has(head link[rel="stylesheet"][href*="/rtl"]) {
+    #issue-pane {
+      border-left: none;
+      border-right: 1px solid #ccc;
+    }
+    #main.grid-direction-column {
+      & #issue-pane {
+        padding-right: 0;
+        padding-left: 10px;
+      }
+      & #issue-pane-toggle-minimize {
+        right: auto;
+        left: 0;
+
+        span.ui-icon {
+          /* ui-icon-triangle-1-w -3px */
+          background-position: calc(-96px - 3px) -16px;
+        }
+      }
+      &.issue-pane-minimize #issue-pane-toggle-minimize span.ui-icon {
+        /* ui-icon-triangle-1-e -3px */
+        background-position: calc(-32px - 3px) -16px;
+      }
+    }
+    #main.grid-direction-column.issue-pane-minimize #issue-pane {
+      &.preview:not(.maximize) {
+        left: 0 !important;
+        right: auto;
+      }
+      &:not(.preview):not(.maximize) {
+        padding-left: 0;
+      }
+    }
+    #content {
+      .enable_2-pane_mode_box {
+        #enable_2-pane_mode {
+          margin-left: 5px;
+          margin-right: 10px;
+        }
+      }
+    }
+  }
 </style>
diff --git a/app/views/settings/_enhanced_ux_settings.html.erb b/app/views/settings/_enhanced_ux_settings.html.erb
index a2a8c8d..b6b3428 100644
--- a/app/views/settings/_enhanced_ux_settings.html.erb
+++ b/app/views/settings/_enhanced_ux_settings.html.erb
@@ -135,4 +135,9 @@
     <input type="hidden" name="settings[two_pane_mode]" value="'0'">
     <%= check_box_tag 'settings[two_pane_mode]', '1', @settings[:two_pane_mode] == '1' %>
   </p>
+  <p class="">
+    <label for="fixes_for_rtl_design">Fixes for RTL design:</label>
+    <input type="hidden" name="settings[fixes_for_rtl_design]" value="'0'">
+    <%= check_box_tag 'settings[fixes_for_rtl_design]', '1', @settings[:fixes_for_rtl_design] == '1' %>
+  </p>
 </fieldset>
diff --git a/assets/stylesheets/global/fixes_for_rtl_design.css b/assets/stylesheets/global/fixes_for_rtl_design.css
new file mode 100644
index 0000000..2df9649
--- /dev/null
+++ b/assets/stylesheets/global/fixes_for_rtl_design.css
@@ -0,0 +1,96 @@
+/*
+// Path pattern:
+// Insertion position: Head of all pages
+// Type:               CSS
+// Comment:            Fixes for RTL design
+*/
+html[dir="rtl"],
+html:has(head link[rel="stylesheet"][href*="/rtl"]) {
+  .icon-only {
+    padding-left: 0;
+    padding-right: 16px;
+  }
+  a.sort {
+    background-position: left 50%;
+  }
+  .pagination {
+    margin-right: 3px;
+    margin-left: 0;
+    ul.pages {
+      margin: 0 0 0 5px;
+    }
+  }
+  .contextual .drdn-content {
+    right: auto;
+    left: 0;
+
+    a.icon {
+      padding-left: 0;
+      padding-right: 24px;
+      background-position-x: calc(100% - 4px);
+    }
+  }
+  table.list.issues > tbody > tr > td:not(.checkbox) {
+    padding-left: 10px;
+    padding-right: 0;
+  }
+
+  /* Issue view */
+  body.avatars-on div.journal {
+    padding-left: 0;
+    padding-right: 32px;
+  }
+  div.journal h4 img.gravatar {
+    margin-left: 0;
+    margin-right: -32px;
+  }
+  table.list td.buttons a,
+  div.buttons a {
+    margin-right: 0;
+    margin-left: 0.6em;
+  }
+  #issue-form {
+    input[type="submit"] {
+      margin-left: auto;
+      margin-right: 20px;
+    }
+  }
+  #issue_is_private_wrap {
+    float: left;
+  }
+  @media screen and (max-width: 899px) {
+    /* tabular forms resets for mobile */
+    .tabular p,
+    .tabular.settings p {
+      padding-right: 0;
+    }
+    .tabular label,
+    .tabular.settings label {
+      margin-left: 0;
+      margin-right: 0;
+      text-align: right;
+    }
+    #header {
+      padding: 0;
+    }
+  }
+  .ui-dialog .ui-dialog-title {
+    float: right;
+  }
+  .ui-dialog .ui-dialog-titlebar-close {
+    right: auto;
+    left: 0.3em;
+  }
+  .contextual > *:not(:first-child),
+  .buttons > .icon:not(:first-child),
+  .contextual .journal-actions > *:not(:first-child) {
+    margin-left: 0;
+    margin-right: 5px;
+  }
+
+  /* Roadmap view */
+  div#roadmap h3.version {
+    padding-left: 0px;
+    padding-right: 20px;
+  }
+}
diff --git a/assets/stylesheets/issues/fixed_submit_button.css b/assets/stylesheets/issues/fixed_submit_button.css
index 99e1e27..ba96985 100644
--- a/assets/stylesheets/issues/fixed_submit_button.css
+++ b/assets/stylesheets/issues/fixed_submit_button.css
@@ -14,7 +14,7 @@
     height: 70px;
     box-shadow: -5px 5px 5px 0px rgb(0 0 0 / 50%);
     z-index: 6;
-    margin-left: 20px;
+    margin: 0 20px;
     padding: 0;
     bottom: 40px;
     opacity: 0.5;
@@ -41,3 +41,31 @@
     }
   }
 }
+
+/* Support RTL */
+html[dir="rtl"],
+html:has(head link[rel="stylesheet"][href*="/rtl"]) {
+  :where(body.action-create, .action-new) #content {
+    #issue-form > input[type="submit"] {
+      &:nth-child(1 of input[type="submit"]) {
+        left: auto;
+        right: 0;
+      }
+
+      &:nth-child(2 of input[type="submit"]) {
+        left: auto;
+        right: 80px;
+      }
+
+      &:nth-child(3 of input[type="submit"]) {
+        left: auto;
+        right: 160px;
+      }
+
+      &:nth-child(4 of input[type="submit"]) {
+        left: auto;
+        right: 240px;
+      }
+    }
+  }
+}
diff --git a/init.rb b/init.rb
index abc35b2..f053d21 100644
--- a/init.rb
+++ b/init.rb
@@ -31,6 +31,7 @@
         show_only_opened_issues: '1',
         simple_menu_bar: '1',
         two_pane_mode: '1',
+        fixes_for_rtl_design: '1',
       },
       partial: 'settings/enhanced_ux_settings'
 end
diff --git a/lib/enhanced_ux/hooks/view_layouts_base_html_head_hook.rb b/lib/enhanced_ux/hooks/view_layouts_base_html_head_hook.rb
index 0767cc4..c9a4d10 100644
--- a/lib/enhanced_ux/hooks/view_layouts_base_html_head_hook.rb
+++ b/lib/enhanced_ux/hooks/view_layouts_base_html_head_hook.rb
@@ -104,6 +104,10 @@ def view_layouts_base_html_head(context={})
             end
           end
 
+          if Setting.plugin_redmine_enhanced_ux[:fixes_for_rtl_design] == '1'
+            tags << stylesheet_link_tag("global/fixes_for_rtl_design", :plugin => "redmine_enhanced_ux", media: "all")
+          end
+
           return tags.join('')
         else
           return ''