diff --git a/components/dashboard/src/icons/Spinner.svg b/components/dashboard/src/icons/Spinner.svg
index 5ed476c64d224a..989c65996ab86b 100644
--- a/components/dashboard/src/icons/Spinner.svg
+++ b/components/dashboard/src/icons/Spinner.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 21 20"><path fill="#F5F5F4" fill-rule="evenodd" d="M18.5 10a8 8 0 11-16 0 8 8 0 0116 0z" clip-rule="evenodd"/><path fill="#A8A29E" d="M18.5 10A8.001 8.001 0 114.843 4.343L10.5 10h8z"/><path fill="#F5F5F4" fill-rule="evenodd" d="M14.5 10a4 4 0 11-8 0 4 4 0 018 0z" clip-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g clip-path="url(#a)"><path fill="#A8A29E" fill-rule="evenodd" d="M11.77.945A8 8 0 0 0 8 0v4a4 4 0 1 1-2.828 6.828l-2.83 2.83A8 8 0 1 0 11.77.945h-.001Z" clip-rule="evenodd"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z" transform="rotate(-90 8 8)"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/components/dashboard/src/icons/SpinnerDark.svg b/components/dashboard/src/icons/SpinnerDark.svg
deleted file mode 100644
index 3698f94217afc4..00000000000000
--- a/components/dashboard/src/icons/SpinnerDark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 21 20"><path fill="#44403C" fill-rule="evenodd" d="M18.5 10a8 8 0 11-16 0 8 8 0 0116 0z" clip-rule="evenodd"/><path fill="#A8A29E" d="M18.5 10A8.001 8.001 0 114.843 4.343L10.5 10h8z"/><path fill="#44403C" fill-rule="evenodd" d="M14.5 10a4 4 0 11-8 0 4 4 0 018 0z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/components/dashboard/src/projects/ConfigureProject.tsx b/components/dashboard/src/projects/ConfigureProject.tsx
index f173ad1b22f621..20a717e6853efa 100644
--- a/components/dashboard/src/projects/ConfigureProject.tsx
+++ b/components/dashboard/src/projects/ConfigureProject.tsx
@@ -13,7 +13,6 @@ import { getGitpodService } from "../service/service";
 import { getCurrentTeam, TeamsContext } from "../teams/teams-context";
 import Header from "../components/Header";
 import Spinner from "../icons/Spinner.svg";
-import SpinnerDark from "../icons/SpinnerDark.svg";
 import PrebuildLogsEmpty from "../images/prebuild-logs-empty.svg";
 import PrebuildLogsEmptyDark from "../images/prebuild-logs-empty-dark.svg";
 import { ThemeContext } from "../theme-context";
@@ -163,7 +162,7 @@ export default function () {
             <MonacoEditor classes="w-full flex-grow" disabled={isEditorDisabled} language="dockerfile" value={dockerfile} onChange={setDockerfile} />}
         </Suspense>
         {isDetecting && <div className="absolute h-full w-full bg-gray-100 dark:bg-gray-700 flex items-center justify-center space-x-2">
-          <img className="h-5 w-5 animate-spin" src={isDark ? SpinnerDark : Spinner} />
+          <img className="h-5 w-5 animate-spin" src={Spinner} />
           <span className="font-semibold text-gray-400">Detecting project configuration ...</span>
         </div>}
       </div>
@@ -177,7 +176,7 @@ export default function () {
             </div>)
         }</div>
         <div className="h-20 px-6 bg-gray-50 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-600 flex space-x-2">
-          {prebuildWasTriggered && <PrebuildInstanceStatus prebuildInstance={prebuildInstance} isDark={isDark} />}
+          {prebuildWasTriggered && <PrebuildInstanceStatus prebuildInstance={prebuildInstance} />}
           <div className="flex-grow" />
           {(prebuildInstance?.status.phase === "stopped" && !prebuildInstance?.status.conditions.failed)
               ? <a className="my-auto" href={`/#${project?.cloneUrl}`}><button className="secondary">New Workspace</button></a>
diff --git a/components/dashboard/src/projects/Prebuild.tsx b/components/dashboard/src/projects/Prebuild.tsx
index 3c9e46e788c3ef..c02318c061e4c4 100644
--- a/components/dashboard/src/projects/Prebuild.tsx
+++ b/components/dashboard/src/projects/Prebuild.tsx
@@ -12,7 +12,6 @@ import Header from "../components/Header";
 import PrebuildLogs from "../components/PrebuildLogs";
 import { getGitpodService, gitpodHostUrl } from "../service/service";
 import { TeamsContext, getCurrentTeam } from "../teams/teams-context";
-import { ThemeContext } from "../theme-context";
 import { PrebuildInstanceStatus } from "./Prebuilds";
 import { shortCommitMessage } from "./render-utils";
 
@@ -28,7 +27,6 @@ export default function () {
 
     const [ prebuild, setPrebuild ] = useState<PrebuildWithStatus | undefined>();
     const [ prebuildInstance, setPrebuildInstance ] = useState<WorkspaceInstance | undefined>();
-    const { isDark } = useContext(ThemeContext);
 
     useEffect(() => {
         if (!teams || !projectName || !prebuildId) {
@@ -88,7 +86,7 @@ export default function () {
                     <PrebuildLogs workspaceId={prebuild?.info?.buildWorkspaceId} onInstanceUpdate={onInstanceUpdate} />
                 </div>
                 <div className="h-20 px-6 bg-gray-50 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-600 flex space-x-2">
-                    {prebuildInstance && <PrebuildInstanceStatus prebuildInstance={prebuildInstance} isDark={isDark} />}
+                    {prebuildInstance && <PrebuildInstanceStatus prebuildInstance={prebuildInstance} />}
                     <div className="flex-grow" />
                     {prebuildInstance?.status.phase === "stopped"
                         ? <a className="my-auto" href={gitpodHostUrl.withContext(`${prebuild?.info.changeUrl}`).toString()}><button>New Workspace</button></a>
diff --git a/components/dashboard/src/projects/Prebuilds.tsx b/components/dashboard/src/projects/Prebuilds.tsx
index cf106f9b0d011d..8867632149132c 100644
--- a/components/dashboard/src/projects/Prebuilds.tsx
+++ b/components/dashboard/src/projects/Prebuilds.tsx
@@ -5,14 +5,13 @@
  */
 
 import moment from "moment";
-import { PrebuildInfo, PrebuildWithStatus, PrebuiltWorkspaceState, Project, WorkspaceInstance } from "@gitpod/gitpod-protocol";
+import { PrebuildInfo, PrebuildWithStatus, PrebuiltWorkspaceState, Project, StartPrebuildResult, WorkspaceInstance } from "@gitpod/gitpod-protocol";
 import { useContext, useEffect, useState } from "react";
 import { useHistory, useLocation, useRouteMatch } from "react-router";
 import Header from "../components/Header";
 import DropDown, { DropDownEntry } from "../components/DropDown";
 import { ItemsList, Item, ItemField, ItemFieldContextMenu } from "../components/ItemsList";
 import Spinner from "../icons/Spinner.svg";
-import SpinnerDark from "../icons/SpinnerDark.svg";
 import StatusDone from "../icons/StatusDone.svg";
 import StatusFailed from "../icons/StatusFailed.svg";
 import StatusPaused from "../icons/StatusPaused.svg";
@@ -38,6 +37,7 @@ export default function () {
     const [statusFilter, setStatusFilter] = useState<PrebuiltWorkspaceState | undefined>();
 
     const [prebuilds, setPrebuilds] = useState<PrebuildWithStatus[]>([]);
+    const [isPrebuildPending, setIsPrebuildPending] = useState<boolean>(false);
 
     useEffect(() => {
         if (!project) {
@@ -46,7 +46,8 @@ export default function () {
         const registration = getGitpodService().registerClient({
             onPrebuildUpdate: (update: PrebuildWithStatus) => {
                 if (update.info.projectId === project.id) {
-                    setPrebuilds(prev => [update, ...prev.filter(p => p.info.id !== update.info.id)])
+                    setPrebuilds(prev => [update, ...prev.filter(p => p.info.id !== update.info.id)]);
+                    setIsPrebuildPending(false);
                 }
             }
         });
@@ -126,9 +127,23 @@ export default function () {
         history.push(`/${!!team ? 't/'+team.slug : 'projects'}/${projectName}/${pb.id}`);
     }
 
-    const triggerPrebuild = (branchName: string | null) => {
+    const triggerPrebuild = async (branchName: string | null) => {
         if (project) {
-            getGitpodService().server.triggerPrebuild(project.id, branchName);
+            setIsPrebuildPending(true);
+            try {
+                const result = await Promise.race([
+                    getGitpodService().server.triggerPrebuild(project.id, branchName),
+                    new Promise((_, reject) => setTimeout(() => reject(new Error('Timed out while waiting for new prebuild')), 30000)),
+                ]) as StartPrebuildResult;
+                console.log('Successfully triggerred!', result);
+                if (result.done) {
+                    // TODO(janx): Visually highlight the prebuild with `p.info.buildWorkspaceId === result.wsid`
+                    setIsPrebuildPending(false);
+                }
+            } catch (error) {
+                console.error('Running prebuild failed!', error);
+                setIsPrebuildPending(false);
+            }
         }
     }
 
@@ -150,7 +165,7 @@ export default function () {
                 <div className="py-3 pl-3">
                     <DropDown prefix="Prebuild Status: " contextMenuWidth="w-32" entries={statusFilterEntries()} />
                 </div>
-                <button disabled={!project} onClick={() => triggerPrebuild(null)} className="ml-2">Trigger Prebuild</button>
+                <button disabled={!project || isPrebuildPending} onClick={() => triggerPrebuild(null)} className="ml-2 flex items-center space-x-2"><span>Trigger Prebuild</span>{isPrebuildPending && <img className="h-4 w-4 animate-spin filter brightness-150" src={Spinner} />}</button>
             </div>
             <ItemsList className="mt-2">
                 <Item header={true} className="grid grid-cols-3">
@@ -233,7 +248,7 @@ export function prebuildStatusIcon(status: PrebuiltWorkspaceState | undefined) {
     }
 }
 
-export function PrebuildInstanceStatus(props: { prebuildInstance?: WorkspaceInstance, isDark?: boolean }) {
+export function PrebuildInstanceStatus(props: { prebuildInstance?: WorkspaceInstance }) {
     let status = <></>;
     let details = <></>;
     switch (props.prebuildInstance?.status.phase) {
@@ -244,7 +259,7 @@ export function PrebuildInstanceStatus(props: { prebuildInstance?: WorkspaceInst
                 <span>PENDING</span>
                 </div>;
             details = <div className="flex space-x-1 items-center text-gray-400">
-                <img className="h-4 w-4 animate-spin" src={props.isDark ? SpinnerDark : Spinner} />
+                <img className="h-4 w-4 animate-spin" src={Spinner} />
                 <span>Prebuild in progress ...</span>
                 </div>;
             break;
@@ -259,7 +274,7 @@ export function PrebuildInstanceStatus(props: { prebuildInstance?: WorkspaceInst
                 <span>RUNNING</span>
                 </div>;
             details = <div className="flex space-x-1 items-center text-gray-400">
-                <img className="h-4 w-4 animate-spin" src={props.isDark ? SpinnerDark : Spinner} />
+                <img className="h-4 w-4 animate-spin" src={Spinner} />
                 <span>Prebuild in progress ...</span>
                 </div>;
             break;