diff --git a/theme/afterburner/style/afterburner_rtl.css b/theme/afterburner/style/afterburner_rtl.css
index 7e300fc08d3..a52030b99b2 100644
--- a/theme/afterburner/style/afterburner_rtl.css
+++ b/theme/afterburner/style/afterburner_rtl.css
@@ -9,11 +9,13 @@
 .dir-rtl .block .header .title h2 {
     margin-right: 10px;
 }
-.dir-rtl .coursebox h3,
-.dir-rtl .coursebox .info,
-.dir-rtl .coursebox .summary {
-    text-align: right;
+
+.dir-rtl .course_category_tree .category > .header .name {
+    padding-left:0;
+    padding-right:20px;
 }
+.dir-rtl .coursebox .summary {float:right;}
+
 .dir-rtl a.logo {
     float: right;
 }
diff --git a/theme/afterburner/style/afterburner_styles.css b/theme/afterburner/style/afterburner_styles.css
index 990fe49ecf3..b317e3d44f5 100644
--- a/theme/afterburner/style/afterburner_styles.css
+++ b/theme/afterburner/style/afterburner_styles.css
@@ -161,13 +161,6 @@ Navbar & Breadcrumb
     color: #787878;
 }
 
-.jsenabled .course_category_tree .controls {
-    visibility: visible;
-    float: right;
-}
-.category_label {
-    padding-left: 20px;
-}
 /*
 Collapse All - Expand All
 -------------------------*/
@@ -229,27 +222,22 @@ textarea {
     cursor: default;
 }
 /*
-Coursebox Info & Summary
-------------------------*/
-.coursebox h3,
-.coursebox .info,
-.coursebox .summary {
-    text-align: left;
+Courses and categories lists
+----------------------------*/
+.courses .coursebox .summary {
     width: 100%;
-    height: auto;
-}
-.coursebox .info {
     float: left;
 }
-.coursebox .summary {
-    float: right;
+.coursebox .name,
+.coursebox .summary,
+.coursebox .coursecat,
+.coursebox .teachers,
+.course_category_tree .paging {
+    margin: 5px;
 }
-.coursebox .summary p {
-    margin: 5px 0 0;
-}
-.coursebox .info h3.name {
-    padding: 0;
-    margin: 5px 0 0;
+.course_category_tree .category > .info .name {
+    padding-left: 20px;
+    margin: 5px;
 }
 /*
 Course Section Topic & Weekly
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 8816b8eca86..be09a4fbdb4 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -107,7 +107,6 @@ img.iconkbhelp {height:17px;width:49px;}
 img.icon-pre, .dir-rtl img.icon-post { padding-right: 3px; padding-left: 0; }
 img.icon-post, .dir-rtl img.icon-pre { padding-left: 3px; padding-right: 0; }
 
-.categorybox .category {font-size:1.2em;font-weight:bold;}
 .generalbox {border:1px solid;}
 .boxaligncenter {margin-left:auto;margin-right:auto;}
 .boxalignright {margin-left:auto;margin-right:0;}
diff --git a/theme/base/style/course.css b/theme/base/style/course.css
index 081b6bf9679..cac1c9fab6d 100644
--- a/theme/base/style/course.css
+++ b/theme/base/style/course.css
@@ -92,109 +92,73 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
 
 .section img.movetarget {height:16px;width:80px;}
 
-#page-course-enrol .generalbox,
-#page-course-enrol .coursebox {margin-top: 20px;}
+.course ul.section {margin:5px;padding:0;}
+
+.weeks-format, /* Window-width: 800 pixels.IE doesn't support, see inline IE conditional comment. */
+.topics-format {margin-top: 8px;min-width: 763px;}
 
 #page-course-pending .singlebutton,
-#page-course-category #renameform,
-#page-course-category #themeform,
-#page-course-category #coursesearch,
 #page-course-category .singlebutton,
 #page-course-editsection .singlebutton {text-align:center;}
-#page-course-category #movecourses td img { margin: 0 .22em; vertical-align: text-bottom;}
-#page-course-category #movecourses td img.icon { padding: 0; }
 
-#coursesearch,
-#coursesearch2 {margin-top: 1em;text-align:center;}
-
-#page-course-info .generalbox.icons {text-align: center;}
-#page-course-info .generalbox.info {margin-left:auto;margin-right:auto;}
+#coursesearch {margin-top: 1em;text-align:center;}
 
 #page-course-pending .pendingcourserequests {margin-bottom: 1em;}
 #page-course-pending .pendingcourserequests .singlebutton {display: inline;}
 #page-course-pending .pendingcourserequests .cell {padding: 0 5px;}
 #page-course-pending .pendingcourserequests .cell.c6 {white-space: nowrap;}
 
-.coursebox {width: 100%;margin-bottom: 15px;}
-.coursebox .info {float: left;text-align:left;width: 40%;}
-.coursebox .summary {float: right;text-align:left;width: 55%;}
-.coursebox .summary .category {text-align:right;}
+/* Courses and categories lists */
+
+.coursebox {width: 100%;margin-bottom:15px;}
+.coursebox.collapsed {margin-bottom:0}
+.coursebox.collapsed > .content {display:none;}
+.coursebox .name a {display:block;background-image:url([[pix:moodle|i/course]]);background-repeat: no-repeat;padding-left:21px;background-position: center left;}
+.coursebox.remotehost .name a {background-image:url([[pix:moodle|i/mnethost]]);}
+.coursebox .name,
+.coursebox .teachers {float:left;width: 40%;}
 .coursebox .teachers li {list-style-type:none;padding:0;margin:0;}
-.coursebox .enrolmenticons {margin-top: .3em;}
-.coursebox .enrolmenticons img {margin-right: .45em;}
+.coursebox .enrolmenticons {padding:3px 0;float:right;}
+.coursebox .moreinfo {padding:3px 0;float:right;}
+.coursebox .enrolmenticons img,
+.coursebox .moreinfo img {margin:0 .2em;}
+.coursebox .content {clear:both;}
+.courses .coursebox .summary,
+.coursebox .coursecat {float:right;width: 55%;}
+.coursebox .coursecat {text-align:right;clear:right;}
+.coursebox.remotecoursebox .remotecourseinfo {float:left;width: 40%;}
 
-.categorylist {width: 100%;}
-.categorylist .category .numberofcourse {font-style: italic; font-size: 0.85em; font-style: normal;}
-.categorylist .category {padding-top: 5px; padding-bottom: 5px; }
-.categorylist .category .info,
-.categorylist .category .name,
-.categorylist .category .image,
-.categorylist .course .name,
-.categorylist .course .info {float:left;text-align: left; margin-left: .45em;}
-.categorylist .course .name img.smallicon { vertical-align: text-bottom; margin-right: .45em;}
-.dir-rtl .categorylist .course .name img.smallicon { margin-left: .45em; margin-right: 0;}
-.categorylist .course .info {margin-left: .45em;}
-.categorylist .course .info img { vertical-align: text-bottom;}
-.dir-rtl .categorylist .course .info {margin-right: .45em; margin-left: 0;}
-.categorylist .course {padding-left:24px; margin-bottom: .5em; line-height: 1.5em;}
-.categorylist .course .indentation { margin-left: 24px;}
-.categorylist .category .indentation { margin-left: 24px;}
+.dir-rtl .coursebox .name a {padding-left:0;padding-right:21px;background-position: center right;}
+.dir-rtl .coursebox .name,
+.dir-rtl .coursebox .teachers {float:right;}
+.dir-rtl .coursebox .enrolmenticons,
+.dir-rtl .coursebox .moreinfo {float:left;}
+.dir-rtl .courses .coursebox .summary,
+.dir-rtl .coursebox .coursecat {float:left;}
+.dir-rtl .coursebox .coursecat {text-align:left;clear:left;}
 
-.course ul.section {margin:5px;padding:0;}
+.course_category_tree .category .numberofcourse {font-size: 0.85em;}
 
-.weeks-format, /* Window-width: 800 pixels.IE doesn't support, see inline IE conditional comment. */
-.topics-format {margin-top: 8px;min-width: 763px;}
-.categoryboxcontent {border-width:1px;border-style:solid;}
-
-/* Course and category combo list on front page */
 .course_category_tree .controls {visibility: hidden;}
 .course_category_tree .controls div {display:inline;cursor:pointer;}
-.course_category_tree .category.with_children>.category_label {background-image:url([[pix:moodle|t/expanded]]);background-repeat: no-repeat;}
-.course_category_tree .category_label {padding-left:13px;}
-.course_category_tree .category .category {margin:5px 0;}
-.course_category_tree .category .courses {padding-left:16px;}
-.course_category_tree .category .courses .course_link {display:block;background-image:url([[pix:moodle|i/course]]);background-repeat: no-repeat;padding-left:21px;}
-.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 img { margin-left: .45em;}
-.dir-rtl .course_category_tree .category .course_info img { margin-right: .45em; margin-left: 0;}
 .jsenabled .course_category_tree .controls {visibility: visible;}
-.jsenabled .course_category_tree .category.with_children.collapsed .category_label {background-image:url([[pix:moodle|t/collapsed]]);}
-.jsenabled .course_category_tree .category.with_children.collapsed .subcategories,
-.jsenabled .course_category_tree .category.with_children.collapsed .courses {display:none;}
+
+.course_category_tree .category>.info .name {background-image:url([[pix:moodle|t/collapsed_empty]]);background-repeat: no-repeat;background-position:center left;}
+.dir-rtl .course_category_tree .category>.info .name {background-image:url([[pix:moodle|t/collapsed_empty_rtl]]);background-position:center right;}
+.course_category_tree .category.with_children>.info .name {background-image:url([[pix:moodle|t/expanded]]);}
+.course_category_tree .category.with_children.collapsed>.info .name {background-image:url([[pix:moodle|t/collapsed]]);}
+.dir-rtl .course_category_tree .category.with_children.collapsed>.info .name {background-image:url([[pix:moodle|t/collapsed_rtl]]);}
+.course_category_tree .category.collapsed>.content {display:none;}
+
+.course_category_tree .category > .info .name {padding-left:13px;}
+.course_category_tree .category > .content {padding-left:16px;}
+
+.dir-rtl .course_category_tree .category > .info .name {padding-left:0;padding-right:13px;}
+.dir-rtl .course_category_tree .category > .content {padding-left:0;padding-right:16px;}
 
 .path-course .clearfloat {float:none; clear:both;height:0px;}
 
-/*all courses view*/
-#page-course-index .categorylist .course.clearfloat { height: auto; }
-
-/**
-* Overide for RTL layout
-*/
-.dir-rtl .coursebox .info {float: right; text-align: right;}
-.dir-rtl .coursebox .summary {text-align:right;}
-.dir-rtl .course_category_tree .category.with_children> .category_label {background-position: center right; padding-right: 18px;}
-.dir-rtl .course_category_tree .category_label, .dir-rtl .course_category_tree .category .course {padding-right:18px;}
-.dir-rtl.jsenabled .course_category_tree .category.with_children.collapsed .category_label {background-image:url([[pix:moodle|t/collapsed_rtl]]);}
-.dir-rtl .course_category_tree .category .courses .course_link {background-position:center right; padding-right:18px;}
-.dir-rtl .clearfloat {float:none; clear:both;height:0px;}
-.dir-rtl .categorylist .category .info,
-.dir-rtl .categorylist .category .indentation,
-.dir-rtl .categorylist .category .name,
-.dir-rtl .categorylist .category .image,
-.dir-rtl .categorylist .course .name,
-.dir-rtl .categorylist .course .indentation,
-.dir-rtl .categorylist .course .info {float:right;text-align: right;}
-.dir-rtl .categorylist .course {padding-right:18px;}
-
-#page-course-index.dir-rtl .category .image {padding-left: 5px; padding-right: 0px;}
-#page-course-index.dir-rtl .indentation {padding-left: 0px;padding-right: 30px;}
-
-table.category_subcategories {margin-bottom:1em;}
-table.category_subcategories td {white-space: nowrap;}
+/* Quick edit of module name */
 
 .sitetopic .section .activity form.activityinstance,
 .course-content .section .activity form.activityinstance { display: inline; vertical-align: bottom; }
diff --git a/theme/standard/style/course.css b/theme/standard/style/course.css
index e09c032c603..bd34ece6f1e 100644
--- a/theme/standard/style/course.css
+++ b/theme/standard/style/course.css
@@ -6,13 +6,6 @@
 .course-content ul.weeks li.section .right {padding:4px 0;}
 
 /** Course **/
-.coursebox {border:1px solid #DDD;border-color:#DDDDDD;}
-.coursebox .info {margin:5px;font-size:1em;}
-.coursebox .info .name {margin:3px 0;}
-.coursebox .info .teachers {margin:0 1em;font-size:0.9em;}
-.coursebox .cost {font-size:0.9em;padding-top: 20px;}
-.coursebox .summary {margin:5px;font-size:0.9em;}
-
 #page-course-recent h2.main {font-size:1.1em;}
 #page-course-recent .user {font-size:0.75em;}
 #page-course-recent .grade {font-style: italic;font-size:0.9em;}
@@ -55,8 +48,6 @@
 .weeks .content,
 .topics .content {padding: 5px;}
 
-.categoryboxcontent {border-color:#DDDDDD;}
-
 #page-report-outline-user .section {border-color:#AAAAAA;}
 
 #page-admin-report .plugin,
@@ -66,9 +57,6 @@
 .path-course-view .unread {background: #9EBEFF;}
 .path-course-view .completionprogress {font-size:0.80em; margin-right: 1.5em; }
 
-#page-course-category .courseboxes,
-#page-course-index .courseboxes {padding:20px;}
-
 #page-report #content {padding-top:15px;padding-bottom:15px;}
 
 #page-report #region-main p,
@@ -84,24 +72,41 @@
 .addcoursebutton {text-align:center;}
 .categorypicker {text-align:center;margin-bottom:10px;}
 .path-report-outline .loginfo {text-align:center;margin: 1em;}
-.categorylist {width: 90%;margin:0 auto;text-align: left;}
 
-/* Course and category combo list on front page */
+/* Courses and categories lists */
+
+.coursebox {border:1px solid #DDD;border-color:#DDDDDD;}
+#page-enrol-index .generalbox.info,
+#page-course-info .generalbox.info {border:none;}
+.coursebox .name {padding: 5px;margin:0;}
+.coursebox .teachers {padding:3px 0 3px 21px;margin:0;font-size:0.9em;}
+.coursebox .coursecat,
+.coursebox .summary,
+.coursebox.remotecoursebox .remotecourseinfo {padding:3px 5px;font-size:0.9em;}
+.dir-rtl .coursebox .teachers {padding:3px 21px 3px 0;}
+
 .course_category_tree .controls {margin-bottom:5px;text-align:right;float:right;}
 .course_category_tree .controls div {padding-right:2em;font-size:75%;}
-.course_category_tree .category {background-color:#FFF;background-image:url([[pix:theme|hgradient]]);background-repeat: repeat-x;border:1px solid #ddd;margin-bottom:10px;}
-.course_category_tree .category .subcategories {background-color:inherit;padding-left:16px;border:1px solid #FFF;}
-.course_category_tree .category.with_children .category_label {background-position:3px 3px;}
-.course_category_tree .category_link .category_link {font-size:95%;}
-.course_category_tree .category_label {padding-left:13px;}
-.course_category_tree .category_link {display:block;margin:5px;font-size:120%;font-weight:bold;}
-.course_category_tree .category .courses {background-color:inherit;}
-.course_category_tree .category .courses .course_link {margin:5px;margin-right:100px;}
-.course_category_tree .category .course {border:1px solid #f9f9f9;border-bottom-color: #eee;border-right-width:0;}
-.course_category_tree .category .course:last-child {border-bottom-color:#f6f6f6;}
-.course_category_tree .category .course.even {background-color:#f6f6f6;border-color:#eee;border-top-color: #f9f9f9;}
-.course_category_tree .category .course_info {right:3px;top:3px;}
-.course_category_tree .category .course:hover {background-color:#eee;}
+
+.course_category_tree .category >.info {background-image:url([[pix:theme|hgradient]]);background-repeat: repeat-x;background-color:#e1e1df;border:1px solid #ddd;margin:3px 0;}
+.course_category_tree.frontpage-category-names .category >.info {background:none;border:none;margin:0;}
+.course_category_tree .category >.info .name {padding:5px 21px;margin:0;background-position: 3px center;}
+.dir-rtl .course_category_tree .category >.info .name {background-position: right 3px center 0;}
+
+.courses .coursebox.collapsed {border:1px solid #eeeeee;padding:3px 0;}
+.courses .coursebox.even {background-color:#f6f6f6;}
+.courses .coursebox:hover,
+.course_category_tree .courses > .paging:hover {background-color:#eeeeee;}
+
+.course_category_tree .subcategories > .paging,
+.course_category_tree .courses > .paging {margin:0;padding:5px;}
+
+.course_category_tree .courses > .paging.paging-morelink,
+.course_category_tree .subcategories > .paging.paging-morelink {text-align:left;}
+
+.course_category_tree .paging.paging-morelink a {font-size:90%}
+.dir-rtl .course_category_tree .paging.paging-morelink {text-align:right;}
+
 
 /* Publication */
 #page-course-publish-metadata .metadatatext {width: 400px;}
diff --git a/theme/standard/style/css3.css b/theme/standard/style/css3.css
index 85ba9261041..a9fa6e034b0 100644
--- a/theme/standard/style/css3.css
+++ b/theme/standard/style/css3.css
@@ -58,8 +58,6 @@ table.minicalendar td,
   border-radius: 5px;
 }
 
-.categorybox,
-.categoryboxcontent,
 .coursebox,
 .notifyproblem,
 .notifysuccess,