diff --git a/src/addons/messages/tests/behat/snapshots/test-basic-usage-of-messages-in-app-view-recent-conversations-and-contacts_22.png b/src/addons/messages/tests/behat/snapshots/test-basic-usage-of-messages-in-app-view-recent-conversations-and-contacts_22.png
index cb8d3a916..368bf2370 100644
Binary files a/src/addons/messages/tests/behat/snapshots/test-basic-usage-of-messages-in-app-view-recent-conversations-and-contacts_22.png and b/src/addons/messages/tests/behat/snapshots/test-basic-usage-of-messages-in-app-view-recent-conversations-and-contacts_22.png differ
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index a4e47748a..ed939a983 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -7,7 +7,7 @@
     --card-border-width: 0px;
     --card-radius: 0px;
     --card-background: transparent;
-    --activity-border: 2px solid var(--stroke);
+    --activity-border: 1px solid var(--stroke);
     --card-padding-bottom: var(--vertical-spacing);
 
     ion-card {
@@ -132,15 +132,16 @@
         margin-bottom: var(--vertical-spacing);
     }
 
-    .activity-extrabadges,
     .core-module-description {
-        border-top: 1px solid var(--stroke);
         display: block;
     }
 
     .activity-extrabadges {
         font: var(--mdl-typography-body-font-md);
         color: var(--medium);
+        border: 1px solid var(--stroke);
+        border-radius: var(--mdl-shape-borderRadius-sm);
+        padding: var(--mdl-spacing-2) var(--mdl-spacing-3) var(--mdl-spacing-2) var(--mdl-spacing-3);
     }
 
     .activity-description-availabilityinfo .core-module-availabilityinfo {
diff --git a/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_53.png b/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_53.png
index 5218e6775..1ed06e5f8 100644
Binary files a/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_53.png and b/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_53.png differ
diff --git a/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_57.png b/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_57.png
index dd66e5285..f4c011c74 100644
Binary files a/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_57.png and b/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_57.png differ
diff --git a/src/theme/components/ion-accordion.scss b/src/theme/components/ion-accordion.scss
index 843df5458..bf514dd4f 100644
--- a/src/theme/components/ion-accordion.scss
+++ b/src/theme/components/ion-accordion.scss
@@ -1,15 +1,28 @@
 ion-accordion {
-    .ion-accordion-toggle-icon[slot="start"] {
+    > [slot="header"] .ion-accordion-toggle-icon[slot="start"] {
         @include margin-horizontal(null, var(--mdl-spacing-2));
         background-color: var(--gray-100);
         border-radius: 50%;
         padding: var(--mdl-spacing-1);
     }
+
+    /**
+    * Change arrow direction to match LMS: expanded is down, collapsed is right.
+    */
+    &.accordion-expanding > [slot="header"] .ion-accordion-toggle-icon,
+    &.accordion-expanded > [slot="header"] .ion-accordion-toggle-icon {
+        transform: none;
+    }
+
+    &.accordion-collapsing > [slot="header"] .ion-accordion-toggle-icon,
+    &.accordion-collapsed > [slot="header"] .ion-accordion-toggle-icon {
+        transform: rotate(-90deg);
+    }
 }
 
 :root.dark {
     ion-accordion {
-        .ion-accordion-toggle-icon[slot="start"] {
+        > [slot="header"] .ion-accordion-toggle-icon[slot="start"] {
             background-color: var(--gray-800);
         }
     }