diff --git a/ui/balance_druid/sim.ts b/ui/balance_druid/sim.ts
index 040232ebde..b82f98d26d 100644
--- a/ui/balance_druid/sim.ts
+++ b/ui/balance_druid/sim.ts
@@ -108,8 +108,6 @@ export class BalanceDruidSimUI extends IndividualSimUI<Spec.SpecBalanceDruid> {
             // Inputs to include in the 'Other' section on the settings tab.
             otherInputs: {
                 inputs: [
-                    OtherInputs.PrepopPotion,
-
                     OtherInputs.TankAssignment,
                 ],
             },
diff --git a/ui/core/components/icon_inputs.ts b/ui/core/components/icon_inputs.ts
index ae70d36812..9f82782f74 100644
--- a/ui/core/components/icon_inputs.ts
+++ b/ui/core/components/icon_inputs.ts
@@ -348,22 +348,26 @@ function makeMultistateIndividualBuffInput(id: ActionId, numStates: number, fiel
 // Custom buffs that don't fit into any of the helper functions above.
 //////////////////////////////////////////////////////////////////////
 
-export const makePotionsInput = makeConsumeInputFactory('defaultPotion', [
-	{ actionId: ActionId.fromItemId(33447), value: Potions.RunicHealingPotion },
-	{ actionId: ActionId.fromItemId(33448), value: Potions.RunicManaPotion },
-	{ actionId: ActionId.fromItemId(40093), value: Potions.IndestructiblePotion },
-	{ actionId: ActionId.fromItemId(40211), value: Potions.PotionOfSpeed },
-	{ actionId: ActionId.fromItemId(40212), value: Potions.PotionOfWildMagic },
-
-	{ actionId: ActionId.fromItemId(22839), value: Potions.DestructionPotion },
-	{ actionId: ActionId.fromItemId(22838), value: Potions.HastePotion },
-	{ actionId: ActionId.fromItemId(13442), value: Potions.MightyRagePotion },
-	{ actionId: ActionId.fromItemId(22832), value: Potions.SuperManaPotion },
-	{ actionId: ActionId.fromItemId(31677), value: Potions.FelManaPotion },
-	{ actionId: ActionId.fromItemId(22828), value: Potions.InsaneStrengthPotion },
-	{ actionId: ActionId.fromItemId(22849), value: Potions.IronshieldPotion },
-	{ actionId: ActionId.fromItemId(22837), value: Potions.HeroicPotion },
-] as Array<IconEnumValueConfig<Player<any>, Potions>>);
+function makePotionInputFactory(consumesFieldName: keyof Consumes): (options: Array<Potions>) => InputHelpers.TypedIconEnumPickerConfig<Player<any>, Potions> {
+	return makeConsumeInputFactory(consumesFieldName, [
+		{ actionId: ActionId.fromItemId(33447), value: Potions.RunicHealingPotion },
+		{ actionId: ActionId.fromItemId(33448), value: Potions.RunicManaPotion },
+		{ actionId: ActionId.fromItemId(40093), value: Potions.IndestructiblePotion },
+		{ actionId: ActionId.fromItemId(40211), value: Potions.PotionOfSpeed },
+		{ actionId: ActionId.fromItemId(40212), value: Potions.PotionOfWildMagic },
+
+		{ actionId: ActionId.fromItemId(22839), value: Potions.DestructionPotion },
+		{ actionId: ActionId.fromItemId(22838), value: Potions.HastePotion },
+		{ actionId: ActionId.fromItemId(13442), value: Potions.MightyRagePotion },
+		{ actionId: ActionId.fromItemId(22832), value: Potions.SuperManaPotion },
+		{ actionId: ActionId.fromItemId(31677), value: Potions.FelManaPotion },
+		{ actionId: ActionId.fromItemId(22828), value: Potions.InsaneStrengthPotion },
+		{ actionId: ActionId.fromItemId(22849), value: Potions.IronshieldPotion },
+		{ actionId: ActionId.fromItemId(22837), value: Potions.HeroicPotion },
+	] as Array<IconEnumValueConfig<Player<any>, Potions>>);
+}
+export const makePotionsInput = makePotionInputFactory('defaultPotion');
+export const makePrepopPotionsInput = makePotionInputFactory('prepopPotion');
 
 export const makeConjuredInput = makeConsumeInputFactory('defaultConjured', [
 	{ actionId: ActionId.fromItemId(12662), value: Conjured.ConjuredDarkRune },
diff --git a/ui/core/components/other_inputs.ts b/ui/core/components/other_inputs.ts
index 128c2cc827..12134737f0 100644
--- a/ui/core/components/other_inputs.ts
+++ b/ui/core/components/other_inputs.ts
@@ -1,7 +1,6 @@
 import { BooleanPicker } from '../components/boolean_picker.js';
 import { EnumPicker, EnumPickerConfig } from '../components/enum_picker.js';
 import { Conjured } from '../proto/common.js';
-import { Potions } from '../proto/common.js';
 import { RaidTarget } from '../proto/common.js';
 import { TristateEffect } from '../proto/common.js';
 import { Party } from '../party.js';
@@ -77,25 +76,6 @@ export function makePhaseSelector(parent: HTMLElement, sim: Sim): EnumPicker<Sim
     });
 }
 
-export const PrepopPotion = {
-	type: 'enum' as const,
-	label: 'Prepop Potion',
-	labelTooltip: 'If set, this potion will be used 1s before combat starts.',
-	values: [
-		{ name: 'None', value: Potions.UnknownPotion },
-		{ name: 'Speed', value: Potions.PotionOfSpeed },
-		{ name: 'Wild Magic', value: Potions.PotionOfWildMagic },
-		{ name: 'Indestructible Potion', value: Potions.IndestructiblePotion },
-	],
-	changedEvent: (player: Player<any>) => player.consumesChangeEmitter,
-	getValue: (player: Player<any>) => player.getConsumes().prepopPotion,
-	setValue: (eventID: EventID, player: Player<any>, newValue: number) => {
-		const newConsumes = player.getConsumes();
-		newConsumes.prepopPotion = newValue;
-		player.setConsumes(eventID, newConsumes);
-	},
-};
-
 export const StartingConjured = {
 	type: 'enum' as const,
 	label: 'Starting Conjured',
diff --git a/ui/core/individual_sim_ui.ts b/ui/core/individual_sim_ui.ts
index ede4395a97..7f62fe294a 100644
--- a/ui/core/individual_sim_ui.ts
+++ b/ui/core/individual_sim_ui.ts
@@ -460,6 +460,7 @@ export abstract class IndividualSimUI<SpecType extends Spec> extends SimUI {
 						<div class="consumes-row">
 							<span>Potions</span>
 							<div class="consumes-row-inputs">
+								<div class="consumes-prepot"></div>
 								<div class="consumes-potions"></div>
 								<div class="consumes-conjured"></div>
 							</div>
@@ -644,6 +645,22 @@ export abstract class IndividualSimUI<SpecType extends Spec> extends SimUI {
 			}, this);
 		}
 
+		const prepopPotionOptions = this.splitRelevantOptions([
+			// This list is smaller because some potions don't make sense to use as prepot.
+			// E.g. healing/mana potions.
+			{ item: Potions.IndestructiblePotion, stats: [Stat.StatArmor] },
+			{ item: Potions.PotionOfSpeed, stats: [Stat.StatMeleeHaste, Stat.StatSpellHaste] },
+			{ item: Potions.PotionOfWildMagic, stats: [Stat.StatMeleeCrit, Stat.StatSpellCrit, Stat.StatSpellPower] },
+		]);
+		if (prepopPotionOptions.length) {
+			const elem = this.rootElem.getElementsByClassName('consumes-prepot')[0] as HTMLElement;
+			new IconEnumPicker(elem, this.player, IconInputs.makePrepopPotionsInput(prepopPotionOptions));
+			tippy(elem, {
+				'content': 'Prepop Potion (1s before combat)',
+				'allowHTML': true,
+			});
+		}
+
 		const potionOptions = this.splitRelevantOptions([
 			{ item: Potions.RunicHealingPotion, stats: [Stat.StatStamina] },
 			{ item: Potions.RunicManaPotion, stats: [Stat.StatIntellect] },
@@ -654,9 +671,14 @@ export abstract class IndividualSimUI<SpecType extends Spec> extends SimUI {
 		if (potionOptions.length) {
 			const elem = this.rootElem.getElementsByClassName('consumes-potions')[0] as HTMLElement;
 			new IconEnumPicker(elem, this.player, IconInputs.makePotionsInput(potionOptions));
+			tippy(elem, {
+				'content': 'Combat Potion',
+				'allowHTML': true,
+			});
 		}
 
 		const conjuredOptions = this.splitRelevantOptions([
+			this.player.getClass() == Class.ClassRogue ? { item: Conjured.ConjuredRogueThistleTea, stats: [] } : null,
 			{ item: Conjured.ConjuredHealthstone, stats: [Stat.StatStamina] },
 			{ item: Conjured.ConjuredDarkRune, stats: [Stat.StatIntellect] },
 			{ item: Conjured.ConjuredFlameCap, stats: [Stat.StatStrength, Stat.StatAgility, Stat.StatFireSpellPower] },
@@ -1195,15 +1217,16 @@ export abstract class IndividualSimUI<SpecType extends Spec> extends SimUI {
 		});
 	}
 
-	splitRelevantOptions<T>(options: Array<StatOption<T>>): Array<T> {
+	splitRelevantOptions<T>(options: Array<StatOption<T> | null>): Array<T> {
 		return options
+			.filter(option => option != null)
 			.filter(option =>
-				this.individualConfig.includeBuffDebuffInputs.includes(option.item) ||
-				option.stats.length == 0 ||
-				option.stats.some(stat => this.individualConfig.epStats.includes(stat)))
+				this.individualConfig.includeBuffDebuffInputs.includes(option!.item) ||
+				option!.stats.length == 0 ||
+				option!.stats.some(stat => this.individualConfig.epStats.includes(stat)))
 			.filter(option =>
-				!this.individualConfig.excludeBuffDebuffInputs.includes(option.item))
-			.map(option => option.item);
+				!this.individualConfig.excludeBuffDebuffInputs.includes(option!.item))
+			.map(option => option!.item);
 	}
 }
 
diff --git a/ui/deathknight/sim.ts b/ui/deathknight/sim.ts
index 443b947263..c2107375bc 100644
--- a/ui/deathknight/sim.ts
+++ b/ui/deathknight/sim.ts
@@ -151,8 +151,6 @@ export class DeathknightSimUI extends IndividualSimUI<Spec.SpecDeathknight> {
 					DeathKnightInputs.PrecastGhoulFrenzy,
 					DeathKnightInputs.PrecastHornOfWinter,
 					
-					OtherInputs.PrepopPotion,
-
 					OtherInputs.TankAssignment,
 					OtherInputs.InFrontOfTarget,
 				],
diff --git a/ui/elemental_shaman/sim.ts b/ui/elemental_shaman/sim.ts
index f747b9922b..60873d356c 100644
--- a/ui/elemental_shaman/sim.ts
+++ b/ui/elemental_shaman/sim.ts
@@ -138,7 +138,6 @@ export class ElementalShamanSimUI extends IndividualSimUI<Spec.SpecElementalSham
 			// Inputs to include in the 'Other' section on the settings tab.
 			otherInputs: {
 				inputs: [
-					OtherInputs.PrepopPotion,
 					OtherInputs.TankAssignment,
 				],
 			},
diff --git a/ui/enhancement_shaman/sim.ts b/ui/enhancement_shaman/sim.ts
index d117b447bf..5e2fab08b7 100644
--- a/ui/enhancement_shaman/sim.ts
+++ b/ui/enhancement_shaman/sim.ts
@@ -147,7 +147,6 @@ export class EnhancementShamanSimUI extends IndividualSimUI<Spec.SpecEnhancement
 			otherInputs: {
 				inputs: [
 					ShamanInputs.SyncTypeInput,
-					OtherInputs.PrepopPotion,
 					OtherInputs.TankAssignment,
 					OtherInputs.InFrontOfTarget,
 				],
diff --git a/ui/feral_druid/sim.ts b/ui/feral_druid/sim.ts
index 1f1149e85e..bd403d77b9 100644
--- a/ui/feral_druid/sim.ts
+++ b/ui/feral_druid/sim.ts
@@ -148,7 +148,6 @@ export class FeralDruidSimUI extends IndividualSimUI<Spec.SpecFeralDruid> {
 			otherInputs: {
 				inputs: [
 					DruidInputs.LatencyMs,
-					OtherInputs.PrepopPotion,
 					OtherInputs.TankAssignment,
 					OtherInputs.InFrontOfTarget,
 				],
diff --git a/ui/feral_tank_druid/sim.ts b/ui/feral_tank_druid/sim.ts
index d09b8275ce..8a65730391 100644
--- a/ui/feral_tank_druid/sim.ts
+++ b/ui/feral_tank_druid/sim.ts
@@ -150,7 +150,6 @@ export class FeralTankDruidSimUI extends IndividualSimUI<Spec.SpecFeralTankDruid
 					OtherInputs.HealingCadence,
 					OtherInputs.HpPercentForDefensives,
 					DruidInputs.StartingRage,
-					OtherInputs.PrepopPotion,
 					OtherInputs.InFrontOfTarget,
 				],
 			},
diff --git a/ui/hunter/sim.ts b/ui/hunter/sim.ts
index 0a161fa0e8..4affa3bfba 100644
--- a/ui/hunter/sim.ts
+++ b/ui/hunter/sim.ts
@@ -213,7 +213,6 @@ export class HunterSimUI extends IndividualSimUI<Spec.SpecHunter> {
 				inputs: [
 					HunterInputs.PetUptime,
 					HunterInputs.SniperTrainingUptime,
-					OtherInputs.PrepopPotion,
 					OtherInputs.TankAssignment,
 					OtherInputs.InFrontOfTarget,
 				],
diff --git a/ui/mage/sim.ts b/ui/mage/sim.ts
index 5b8354ebd7..0c3748eead 100644
--- a/ui/mage/sim.ts
+++ b/ui/mage/sim.ts
@@ -136,7 +136,6 @@ export class MageSimUI extends IndividualSimUI<Spec.SpecMage> {
 				inputs: [
 					MageInputs.EvocationTicks,
 					MageInputs.FocusMagicUptime,
-					OtherInputs.PrepopPotion,
 					OtherInputs.DistanceFromTarget,
 
 					OtherInputs.TankAssignment,
diff --git a/ui/retribution_paladin/sim.ts b/ui/retribution_paladin/sim.ts
index a4b7893394..99b57c8694 100644
--- a/ui/retribution_paladin/sim.ts
+++ b/ui/retribution_paladin/sim.ts
@@ -168,7 +168,6 @@ export class RetributionPaladinSimUI extends IndividualSimUI<Spec.SpecRetributio
 					RetributionPaladinInputs.JudgementSelection,
 					RetributionPaladinInputs.StartingSealSelection,
 					RetributionPaladinInputs.DamageTakenPerSecond,
-					OtherInputs.PrepopPotion,
 					OtherInputs.TankAssignment,
 					OtherInputs.InFrontOfTarget,
 				],
diff --git a/ui/rogue/sim.ts b/ui/rogue/sim.ts
index 5ac053cd8d..be303d255e 100644
--- a/ui/rogue/sim.ts
+++ b/ui/rogue/sim.ts
@@ -156,7 +156,6 @@ export class RogueSimUI extends IndividualSimUI<Spec.SpecRogue> {
 			otherInputs: {
 				inputs: [
 					OtherInputs.StartingConjured,
-					OtherInputs.PrepopPotion,
 					OtherInputs.TankAssignment,
 					OtherInputs.InFrontOfTarget,
 				],
diff --git a/ui/shadow_priest/sim.ts b/ui/shadow_priest/sim.ts
index 7e8cba5506..8302c0dad8 100644
--- a/ui/shadow_priest/sim.ts
+++ b/ui/shadow_priest/sim.ts
@@ -124,7 +124,6 @@ export class ShadowPriestSimUI extends IndividualSimUI<Spec.SpecShadowPriest> {
 			// Inputs to include in the 'Other' section on the settings tab.
 			otherInputs: {
 				inputs: [
-					OtherInputs.PrepopPotion,
 					OtherInputs.TankAssignment,
 				],
 			},
diff --git a/ui/smite_priest/sim.ts b/ui/smite_priest/sim.ts
index ade17da3a9..5aca114d1a 100644
--- a/ui/smite_priest/sim.ts
+++ b/ui/smite_priest/sim.ts
@@ -131,7 +131,6 @@ export class SmitePriestSimUI extends IndividualSimUI<Spec.SpecSmitePriest> {
 			// Inputs to include in the 'Other' section on the settings tab.
 			otherInputs: {
 				inputs: [
-					OtherInputs.PrepopPotion,
 					OtherInputs.TankAssignment,
 				],
 			},
diff --git a/ui/tank_deathknight/sim.ts b/ui/tank_deathknight/sim.ts
index da23a6cc63..e6d496f7f2 100644
--- a/ui/tank_deathknight/sim.ts
+++ b/ui/tank_deathknight/sim.ts
@@ -152,8 +152,6 @@ export class TankDeathknightSimUI extends IndividualSimUI<Spec.SpecTankDeathknig
 			// Inputs to include in the 'Other' section on the settings tab.
 			otherInputs: {
 				inputs: [
-					OtherInputs.PrepopPotion,
-
 					OtherInputs.TankAssignment,
 					OtherInputs.InFrontOfTarget,
 				],
diff --git a/ui/warlock/sim.ts b/ui/warlock/sim.ts
index 5e8c875d1c..cbe4f00a01 100644
--- a/ui/warlock/sim.ts
+++ b/ui/warlock/sim.ts
@@ -136,7 +136,6 @@ export class WarlockSimUI extends IndividualSimUI<Spec.SpecWarlock> {
 			// Inputs to include in the 'Other' section on the settings tab.
 			otherInputs: {
 				inputs: [
-					OtherInputs.PrepopPotion,
 					OtherInputs.DistanceFromTarget,
 					OtherInputs.TankAssignment,
 				],