diff --git a/templates/sheets/activeEffect/details.hbs b/templates/sheets/activeEffect/details.hbs
index 22c95a1e..72e77d5e 100644
--- a/templates/sheets/activeEffect/details.hbs
+++ b/templates/sheets/activeEffect/details.hbs
@@ -12,4 +12,5 @@
     {{/if}}
 
     {{formGroup fields.statuses value=source.statuses options=statuses rootId=rootId classes="statuses"}}
-</section>
+    {{formGroup fields.showIcon value=source.showIcon options=showIconOptions rootId=rootId}}
+</section>
\ No newline at end of file
diff --git a/templates/sheets/activeEffect/settings.hbs b/templates/sheets/activeEffect/settings.hbs
index cf98c786..6ccd9ee9 100644
--- a/templates/sheets/activeEffect/settings.hbs
+++ b/templates/sheets/activeEffect/settings.hbs
@@ -7,34 +7,47 @@
         {{formGroup systemFields.rangeDependence.fields.target value=source.system.rangeDependence.target localize=true }}
         {{formGroup systemFields.rangeDependence.fields.range value=source.system.rangeDependence.range localize=true }}
     </fieldset>
+{{!-- 
+    {{#if start}}
+        <fieldset class="start-data">
+            <legend>{{localize "EFFECT.START.Header"}}</legend>
+            <div class="form-group">
+                <span class="label">{{localize "EFFECT.FIELDS.start.time.label"}}</span>
+                <div class="form-fields">{{start.time}}</div>
+            </div>
+            {{#if start.combat}}
+            <div class="form-group">
+                <span class="label">{{localize "DOCUMENT.Combat"}}</span>
+                <div class="form-fields">
+                    {{localize "EFFECT.START.Combat" round=start.round turn=start.turn}}
+                </div>
+            </div>
+            {{#if start.combatant}}
+            <div class="form-group">
+                <span class="label">{{localize "DOCUMENT.Combatant"}}</span>
+                <div class="form-fields">
+                    {{localize "EFFECT.START.Combatant" combatant=start.combatantName initiative=start.combatantInitiative}}
+                </div>
+            </div>
+            {{/if}}
+            {{/if}}
+        </fieldset>
+    {{/if}} --}}
 
-    <fieldset class="one-column">
-        {{formGroup fields.duration.fields.seconds value=source.duration.seconds rootId=rootId}}
-        {{formGroup fields.duration.fields.startTime value=source.duration.startTime rootId=rootId}}
-    </fieldset>
-
-    <fieldset class="one-column">
-        <div class="form-group">
-            <label>{{localize "EFFECT.DurationTurns"}}</label>
+     {{!-- <fieldset>
+        <legend>{{localize "EFFECT.DURATION.Header"}}</legend>
+        <div class="form-group slim duration" data-duration>
+            <label class="flexrow" for="{{rootId}}-duration.value">
+                <span>{{localize "EFFECT.DURATION.Label"}}</span>
+                <span class="warning" hidden><i class="fa-duotone fa-triangle-exclamation"></i></span>
+            </label>
             <div class="form-fields">
-                <label for="{{rootId}}-duration.rounds">{{localize "EFFECT.FIELDS.duration.rounds.label"}}</label>
-                {{formInput fields.duration.fields.rounds value=source.duration.rounds
-                    id=(concat rootId "-duration.rounds")}}
-                <label for="{{rootId}}-duration.turns">{{localize "EFFECT.FIELDS.duration.turns.label"}}</label>
-                {{formInput fields.duration.fields.turns value=source.duration.turns
-                    id=(concat rootId "-duration.turns")}}
+                {{formInput fields.duration.fields.value value=source.duration.value id=(concat rootId "-duration.value")
+                            aria=(object label=(localize "EFFECT.FIELDS.duration.value.label"))}}
+                {{formInput fields.duration.fields.units value=source.duration.units id=(concat rootId "-duration.units")
+                            options=durationUnits aria=(object label=(localize "EFFECT.FIELDS.duration.units.label"))}}
             </div>
         </div>
-        <div class="form-group">
-            <label>{{localize "EFFECT.StartTurns"}}</label>
-            <div class="form-fields">
-                <label for="{{rootId}}-duration.startRound">{{localize "EFFECT.FIELDS.duration.startRound.label"}}</label>
-                {{formInput fields.duration.fields.startRound value=source.duration.startRound
-                    id=(concat rootId "-duration.startRound")}}
-                <label for="{{rootId}}-duration.startTurn">{{localize "EFFECT.FIELDS.duration.startTurn.label"}}</label>
-                {{formInput fields.duration.fields.startTurn value=source.duration.startTurn
-                    id=(concat rootId "-duration.startTurn")}}
-            </div>
-        </div>
-    </fieldset>
-</section>
+        {{formGroup fields.duration.fields.expiry choices=expiryEvents value=source.duration.expiry rootId=rootId}}
+    </fieldset> --}}
+</section>
\ No newline at end of file