diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less
index 440c1eaee8..81207f2c5b 100644
--- a/apps/common/main/resources/less/asc-mixins.less
+++ b/apps/common/main/resources/less/asc-mixins.less
@@ -394,6 +394,20 @@
     }
 }
 
+.float-right {
+    float: right;
+    .rtl & {
+        float: left;
+    }
+}
+
+.float-left {
+    float: left;
+    .rtl & {
+        float: right;
+    }
+}
+
 //.adaptive-solid-border(@width, @color, @borderside: all) {
 //    @lb-border: if((@borderside = all), border, e('border-@{borderside}'));
 //    @lb-border-width: if((@borderside = all), border-width, e('border-@{borderside}-width'));
diff --git a/apps/documenteditor/main/app/template/DropcapSettingsAdvanced.template b/apps/documenteditor/main/app/template/DropcapSettingsAdvanced.template
index 901113fcc4..f4f7db8f8d 100644
--- a/apps/documenteditor/main/app/template/DropcapSettingsAdvanced.template
+++ b/apps/documenteditor/main/app/template/DropcapSettingsAdvanced.template
@@ -69,7 +69,7 @@
             </tr>
             <tr>
                 <td class="settins-cell padding-small" colspan="2" style="padding-right: 10px;">
-                    <label class="input-label" style="float: right;"><%= scope.textDistance %></label>
+                    <label class="input-label float-right"><%= scope.textDistance %></label>
                 </td>
                 <td class="settins-cell padding-small">
                     <div id="frame-advanced-input-hdist"></div>
@@ -104,7 +104,7 @@
             </tr>
             <tr>
                 <td class="settins-cell padding-small" colspan="2" style="padding-right: 10px;">
-                    <label class="input-label" style="float: right;"><%= scope.textDistance %></label>
+                    <label class="input-label float-right"><%= scope.textDistance %></label>
                 </td>
                 <td class="settins-cell padding-small">
                     <div id="frame-advanced-input-vdist"></div>
diff --git a/apps/documenteditor/main/app/template/FormSettings.template b/apps/documenteditor/main/app/template/FormSettings.template
index 3ea7801f8c..fc734a4bb9 100644
--- a/apps/documenteditor/main/app/template/FormSettings.template
+++ b/apps/documenteditor/main/app/template/FormSettings.template
@@ -180,7 +180,7 @@
     <tr class="form-textfield">
         <td class="padding-small">
             <div id="form-chb-max-chars" style="display: inline-block;margin-top: 4px;"></div>
-            <div id="form-spin-max-chars" style="display: inline-block;float: right;"></div>
+            <div id="form-spin-max-chars" style="display: inline-block;" class="float-right"></div>
         </td>
     </tr>
     <tr class="form-textfield">
@@ -252,13 +252,13 @@
     <tr>
         <td class="padding-small">
             <label class="input-label" style="margin-top: 4px;"><%= scope.textColor %></label>
-            <div id="form-color-btn" style="display: inline-block; float: right;"></div>
+            <div id="form-color-btn" style="display: inline-block;" class="float-right"></div>
         </td>
     </tr>
     <tr>
         <td class="padding-small">
             <label class="input-label" style="margin-top: 4px;"><%= scope.textBackgroundColor %></label>
-            <div id="form-background-color-btn" style="display: inline-block; float: right;"></div>
+            <div id="form-background-color-btn" style="display: inline-block;" class="float-right"></div>
         </td>
     </tr>
 </table>
diff --git a/apps/documenteditor/main/app/template/RolesManagerDlg.template b/apps/documenteditor/main/app/template/RolesManagerDlg.template
index 398212f8c7..3aef72416b 100644
--- a/apps/documenteditor/main/app/template/RolesManagerDlg.template
+++ b/apps/documenteditor/main/app/template/RolesManagerDlg.template
@@ -6,8 +6,8 @@
                     <label><%= scope.textDescription %></label>
                 </td>
                 <td class="padding-small" style="width: 60px;">
-                    <div id="roles-manager-btn-down" style="display: inline-block;float: right;margin-left: 5px;"></div>
-                    <div id="roles-manager-btn-up" style="display: inline-block;float: right;"></div>
+                    <div id="roles-manager-btn-down" style="display: inline-block;margin-left: 5px;" class="float-right"></div>
+                    <div id="roles-manager-btn-up" style="display: inline-block;" class="float-right"></div>
                 </td>
             </tr>
             <tr>
@@ -19,7 +19,7 @@
                 <td colspan=2 class="padding-large">
                     <button type="button" class="btn btn-text-default" id="roles-manager-btn-new" style="min-width: 100px;margin-right:5px;"><%= scope.textNew %></button>
                     <button type="button" class="btn btn-text-default" id="roles-manager-btn-edit" style="min-width: 100px;"><%= scope.textEdit %></button>
-                    <button type="button" class="btn btn-text-default" id="roles-manager-btn-delete" style="min-width: 100px; float: right;"><%= scope.textDelete %></button>
+                    <button type="button" class="btn btn-text-default float-right" id="roles-manager-btn-delete" style="min-width: 100px;"><%= scope.textDelete %></button>
                 </td>
             </tr>
         </table>
diff --git a/apps/documenteditor/main/app/view/CustomColumnsDialog.js b/apps/documenteditor/main/app/view/CustomColumnsDialog.js
index 558ec7470b..085210bbf3 100644
--- a/apps/documenteditor/main/app/view/CustomColumnsDialog.js
+++ b/apps/documenteditor/main/app/view/CustomColumnsDialog.js
@@ -61,7 +61,7 @@ define([
             this.template = [
                 '<div class="box" style="height: 203px;">',
                     '<div class="input-row" style="margin-bottom: 10px;">',
-                        '<label class="input-label">' + this.textColumns + '</label><div id="custom-columns-spin-num" style="float: right;"></div>',
+                        '<label class="input-label">' + this.textColumns + '</label><div id="custom-columns-spin-num" class="float-right"></div>',
                     '</div>',
                     '<div id="custom-columns-list" style="width:100%; height: 113px;"></div>',
                     '<div class="input-row" style="margin: 10px 0;">',
diff --git a/apps/documenteditor/main/app/view/TableFormulaDialog.js b/apps/documenteditor/main/app/view/TableFormulaDialog.js
index 133de44348..469109132a 100644
--- a/apps/documenteditor/main/app/view/TableFormulaDialog.js
+++ b/apps/documenteditor/main/app/view/TableFormulaDialog.js
@@ -66,7 +66,7 @@ define([
                     '</div>',
                     '<div id="id-dlg-formula-format" class="input-row" style="margin-bottom: 20px;"></div>',
                     '<div class="input-row">',
-                        '<div id="id-dlg-formula-function" style="display: inline-block; width: 50%; padding-right: 10px; float: left;"></div>',
+                        '<div id="id-dlg-formula-function" style="display: inline-block; width: 50%; padding-right: 10px;" class="float-left"></div>',
                         '<div id="id-dlg-formula-bookmark" style="display: inline-block; width: 50%;"></div>',
                     '</div>',
                     '</div>'
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index 36d8dd855f..3904ffe184 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -333,16 +333,6 @@
     }
 }
 
-#window-custom-columns {
-    #custom-columns-spin-num, #custom-columns-spin-spacing {
-        float: right;
-
-        .rtl & {
-            float: left;
-        }
-    }
-}
-
 #window-note-settings {
     #note-settings-combo-footnote,
     #note-settings-combo-endnote {
diff --git a/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template b/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template
index b2c161b2ce..6cfdb40275 100644
--- a/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template
+++ b/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template
@@ -87,10 +87,10 @@
             <div class="separator short"></div>
             <div class="group small">
                 <div class="elset" style="width: 172px;">
-                    <span class="btn-slot" id="slot-field-fontname" style="width: 80px;float: left;"></span>
-                    <span class="btn-slot" id="slot-field-fontsize" style="width: 35px;margin-left: 2px;float: left;"></span>
-                    <span class="btn-slot split" id="slot-btn-fontcolor" style="margin-left: 2px;margin-top: 1px;float: left;"></span>
-                    <span class="btn-slot" id="slot-btn-formatting" style="margin-left: 2px;margin-top: 1px;float: left;"></span>
+                    <span class="btn-slot float-left" id="slot-field-fontname" style="width: 80px;"></span>
+                    <span class="btn-slot float-left" id="slot-field-fontsize" style="width: 35px;margin-left: 2px;"></span>
+                    <span class="btn-slot split float-left" id="slot-btn-fontcolor" style="margin-left: 2px;margin-top: 1px;"></span>
+                    <span class="btn-slot float-left" id="slot-btn-formatting" style="margin-left: 2px;margin-top: 1px;"></span>
                 </div>
             </div>
             <div class="separator short"></div>
@@ -114,7 +114,7 @@
             <div class="separator short"></div>
             <div class="group small">
                 <div class="elset">
-                    <span class="btn-slot" id="slot-btn-format" style="width: 80px; float: left;"></span>
+                    <span class="btn-slot float-left" id="slot-btn-format" style="width: 80px;"></span>
                 </div>
             </div>
             <div class="separator short"></div>
@@ -132,8 +132,8 @@
             <div class="group" style="width: 100%;padding-left: 0;"></div>
             <div class="group small" style="padding-right: 10px;">
                 <div class="elset">
-                    <span class="btn-slot" id="slot-btn-visible-area" style="width: auto;float: left;"></span>
-                    <span class="btn-slot" id="slot-btn-visible-area-close" style="width: auto;float: left;"></span>
+                    <span class="btn-slot float-left" id="slot-btn-visible-area" style="width: auto;"></span>
+                    <span class="btn-slot float-left" id="slot-btn-visible-area-close" style="width: auto;"></span>
                 </div>
             </div>
         </section>
diff --git a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js
index ae1f81ddca..248cb9b61c 100644
--- a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js
+++ b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js
@@ -66,7 +66,7 @@ define([
                                     '</div>',
                                     '<div style="margin-top: 4px;">',
                                         '<label id="formula-wizard-lbl-func-res">' + this.textFunctionRes + '</label>',
-                                        '<div id="formula-wizard-lbl-val-func" class="input-label" style="float: right; width: 200px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"></div>',
+                                        '<div id="formula-wizard-lbl-val-func" class="input-label float-right" style="width: 200px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"></div>',
                                     '</div>',
                                 '</div>',
                                 '</td></tr>',
diff --git a/apps/spreadsheeteditor/main/app/view/PrintSettings.js b/apps/spreadsheeteditor/main/app/view/PrintSettings.js
index faac52f8a7..a4702fdd43 100644
--- a/apps/spreadsheeteditor/main/app/view/PrintSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/PrintSettings.js
@@ -75,8 +75,8 @@ define([    'text!spreadsheeteditor/main/app/template/PrintSettings.template',
                     '<div class="separator horizontal"></div>',
                     '<div class="footer justify">',
                         '<button id="printadv-dlg-btn-hide" class="btn btn-text-default" style="min-width: 100px;width: auto;">' + this.textHideDetails + '</button>',
-                        '<button class="btn normal dlg-btn" result="cancel" style="width: 86px;float: right;">' + this.cancelButtonText + '</button>',
-                        '<button class="btn normal dlg-btn primary" result="ok" style="margin-left: 10px;  width: 150px;float: right;">' + ((this.type == 'print') ? this.btnPrint : this.btnDownload) + '</button>',
+                        '<button class="btn normal dlg-btn float-right" result="cancel" style="width: 86px;">' + this.cancelButtonText + '</button>',
+                        '<button class="btn normal dlg-btn primary float-right" result="ok" style="margin-left: 10px;  width: 150px;">' + ((this.type == 'print') ? this.btnPrint : this.btnDownload) + '</button>',
                     '</div>'
                 ].join('')
             }, options);
diff --git a/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js
index 1e583b6542..ab030c2b70 100644
--- a/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js
@@ -90,7 +90,7 @@ define([
                                 '<label class="header">', me.txtBaseField,'</label>',
                                 '<div id="value-field-settings-field" class="input-group-nr" style="width:128px;"></div>',
                             '</td>',
-                            '<td style="float: right;">',
+                            '<td class="float-right">',
                                 '<label class="header">', me.txtBaseItem,'</label>',
                                 '<div id="value-field-settings-item" class="input-group-nr" style="width:128px;"></div>',
                             '</td>',
diff --git a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js
index 0e65e51e82..fac89a7367 100644
--- a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js
@@ -78,7 +78,7 @@ define([
                                         '<button type="button" class="btn btn-text-default auto" id="view-manager-btn-new" style="min-width: 80px;margin-right:5px;">' + this.textNew + '</button>',
                                         '<button type="button" class="btn btn-text-default auto" id="view-manager-btn-rename" style="min-width: 80px;margin-right:5px;">' + this.textRename + '</button>',
                                         '<button type="button" class="btn btn-text-default auto" id="view-manager-btn-duplicate" style="min-width: 80px;">' + this.textDuplicate + '</button>',
-                                        '<button type="button" class="btn btn-text-default auto" id="view-manager-btn-delete" style="min-width: 80px;float: right;">' + this.textDelete + '</button>',
+                                        '<button type="button" class="btn btn-text-default auto float-right" id="view-manager-btn-delete" style="min-width: 80px;">' + this.textDelete + '</button>',
                                     '</td>',
                                 '</tr>',
                             '</table>',