diff --git a/theme/base/style/grade.css b/theme/base/style/grade.css
index 0c4f2f63aa6..959835e67db 100644
--- a/theme/base/style/grade.css
+++ b/theme/base/style/grade.css
@@ -4,10 +4,188 @@
 .path-grade-edit .buttons {text-align:center;}
 .path-grade-edit-tree .idnumber {margin-left: 15px;}
 .path-grade-edit-tree .movetarget {position: relative;width: 80px;height: 16px;}
-.path-grade-edit-tree ul#grade_tree {width: auto;}
-.path-grade-edit-tree ul#grade_tree li {list-style: none;}
-.path-grade-edit-tree ul#grade_tree li.category {margin-bottom: 6px;}
-.path-grade-edit-tree .iconsmall {margin-left: 4px;}
+
+.path-grade-edit-tree .setup-grades {
+	width: 100%;
+}
+.path-grade-edit-tree .setup-grades thead th {
+	text-align: left;
+}
+.path-grade-edit-tree .setup-grades .column-rowspan {
+    padding: 0;
+    width: 24px;
+    min-width: 24px;
+    max-width: 24px;
+}
+.path-grade-edit-tree .setup-grades .category td.column-name {
+    padding-left: 0;
+}
+.path-grade-edit-tree .setup-grades td.column-name {
+    padding-left: 24px;
+}
+.path-grade-edit-tree .setup-grades .column-name h4 img.icon {
+    padding-left: 0;
+}
+.path-grade-edit-tree .setup-grades .column-name img.smallicon {
+	margin: 0 .3em;
+}
+.path-grade-edit-tree .setup-grades .category input[type="text"],
+.path-grade-edit-tree .setup-grades .category .column-range,
+.path-grade-edit-tree .setup-grades .categoryitem {
+    font-weight: bold;
+}
+.path-grade-edit-tree .setup-grades .emptyrow {
+    display: none;
+}
+.path-grade-edit-tree .setup-grades.generaltable .levelodd {
+    background-color: #f0f0f0;
+}
+.path-grade-edit-tree .setup-grades.generaltable .leveleven {
+    background-color: #fafafa;
+}
+.path-grade-edit-tree .setup-grades.generaltable tbody tr:hover > td,
+.path-grade-edit-tree .setup-grades.generaltable tbody tr:hover > th {
+    background-color: #f5f5f5;
+}
+.path-grade-edit-tree .setup-grades .column-weight.level3 {
+    padding-left: 37px;
+}
+.path-grade-edit-tree .setup-grades .column-weight.level4 {
+    padding-left: 66px;
+}
+.path-grade-edit-tree .setup-grades .column-weight.level5 {
+    padding-left: 95px;
+}
+.path-grade-edit-tree .setup-grades .column-weight.level6 {
+    padding-left: 124px;
+}
+.path-grade-edit-tree .setup-grades .column-weight.level7 {
+    padding-left: 153px;
+}
+.path-grade-edit-tree .setup-grades .column-weight.level8 {
+    padding-left: 182px;
+}
+.path-grade-edit-tree .setup-grades .column-weight.level9 {
+    padding-left: 211px;
+}
+.path-grade-edit-tree .setup-grades .column-weight.level10 {
+    padding-left: 240px;
+}
+.path-grade-edit-tree .setup-grades .column-range.level2 {
+    padding-left: 37px;
+}
+.path-grade-edit-tree .setup-grades .column-range.level3 {
+    padding-left: 66px;
+}
+.path-grade-edit-tree .setup-grades .column-range.level4 {
+    padding-left: 95px;
+}
+.path-grade-edit-tree .setup-grades .column-range.level5 {
+    padding-left: 124px;
+}
+.path-grade-edit-tree .setup-grades .column-range.level6 {
+    padding-left: 153px;
+}
+.path-grade-edit-tree .setup-grades .column-range.level7 {
+    padding-left: 182px;
+}
+.path-grade-edit-tree .setup-grades .column-range.level8 {
+    padding-left: 211px;
+}
+.path-grade-edit-tree .setup-grades .column-range.level9 {
+    padding-left: 240px;
+}
+.path-grade-edit-tree .setup-grades .column-range.level10 {
+    padding-left: 269px;
+}
+
+.dir-rtl.path-grade-edit-tree .setup-grades thead th {
+	text-align: right;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .category td.column-name {
+    padding-right: 0;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades td.column-name {
+    padding-right: 24px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-name h4 img.icon {
+    padding-left: 4px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-weight input[type="checkbox"] {
+    margin-right: 0;
+    margin-left: 7px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-select input[type="checkbox"] {
+    margin-right: 0;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level3 {
+	padding-left: 0;
+    padding-right: 37px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level4 {
+    padding-left: 0;
+    padding-right: 66px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level5 {
+    padding-left: 0;
+    padding-right: 95px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level6 {
+    padding-left: 0;
+    padding-right: 124px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level7 {
+    padding-left: 0;
+    padding-right: 153px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level8 {
+    padding-left: 0;
+    padding-right: 182px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level9 {
+    padding-left: 0;
+    padding-right: 211px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level10 {
+    padding-left: 0;
+    padding-right: 240px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level2 {
+    padding-left: 0;
+    padding-right: 37px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level3 {
+    padding-left: 0;
+    padding-right: 66px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level4 {
+    padding-left: 0;
+    padding-right: 95px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level5 {
+    padding-left: 0;
+    padding-right: 124px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level6 {
+    padding-left: 0;
+    padding-right: 153px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level7 {
+    padding-left: 0;
+    padding-right: 182px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level8 {
+    padding-left: 0;
+    padding-right: 211px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level9 {
+    padding-left: 0;
+    padding-right: 240px;
+}
+.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level10 {
+    padding-left: 0;
+    padding-right: 269px;
+}
 
 #grade-report-toggles {text-align: center;}
 #grade-aggregation-help dt {margin-top: 15px;}
@@ -16,19 +194,7 @@
 .gradeexportlink {padding: 2em;text-align: center;}
 
 .gradetreebox {margin-top:10px;overflow-x:auto;overflow-y:hidden;}
-.gradetreebox table {font-size: 0.8em;width: 100%;}
-.gradetreebox td.colspan,
-.gradetreebox tr.category .cell {background-color: #DDD;}
-.gradetreebox th.actions {white-space: nowrap;width: 105px;}
-.gradetreebox td.name {white-space: nowrap;}
-.gradetreebox td.name h4 {display: inline;}
-.gradetreebox td.range {white-space: nowrap;}
-.gradetreebox span.actionlink {color: blue;}
-.gradetreebox span.actionlink:hover {text-decoration: underline;cursor: pointer;}
-.gradetreebox img.iconsmall {margin-left: 4px;}
-.gradetreebox img.icon {margin-right: 5px;}
 .gradetreebox #gradetreesubmit {margin-bottom:1em;text-align: center;}
-.gradetreebox .hidden {display: none;}
 
 /** Advanced grading **/
 #page-grade-grading-manage #activemethodselector {text-align:center;margin-bottom:1em;}
@@ -73,10 +239,6 @@
     text-align:center;
 }
 
-.path-grade-edit-tree table.setup-grades .column-select {
-    text-align: center;
-}
-
 .path-grade-edit-tree table.setup-grades .column-weight {
     white-space: nowrap;
 }
diff --git a/theme/bootstrapbase/less/moodle/grade.less b/theme/bootstrapbase/less/moodle/grade.less
index 70268f9af61..17086c800a2 100644
--- a/theme/bootstrapbase/less/moodle/grade.less
+++ b/theme/bootstrapbase/less/moodle/grade.less
@@ -231,8 +231,184 @@
     }
 }
 
-.path-grade-edit-tree table.setup-grades .column-select {
-    text-align: center;
+// Set up grades layout
+.path-grade-edit-tree .setup-grades {
+    .column-rowspan {
+        padding: 0;
+        width: 24px;
+        min-width: 24px;
+        max-width: 24px;
+    }
+    .category td.column-name {
+        padding-left: 0;
+    }
+    td.column-name {
+        padding-left: 24px;
+    }
+    .column-name h4 img.icon {
+        padding-left: 0;
+    }
+    .category input[type="text"],
+    .category .column-range,
+    .categoryitem {
+        font-weight: bold;
+    }
+    .emptyrow {
+        display: none;
+    }
+    .column-weight {
+        &.level3 {
+            padding-left: 37px;
+        }
+        &.level4 {
+            padding-left: 66px;
+        }
+        &.level5 {
+            padding-left: 95px;
+        }
+        &.level6 {
+            padding-left: 124px;
+        }
+        &.level7 {
+            padding-left: 153px;
+        }
+        &.level8 {
+            padding-left: 182px;
+        }
+        &.level9 {
+            padding-left: 211px;
+        }
+        &.level10 {
+            padding-left: 240px;
+        }
+    }
+    .column-range {
+        &.level2 {
+            padding-left: 37px;
+        }
+        &.level3 {
+            padding-left: 66px;
+        }
+        &.level4 {
+            padding-left: 95px;
+        }
+        &.level5 {
+            padding-left: 124px;
+        }
+        &.level6 {
+            padding-left: 153px;
+        }
+        &.level7 {
+            padding-left: 182px;
+        }
+        &.level8 {
+            padding-left: 211px;
+        }
+        &.level9 {
+            padding-left: 240px;
+        }
+        &.level10 {
+            padding-left: 269px;
+        }
+    }
+    &.generaltable {
+        .levelodd {
+            background-color: @tableBackgroundAccent;
+        }
+        .leveleven {
+            background-color: @tableBackground;
+        }
+        tbody tr:hover > td,
+        tbody tr:hover > th {
+            background-color: @tableBackgroundHover;
+        }
+    }
+}
+
+.dir-rtl {
+    &.path-grade-edit-tree .setup-grades {
+        .category td.column-name {
+            padding-right: 0;
+        }
+        td.column-name {
+            padding-right: 24px;
+        }
+        .column-name h4 img.icon {
+            padding-left: 4px;
+        }
+        .column-weight {
+            &.level3 {
+                padding-left: 0;
+                padding-right: 37px;
+            }
+            &.level4 {
+                padding-left: 0;
+                padding-right: 66px;
+            }
+            &.level5 {
+                padding-left: 0;
+                padding-right: 95px;
+            }
+            &.level6 {
+                padding-left: 0;
+                padding-right: 124px;
+            }
+            &.level7 {
+                padding-left: 0;
+                padding-right: 153px;
+            }
+            &.level8 {
+                padding-left: 0;
+                padding-right: 182px;
+            }
+            &.level9 {
+                padding-left: 0;
+                padding-right: 211px;
+            }
+            &.level10 {
+                padding-left: 0;
+                padding-right: 240px;
+            }
+        }
+        .column-range {
+            &.level2 {
+                padding-left: 0;
+                padding-right: 37px;
+            }
+            &.level3 {
+                padding-left: 0;
+                padding-right: 66px;
+            }
+            &.level4 {
+                padding-left: 0;
+                padding-right: 95px;
+            }
+            &.level5 {
+                padding-left: 0;
+                padding-right: 124px;
+            }
+            &.level6 {
+                padding-left: 0;
+                padding-right: 153px;
+            }
+            &.level7 {
+                padding-left: 0;
+                padding-right: 182px;
+            }
+            &.level8 {
+                padding-left: 0;
+                padding-right: 211px;
+            }
+            &.level9 {
+                padding-left: 0;
+                padding-right: 240px;
+            }
+            &.level10 {
+                padding-left: 0;
+                padding-right: 269px;
+            }
+        }
+    }
 }
 
 .path-grade-edit-tree table.setup-grades .column-weight {