diff --git a/src/addons/block/activitymodules/components/activitymodules/activitymodules.scss b/src/addons/block/activitymodules/components/activitymodules/activitymodules.scss
index 7f0ff5973..bb4fef1e9 100644
--- a/src/addons/block/activitymodules/components/activitymodules/activitymodules.scss
+++ b/src/addons/block/activitymodules/components/activitymodules/activitymodules.scss
@@ -1,7 +1,7 @@
 :host {
     core-mod-icon {
-        margin: 0;
-        --padding-start: 0px;
+        --margin-vertical: 0px;
+        --margin-end: 12px;
         --module-icon-size: 24px;
     }
 }
diff --git a/src/addons/mod/workshop/components/assessment-strategy/assessment-strategy.ts b/src/addons/mod/workshop/components/assessment-strategy/assessment-strategy.ts
index 95f62fd6d..c3656705a 100644
--- a/src/addons/mod/workshop/components/assessment-strategy/assessment-strategy.ts
+++ b/src/addons/mod/workshop/components/assessment-strategy/assessment-strategy.ts
@@ -250,7 +250,7 @@ export class AddonModWorkshopAssessmentStrategyComponent implements OnInit, OnDe
      * @returns True if data has changed.
      */
     hasDataChanged(): boolean {
-        if (!this.assessmentStrategyLoaded || !this.workshop.strategy) {
+        if (!this.assessmentStrategyLoaded || !this.workshop.strategy || !this.edit) {
             return false;
         }
 
diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss
index 7d79dd7f3..fb23300c9 100644
--- a/src/core/components/mod-icon/mod-icon.scss
+++ b/src/core/components/mod-icon/mod-icon.scss
@@ -16,7 +16,7 @@
 
     margin-top: var(--margin-vertical);
     margin-bottom: var(--margin-vertical);
-    @include margin-horizontal(null, var(--margin-end));
+    @include margin-horizontal(0px, var(--margin-end));
 
     border-radius: var(--icon-radius);
     @include padding(var(--padding-top), var(--padding-end), var(--padding-bottom), var(--padding-start));
@@ -77,3 +77,10 @@
     --margin-vertical: 12px;
     --margin-end: 12px;
 }
+
+:host-context(html.dark) {
+    &.version_40:not(.colorize),
+    &.version_current {
+        background-color: var(--white);
+    }
+}