diff --git a/Wonky.Client/Components/SearchCatalogPhraseComponent.razor b/Wonky.Client/Components/SearchCatalogPhraseComponent.razor
index c241cd74..c4844444 100644
--- a/Wonky.Client/Components/SearchCatalogPhraseComponent.razor
+++ b/Wonky.Client/Components/SearchCatalogPhraseComponent.razor
@@ -16,6 +16,6 @@
 <div class="input-group">
     <input id="search-input" type="text" class="form-control" placeholder="Søg ..." aria-described-by="search-addon"
            @bind-value="SearchTerm" @bind-value:event="oninput" onkeyup="@OnSearchChanged" />
-    <span class="input-group-text" id="search-addon"><i class="oi oi-delete" @onclick="@ClearSearch"></i></span>
+    <span class="input-group-text" id="search-addon"><i class="bi-backspace" @onclick="@ClearSearch"></i></span>
 </div>
 
diff --git a/Wonky.Client/Components/SearchCustomerPhraseComponent.razor b/Wonky.Client/Components/SearchCustomerPhraseComponent.razor
index 19963065..200e1818 100644
--- a/Wonky.Client/Components/SearchCustomerPhraseComponent.razor
+++ b/Wonky.Client/Components/SearchCustomerPhraseComponent.razor
@@ -17,6 +17,6 @@
 <div class="input-group">
     <input id="search-input" type="text" class="form-control" placeholder="Søg ..." aria-described-by="search-addon"
            @bind-value="SearchTerm" @bind-value:event="oninput" @onkeyup="OnSearchChanged" />
-    <button class="input-group-text" id="search-addon"><i class="oi oi-delete" @onclick="@ClearSearch"></i></button>
+    <button class="input-group-text" id="search-addon"><i class="bi-backspace" @onclick="@ClearSearch"></i></button>
 </div>
 
diff --git a/Wonky.Client/Components/SearchPhraseComponent.razor b/Wonky.Client/Components/SearchPhraseComponent.razor
index c241cd74..c4844444 100644
--- a/Wonky.Client/Components/SearchPhraseComponent.razor
+++ b/Wonky.Client/Components/SearchPhraseComponent.razor
@@ -16,6 +16,6 @@
 <div class="input-group">
     <input id="search-input" type="text" class="form-control" placeholder="Søg ..." aria-described-by="search-addon"
            @bind-value="SearchTerm" @bind-value:event="oninput" onkeyup="@OnSearchChanged" />
-    <span class="input-group-text" id="search-addon"><i class="oi oi-delete" @onclick="@ClearSearch"></i></span>
+    <span class="input-group-text" id="search-addon"><i class="bi-backspace" @onclick="@ClearSearch"></i></span>
 </div>
 
diff --git a/Wonky.Client/Components/TaskItemTableComponent.razor b/Wonky.Client/Components/TaskItemTableComponent.razor
index dab74518..b61b7df9 100644
--- a/Wonky.Client/Components/TaskItemTableComponent.razor
+++ b/Wonky.Client/Components/TaskItemTableComponent.razor
@@ -46,24 +46,24 @@
                 </td>
                 <td class="align-middle">
                     <a class="btn btn-light border-dark" href="/advisor/tasks/@task.TaskItemId">
-                        <i class="oi oi-calendar"></i>
+                        <i class="bi-calendar"></i>
                     </a>
                 </td>
                 <td class="align-middle">
                     <button type="button" class="btn btn-light border-dark" @onclick="@(() => CallConfirmationModal(task.TaskItemId))">
-                        <i class="oi oi-circle-x"></i>
+                        <i class="bi-trash"></i>
                     </button>
                 </td>
                 <td class="align-middle">
                     <button type="button" class="btn btn-light border-dark" @onclick="@(() => TaskCompleted(task.TaskItemId))">
-                        <i class="oi oi-check"></i>
+                        <i class="bi-check"></i>
                     </button>
                 </td>
                 <td class="align-middle">
                     @if (task.TaskTypeEnum is "Recall")
                     {
                         <a class="btn btn-light border-dark pe-3 me-2" href="/advisor/customers/@task.ReferenceId">
-                            <i class="oi oi-pencil"></i>
+                            <i class="bi-pencil"></i>
                         </a>
                     }
                 </td>
@@ -71,7 +71,7 @@
                     @if (task.TaskTypeEnum is "Recall")
                     {
                         <button type="button" class="btn btn-primary" @onclick="@(() => CompleteTask(task.TaskItemId))">
-                            <i class="oi oi-map-marker"></i>
+                            <i class="bi-pin-map"></i>
                         </button>
                     }
                 </td>
diff --git a/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor
index 27faaaba..bb9dfb8f 100644
--- a/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor
+++ b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor
@@ -80,7 +80,7 @@
                                                     <div class="text-sm-end me-1">@rate.Rate</div>
                                                     <div>
                                                         <a class="btn btn-primary btn-sm" data-bs-dismiss="modal" @onclick="@(() => SelectItem(item.SalesItemId, rate.Quantity, rate.Rate))">
-                                                            <i class="oi oi-plus"></i>
+                                                            <i class="bi-plus-lg"></i>
                                                         </a>
                                                     </div>
                                                 </li>
diff --git a/Wonky.Client/Pages/Login.razor b/Wonky.Client/Pages/Login.razor
index f6991495..fe1ea5bd 100644
--- a/Wonky.Client/Pages/Login.razor
+++ b/Wonky.Client/Pages/Login.razor
@@ -50,7 +50,7 @@
                         @* current-password *@
                         <div class="input-group mb-4">
                             <span class="input-group-text" id="key">
-                                <i class="oi oi-key"></i>
+                                <i class="bi-key"></i>
                             </span>
                             <InputText type="password" class="form-control" aria-described-by="key"
                                        @bind-Value="CredentialDto.Password" autocomplete="current-password"/>