diff --git a/modules/custom/az_carousel/css/az_carousel.css b/modules/custom/az_carousel/css/az_carousel.css
index 50d67d14d5..87a54f3d6e 100644
--- a/modules/custom/az_carousel/css/az_carousel.css
+++ b/modules/custom/az_carousel/css/az_carousel.css
@@ -1,6 +1,5 @@
 /* Node Overrides */
-.az-carousel .node__content,
-.az-carousel .field--type-entity-reference {
+.az-carousel .node__content {
 	margin: 0;
 }
 
diff --git a/modules/custom/az_event/config/install/core.entity_view_display.node.az_event.az_card_alternate.yml b/modules/custom/az_event/config/install/core.entity_view_display.node.az_event.az_card_alternate.yml
index 8abd67e599..20684c2f22 100644
--- a/modules/custom/az_event/config/install/core.entity_view_display.node.az_event.az_card_alternate.yml
+++ b/modules/custom/az_event/config/install/core.entity_view_display.node.az_event.az_card_alternate.yml
@@ -48,7 +48,7 @@ third_party_settings:
         speed: fast
     group_link:
       children:
-        - field_az_media_thumbnail_image
+        - group_media
         - group_date
         - group_heading
         - group_summary
@@ -71,7 +71,7 @@ third_party_settings:
       label: Date
       parent_name: group_link
       region: content
-      weight: 7
+      weight: 4
       format_type: html_element
       format_settings:
         classes: 'text-body-secondary fw-bold small'
@@ -89,7 +89,7 @@ third_party_settings:
       label: Heading
       parent_name: group_link
       region: content
-      weight: 8
+      weight: 5
       format_type: html_element
       format_settings:
         classes: 'card-title text-red h5 mt-0 mb-2'
@@ -107,7 +107,7 @@ third_party_settings:
       label: Summary
       parent_name: group_link
       region: content
-      weight: 9
+      weight: 6
       format_type: html_element
       format_settings:
         classes: 'card-text fw-normal small mb-0'
@@ -119,6 +119,26 @@ third_party_settings:
         attributes: ''
         effect: none
         speed: fast
+    group_media:
+      children:
+        - field_az_media_thumbnail_image
+      label: Media
+      parent_name: group_link
+      region: content
+      weight: 2
+      format_type: html_element
+      format_settings:
+        classes: 'pb-card mb-nmin'
+        show_empty_fields: false
+        id: ''
+        label_as_html: false
+        element: div
+        show_label: false
+        label_element: h3
+        label_element_classes: ''
+        attributes: ''
+        effect: none
+        speed: fast
   smart_title:
     enabled: true
     settings:
@@ -158,7 +178,7 @@ content:
       view_mode: az_card_image
       link: false
     third_party_settings: {  }
-    weight: 6
+    weight: 3
     region: content
   field_az_summary:
     type: az_text_summary
diff --git a/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_card.yml b/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_card.yml
index b551abeace..f17394d912 100644
--- a/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_card.yml
+++ b/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_card.yml
@@ -56,7 +56,7 @@ third_party_settings:
         speed: fast
     group_link:
       children:
-        - field_az_media_thumbnail_image
+        - group_media
         - group_heading
         - group_text_muted
         - group_summary
@@ -80,11 +80,13 @@ third_party_settings:
       label: Heading
       parent_name: group_link
       region: content
-      weight: 2
+      weight: 22
       format_type: html_element
       format_settings:
         classes: 'card-title text-midnight h5 mb-0'
+        show_empty_fields: false
         id: ''
+        label_as_html: false
         element: h4
         show_label: false
         label_element: h3
@@ -98,7 +100,7 @@ third_party_settings:
       label: 'Text Body Secondary'
       parent_name: group_link
       region: content
-      weight: 3
+      weight: 23
       format_type: html_element
       format_settings:
         classes: 'text-body-secondary fw-normal small mt-2'
@@ -118,7 +120,7 @@ third_party_settings:
       label: Summary
       parent_name: group_link
       region: content
-      weight: 4
+      weight: 24
       format_type: html_element
       format_settings:
         classes: 'card-text fw-normal mt-2 text-body'
@@ -138,7 +140,7 @@ third_party_settings:
       label: 'Read more'
       parent_name: group_link
       region: content
-      weight: 5
+      weight: 25
       format_type: html_element
       format_settings:
         classes: mt-2
@@ -172,6 +174,26 @@ third_party_settings:
         attributes: ''
         effect: none
         speed: fast
+    group_media:
+      children:
+        - field_az_media_thumbnail_image
+      label: Media
+      parent_name: group_link
+      region: content
+      weight: 20
+      format_type: html_element
+      format_settings:
+        classes: 'pb-card mb-nmin'
+        show_empty_fields: false
+        id: ''
+        label_as_html: false
+        element: div
+        show_label: false
+        label_element: h3
+        label_element_classes: ''
+        attributes: ''
+        effect: none
+        speed: fast
 id: node.az_news.az_card
 targetEntityType: node
 bundle: az_news
@@ -189,7 +211,7 @@ content:
       view_mode: az_card_image
       link: false
     third_party_settings: {  }
-    weight: 0
+    weight: 21
     region: content
   field_az_published:
     type: timestamp_ap_style
diff --git a/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_marquee.yml b/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_marquee.yml
index 004f3ea9dc..8605a3d60b 100644
--- a/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_marquee.yml
+++ b/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_marquee.yml
@@ -76,7 +76,7 @@ third_party_settings:
       weight: 3
       format_type: html_element
       format_settings:
-        classes: mb-1
+        classes: 'pb-card mb-nmin'
         show_empty_fields: false
         id: ''
         label_as_html: false
diff --git a/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_media_list.yml b/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_media_list.yml
index 9e5eabf924..ac88a576db 100644
--- a/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_media_list.yml
+++ b/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_media_list.yml
@@ -97,8 +97,10 @@ third_party_settings:
       weight: 5
       format_type: html_element
       format_settings:
-        classes: 'col-4 pt-2'
+        classes: 'col-4 pt-2 pb-card mb-nmin'
+        show_empty_fields: false
         id: ''
+        label_as_html: false
         element: div
         show_label: false
         label_element: h3
diff --git a/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_medium_media_list.yml b/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_medium_media_list.yml
index 80ecb98b79..435ea1b7ce 100644
--- a/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_medium_media_list.yml
+++ b/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_medium_media_list.yml
@@ -95,8 +95,10 @@ third_party_settings:
       weight: 6
       format_type: html_element
       format_settings:
-        classes: col-4
+        classes: 'col-4 pb-card mb-nmin'
+        show_empty_fields: false
         id: ''
+        label_as_html: false
         element: div
         show_label: false
         label_element: h3
diff --git a/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_row_with_background.yml b/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_row_with_background.yml
index 425047d77b..079afb34a7 100644
--- a/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_row_with_background.yml
+++ b/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_row_with_background.yml
@@ -77,7 +77,7 @@ third_party_settings:
       weight: 25
       format_type: html_element
       format_settings:
-        classes: 'col-12 position-relative col-lg-4 pe-3'
+        classes: 'col-12 position-relative col-lg-4 pe-3 pb-card mb-nmin'
         show_empty_fields: false
         id: ''
         label_as_html: false
diff --git a/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_small_row.yml b/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_small_row.yml
index 5cadc017c9..b65107542b 100644
--- a/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_small_row.yml
+++ b/modules/custom/az_news/config/install/core.entity_view_display.node.az_news.az_small_row.yml
@@ -75,7 +75,7 @@ third_party_settings:
       weight: 0
       format_type: html_element
       format_settings:
-        classes: card border-0 hover
+        classes: 'card border-0 hover'
         show_empty_fields: false
         id: ''
         label_as_html: false
@@ -111,9 +111,10 @@ third_party_settings:
       weight: 8
       format_type: html_element
       format_settings:
-        classes: col-4
+        classes: 'col-4 pb-card mb-nmin'
         show_empty_fields: false
         id: ''
+        label_as_html: false
         element: div
         show_label: false
         label_element: h3
diff --git a/modules/custom/az_paragraphs/az_paragraphs_splitscreen/css/az_splitscreen.css b/modules/custom/az_paragraphs/az_paragraphs_splitscreen/css/az_splitscreen.css
index 59ff8c253c..f30a790d5b 100644
--- a/modules/custom/az_paragraphs/az_paragraphs_splitscreen/css/az_splitscreen.css
+++ b/modules/custom/az_paragraphs/az_paragraphs_splitscreen/css/az_splitscreen.css
@@ -15,9 +15,6 @@
   object-fit: cover;
   border-radius: 0;
 }
-.az-splitscreen-image .field--type-entity-reference {
-  margin: 0;
-}
 .az-splitscreen-text {
   width: 100%;
 }
diff --git a/modules/custom/az_publication/config/install/core.entity_view_display.node.az_publication.az_card.yml b/modules/custom/az_publication/config/install/core.entity_view_display.node.az_publication.az_card.yml
index 81651548b6..a6677def40 100644
--- a/modules/custom/az_publication/config/install/core.entity_view_display.node.az_publication.az_card.yml
+++ b/modules/custom/az_publication/config/install/core.entity_view_display.node.az_publication.az_card.yml
@@ -43,7 +43,7 @@ third_party_settings:
       label: Reference
       parent_name: group_link
       region: content
-      weight: 7
+      weight: 4
       format_type: html_element
       format_settings:
         classes: 'text-body-secondary fw-normal small mt-2'
@@ -79,7 +79,7 @@ third_party_settings:
         speed: fast
     group_link:
       children:
-        - field_az_publication_image
+        - group_media
         - group_heading
         - group_az_publication_reference
       label: Link
@@ -101,7 +101,7 @@ third_party_settings:
       label: Heading
       parent_name: group_link
       region: content
-      weight: 6
+      weight: 3
       format_type: html_element
       format_settings:
         classes: 'card-title text-midnight h5 mb-0'
@@ -114,6 +114,26 @@ third_party_settings:
         attributes: ''
         effect: none
         speed: fast
+    group_media:
+      children:
+        - field_az_publication_image
+      label: Media
+      parent_name: group_link
+      region: content
+      weight: 1
+      format_type: html_element
+      format_settings:
+        classes: 'pb-card mb-nmin'
+        show_empty_fields: false
+        id: ''
+        label_as_html: false
+        element: div
+        show_label: false
+        label_element: h3
+        label_element_classes: ''
+        attributes: ''
+        effect: none
+        speed: fast
   smart_title:
     enabled: true
     settings:
@@ -139,7 +159,7 @@ content:
       view_mode: az_card_image
       link: false
     third_party_settings: {  }
-    weight: 5
+    weight: 2
     region: content
   smart_title:
     settings: {  }
diff --git a/themes/custom/az_barrio/css/az-media-display.css b/themes/custom/az_barrio/css/az-media-display.css
index 4b85828ea6..3e9d84956d 100644
--- a/themes/custom/az_barrio/css/az-media-display.css
+++ b/themes/custom/az_barrio/css/az-media-display.css
@@ -31,9 +31,6 @@
   width: auto;
   max-width: 100%;
 }
-.field--type-entity-reference.field--name-field-az-media-image {
-  margin-bottom: 0 !important;
-}
 @media (min-width:576px) {
   .align-left .az-default.az-media,
   .align-left .az-natural-size.az-media,
diff --git a/themes/custom/az_barrio/css/ckeditor5.css b/themes/custom/az_barrio/css/ckeditor5.css
index a57933315a..64d0ddabdd 100644
--- a/themes/custom/az_barrio/css/ckeditor5.css
+++ b/themes/custom/az_barrio/css/ckeditor5.css
@@ -27,10 +27,6 @@
   --ck-z-modal: calc( var(--ck-z-default) + 999 );
 }
 
-.ck.ck-content .field--type-entity-reference.field--name-field-az-media-image {
-  margin-bottom: 0;
-}
-
 .ck.ck-content ul {
   list-style-type: initial;
 }
diff --git a/themes/custom/az_barrio/css/style.css b/themes/custom/az_barrio/css/style.css
index ab4f77f443..d6db9f3b37 100644
--- a/themes/custom/az_barrio/css/style.css
+++ b/themes/custom/az_barrio/css/style.css
@@ -749,8 +749,8 @@ form.webform-submission-form {
 /* end Bootstrap Barrio image field styles */
 
 /* overrides Entity Reference fields and labels to match similar fields */
-.field--type-entity-reference {
-  margin: 0;
+.field.field--type-entity-reference {
+  margin-bottom: 0;
 }
 
 @media (min-width: 768px) {