diff --git a/Server/wwwroot/css/Themes/cyborg.custom.css b/Server/wwwroot/css/Themes/cyborg.custom.css
index fe4b23ac..4921ac65 100644
--- a/Server/wwwroot/css/Themes/cyborg.custom.css
+++ b/Server/wwwroot/css/Themes/cyborg.custom.css
@@ -116,7 +116,7 @@ button.navbar-toggler:hover {
     color: limegreen;
 }
 
-td .fa-times {
+td > .fa-times {
     color: red;
 }
 
diff --git a/Server/wwwroot/css/Themes/yeti.custom.css b/Server/wwwroot/css/Themes/yeti.custom.css
index d8449965..d2beed4b 100644
--- a/Server/wwwroot/css/Themes/yeti.custom.css
+++ b/Server/wwwroot/css/Themes/yeti.custom.css
@@ -112,7 +112,7 @@ button.navbar-toggler:hover {
     color: forestgreen;
 }
 
-td .fa-times {
+td > .fa-times {
     color: red;
 }
 
diff --git a/Server/wwwroot/src/Main/DataGrid.ts b/Server/wwwroot/src/Main/DataGrid.ts
index 7210a371..276f52ec 100644
--- a/Server/wwwroot/src/Main/DataGrid.ts
+++ b/Server/wwwroot/src/Main/DataGrid.ts
@@ -162,6 +162,10 @@ export function RenderDeviceRows() {
                                 <i class="fas fa-edit" title="Edit"></i>
                                 Edit
                             </a>
+                            <a class="dropdown-item device-remove-button" href="#">
+                                <i class="fas fa-times" title="Remove"></i>
+                                Remove
+                            </a>
                           </div>
                         </div>
                     </td>`;
@@ -180,7 +184,9 @@ export function RenderDeviceRows() {
         (recordRow.querySelector(".device-viewonly-button") as HTMLButtonElement).onclick = (ev) => {
             AddConsoleOutput("Launching remote control on client device...");
             BrowserHubConnection.StartRemoteControl(device.ID, true);
-          
+        };
+        (recordRow.querySelector(".device-remove-button") as HTMLButtonElement).onclick = (ev) => {
+            BrowserHubConnection.Connection.invoke("RemoveDevices", [ device.ID ]);
         };
     }
 }