diff --git a/app/features/build-analyzer/routes/analyzer.module.css b/app/features/build-analyzer/routes/analyzer.module.css
index 3f3b2593d..f7f4c10a6 100644
--- a/app/features/build-analyzer/routes/analyzer.module.css
+++ b/app/features/build-analyzer/routes/analyzer.module.css
@@ -255,6 +255,12 @@
 	align-items: center;
 }
 
+/* doubled class to outweigh the Table cell padding rule so the popover
+   button does not make these rows taller than the text-only rows */
+.popoverCell.popoverCell {
+	padding-block: 0;
+}
+
 .statPopover {
 	min-width: 360px;
 
diff --git a/app/features/build-analyzer/routes/analyzer.tsx b/app/features/build-analyzer/routes/analyzer.tsx
index bdff6f6b6..a49195bb6 100644
--- a/app/features/build-analyzer/routes/analyzer.tsx
+++ b/app/features/build-analyzer/routes/analyzer.tsx
@@ -1009,7 +1009,7 @@ function StatChartPopover(props: StatChartProps) {
 				<SendouButton
 					shape="circle"
 					variant="minimal"
-					size="small"
+					size={props.simple ? "miniscule" : "small"}
 					icon={<FlaskConical />}
 				/>
 			}
@@ -1643,19 +1643,21 @@ function DamageTable({
 
 					return (
 						<tr key={val.id}>
-							<td className="stack horizontal xs items-center">
-								{damageIsSubWeaponDamage(val) ? (
-									<Image
-										alt=""
-										path={subWeaponImageUrl(val.subWeaponId)}
-										width={12}
-										height={12}
-									/>
-								) : null}{" "}
-								{t(typeRowName as any)}{" "}
-								{damageIsSubWeaponDamage(val) && val.type === "SPLASH" ? (
-									<>({t("analyzer:damage.SPLASH")})</>
-								) : null}
+							<td>
+								<div className="stack horizontal xs items-center">
+									{damageIsSubWeaponDamage(val) ? (
+										<Image
+											alt=""
+											path={subWeaponImageUrl(val.subWeaponId)}
+											width={12}
+											height={12}
+										/>
+									) : null}{" "}
+									{t(typeRowName as any)}{" "}
+									{damageIsSubWeaponDamage(val) && val.type === "SPLASH" ? (
+										<>({t("analyzer:damage.SPLASH")})</>
+									) : null}
+								</div>
 							</td>
 							{showDistanceColumn && (
 								<td>
@@ -1679,7 +1681,7 @@ function DamageTable({
 								</td>
 							)}
 							{showPopovers ? (
-								<td>
+								<td className={styles.popoverCell}>
 									{renderPopover(val, (val as SubWeaponDamage).subWeaponId) ? (
 										<StatChartPopover
 											mainWeaponId={0}