diff --git a/assets/javascripts/discourse/components/discourse-post-event/dates.gjs b/assets/javascripts/discourse/components/discourse-post-event/dates.gjs
index 2fde3e7e0..00a43df75 100644
--- a/assets/javascripts/discourse/components/discourse-post-event/dates.gjs
+++ b/assets/javascripts/discourse/components/discourse-post-event/dates.gjs
@@ -7,6 +7,7 @@ import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
 import { applyLocalDates } from "discourse/lib/local-dates";
 import { cook } from "discourse/lib/text";
+import icon from "discourse-common/helpers/d-icon";
 import guessDateFormat from "../../lib/guess-best-date-format";
 
 export default class DiscoursePostEventDates extends Component {
@@ -76,9 +77,7 @@ export default class DiscoursePostEventDates extends Component {
   }
 
   <template>
-    <section
-      class="event__section event-dates"
-      {{didInsert this.computeDates}}
-    >{{this.htmlDates}}</section>
+    <section class="event__section event-dates" {{didInsert this.computeDates}}>
+      {{icon "clock"}}{{this.htmlDates}}</section>
   </template>
 }
diff --git a/assets/javascripts/discourse/components/discourse-post-event/index.gjs b/assets/javascripts/discourse/components/discourse-post-event/index.gjs
index 1c8c9e649..24ce64a91 100644
--- a/assets/javascripts/discourse/components/discourse-post-event/index.gjs
+++ b/assets/javascripts/discourse/components/discourse-post-event/index.gjs
@@ -67,6 +67,10 @@ export default class DiscoursePostEvent extends Component {
     return this.currentUser && this.args.event.can_act_on_discourse_post_event;
   }
 
+  get watchingInviteeStatus() {
+    return this.args.event.watchingInvitee?.status;
+  }
+
   <template>
     <div
       class={{concatClass
@@ -108,12 +112,6 @@ export default class DiscoursePostEvent extends Component {
             />
           </header>
 
-          {{#if @event.canUpdateAttendance}}
-            <section class="event__section event-actions">
-              <Status @event={{@event}} />
-            </section>
-          {{/if}}
-
           <PluginOutlet
             @name="discourse-post-event-info"
             @outletArgs={{hash
@@ -122,11 +120,15 @@ export default class DiscoursePostEvent extends Component {
               Url=(component Url url=@event.url)
               Dates=(component Dates event=@event)
               Invitees=(component Invitees event=@event)
+              Status=(component Status event=@event)
             }}
           >
             <Url @url={{@event.url}} />
             <Dates @event={{@event}} />
             <Invitees @event={{@event}} />
+            {{#if @event.canUpdateAttendance}}
+              <Status @event={{@event}} />
+            {{/if}}
           </PluginOutlet>
         {{/if}}
       </div>
diff --git a/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs b/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs
index a3bb470b3..ec61f8368 100644
--- a/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs
+++ b/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs
@@ -2,6 +2,7 @@ import Component from "@glimmer/component";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
+import icon from "discourse-common/helpers/d-icon";
 import i18n from "discourse-common/helpers/i18n";
 import PostEventInvitees from "../modal/post-event-invitees";
 import Invitee from "./invitee";
@@ -70,11 +71,21 @@ export default class DiscoursePostEventInvitees extends Component {
               @action={{this.showAllInvitees}}
             />
           </div>
-          <ul class="event-invitees-avatars">
-            {{#each @event.sampleInvitees as |invitee|}}
-              <Invitee @invitee={{invitee}} />
-            {{/each}}
-          </ul>
+          <div class="event-invitees-avatars-container">
+            {{icon "users"}}
+            <ul class="event-invitees-avatars">
+              {{#each @event.sampleInvitees as |invitee|}}
+                <Invitee @invitee={{invitee}} />
+              {{/each}}
+            </ul>
+          </div>
+        </section>
+      {{else}}
+        <section class="event__section event-invitees no-rsvp">
+          <p class="no-rsvp-description">{{i18n
+              "discourse_post_event.models.invitee.status.going_count.other"
+              count="0"
+            }}</p>
         </section>
       {{/if}}
     {{/unless}}
diff --git a/assets/javascripts/discourse/components/discourse-post-event/status.gjs b/assets/javascripts/discourse/components/discourse-post-event/status.gjs
index 056177769..b09deacb9 100644
--- a/assets/javascripts/discourse/components/discourse-post-event/status.gjs
+++ b/assets/javascripts/discourse/components/discourse-post-event/status.gjs
@@ -12,10 +12,6 @@ export default class DiscoursePostEventStatus extends Component {
   @service discoursePostEventApi;
   @service siteSettings;
 
-  get watchingInviteeStatus() {
-    return this.args.event.watchingInvitee?.status;
-  }
-
   get eventButtons() {
     return this.siteSettings.event_participation_buttons.split("|");
   }
@@ -36,6 +32,10 @@ export default class DiscoursePostEventStatus extends Component {
     return this.args.event.watchingInvitee && this.args.event.isPublic;
   }
 
+  get watchingInviteeStatus() {
+    return this.args.event.watchingInvitee?.status;
+  }
+
   @action
   async leaveEvent() {
     try {
@@ -107,9 +107,9 @@ export default class DiscoursePostEventStatus extends Component {
   }
 
   <template>
-    <div
+    <section
       class={{concatClass
-        "event-status"
+        "event__section event-actions event-status"
         (if
           this.watchingInviteeStatus
           (concat "status-" this.watchingInviteeStatus)
@@ -177,6 +177,6 @@ export default class DiscoursePostEventStatus extends Component {
           {{/unless}}
         {{/if}}
       </PluginOutlet>
-    </div>
+    </section>
   </template>
 }
diff --git a/assets/stylesheets/common/discourse-post-event.scss b/assets/stylesheets/common/discourse-post-event.scss
index 4bdee323e..a3777405e 100644
--- a/assets/stylesheets/common/discourse-post-event.scss
+++ b/assets/stylesheets/common/discourse-post-event.scss
@@ -1,15 +1,14 @@
 $interested: #fb985d;
+$show-interested: inherit;
 
 .discourse-post-event {
   display: flex;
+  max-width: 35rem;
+  justify-content: center;
 
   .event__section {
     padding: 0.5em 1em;
 
-    &:not(:last-child) {
-      border-bottom: 1px solid var(--primary-low);
-    }
-
     &:first-child {
       border-top: 1px solid var(--primary-low);
     }
@@ -28,14 +27,16 @@ $interested: #fb985d;
   }
 
   .discourse-post-event-widget {
-    border: 5px solid var(--primary-low);
+    box-shadow: 0px 0px 0px 3px var(--primary-100);
+    border: 1px solid var(--primary-300);
     display: flex;
     background: var(--secondary);
     margin: 5px 0;
     flex-direction: column;
     flex: 1 0 auto;
-    max-width: 100%;
+    max-width: calc(100% - 2px - 6px);
     box-sizing: border-box;
+    border-radius: var(--d-button-border-radius);
 
     .widget-dropdown {
       margin: 0;
@@ -66,15 +67,15 @@ $interested: #fb985d;
   }
 
   .event-header {
+    column-gap: 1em;
     display: flex;
-    align-items: center;
-    padding: 0 1em;
-    height: 75px;
+    align-items: flex-start;
+    padding: 0.5em 1em;
+    margin-top: 0.5em;
 
     .more-dropdown {
       margin-left: auto;
       align-self: flex-start;
-      margin-top: 1em;
 
       &.has-no-actions {
         display: none;
@@ -102,21 +103,29 @@ $interested: #fb985d;
 
   .event-date {
     display: flex;
+    flex-shrink: 0;
+    align-items: center;
+    justify-content: center;
+    width: 3em;
+    height: 3em;
+    margin: 0;
+    padding: 0;
+    border: 1px solid var(--primary-low);
+    border-radius: var(--d-button-border-radius);
     flex-direction: column;
-    width: auto;
-    margin-right: 1em;
 
     .month {
       text-align: center;
       color: red;
-      font-size: var(--font-down-1);
+      font-size: var(--font-down-2);
+      font-weight: 400;
       text-transform: uppercase;
     }
 
     .day {
       text-align: center;
-      font-weight: 500;
-      font-size: var(--font-up-2);
+      font-size: var(--font-up-1);
+      font-weight: 400;
     }
   }
 
@@ -127,21 +136,34 @@ $interested: #fb985d;
     margin-right: 0.5rem;
 
     .name {
-      font-weight: 700;
       @include ellipsis;
       max-width: 45vw;
+      font-size: var(--font-up-2);
+      font-weight: 400;
+      white-space: initial;
+      margin-bottom: 0.25rem;
     }
     .status-and-creators {
       display: flex;
       align-items: center;
       color: var(--primary-medium);
       font-size: var(--font-down-1);
-      margin: 0.25em 0;
+      font-weight: 400;
+      margin: 0;
 
       .separator {
         margin: 0 0.25em;
       }
 
+      .created-by {
+        margin-right: 0.25em;
+      }
+
+      .username {
+        margin-left: 0.25em;
+        color: var(--primary);
+      }
+
       .creators {
         display: flex;
         align-items: center;
@@ -173,12 +195,20 @@ $interested: #fb985d;
     display: flex;
     justify-content: space-between;
     align-items: center;
-    height: 60px;
-    padding: 0 1em;
+    padding: 0.5em 1em;
+    flex-wrap: wrap;
+    border-top: 1px solid var(--primary-low);
 
-    .event-status {
+    &.event-status {
       margin: 0;
+      gap: 0.5em;
+      .btn {
+        flex: 1;
+      }
 
+      .interested-button {
+        display: $show-interested;
+      }
       &.status-going .going-button .d-icon {
         color: var(--success);
       }
@@ -188,6 +218,9 @@ $interested: #fb985d;
       &.status-not_going .not-going-button .d-icon {
         color: var(--danger);
       }
+      .not-going-button span {
+        white-space: nowrap;
+      }
     }
   }
 
@@ -198,6 +231,7 @@ $interested: #fb985d;
   }
 
   .event-invitees {
+    height: 1.5em;
     display: flex;
     align-items: flex-start;
     justify-content: center;
@@ -205,7 +239,7 @@ $interested: #fb985d;
     flex-direction: column;
 
     .header {
-      display: flex;
+      display: none;
       justify-content: space-between;
       align-items: center;
       margin-bottom: 1em;
@@ -233,14 +267,13 @@ $interested: #fb985d;
     .event-invitees-avatars {
       padding: 0;
       margin: 0;
+      gap: 0.25em;
       display: flex;
       flex-wrap: wrap;
       width: 100%;
 
       .event-invitee {
         list-style: none;
-        margin-right: 0.5em;
-        margin-bottom: 0.5em;
         opacity: 0.25;
 
         &.status-going,
@@ -249,15 +282,19 @@ $interested: #fb985d;
           opacity: 1;
         }
 
-        &.status-going .avatar-flair {
+        &.status-interested {
+          display: $show-interested;
+        }
+
+        &.status-going .avatar-flair .d-icon {
           color: var(--success);
         }
 
-        &.status-not_going .avatar-flair {
+        &.status-not_going .avatar-flair .d-icon {
           color: var(--danger);
         }
 
-        &.status-interested .avatar-flair {
+        &.status-interested .avatar-flair .d-icon {
           color: $interested;
         }
       }
@@ -265,6 +302,11 @@ $interested: #fb985d;
       .topic-invitee-avatar {
         position: relative;
         display: inline-block;
+        padding-right: 0.5em;
+
+        .avatar {
+          width: 1.5rem;
+        }
 
         .avatar-flair {
           position: absolute;
@@ -272,16 +314,16 @@ $interested: #fb985d;
           bottom: 0;
           background: var(--secondary);
           border-radius: 50%;
-          height: 16px;
-          width: 16px;
+          height: 1rem;
+          width: 1rem;
           display: flex;
           align-items: center;
           justify-content: center;
           color: var(--primary-medium);
-          border: 1px solid var(--primary-low);
+          box-shadow: 0 0 0 1px var(--primary-100);
 
           .d-icon {
-            font-size: var(--font-down-3);
+            font-size: var(--font-down-2);
           }
         }
       }
@@ -293,12 +335,18 @@ $interested: #fb985d;
   }
 
   .event-url,
-  .event-dates {
-    display: flex;
+  .event-dates,
+  .event-invitees-avatars-container {
+    display: grid;
+    grid-template-columns: 3em 1fr;
+    grid-column-gap: 1em;
     align-items: center;
+    height: min-content;
 
     .d-icon {
       color: var(--primary-high);
+      margin: 0 auto;
+      padding: 0;
     }
   }
 
@@ -308,32 +356,49 @@ $interested: #fb985d;
       @include ellipsis;
     }
   }
+}
 
-  .event-dates {
-    // hardcoded as cooking date is async and will change height after initial rendering otherwise
-    // not ideal but a decent low tech solution
-    height: 24px;
-
-    .participants {
-      margin-left: 0.5em;
-      color: var(--primary-medium);
-    }
+.event-dates {
+  // hardcoded as cooking date is async and will change height after initial rendering otherwise
+  // not ideal but a decent low tech solution
+  height: 24px;
 
-    .date {
-      color: var(--primary-high);
-      margin-left: 1em;
+  .participants {
+    margin-left: 0.5em;
+    color: var(--primary-medium);
+  }
 
-      .discourse-local-date {
-        .d-icon {
-          display: none;
-        }
-      }
+  .discourse-local-date {
+    .d-icon {
+      display: none;
     }
+  }
 
-    .separator {
-      color: var(--primary-high);
-      margin: 0 0.5em;
-      text-align: center;
-    }
+  .separator {
+    color: var(--primary-high);
+    margin: 0 0.5em;
+    text-align: center;
+  }
+}
+
+.discourse-post-event {
+  .cooked-date,
+  .participants,
+  .event-url .url {
+    font-size: var(--base-font-size);
+    font-weight: 400;
+    border-bottom: none;
+    margin: 0;
+  }
+  .event__section.no-rsvp {
+    display: grid;
+    grid-template-columns: 3em 1fr;
+    grid-column-gap: 1em;
+  }
+  p.no-rsvp-description {
+    color: var(--primary-medium);
+    font-size: var(--font-down-1);
+    font-weight: 400;
+    grid-column-start: 2;
   }
 }
diff --git a/spec/system/post_event_spec.rb b/spec/system/post_event_spec.rb
index 14ee4079c..355df7ed8 100644
--- a/spec/system/post_event_spec.rb
+++ b/spec/system/post_event_spec.rb
@@ -58,7 +58,8 @@
     expect(page).to have_css(".discourse-post-event .status-and-creators .status.public")
 
     page.find(".going-button").click
-    page.find(".event-invitees .show-all").click
+    page.find(".discourse-post-event-more-menu-trigger").click
+    page.find(".show-all-participants").click
     page.find(".d-modal input.filter").fill_in(with: "jan")
     page.find(".d-modal .add-invitee").click
 
@@ -71,29 +72,19 @@
     expect(event.invitees.count).to eq(2)
   end
 
-  it "can update fields and invitees and they are kept when re-opening" do
+  it "persists changes" do
     visit "/new-topic"
-    title = "Test event with updates"
-
-    composer.fill_title(title)
-
+    composer.fill_title("Test event with updates")
     page.find(".toolbar-popup-menu-options .dropdown-select-box-header").click
-
     page.find(
       ".toolbar-popup-menu-options [data-name='#{I18n.t("js.discourse_post_event.builder_modal.attach")}']",
     ).click
-
     page.find(".d-modal input[name=status][value=private]").click
-
     page.find(".d-modal input.group-selector").fill_in(with: "test_")
     page.find(".autocomplete.ac-group").click
-
     page.find(".d-modal .custom-field-input").fill_in(with: "custom value")
-
     page.find(".d-modal .btn-primary").click
-
     composer.submit
-
     page.find(".discourse-post-event-more-menu-trigger").click
     page.find(".edit-event").click