diff --git a/PlotLine/Views/FloorPlans/Edit.cshtml b/PlotLine/Views/FloorPlans/Edit.cshtml
index 9e9994f..93c1f32 100644
--- a/PlotLine/Views/FloorPlans/Edit.cshtml
+++ b/PlotLine/Views/FloorPlans/Edit.cshtml
@@ -407,17 +407,6 @@
                 <section class="floor-plan-tool-card" id="floor-plan-tool-selected" role="tabpanel" aria-labelledby="floor-plan-tool-tab-selected" data-toolbox-panel="selected" hidden>
                     <h2>Selected block <help-icon key="floorPlans.addBlock" /></h2>
                     <p class="muted" data-no-selection>Select a block on the grid to edit its details.</p>
-                    <p class="muted">
-                        Field help:
-                        <help-icon key="floorPlans.fields.location" mode="inline" />
-                        <help-icon key="floorPlans.fields.blockType" mode="inline" />
-                        <help-icon key="floorPlans.fields.xCoordinate" mode="inline" />
-                        <help-icon key="floorPlans.fields.yCoordinate" mode="inline" />
-                        <help-icon key="floorPlans.fields.dimensions" mode="inline" />
-                        <help-icon key="floorPlans.fields.labelOverride" mode="inline" />
-                        <help-icon key="floorPlans.fields.notes" mode="inline" />
-                        <help-icon key="floorPlans.deleteBlock" mode="inline" />
-                    </p>
                     <div class="floor-plan-overlap-warning d-none" data-overlap-warning>Some blocks overlap on this floor.</div>
 
                     @for (var i = 0; i < Model.Blocks.Count; i++)
@@ -432,12 +421,12 @@
                                 <select asp-for="Blocks[i].LocationID" asp-items="Model.LocationOptions" class="form-select form-select-sm" data-block-field="location"></select>
                             </div>
                             <div class="mb-2">
-                                <label class="form-label">Type</label>
+                                <label class="form-label">Type <help-icon key="floorPlans.fields.blockType" mode="inline" /></label>
                                 <select asp-for="Blocks[i].BlockType" asp-items="Model.BlockTypeOptions" class="form-select form-select-sm" data-block-field="type"></select>
                             </div>
                             <div class="row g-2">
                                 <div class="col-6">
-                                    <label class="form-label">X</label>
+                                    <label class="form-label">X <help-icon key="floorPlans.fields.xCoordinate" mode="inline" /></label>
                                     <select class="form-select form-select-sm"
                                             id="Blocks_@(i)__X"
                                             name="Blocks[@i].X"
@@ -446,7 +435,7 @@
                                             data-coordinate-value="@Model.Blocks[i].X"></select>
                                 </div>
                                 <div class="col-6">
-                                    <label class="form-label">Y</label>
+                                    <label class="form-label">Y <help-icon key="floorPlans.fields.yCoordinate" mode="inline" /></label>
                                     <select class="form-select form-select-sm"
                                             id="Blocks_@(i)__Y"
                                             name="Blocks[@i].Y"
@@ -455,16 +444,16 @@
                                             data-coordinate-value="@Model.Blocks[i].Y"></select>
                                 </div>
                                 <div class="col-6">
-                                    <label class="form-label">Width</label>
+                                    <label class="form-label">Width <help-icon key="floorPlans.fields.dimensions" mode="inline" /></label>
                                     <input asp-for="Blocks[i].WidthCells" class="form-control form-control-sm" min="1" max="80" data-block-field="w" />
                                 </div>
                                 <div class="col-6">
-                                    <label class="form-label">Height</label>
+                                    <label class="form-label">Height <help-icon key="floorPlans.fields.dimensions" mode="inline" /></label>
                                     <input asp-for="Blocks[i].HeightCells" class="form-control form-control-sm" min="1" max="80" data-block-field="h" />
                                 </div>
                             </div>
                             <div class="mt-2">
-                                <label class="form-label">Label override</label>
+                                <label class="form-label">Label override <help-icon key="floorPlans.fields.labelOverride" mode="inline" /></label>
                                 <input asp-for="Blocks[i].LabelOverride" class="form-control form-control-sm" />
                             </div>
                             <div class="mt-2">