diff --git a/client/src/components/Board/Board.module.scss b/client/src/components/Board/Board.module.scss
index bd413b9e..cf35f7cf 100644
--- a/client/src/components/Board/Board.module.scss
+++ b/client/src/components/Board/Board.module.scss
@@ -11,8 +11,7 @@
     height: 42px;
     padding: 11px;
     text-align: left;
-    transition: background 85ms ease-in, opacity 40ms ease-in,
-      border-color 85ms ease-in;
+    transition: background 85ms ease-in, opacity 40ms ease-in, border-color 85ms ease-in;
     width: 100%;
 
     &:active {
diff --git a/client/src/components/Boards/EditStep.module.scss b/client/src/components/Boards/EditStep.module.scss
index 9183cbfb..1ea9fed4 100644
--- a/client/src/components/Boards/EditStep.module.scss
+++ b/client/src/components/Boards/EditStep.module.scss
@@ -3,7 +3,7 @@
     bottom: 12px;
     box-shadow: 0 1px 0 #cbcccc;
     position: absolute;
-    right: 9px;
+    left: 9px;
   }
 
   .field {
diff --git a/client/src/components/CardModal/Attachments/EditStep.module.scss b/client/src/components/CardModal/Attachments/EditStep.module.scss
index 9183cbfb..1ea9fed4 100644
--- a/client/src/components/CardModal/Attachments/EditStep.module.scss
+++ b/client/src/components/CardModal/Attachments/EditStep.module.scss
@@ -3,7 +3,7 @@
     bottom: 12px;
     box-shadow: 0 1px 0 #cbcccc;
     position: absolute;
-    right: 9px;
+    left: 9px;
   }
 
   .field {
diff --git a/client/src/components/DueDateEditStep/DueDateEditStep.jsx b/client/src/components/DueDateEditStep/DueDateEditStep.jsx
index a630c3de..60f47ddc 100755
--- a/client/src/components/DueDateEditStep/DueDateEditStep.jsx
+++ b/client/src/components/DueDateEditStep/DueDateEditStep.jsx
@@ -128,6 +128,7 @@ const DueDateEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose })
         </Form>
         <Button
           negative
+          dir="rtl"
           content={t('action.remove')}
           className={styles.deleteButton}
           onClick={handleClearClick}
diff --git a/client/src/components/DueDateEditStep/DueDateEditStep.module.scss b/client/src/components/DueDateEditStep/DueDateEditStep.module.scss
index 0d7c4e3a..3460d789 100644
--- a/client/src/components/DueDateEditStep/DueDateEditStep.module.scss
+++ b/client/src/components/DueDateEditStep/DueDateEditStep.module.scss
@@ -3,7 +3,11 @@
     bottom: 12px;
     box-shadow: 0 1px 0 #cbcccc;
     position: absolute;
-    right: 9px;
+    left: 9px;
+    // :dir(rtl) {
+    //   left: 9px;
+    //   background-color: yellow;
+    // }
   }
 
   .fieldBox {
diff --git a/client/src/components/LabelsStep/EditStep.module.scss b/client/src/components/LabelsStep/EditStep.module.scss
index 4bf29661..6d2159a3 100644
--- a/client/src/components/LabelsStep/EditStep.module.scss
+++ b/client/src/components/LabelsStep/EditStep.module.scss
@@ -3,6 +3,6 @@
     bottom: 12px;
     box-shadow: 0 1px 0 #cbcccc;
     position: absolute;
-    right: 9px;
+    left: 9px;
   }
 }
diff --git a/client/src/components/Static/Static.module.scss b/client/src/components/Static/Static.module.scss
index 829ca3a0..1a14c86d 100644
--- a/client/src/components/Static/Static.module.scss
+++ b/client/src/components/Static/Static.module.scss
@@ -1,4 +1,8 @@
 :global(#app) {
+  // * {
+  //   direction: ltr;
+  // }
+
   .message {
     align-content: space-between;
     align-items: center;
diff --git a/client/src/components/StopwatchEditStep/StopwatchEditStep.module.scss b/client/src/components/StopwatchEditStep/StopwatchEditStep.module.scss
index f16f4e5b..c67b2824 100644
--- a/client/src/components/StopwatchEditStep/StopwatchEditStep.module.scss
+++ b/client/src/components/StopwatchEditStep/StopwatchEditStep.module.scss
@@ -2,8 +2,6 @@
   .deleteButton {
     bottom: 12px;
     box-shadow: 0 1px 0 #cbcccc;
-    position: absolute;
-    right: 9px;
   }
 
   .fieldBox {
diff --git a/client/src/components/semantic.rtl.min.css b/client/src/components/semantic.rtl.min.css
index 576191d7..382de60c 100644
--- a/client/src/components/semantic.rtl.min.css
+++ b/client/src/components/semantic.rtl.min.css
@@ -21,22 +21,26 @@
     -webkit-box-sizing: inherit;
     box-sizing: inherit
 }
+*{
+  direction: rtl;
+}
 
 html {
     -webkit-box-sizing: border-box;
-    box-sizing: border-box
+    box-sizing: border-box;
+
 }
 
 input[type=email],input[type=password],input[type=search],input[type=text] {
     -webkit-appearance: none;
-    -moz-appearance: none
+    -moz-appearance: none;
 }
 
 /*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
 html {
     line-height: 1.15;
     -ms-text-size-adjust: 100%;
-    -webkit-text-size-adjust: 100%
+    -webkit-text-size-adjust: 100%;
 }
 
 body {
@@ -146,7 +150,8 @@ button,input,optgroup,select,textarea {
     font-family: sans-serif;
     font-size: 100%;
     line-height: 1.15;
-    margin: 0
+    margin: 0;
+    text-align: right !important;
 }
 
 button,input {
@@ -4062,9 +4067,11 @@ body .ui.inverted::-webkit-scrollbar-thumb:hover {
 
 .ui.negative.button {
     -webkit-box-shadow: 0 0 0 0 rgba(34,36,38,.15) inset;
-    box-shadow: 0 0 0 0 rgba(34,36,38,.15) inset
+    box-shadow: 0 0 0 0 rgba(34,36,38,.15) inset;
 }
 
+
+
 .ui.negative.button:hover,.ui.negative.buttons .button:hover {
     background-color: #d01919;
     color: #fff;
@@ -38936,7 +38943,7 @@ ol.ui.list li[value]:before {
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
-    margin-right: auto!important
+    margin-left: auto!important
 }
 
 .ui.menu .right.item::before,.ui.menu .right.menu>.item::before {
@@ -52722,6 +52729,7 @@ a.ui.nag {
     transform: translate3d(0,100%,0)
 }
 
+
 .pushable {
     height: 100%;
     overflow-x: hidden;
@@ -55471,3 +55479,4 @@ body.pushable>.pusher {
         background-color: #fcfcfd
     }
 }
+
diff --git a/client/src/i18n.js b/client/src/i18n.js
index 205b8b27..9873fbe0 100644
--- a/client/src/i18n.js
+++ b/client/src/i18n.js
@@ -33,10 +33,10 @@ i18n.dateFns = {
 
 i18n.on('languageChanged', () => {
   if (i18n.resolvedLanguage === 'he' || i18n.resolvedLanguage === 'ar') {
-    document.documentElement.setAttribute('dir', 'rtl');
+    // document.documentElement.setAttribute('dir', 'rtl');
     import('./components/semantic.rtl.min.css');
   } else {
-    document.documentElement.setAttribute('dir', 'ltr');
+    // document.documentElement.setAttribute('dir', 'ltr');
   }
 
   setDefaultLocale(i18n.resolvedLanguage);
diff --git a/client/src/locales/he/core.js b/client/src/locales/he/core.js
index c15c7add..c92c210e 100644
--- a/client/src/locales/he/core.js
+++ b/client/src/locales/he/core.js
@@ -15,7 +15,7 @@ export default {
       addAttachment_title: 'הוסף קובץ מצורף',
       addComment: 'הוסף תגובה',
       addManager_title: 'הוסף מנהל',
-      addMember_title: 'הוסף חבר',
+      addMember_title: 'הוסף משתמש',
       addUser_title: 'הוסף משתמש',
       administrator: 'מנהל',
       all: 'הכל',
@@ -166,7 +166,7 @@ export default {
       addCard_title: 'הוסף כרטיס',
       addComment: 'הוסף תגובה',
       addList: 'הוסף רשימה',
-      addMember: 'הוסף חבר',
+      addMember: 'הוסף משתמש',
       addMoreDetailedDescription: 'הוסף תיאור מפורט יותר',
       addTask: 'הוסף משימה',
       addToCard: 'הוסף לכרטיס',
@@ -216,7 +216,7 @@ export default {
       removeFromBoard: 'הסר מהלוח',
       removeFromProject: 'הסר מהפרויקט',
       removeManager: 'הסר מנהל',
-      removeMember: 'הסר חבר',
+      removeMember: 'הסר משתמש',
       save: 'שמור',
       showAllAttachments: 'הצג את כל הקבצים המצורפים ({{hidden}} מוסתרים)',
       showDetails: 'הצג פרטים',