diff --git a/ecc/components/agenda-fieldset-group/agenda-fieldset-group.js b/ecc/components/agenda-fieldset-group/agenda-fieldset-group.js
index 7a9ef2ad..598074e2 100644
--- a/ecc/components/agenda-fieldset-group/agenda-fieldset-group.js
+++ b/ecc/components/agenda-fieldset-group/agenda-fieldset-group.js
@@ -55,7 +55,7 @@ export default class AgendaFieldsetGroup extends LitElement {
           @update-agenda=${(event) => this.handleAgendaUpdate(event, index)}>
           <div slot="delete-btn" class="delete-btn">
             ${this.agendaItems.length === 1 && this.hasOnlyEmptyAgendaLeft() ? nothing : html`
-              <img class="icon icon-remove-circle" src="/ecc/icons/remove-circle.svg" alt="remove-repeater" @click=${() => this.deleteAgenda(index)}></img>
+              <img class="icon icon-remove-circle" src="${this.agendaItems.length === 1 ? '/ecc/icons/delete.svg' : '/ecc/icons/remove-circle.svg'}" alt="remove-repeater" @click=${() => this.deleteAgenda(index)}></img>
             `}
           </div>
         </agenda-fieldset>
diff --git a/ecc/components/partner-selector-group/partner-selector-group.js b/ecc/components/partner-selector-group/partner-selector-group.js
index a9e3c95e..0af97113 100644
--- a/ecc/components/partner-selector-group/partner-selector-group.js
+++ b/ecc/components/partner-selector-group/partner-selector-group.js
@@ -108,7 +108,7 @@ export default class PartnerSelectorGroup extends LitElement {
           @update-partner=${(event) => this.handlePartnerUpdate(event.detail.partner, index)} @select-partner=${(event) => this.handlePartnerSelect(event.detail.partner, index)}>
           <div slot="delete-btn" class="delete-btn">
             ${this.hasOnlyOneUnsavedPartnerLeft() ? nothing : html`
-              <img class="icon icon-remove-circle" src="/ecc/icons/remove-circle.svg" alt="remove-repeater" @click=${() => this.deletePartner(index)}></img>
+              <img class="icon icon-remove-circle" src="${this.partners.length === 1 ? '/ecc/icons/delete.svg' : '/ecc/icons/remove-circle.svg'}" alt="remove-repeater" @click=${() => this.deletePartner(index)}></img>
             `}
           </div>
           ${imgTag}
diff --git a/ecc/components/product-selector-group/product-selector-group.js b/ecc/components/product-selector-group/product-selector-group.js
index 7cc55472..00e2f058 100644
--- a/ecc/components/product-selector-group/product-selector-group.js
+++ b/ecc/components/product-selector-group/product-selector-group.js
@@ -98,7 +98,7 @@ export default class ProductSelectorGroup extends LitElement {
           @update-product=${(event) => this.handleProductUpdate(event, index)}>
           <div slot="delete-btn" class="delete-btn">
             ${this.selectedProducts.length === 1 && this.hasOnlyEmptyProductLeft() ? nothing : html`
-              <img class="icon icon-remove-circle" src="/ecc/icons/remove-circle.svg" alt="remove-repeater" @click=${() => this.deleteProduct(index)}></img>
+              <img class="icon icon-remove-circle" src="${this.selectedProducts.length === 1 ? '/ecc/icons/delete.svg' : '/ecc/icons/remove-circle.svg'}" alt="remove-repeater" @click=${() => this.deleteProduct(index)}></img>
             `}
           </div>
         </product-selector>
diff --git a/ecc/components/profile-container/profile-container.js b/ecc/components/profile-container/profile-container.js
index 81ba915b..b0513587 100644
--- a/ecc/components/profile-container/profile-container.js
+++ b/ecc/components/profile-container/profile-container.js
@@ -97,7 +97,7 @@ export class ProfileContainer extends LitElement {
         return html`
         <div class="profile-container">
         <profile-ui seriesId=${this.seriesId} profile=${JSON.stringify(profile)} fieldlabels=${JSON.stringify(fieldlabels)} class="form-component" firstnamesearch=${JSON.stringify(firstNameSearch)} lastnamesearch=${JSON.stringify(lastNameSearch)} @update-profile=${(event) => this.updateProfile(index, event.detail.profile)} @select-profile=${(event) => this.setProfile(index, event.detail.profile)}>${imgTag}</profile-ui>
-        ${this.profiles?.length > 1 || !this.profiles[0].isPlaceholder ? html`<img class="icon-remove-circle" src="/ecc/icons/remove-circle.svg" alt="remove-repeater" @click=${() => {
+        ${this.profiles?.length > 1 || !this.profiles[0].isPlaceholder ? html`<img class="icon-remove-circle" src="${this.profiles.length === 1 ? '/ecc/icons/delete.svg' : '/ecc/icons/remove-circle.svg'}" alt="remove-repeater" @click=${() => {
     if (this.profiles.length === 1) {
       this.profiles = [defaultProfile];
     } else {
diff --git a/ecc/scripts/utils.js b/ecc/scripts/utils.js
index 7dd04936..5ba58ece 100644
--- a/ecc/scripts/utils.js
+++ b/ecc/scripts/utils.js
@@ -47,7 +47,7 @@ export function convertTo24HourFormat(timeStr) {
   if (period === 'PM' && hours !== 12) {
     hours += 12;
   } else if (period === 'AM' && hours === 12) {
-    hours = 0;
+    hours = 24;
   }
 
   const formattedHours = hours.toString().padStart(2, '0');