diff --git a/CutList.Web/Components/Pages/Jobs/Edit.razor b/CutList.Web/Components/Pages/Jobs/Edit.razor
index b471897..fe33313 100644
--- a/CutList.Web/Components/Pages/Jobs/Edit.razor
+++ b/CutList.Web/Components/Pages/Jobs/Edit.razor
@@ -413,8 +413,8 @@ else
                                         <td>@part.Quantity</td>
                                         <td>@(string.IsNullOrWhiteSpace(part.Name) ? "-" : part.Name)</td>
                                         <td>
-                                            <button class="btn btn-sm btn-outline-primary me-1" @onclick="() => EditPart(part)">Edit</button>
-                                            <button class="btn btn-sm btn-outline-danger" @onclick="() => DeletePart(part)">Delete</button>
+                                            <button class="btn btn-sm btn-outline-primary me-1" @onclick="() => EditPart(part)" title="Edit"><i class="bi bi-pencil"></i></button>
+                                            <button class="btn btn-sm btn-outline-danger" @onclick="() => DeletePart(part)" title="Delete"><i class="bi bi-trash"></i></button>
                                         </td>
                                     </tr>
                                 }
@@ -731,8 +731,8 @@ else
                                 }
                             </td>
                             <td>
-                                <button class="btn btn-sm btn-outline-primary me-1" @onclick="() => EditStock(stock)">Edit</button>
-                                <button class="btn btn-sm btn-outline-danger" @onclick="() => DeleteStock(stock)">Delete</button>
+                                <button class="btn btn-sm btn-outline-primary me-1" @onclick="() => EditStock(stock)" title="Edit"><i class="bi bi-pencil"></i></button>
+                                <button class="btn btn-sm btn-outline-danger" @onclick="() => DeleteStock(stock)" title="Delete"><i class="bi bi-trash"></i></button>
                             </td>
                         </tr>
                     }
diff --git a/CutList.Web/Components/Pages/Jobs/Index.razor b/CutList.Web/Components/Pages/Jobs/Index.razor
index 9efa651..c672121 100644
--- a/CutList.Web/Components/Pages/Jobs/Index.razor
+++ b/CutList.Web/Components/Pages/Jobs/Index.razor
@@ -43,7 +43,7 @@ else
                 <th>Customer</th>
                 <th>Cutting Tool</th>
                 <th>Last Modified</th>
-                <th style="width: 200px;">Actions</th>
+                <th style="width: 150px;">Actions</th>
             </tr>
         </thead>
         <tbody>
@@ -56,10 +56,10 @@ else
                     <td>@(job.CuttingTool?.Name ?? "-")</td>
                     <td>@((job.UpdatedAt ?? job.CreatedAt).ToLocalTime().ToString("g"))</td>
                     <td>
-                        <a href="jobs/@job.Id" class="btn btn-sm btn-outline-primary">Edit</a>
-                        <a href="jobs/@job.Id/results" class="btn btn-sm btn-success">Optimize</a>
-                        <button class="btn btn-sm btn-outline-secondary" @onclick="() => DuplicateJob(job)">Copy</button>
-                        <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDelete(job)">Delete</button>
+                        <a href="jobs/@job.Id" class="btn btn-sm btn-outline-primary" title="Edit"><i class="bi bi-pencil"></i></a>
+                        <a href="jobs/@job.Id/results" class="btn btn-sm btn-success" title="Optimize"><i class="bi bi-scissors"></i></a>
+                        <button class="btn btn-sm btn-outline-secondary" @onclick="() => DuplicateJob(job)" title="Copy"><i class="bi bi-copy"></i></button>
+                        <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDelete(job)" title="Delete"><i class="bi bi-trash"></i></button>
                     </td>
                 </tr>
             }
diff --git a/CutList.Web/Components/Pages/Stock/Edit.razor b/CutList.Web/Components/Pages/Stock/Edit.razor
index ee896fb..17ebb1f 100644
--- a/CutList.Web/Components/Pages/Stock/Edit.razor
+++ b/CutList.Web/Components/Pages/Stock/Edit.razor
@@ -264,8 +264,8 @@ else
                                             <td>@(offering.PartNumber ?? "-")</td>
                                             <td>@(offering.Price.HasValue ? offering.Price.Value.ToString("C") : "-")</td>
                                             <td>
-                                                <button class="btn btn-sm btn-outline-primary" @onclick="() => EditOffering(offering)">Edit</button>
-                                                <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDeleteOffering(offering)">Delete</button>
+                                                <button class="btn btn-sm btn-outline-primary" @onclick="() => EditOffering(offering)" title="Edit"><i class="bi bi-pencil"></i></button>
+                                                <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDeleteOffering(offering)" title="Delete"><i class="bi bi-trash"></i></button>
                                             </td>
                                         </tr>
                                     }
diff --git a/CutList.Web/Components/Pages/Suppliers/Edit.razor b/CutList.Web/Components/Pages/Suppliers/Edit.razor
index 93933c8..0e0d00c 100644
--- a/CutList.Web/Components/Pages/Suppliers/Edit.razor
+++ b/CutList.Web/Components/Pages/Suppliers/Edit.razor
@@ -143,8 +143,8 @@ else
                                             <td>@(offering.PartNumber ?? "-")</td>
                                             <td>@(offering.Price.HasValue ? offering.Price.Value.ToString("C") : "-")</td>
                                             <td>
-                                                <button class="btn btn-sm btn-outline-primary" @onclick="() => EditOffering(offering)">Edit</button>
-                                                <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDeleteOffering(offering)">Delete</button>
+                                                <button class="btn btn-sm btn-outline-primary" @onclick="() => EditOffering(offering)" title="Edit"><i class="bi bi-pencil"></i></button>
+                                                <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDeleteOffering(offering)" title="Delete"><i class="bi bi-trash"></i></button>
                                             </td>
                                         </tr>
                                     }
diff --git a/CutList.Web/Components/Pages/Suppliers/Index.razor b/CutList.Web/Components/Pages/Suppliers/Index.razor
index eb6dc54..1b19b34 100644
--- a/CutList.Web/Components/Pages/Suppliers/Index.razor
+++ b/CutList.Web/Components/Pages/Suppliers/Index.razor
@@ -27,7 +27,7 @@ else
                 <th>Name</th>
                 <th>Contact Info</th>
                 <th>Notes</th>
-                <th style="width: 160px;">Actions</th>
+                <th style="width: 100px;">Actions</th>
             </tr>
         </thead>
         <tbody>
@@ -39,8 +39,8 @@ else
                     <td>@TruncateText(supplier.Notes, 50)</td>
                     <td>
                         <div class="d-flex gap-1">
-                            <a href="suppliers/@supplier.Id" class="btn btn-sm btn-outline-primary">Edit</a>
-                            <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDelete(supplier)">Delete</button>
+                            <a href="suppliers/@supplier.Id" class="btn btn-sm btn-outline-primary" title="Edit"><i class="bi bi-pencil"></i></a>
+                            <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDelete(supplier)" title="Delete"><i class="bi bi-trash"></i></button>
                         </div>
                     </td>
                 </tr>
diff --git a/CutList.Web/Components/Pages/Tools/Index.razor b/CutList.Web/Components/Pages/Tools/Index.razor
index 49420da..94e4d85 100644
--- a/CutList.Web/Components/Pages/Tools/Index.razor
+++ b/CutList.Web/Components/Pages/Tools/Index.razor
@@ -74,7 +74,7 @@ else
                     <th>Name</th>
                     <th>Kerf Width</th>
                     <th>Default</th>
-                    <th style="width: 140px;">Actions</th>
+                    <th style="width: 100px;">Actions</th>
                 </tr>
             </thead>
             <tbody>
@@ -90,8 +90,8 @@ else
                             }
                         </td>
                         <td>
-                            <button class="btn btn-sm btn-outline-primary" @onclick="() => Edit(tool)">Edit</button>
-                            <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDelete(tool)">Delete</button>
+                            <button class="btn btn-sm btn-outline-primary" @onclick="() => Edit(tool)" title="Edit"><i class="bi bi-pencil"></i></button>
+                            <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDelete(tool)" title="Delete"><i class="bi bi-trash"></i></button>
                         </td>
                     </tr>
                 }