diff --git a/theme/base/style/blocks.css b/theme/base/style/blocks.css
index 512f2c06cf8..9fca8f98c9c 100644
--- a/theme/base/style/blocks.css
+++ b/theme/base/style/blocks.css
@@ -1,6 +1,6 @@
 .block {border:1px solid;margin-bottom:1em;}
 .block .header h2 {margin:4px;}
-.block .header .block_action {float:right;margin:0 4px;vertical-align:top;}
+.block .header .block_action {float:right;margin:2px 4px 0;vertical-align:top;}
 .block .header .block_action input {margin-right:2px;}
 .block .header .commands {margin-left:4px;}
 .block .header .commands .icon img {width:11px;height:11px;margin-right:1px;}
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 58e93ef631c..3938b49d6d4 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -210,7 +210,7 @@ a.skip:active {position: static;display: block;}
 .mform .fitem .fitemtitle {width:15%;text-align:right;float:left;}
 .mform .fitem .fitemtitle div {display: inline;}
 .mform .fitem .felement {border-width: 0;width:80%;margin-left:16%;}
-.mform .fitem fieldset.felement {margin-left:15%;padding-left:1%;margin-bottom:0}
+.mform .fitem fieldset.felement {margin-left:0;padding-left:1%;margin-bottom:0}
 .mform .error,
 .mform .required {color:#A00;}
 .mform .required .fgroup span label {color:#000;}
@@ -723,8 +723,8 @@ sup {vertical-align: super;}
 .dir-rtl .ygtvcancel {background-position: 0 -8822px;}
 .dir-rtl .ygtvcancel:hover {background-position: 0 -8866px;}
 
-.dir-rtl #yui-gen4.yui-layout-unit-left  {left:500px !important;}
-.dir-rtl #yui-gen6.yui-layout-unit-center {left:0px !important;}
+.dir-rtl .file-picker .yui-layout-unit-left  {left:500px !important;}
+.dir-rtl .file-picker .yui-layout-unit-center {left:0px !important;}
 .dir-rtl.yui-skin-sam .yui-panel .hd {text-align:left;}
 .dir-rtl .yui-skin-sam .yui-layout .yui-layout-unit div.yui-layout-bd {text-align:right;}
 
@@ -805,6 +805,7 @@ sup {vertical-align: super;}
 #page-admin-setting-enrolsettingsflatfile.dir-rtl .informationbox {direction: ltr;text-align: left;}
 
 #page-admin-grade-edit-scale-edit.dir-rtl .error input#id_name {margin-right: 170px;}
+.initialbar a {padding-right: 2px;}
 
 /**
  * Chooser Dialogue
@@ -972,6 +973,4 @@ sup {vertical-align: super;}
     box-shadow: 0px 0px 10px 0px #CCCCCC;
     -webkit-box-shadow: 0px 0px 10px 0px #CCCCCC;
     -moz-box-shadow: 0px 0px 10px 0px #CCCCCC;
-}
-
-.initialbar a {padding-right: 2px;}
+}
\ No newline at end of file
diff --git a/theme/base/style/course.css b/theme/base/style/course.css
index 2e938a42f2e..b2f0a394f20 100644
--- a/theme/base/style/course.css
+++ b/theme/base/style/course.css
@@ -107,6 +107,9 @@
 .course_category_tree .category .courses .course_link {display:block;background-image:url([[pix:moodle|i/course]]);background-repeat: no-repeat;padding-left:18px;}
 .course_category_tree .category .course {position:relative;}
 .course_category_tree .category .course_info {position:absolute;right:0;top:0;}
+.dir-rtl .course_category_tree .category .course_info { position: static; }
+.dir-rtl .course_category_tree .category .course_info a, .dir-rtl .course_category_tree .category .course_info div {float: right;}
+.dir-rtl .course_category_tree .controls div {padding: 7px;}
 .course_category_tree .category .course_info a,
 .course_category_tree .category .course_info div {float:left;width:16px;height:16px;}
 .jsenabled .course_category_tree .controls {visibility: visible;}
diff --git a/theme/base/style/user.css b/theme/base/style/user.css
index 8276b71ffe6..b23d73417b3 100644
--- a/theme/base/style/user.css
+++ b/theme/base/style/user.css
@@ -54,3 +54,5 @@
 .dir-rtl .userlist table#participants td,
 .dir-rtl .userlist table#participants th {text-align: right;}
 .dir-rtl .userlist table#participants {margin: 0 auto;}
+
+#page-my-index.dir-rtl .block h3.main { text-align: right;}