diff --git a/donate/static/donate/assets/css/style.css b/donate/static/donate/assets/css/style.css
index f63d0d4460948b06e08cca3a7e733ade66e9228f..4363a1cd9ae9c970a5f053fc3ac2f5dbcc6d2e38 100644
--- a/donate/static/donate/assets/css/style.css
+++ b/donate/static/donate/assets/css/style.css
@@ -1204,12 +1204,12 @@ img.full-width {
   font-weight: inherit;
 }
 
-/* OVERRIDE RICHTEXT IMAGES FOR MAIN PAGE (TODO: find out if we can apply this to all richtext images in donate */
-.section--custom .richtext-image.left {
+/* OVERRIDE RICHTEXT IMAGES */
+.richtext-image.left {
   float: left;
   margin-right: 1.5rem;
 }
-.section--custom .richtext-image.right {
+.richtext-image.right {
   float: right;
   margin-left: 1.5rem;
 }
diff --git a/donate/wagtail_hooks.py b/donate/wagtail_hooks.py
index 3730252243f1baf2220beeeb514f95a146a595b8..d1377bcf2bd6c7ae472c6b0942a9a6c672050196 100644
--- a/donate/wagtail_hooks.py
+++ b/donate/wagtail_hooks.py
@@ -28,7 +28,7 @@ def register_font_color_feature(features):
     for color_name, color_value in font_colors:
         feature_name = "font_color_" + color_value
         type_ = "FONT_COLOR_" + color_value
-        tag = "span"
+        tag = f"span{color_name.lower()}"  # This must be a "custom" HTML element in order for wagtail to correctly save it :-)
 
         control = {
             "type": type_,