diff --git a/ui/app/components/loading-spinner.js b/ui/app/components/loading-spinner.js
index f1f1f8734..a6ed6887c 100644
--- a/ui/app/components/loading-spinner.js
+++ b/ui/app/components/loading-spinner.js
@@ -1,6 +1,6 @@
-import Component from '@ember/component';
-import { tagName } from '@ember-decorators/component';
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
 
-@tagName('')
 export default class LoadingSpinner extends Component {
+  @tracked paused = false;
 }
diff --git a/ui/app/styles/components/loading-spinner.scss b/ui/app/styles/components/loading-spinner.scss
index 0bf07e49e..62cf55f75 100644
--- a/ui/app/styles/components/loading-spinner.scss
+++ b/ui/app/styles/components/loading-spinner.scss
@@ -1,71 +1,154 @@
+$duration: 5s;
+
+$side-length: 50px;
+$cube-length: $side-length * 5;
+
+$lighter-side: $grey-blue;
+$darker-side: darken($lighter-side, 15%);
+
 .loading-spinner {
-  width: 40px;
-  height: 40px;
-  margin: 100px auto;
+  width: 100%;
 
-  .loading-spinner-square {
-    width: 33%;
-    height: 33%;
-    background-color: $primary;
-    float: left;
-    animation: loading-spinner-squareGridScaleDelay 1.3s infinite ease-in-out;
+  .cube-and-logo {
+    position: relative;
+    margin: 100px auto;
+    width: $cube-length;
+    height: $cube-length;
   }
 
-  .loading-spinner-square1 {
-    animation-delay: 0.2s;
+  .logo-container {
+    position: absolute;
+    width: $cube-length;
+    height: $cube-length;
+    top: 0;
+    left: 0;
+
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .icon {
+      width: 32%;
+      height: 32%;
+      transform: translateY(-20px);
+      fill: white;
+      animation: n-fade $duration forwards infinite;
+    }
   }
 
-  .loading-spinner-square2 {
-    animation-delay: 0.3s;
+  .cube {
+    width: $cube-length;
+    height: $cube-length;
+    transform-style: preserve-3d;
+    animation: cube-spin $duration forwards infinite;
   }
 
-  .loading-spinner-square3 {
-    animation-delay: 0.4s;
+  &.paused {
+    .cube,
+    .side-4,
+    .logo-container .icon {
+      animation-play-state: paused;
+    }
   }
 
-  .loading-spinner-square4 {
-    animation-delay: 0.1s;
+  .side {
+    width: $side-length;
+    height: $side-length;
+    position: absolute;
+    background: $lighter-side;
   }
 
-  .loading-spinner-square5 {
-    animation-delay: 0.2s;
+  .side-1 {
+    top: $side-length;
+    left: $side-length * 2;
+    transform-origin: 50% 100%;
+    transform: rotateX(-90deg);
   }
 
-  .loading-spinner-square6 {
-    animation-delay: 0.3s;
+  .side-2 {
+    top: $side-length * 3;
+    left: $side-length * 2;
+    transform-origin: 50% 0%;
+    transform: rotateX(90deg);
   }
 
-  .loading-spinner-square7 {
-    animation-delay: 0s;
+  .side-3 {
+    top: $side-length * 2;
+    left: $side-length;
+    transform-origin: 100% 50%;
+    transform: rotateY(90deg);
   }
 
-  .loading-spinner-square8 {
-    animation-delay: 0.1s;
-  }
-
-  .loading-spinner-square9 {
-    animation-delay: 0.2s;
+  .side-4 {
+    top: $side-length * 2;
+    left: $side-length * 2;
+    transform-origin: 100% 50%;
+    transform: rotateY(90deg);
+    animation: darker-side-fade $duration forwards infinite;
   }
 }
 
-@-webkit-keyframes loading-spinner-squareGridScaleDelay {
-  0%,
-  70%,
+$rotateX: 55deg;
+$rotateY: 45deg;
+
+@keyframes cube-spin {
+  0% {
+    transform: rotateX($rotateX) rotate($rotateY) rotateZ(360deg);
+  }
+
+  30% {
+    transform: rotateX($rotateX) rotate($rotateY) rotateZ(0deg);
+  }
+
+  70% {
+    transform: rotateX($rotateX) rotate($rotateY) rotateZ(0deg);
+  }
+
   100% {
-    transform: scale3D(1, 1, 1);
-  }
-  35% {
-    transform: scale3D(0, 0, 1);
+    transform: rotateX($rotateX) rotate($rotateY) rotateZ(360deg);
   }
 }
 
-@keyframes loading-spinner-squareGridScaleDelay {
-  0%,
-  70%,
-  100% {
-    transform: scale3D(1, 1, 1);
+@keyframes darker-side-fade {
+  30% {
+    background: $lighter-side;
   }
+
   35% {
-    transform: scale3D(0, 0, 1);
+    background: $darker-side;
+  }
+
+  65% {
+    background: $darker-side;
+  }
+
+  70% {
+    background: $lighter-side;
+  }
+}
+
+@keyframes n-fade {
+  0% {
+    opacity: 0;
+  }
+
+  40% {
+    opacity: 0;
+  }
+
+  45% {
+    opacity: 1;
+  }
+
+  65% {
+    opacity: 1;
+  }
+
+  70% {
+    opacity: 0;
+  }
+
+  100% {
+    opacity: 0;
   }
 }
diff --git a/ui/app/templates/components/loading-spinner.hbs b/ui/app/templates/components/loading-spinner.hbs
index ee8ca9fa7..5ce56049e 100644
--- a/ui/app/templates/components/loading-spinner.hbs
+++ b/ui/app/templates/components/loading-spinner.hbs
@@ -1,11 +1,13 @@
-<div class="loading-spinner">
-  <div class="loading-spinner-square loading-spinner-square1"></div>
-  <div class="loading-spinner-square loading-spinner-square2"></div>
-  <div class="loading-spinner-square loading-spinner-square3"></div>
-  <div class="loading-spinner-square loading-spinner-square4"></div>
-  <div class="loading-spinner-square loading-spinner-square5"></div>
-  <div class="loading-spinner-square loading-spinner-square6"></div>
-  <div class="loading-spinner-square loading-spinner-square7"></div>
-  <div class="loading-spinner-square loading-spinner-square8"></div>
-  <div class="loading-spinner-square loading-spinner-square9"></div>
+<div class="loading-spinner {{if this.paused 'paused'}}" {{on "click" (toggle-action 'paused' this)}}>
+  <div class="cube-and-logo">
+    <div class="cube">
+      <div class="side side-1"></div>
+      <div class="side side-2"></div>
+      <div class="side side-3"></div>
+      <div class="side side-4"></div>
+    </div>
+    <div class="logo-container">
+      {{x-icon "nomad-logo-n"}}
+    </div>
+  </div>
 </div>
diff --git a/ui/public/images/icons/nomad-logo-n.svg b/ui/public/images/icons/nomad-logo-n.svg
new file mode 100644
index 000000000..7c5a408e2
--- /dev/null
+++ b/ui/public/images/icons/nomad-logo-n.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 59.6 68.1" style="enable-background:new 0 0 59.6 68.1;" xml:space="preserve">
+  <polygon points="43.2,14.8 43.2,37.5 35.3,42 29.8,38.6 25.8,36.3 25.8,47.7 16.9,53.3 16.9,30.7 19.9,28.8 20.3,28.6 
+    24,26.3 33.8,31.8 33.8,20.4 "/>
+</svg>