diff --git a/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/Devices/DevicesListPageTests.cs b/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/Devices/DevicesListPageTests.cs
index 752a4223d..cbfc776aa 100644
--- a/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/Devices/DevicesListPageTests.cs
+++ b/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/Devices/DevicesListPageTests.cs
@@ -123,9 +123,8 @@ public async Task WhenResetFilterButtonClickShouldClearFilters()
             this.mockRepository.VerifyAll();
         }
 
-        [TestCase("newDeviceButton")]
-        [TestCase("tableAddItemButton")]
-        public void WhenAddNewDeviceClickShouldNavigateToNewDevicePage(string buttonName)
+        [Test]
+        public void WhenAddNewDeviceClickShouldNavigateToNewDevicePage()
         {
             // Arrange
             _ = this.mockHttpClient
@@ -146,7 +145,7 @@ public void WhenAddNewDeviceClickShouldNavigateToNewDevicePage(string buttonName
             var cut = RenderComponent<DeviceListPage>();
 
             // Act
-            cut.WaitForElement($"#{buttonName}").Click();
+            cut.WaitForElement($"#addDeviceButton").Click();
             cut.WaitForAssertion(() => string.Equals("http://localhost/devices/new", mockNavigationManager.Uri, StringComparison.OrdinalIgnoreCase));
 
             // Assert
diff --git a/src/AzureIoTHub.Portal/Client/Pages/DeviceModels/DeviceModelListPage.razor b/src/AzureIoTHub.Portal/Client/Pages/DeviceModels/DeviceModelListPage.razor
index 87b9586bb..8209ccd65 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/DeviceModels/DeviceModelListPage.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/DeviceModels/DeviceModelListPage.razor
@@ -37,7 +37,7 @@
                     <MudText Typo="Typo.h6">Device Models</MudText>
                     <MudSpacer />
                     <MudIconButton Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="LoadDeviceModels" Class="ma-2"></MudIconButton>
-                    <MudIconButton Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDeviceModel" Class="ma-2"></MudIconButton>
+                    <MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDeviceModel" />
                 </ToolBarContent>
                 <HeaderContent>
                     <MudTh></MudTh>
@@ -69,10 +69,7 @@
             </MudTable>
         </MudItem>
     }
-    <MudItem xs="12">
-        <a href="/device-models/new"><MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Label="Add a new device model" /></a>
-    </MudItem>
-
+    
 </MudGrid>
 
 @code {
diff --git a/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor b/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor
index 0ee4d2c5c..528f59518 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor
@@ -1,5 +1,6 @@
 @page "/devices/{DeviceID}"
 @using AzureIoTHub.Portal.Client.Pages.Devices.LoRaWAN
+@using AzureIoTHub.Portal.Client.Pages.Edge_Devices
 @using AzureIoTHub.Portal.Client.Validators
 @using AzureIoTHub.Portal.Models
 @using AzureIoTHub.Portal.Models.v10
diff --git a/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceListPage.razor b/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceListPage.razor
index 035ca0f4e..ffce61a82 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceListPage.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceListPage.razor
@@ -87,7 +87,7 @@
                 <MudText Typo="Typo.h6">Devices</MudText>
                 <MudSpacer />
                 <MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick=@Search Size="Size.Medium" id="tableRefreshButton" Class="ma-2"></MudIconButton>
-                <MudIconButton Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDevice" id="tableAddItemButton" Class="ma-2"></MudIconButton>
+                <MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDevice" id="addDeviceButton"/>
             </ToolBarContent>
             <HeaderContent>
                 <MudTh></MudTh>
@@ -151,10 +151,7 @@
         </MudTable>
     </MudItem>
 
-    <MudItem xs="12">
-        <MudFab OnClick="AddDevice" Color="Color.Secondary" StartIcon="@Icons.Material.Filled.Add" Label="Add a new device" id="newDeviceButton"></MudFab>
-    </MudItem>
-
+    
 </MudGrid>
 
 @code {
diff --git a/src/AzureIoTHub.Portal/Client/Pages/Edge_Devices/EdgeDeviceListPage.razor b/src/AzureIoTHub.Portal/Client/Pages/Edge_Devices/EdgeDeviceListPage.razor
index 6e7c4cfe3..a26e9f468 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/Edge_Devices/EdgeDeviceListPage.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/Edge_Devices/EdgeDeviceListPage.razor
@@ -67,7 +67,7 @@
                 <MudText Typo="Typo.h6">Gateways</MudText>
                 <MudSpacer />
                 <MudIconButton Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="Search" Class="ma-2"></MudIconButton>
-                <MudIconButton Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="ShowAddDialog" Class="ma-2"></MudIconButton>
+                      <MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Size="Size.Medium"  OnClick="ShowAddDialog" />
             </ToolBarContent>
             <HeaderContent>
                 <MudTh>ID</MudTh>
@@ -112,9 +112,6 @@
             </PagerContent>
         </MudTable>
     </MudItem>
-    <MudItem xs="12">
-        <MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Label="Add IoT Edge" OnClick="ShowAddDialog" />
-    </MudItem>
 </MudGrid>
 
 @code {
diff --git a/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor b/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor
index 32ec5a400..b79a75246 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor
@@ -24,7 +24,7 @@
                 <MudText Typo="Typo.h6">LoRaWAN Concentrators</MudText>
                 <MudSpacer />
                 <MudIconButton Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="Search" Class="ma-2"></MudIconButton>
-                <MudIconButton Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDevice" Class="ma-2"></MudIconButton>
+                <MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDevice" />
             </ToolBarContent>
             <HeaderContent>
                 <MudTh>Device</MudTh>
@@ -76,9 +76,7 @@
             </PagerContent>
         </MudTable>
     </MudItem>
-    <MudItem xs="12">
-        <a href="lorawan/concentrators/new"><MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Label="Add a new concentrator" /></a>
-    </MudItem>
+    
 </MudGrid>
 
 @code {