diff --git a/src/api/process.ts b/src/api/process.ts
index 88bd75c2a..85781c3dd 100644
--- a/src/api/process.ts
+++ b/src/api/process.ts
@@ -79,6 +79,7 @@ export function startBuildProcess(
         sub.unsubscribe();
         stopContainer(name).subscribe((event: ProcessOutput) => {
           observer.next(event);
+          observer.complete();
         });
       });
   });
diff --git a/src/app/assets/public/images/icons/collapse.svg b/src/app/assets/public/images/icons/collapse.svg
index 6b855755f..52d5f9298 100644
--- a/src/app/assets/public/images/icons/collapse.svg
+++ b/src/app/assets/public/images/icons/collapse.svg
@@ -40,4 +40,4 @@
      inkscape:current-layer="svg8" /><path
      d="M68,52H32v-4h36V52z M82,20v60c0,1.1-0.9,2-2,2H20c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2h60C81.1,18,82,18.9,82,20z M78,22  H22v56h56V22z"
      id="path2"
-     style="fill:#f1fa8c" /></svg>
+     style="fill:#FFFFFF" /></svg>
diff --git a/src/app/assets/public/images/icons/expand.svg b/src/app/assets/public/images/icons/expand.svg
index 52a8be9a1..442400309 100644
--- a/src/app/assets/public/images/icons/expand.svg
+++ b/src/app/assets/public/images/icons/expand.svg
@@ -40,4 +40,4 @@
      inkscape:current-layer="svg8" /><path
      d="M48,52H32v-4h16V32h4v16h16v4H52v16h-4V52z M82,20v60c0,1.1-0.9,2-2,2H20c-1.1,0-2-0.9-2-2V20c0-1.1,0.9-2,2-2h60  C81.1,18,82,18.9,82,20z M78,22H22v56h56V22z"
      id="path2"
-     style="fill:#f1fa8c" /></svg>
+     style="fill:#FFFFFF" /></svg>
diff --git a/src/app/components/app-terminal/app-terminal.component.ts b/src/app/components/app-terminal/app-terminal.component.ts
index 378873f27..d09541284 100644
--- a/src/app/components/app-terminal/app-terminal.component.ts
+++ b/src/app/components/app-terminal/app-terminal.component.ts
@@ -20,11 +20,11 @@ export class AppTerminalComponent implements OnInit {
     this.au = new AnsiUp.default();
     this.au.use_classes = true;
     this.commands = [];
+    this.noData = true;
   }
 
   ngOnChanges(changes: SimpleChange) {
     if (!this.data) {
-      this.noData = true;
       return;
     }
 
diff --git a/src/app/styles/terminal.sass b/src/app/styles/terminal.sass
index fe0ba1ee6..75f00d6de 100644
--- a/src/app/styles/terminal.sass
+++ b/src/app/styles/terminal.sass
@@ -26,7 +26,7 @@
     .command-line
       display: flex
       align-items: center
-      background: lighten(#000000, 3)
+      background: #000000
       margin: 2px 5px
       padding: 0px
       border-radius: 2px
@@ -42,13 +42,13 @@
 
       .command
         font-size: 12px
-        color: #f1fa8c
-        font-weight: bold
+        color: $white
+        font-weight: $weight-semibold
 
         span
           font-size: 12px
-          color: #f1fa8c
-          font-weight: bold
+          color: $white
+          font-weight: $weight-semibold
 
     .output
       display: inline-block
@@ -57,7 +57,7 @@
       margin: 0 !important
       font-family: monaco, monospace
       font-size: 12px
-      padding: 0 10px 5px !important
+      padding: 10px 10px 10px 25px !important
       background: #000000
       white-space: pre-wrap
       word-wrap: break-word