diff --git a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html
index 8486df792..f1eff1fe4 100644
--- a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html
+++ b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html
@@ -13,7 +13,7 @@
         <i class="far fa-arrow-alt-circle-up"></i> {{ 'plugins.status_update_available' | translate }}
       </p>
       <p class="mb-0 primary-text" *ngIf="plugin.betaUpdateAvailable && !plugin.updateAvailable && !plugin.disabled">
-          <i class="far fa-arrow-alt-circle-up"></i> {{ 'plugins.status_update_beta_available' | translate }}
+        <i class="far fa-arrow-alt-circle-up"></i> {{ 'plugins.status_update_beta_available' | translate }}
       </p>
       <p class="mb-0 red-text" *ngIf="plugin.installedVersion && plugin.disabled">
         <i class="far fa-times-circle"></i> {{ 'plugins.status_disabled' | translate }}
@@ -136,7 +136,7 @@ <h4 class="card-title mb-0">
                   (click)="$plugin.uninstallPlugin(plugin)">
             <i class="fas fa-fw fa-trash"></i> {{ 'plugins.button_uninstall' | translate }}
           </button>
-          <div class="dropdown-divider"></div>
+          <div class="dropdown-divider" *ngIf="plugin.links.homepage || plugin.links.npm"></div>
           <a ngbDropdownItem target="_blank" rel="noopener noreferrer" class="text-decoration-none"
             *ngIf="plugin.links.homepage || plugin.links.npm" [href]="plugin.links.homepage || plugin.links.npm">
             <i class="{{ plugin.links?.homepage?.includes('github.com') ? 'fa fa-lg fa-github' : 'fas fa-external-link-alt' }}"></i> Plugin Homepage
diff --git a/ui/src/app/modules/status/widgets/homebridge-status-widget/homebridge-status-widget.component.html b/ui/src/app/modules/status/widgets/homebridge-status-widget/homebridge-status-widget.component.html
index 46b532a1f..918744d27 100644
--- a/ui/src/app/modules/status/widgets/homebridge-status-widget/homebridge-status-widget.component.html
+++ b/ui/src/app/modules/status/widgets/homebridge-status-widget/homebridge-status-widget.component.html
@@ -38,7 +38,7 @@
           <i class="fas fa-cog fa-spin primary-text" *ngIf="!homebridgePkg.installedVersion"></i>
           <i class="fas fa-check-circle primary-text"
             *ngIf="homebridgePkg.installedVersion && !homebridgePkg.updateAvailable && !homebridgePkg.betaUpdateAvailable"></i>
-          <i class="fas fa-cloud-upload-alt primary-text"
+          <i class="fas fa-arrow-alt-circle-up primary-text"
             *ngIf="homebridgePkg.installedVersion && (homebridgePkg.updateAvailable || homebridgePkg.betaUpdateAvailable)"></i>
         </div>
         <div class="align-self-center">
@@ -77,7 +77,7 @@
     <div class="hb-status-item d-flex flex-row mr-4 pr-4">
       <div class="d-flex">
         <div class="mb-0 px-3 py-2 hb-status-icon">
-          <i class="fas fa-cloud-upload-alt primary-text" *ngIf="homebridgePluginStatus.length"></i>
+          <i class="fas fa-arrow-alt-circle-up primary-text" *ngIf="homebridgePluginStatus.length"></i>
           <i class="fas fa-check-circle primary-text" *ngIf="!homebridgePluginStatus.length"></i>
         </div>
         <div class="align-self-center">