diff --git a/app/images/paused.png b/app/images/paused.png
index 221adf9f1b..225cd93ec4 100644
Binary files a/app/images/paused.png and b/app/images/paused.png differ
diff --git a/app/images/paused@2x.png b/app/images/paused@2x.png
index dea41b1881..567492f747 100644
Binary files a/app/images/paused@2x.png and b/app/images/paused@2x.png differ
diff --git a/app/images/running-white.png b/app/images/running-white.png
new file mode 100644
index 0000000000..682d7b4685
Binary files /dev/null and b/app/images/running-white.png differ
diff --git a/app/images/running-white@2x.png b/app/images/running-white@2x.png
new file mode 100644
index 0000000000..a83f28aee8
Binary files /dev/null and b/app/images/running-white@2x.png differ
diff --git a/app/images/runningwave-white.png b/app/images/runningwave-white.png
new file mode 100644
index 0000000000..b564bea7b6
Binary files /dev/null and b/app/images/runningwave-white.png differ
diff --git a/app/images/runningwave-white@2x.png b/app/images/runningwave-white@2x.png
new file mode 100644
index 0000000000..013a1247fc
Binary files /dev/null and b/app/images/runningwave-white@2x.png differ
diff --git a/app/images/runningwave.png b/app/images/runningwave.png
deleted file mode 100644
index 9833ff0ac1..0000000000
Binary files a/app/images/runningwave.png and /dev/null differ
diff --git a/app/images/runningwave@2x.png b/app/images/runningwave@2x.png
index cfda2c62a4..bb2a5ef49f 100644
Binary files a/app/images/runningwave@2x.png and b/app/images/runningwave@2x.png differ
diff --git a/app/images/still-white.png b/app/images/still-white.png
new file mode 100644
index 0000000000..ec950d5c24
Binary files /dev/null and b/app/images/still-white.png differ
diff --git a/app/images/still-white@2x.png b/app/images/still-white@2x.png
new file mode 100644
index 0000000000..64110715fe
Binary files /dev/null and b/app/images/still-white@2x.png differ
diff --git a/app/images/stopped.png b/app/images/stopped.png
index 2b64d4a3cd..420b832ac7 100644
Binary files a/app/images/stopped.png and b/app/images/stopped.png differ
diff --git a/app/images/stopped@2x.png b/app/images/stopped@2x.png
index 776f0c8aea..0c19121c59 100644
Binary files a/app/images/stopped@2x.png and b/app/images/stopped@2x.png differ
diff --git a/app/images/wavy-white.png b/app/images/wavy-white.png
new file mode 100644
index 0000000000..066b750d35
Binary files /dev/null and b/app/images/wavy-white.png differ
diff --git a/app/images/wavy-white@2x.png b/app/images/wavy-white@2x.png
new file mode 100644
index 0000000000..3d9a4287c4
Binary files /dev/null and b/app/images/wavy-white@2x.png differ
diff --git a/app/styles/containers.less b/app/styles/containers.less
index 2159209d65..94155a28c3 100644
--- a/app/styles/containers.less
+++ b/app/styles/containers.less
@@ -75,21 +75,42 @@
             margin: 0px 5px 0px 20px;
 
             &.active {
-                background: @brand-primary;
-                li {
-                  .name {
-                    color: white;
-                  }
-                  .image {
-                    color: white;
-                    opacity: 0.9;
-                  }
+              background: @brand-primary;
+              li {
+                .name {
+                  color: white;
                 }
-                color: white;
-                border-bottom: none;
-                border-radius: 40px;
+                .image {
+                  color: white;
+                  opacity: 0.9;
+                }
+              }
+              color: white;
+              border-bottom: none;
+              border-radius: 40px;
+              .state-running {
+                .at2x('running-white.png', 20px, 20px);
+                overflow: hidden;
+                // -webkit-mask-image: -webkit-radial-gradient(circle, white, black);
 
-              &:hover {
+                .runningwave {
+                  position: absolute;
+                  width: 40px;
+                  height: 20px;
+                  left: -20px;
+                  .at2x('runningwave-white.png', 20px, 20px);
+                  // background-repeat: repeat;
+                  -webkit-animation-name: translatewave;
+                  -webkit-animation-duration: 8.0s;
+                  -webkit-animation-iteration-count: infinite;
+                  -webkit-animation-timing-function: linear;
+                }
+              }
+              .state-paused {
+                .at2x('wavy-white.png', 20px, 20px);
+              }
+              .state-stopped {
+                .at2x('still-white.png', 20px, 20px);
               }
             }
 
diff --git a/app/styles/main.less b/app/styles/main.less
index 780e59028f..e8bcec4aa9 100644
--- a/app/styles/main.less
+++ b/app/styles/main.less
@@ -18,7 +18,7 @@ html, body {
 }
 
 ::-webkit-scrollbar {
-  width: 13px;
+  width: 10px;
 }
 
 ::-webkit-scrollbar-track {
@@ -33,7 +33,7 @@ html, body {
   background-clip: padding-box;
   width: 7px;
   border-radius: 8px;
-  background-color: rgba(0,0,0,0.2);
+  background-color: rgba(0,0,0,0.07);
 }
 
 .create-modal {