diff --git a/packages/frontend-2/assets/images/boxes/empty.png b/packages/frontend-2/assets/images/boxes/empty.png
deleted file mode 100755
index 399a9bb54..000000000
Binary files a/packages/frontend-2/assets/images/boxes/empty.png and /dev/null differ
diff --git a/packages/frontend-2/assets/images/connectors/hero_dark.webp b/packages/frontend-2/assets/images/connectors/hero_dark.webp
new file mode 100644
index 000000000..1dac3bc49
Binary files /dev/null and b/packages/frontend-2/assets/images/connectors/hero_dark.webp differ
diff --git a/packages/frontend-2/assets/images/connectors/hero_light.webp b/packages/frontend-2/assets/images/connectors/hero_light.webp
new file mode 100644
index 000000000..b58bd139c
Binary files /dev/null and b/packages/frontend-2/assets/images/connectors/hero_light.webp differ
diff --git a/packages/frontend-2/assets/images/discussions/d-d-1.png b/packages/frontend-2/assets/images/discussions/d-d-1.png
deleted file mode 100644
index 8262f9f19..000000000
Binary files a/packages/frontend-2/assets/images/discussions/d-d-1.png and /dev/null differ
diff --git a/packages/frontend-2/assets/images/discussions/d-d-2.png b/packages/frontend-2/assets/images/discussions/d-d-2.png
deleted file mode 100644
index e37316c58..000000000
Binary files a/packages/frontend-2/assets/images/discussions/d-d-2.png and /dev/null differ
diff --git a/packages/frontend-2/assets/images/discussions/d-w-1.png b/packages/frontend-2/assets/images/discussions/d-w-1.png
deleted file mode 100644
index 1a7c520a4..000000000
Binary files a/packages/frontend-2/assets/images/discussions/d-w-1.png and /dev/null differ
diff --git a/packages/frontend-2/assets/images/discussions/d-w-2.png b/packages/frontend-2/assets/images/discussions/d-w-2.png
deleted file mode 100644
index 09a8f8a62..000000000
Binary files a/packages/frontend-2/assets/images/discussions/d-w-2.png and /dev/null differ
diff --git a/packages/frontend-2/assets/images/speckle_text_logo_white.svg b/packages/frontend-2/assets/images/speckle_text_logo_white.svg
deleted file mode 100644
index 8806b2f46..000000000
--- a/packages/frontend-2/assets/images/speckle_text_logo_white.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<svg width="300" height="84" viewBox="0 0 300 84" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_38_2213)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.98 0.631348L0 17.2189V83.2951L299.98 66.7077V0.631348V0.631348Z" fill="#3B82F6"/>
-<path d="M76.631 65.7472C73.7571 65.9062 71.2156 65.5319 69.0063 64.6244C66.7969 63.7169 65.0636 62.3225 63.8064 60.4412C62.549 58.5598 61.9204 56.2102 61.9204 53.3923V51.9835L68.3327 51.6289V53.0378C68.3327 55.5306 69.0871 57.3494 70.5958 58.4944C72.1047 59.6392 74.1164 60.1421 76.631 60.0031C79.1817 59.862 81.1035 59.2319 82.3968 58.1127C83.6899 56.9936 84.3366 55.6029 84.3366 53.9412C84.3366 52.8213 84.0313 51.9259 83.4206 51.2552C82.8098 50.5844 81.9207 50.0647 80.7532 49.6956C79.5857 49.3267 78.1758 48.9892 76.5232 48.6832L74.9067 48.4474C72.428 48.0065 70.2815 47.3936 68.4674 46.6088C66.6534 45.8239 65.2613 44.7539 64.2913 43.3986C63.3213 42.0432 62.8364 40.2277 62.8364 37.9516C62.8364 35.6756 63.3753 33.695 64.4531 32.0096C65.5307 30.3242 67.0574 28.9934 69.0332 28.0172C71.0091 27.0409 73.3262 26.4793 75.9845 26.3323C78.6428 26.1852 81.0137 26.5057 83.0972 27.2938C85.1807 28.0816 86.8243 29.3455 88.0277 31.0854C89.2311 32.8252 89.8328 35.0499 89.8328 37.7594V39.5477L83.4206 39.9023V38.114C83.4206 36.5605 83.1153 35.3309 82.5045 34.4255C81.8938 33.5199 81.0316 32.8812 79.9181 32.5093C78.8044 32.1373 77.4932 31.993 75.9845 32.0765C73.7571 32.1997 72.0688 32.7266 70.9192 33.657C69.7697 34.5877 69.1949 35.8479 69.1949 37.4375C69.1949 38.449 69.4554 39.2927 69.9762 39.9682C70.4971 40.644 71.2694 41.1793 72.2933 41.5743C73.3171 41.9692 74.6014 42.2866 76.1461 42.5263L77.7627 42.8163C80.3492 43.2513 82.6123 43.8577 84.5521 44.6356C86.4921 45.4133 88.0098 46.4945 89.1055 47.8791C90.2011 49.2636 90.749 51.1119 90.749 53.4241C90.749 55.7 90.1652 57.7373 88.9977 59.536C87.8302 61.3346 86.1957 62.7798 84.0941 63.8715C81.9926 64.9631 79.5049 65.5883 76.631 65.7472Z" fill="white"/>
-<path d="M96.4067 63.8953V25.9618L111.656 25.1186C114.027 24.9875 116.111 25.3419 117.907 26.1819C119.703 27.0219 121.122 28.271 122.164 29.9295C123.206 31.588 123.726 33.5912 123.726 35.9394V36.6982C123.726 39.0103 123.197 41.0628 122.137 42.8554C121.077 44.6481 119.64 46.0643 117.826 47.104C116.012 48.1435 113.955 48.7268 111.656 48.8541L102.927 49.3368V63.5346L96.4067 63.8953ZM102.927 43.4299L111.01 42.983C112.878 42.8797 114.378 42.2911 115.509 41.2169C116.641 40.1427 117.206 38.7206 117.206 36.9503V36.4085C117.206 34.6382 116.65 33.2782 115.536 32.3281C114.422 31.3782 112.914 30.9558 111.01 31.061L102.927 31.508V43.4299Z" fill="white"/>
-<path d="M128.9 62.0985V24.1651L152.933 22.8362V28.7429L135.42 29.7113V39.6824L151.424 38.7975V44.7043L135.42 45.5892V55.8312L153.202 54.848V60.7547L128.9 62.0985Z" fill="white"/>
-<path d="M173.031 60.4167C168.433 60.671 164.769 59.564 162.039 57.0957C159.309 54.6274 157.943 50.9368 157.943 46.0234V37.0278C157.943 32.1145 159.309 28.2727 162.039 25.5026C164.769 22.7324 168.433 21.2201 173.031 20.9659C177.63 20.7116 181.177 21.78 183.674 24.1708C186.17 26.5617 187.419 29.9607 187.419 34.3683V34.6934L181.06 35.045V34.5573C181.06 32.173 180.404 30.2492 179.093 28.7864C177.782 27.3236 175.761 26.6676 173.031 26.8184C170.373 26.9655 168.28 27.903 166.754 29.6313C165.227 31.3595 164.464 33.6687 164.464 36.5589V45.7713C164.464 48.6253 165.227 50.841 166.754 52.4184C168.28 53.9959 170.373 54.7111 173.031 54.5641C175.761 54.4131 177.782 53.5337 179.093 51.9257C180.404 50.318 181.06 48.3217 181.06 45.9374V45.0161L187.419 44.6645V45.4232C187.419 49.8307 186.17 53.3679 183.674 56.0349C181.177 58.7018 177.63 60.1624 173.031 60.4167Z" fill="white"/>
-<path d="M193.508 58.5259V20.5924L200.028 20.2319V35.6763L200.945 35.6256L214.092 19.4543L222.445 18.9924L206.01 38.5969L222.984 56.896L214.416 57.3699L200.945 42.3453L200.028 42.3959V58.1654L193.508 58.5259Z" fill="white"/>
-<path d="M227.025 56.6726V18.7392L233.545 18.3787V50.4054L251.219 49.428V55.3348L227.025 56.6726Z" fill="white"/>
-<path d="M256.285 55.0546V17.1212L280.317 15.7922V21.6991L262.805 22.6674V32.6384L278.809 31.7535V37.6604L262.805 38.5453V48.7873L280.587 47.8041V53.7107L256.285 55.0546Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M54.5232 35.0176L22.5767 36.7715V68.6316L54.5232 66.8775V35.0176Z" fill="#FAFCFD"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M48.1467 29.1033L16.2002 30.8574L22.8257 36.7715L54.7722 35.0176L48.1467 29.1033Z" fill="#CEDDF0"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22.8257 36.7716L16.2002 30.8574V62.7175L22.8257 68.6316V36.7716Z" fill="#7399D4"/>
-</g>
-<defs>
-<clipPath id="clip0_38_2213">
-<rect width="300" height="84" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/packages/frontend-2/assets/images/workspace/cubes.webp b/packages/frontend-2/assets/images/workspace/cubes.webp
new file mode 100644
index 000000000..192f3b501
Binary files /dev/null and b/packages/frontend-2/assets/images/workspace/cubes.webp differ
diff --git a/packages/frontend-2/components/connectors/Banner.vue b/packages/frontend-2/components/connectors/Banner.vue
index a5e039829..3ba2ebc4e 100644
--- a/packages/frontend-2/components/connectors/Banner.vue
+++ b/packages/frontend-2/components/connectors/Banner.vue
@@ -2,27 +2,27 @@
   <div
     class="relative rounded-md overflow-hidden aspect-[896/405] max-h-[405px] w-full"
   >
-    <figure class="dark:hidden absolute w-full">
-      <NuxtImg
-        src="/images/connectors/connectors_light.png"
+    <figure v-if="isDarkTheme" class="absolute w-full">
+      <img
+        src="~/assets/images/connectors/hero_dark.webp"
         alt="Speckle Connectors"
         class="w-full h-auto aspect-[896/405] object-cover"
       />
-      <NuxtImg
-        src="/images/connectors/connectors_light.png"
-        alt="Sync data in real time"
+      <img
+        src="~/assets/images/connectors/hero_dark.webp"
+        alt="Speckle Connectors"
         class="absolute bottom-0 left-0 w-full h-[125px] aspect-[896/405] object-cover object-left-bottom blur-[20px]"
       />
     </figure>
-    <figure class="hidden dark:block absolute w-full">
-      <NuxtImg
-        src="/images/connectors/connectors_dark.png"
+    <figure v-else class="absolute w-full">
+      <img
+        src="~/assets/images/connectors/hero_light.webp"
         alt="Speckle Connectors"
         class="w-full h-auto aspect-[896/405] object-cover"
       />
-      <NuxtImg
-        src="/images/connectors/connectors_dark.png"
-        alt="Speckle Connectors"
+      <img
+        src="~/assets/images/connectors/hero_light.webp"
+        alt="Sync data in real time"
         class="absolute bottom-0 left-0 w-full h-[125px] aspect-[896/405] object-cover object-left-bottom blur-[20px]"
       />
     </figure>
@@ -36,3 +36,9 @@
     </div>
   </div>
 </template>
+
+<script setup lang="ts">
+import { useTheme } from '~/lib/core/composables/theme'
+
+const { isDarkTheme } = useTheme()
+</script>
diff --git a/packages/frontend-2/components/global/logo/TextWhite.vue b/packages/frontend-2/components/global/logo/TextWhite.vue
deleted file mode 100644
index d30c80c97..000000000
--- a/packages/frontend-2/components/global/logo/TextWhite.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<template>
-  <NuxtLink to="/">
-    <img
-      src="~/assets/images/speckle_text_logo_white.svg"
-      alt="Speckle logo"
-      width="192"
-    />
-  </NuxtLink>
-</template>
diff --git a/packages/frontend-2/components/workspace/ExplainerVideoDialog.vue b/packages/frontend-2/components/workspace/ExplainerVideoDialog.vue
index 18e148665..262b90ce9 100644
--- a/packages/frontend-2/components/workspace/ExplainerVideoDialog.vue
+++ b/packages/frontend-2/components/workspace/ExplainerVideoDialog.vue
@@ -4,8 +4,8 @@
       vimeo-id="1084612464"
       title="Speckle explained in 5 minutes"
       controls
-      dark-placeholder="/images/workspace/explainer-video-dark.png"
-      light-placeholder="/images/workspace/explainer-video-light.png"
+      dark-placeholder="/images/workspace/explainer-video-dark.webp"
+      light-placeholder="/images/workspace/explainer-video-light.webp"
       placeholder-alt="Play explainer video"
       @on-play="onPlay"
     />
diff --git a/packages/frontend-2/components/workspace/plan/LimitReachedDialog.vue b/packages/frontend-2/components/workspace/plan/LimitReachedDialog.vue
index 4225cd6b7..4b5af96c9 100644
--- a/packages/frontend-2/components/workspace/plan/LimitReachedDialog.vue
+++ b/packages/frontend-2/components/workspace/plan/LimitReachedDialog.vue
@@ -12,8 +12,8 @@
   >
     <div class="flex flex-col">
       <div v-if="!condensed" class="relative bg-primary h-32 md:h-48 select-none">
-        <NuxtImg
-          src="/images/workspace/cubes.png"
+        <img
+          src="~/assets/images/workspace/cubes.webp"
           alt="Speckle cubes"
           class="w-full object-cover h-full"
         />
diff --git a/packages/frontend-2/public/images/workspace/avatars/avatar_0.svg b/packages/frontend-2/public/images/workspace/avatars/avatar_0.svg
deleted file mode 100644
index 39ee1e687..000000000
--- a/packages/frontend-2/public/images/workspace/avatars/avatar_0.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 8H12V18H8V8Z" fill="#FBBF24"/>
-<path d="M12 28H8V32H32V28H28V22H22V12H18V22H12V28Z" fill="#FBBF24"/>
-<path d="M28 8H32V18H28V8Z" fill="#FBBF24"/>
-</svg>
diff --git a/packages/frontend-2/public/images/workspace/avatars/avatar_1.svg b/packages/frontend-2/public/images/workspace/avatars/avatar_1.svg
deleted file mode 100644
index b5f44be88..000000000
--- a/packages/frontend-2/public/images/workspace/avatars/avatar_1.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 8H8V14H12V8Z" fill="#1CBA80"/>
-<path d="M12 22H8V32H12V22Z" fill="#1CBA80"/>
-<path d="M12 18V22H28V32H32V22H28V18H12Z" fill="#1CBA80"/>
-<path d="M18 8H22V14H18V8Z" fill="#1CBA80"/>
-<path d="M16 26H24V32H16V26Z" fill="#1CBA80"/>
-<path d="M32 8H28V14H32V8Z" fill="#1CBA80"/>
-</svg>
diff --git a/packages/frontend-2/public/images/workspace/avatars/avatar_2.svg b/packages/frontend-2/public/images/workspace/avatars/avatar_2.svg
deleted file mode 100644
index 68fca2387..000000000
--- a/packages/frontend-2/public/images/workspace/avatars/avatar_2.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 8H12V14H18V8H22V14H28V8H32V18H22V24H26V28H32V32H8V28H14V24H18V18H8V8Z" fill="#4B40C9"/>
-</svg>
diff --git a/packages/frontend-2/public/images/workspace/avatars/avatar_3.svg b/packages/frontend-2/public/images/workspace/avatars/avatar_3.svg
deleted file mode 100644
index 5117c999e..000000000
--- a/packages/frontend-2/public/images/workspace/avatars/avatar_3.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M18 6H22V10H18V6Z" fill="#C45959"/>
-<path d="M8 16H12V22H18V14H22V22H28V16H32V28H26V34H14V28H8V16Z" fill="#C45959"/>
-</svg>
diff --git a/packages/frontend-2/public/images/workspace/avatars/avatar_4.svg b/packages/frontend-2/public/images/workspace/avatars/avatar_4.svg
deleted file mode 100644
index 654e3800f..000000000
--- a/packages/frontend-2/public/images/workspace/avatars/avatar_4.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14 6H10V10H14V16L8 16V30H14V36H26V30H32V16L26 16V10H30V6H26V10L22 10V8H18V10L14 10V6ZM28 20H22V24H28V20ZM12 20L18 20V24H12V20Z" fill="#B9B8CC"/>
-</svg>
diff --git a/packages/frontend-2/public/images/workspace/avatars/avatar_5.svg b/packages/frontend-2/public/images/workspace/avatars/avatar_5.svg
deleted file mode 100644
index 59f93ff30..000000000
--- a/packages/frontend-2/public/images/workspace/avatars/avatar_5.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 24H8V18H12V24Z" fill="#136CFF"/>
-<path d="M22 12H18V6H22V12Z" fill="#136CFF"/>
-<path d="M18 34H22V30H18V34Z" fill="#136CFF"/>
-<path d="M10 36H14V30H10V36Z" fill="#136CFF"/>
-<path d="M26 36H30V30H26V36Z" fill="#136CFF"/>
-<path d="M18 22H22V18H18V22Z" fill="#136CFF"/>
-<path d="M24 18H16V12H24V18Z" fill="#136CFF"/>
-<path d="M14 26L26 26L26 30L14 30L14 26Z" fill="#136CFF"/>
-<path d="M8 22L32 22L32 26L8 26L8 22Z" fill="#136CFF"/>
-<path d="M32 24H28V18H32V24Z" fill="#136CFF"/>
-</svg>
diff --git a/packages/frontend-2/public/images/workspace/cubes.png b/packages/frontend-2/public/images/workspace/cubes.png
deleted file mode 100644
index a74598812..000000000
Binary files a/packages/frontend-2/public/images/workspace/cubes.png and /dev/null differ
diff --git a/packages/frontend-2/public/images/workspace/explainer-video-dark.png b/packages/frontend-2/public/images/workspace/explainer-video-dark.png
deleted file mode 100644
index 3fff16376..000000000
Binary files a/packages/frontend-2/public/images/workspace/explainer-video-dark.png and /dev/null differ
diff --git a/packages/frontend-2/public/images/workspace/explainer-video-dark.webp b/packages/frontend-2/public/images/workspace/explainer-video-dark.webp
new file mode 100644
index 000000000..34f44f2ba
Binary files /dev/null and b/packages/frontend-2/public/images/workspace/explainer-video-dark.webp differ
diff --git a/packages/frontend-2/public/images/workspace/explainer-video-light.png b/packages/frontend-2/public/images/workspace/explainer-video-light.png
deleted file mode 100644
index 640672689..000000000
Binary files a/packages/frontend-2/public/images/workspace/explainer-video-light.png and /dev/null differ
diff --git a/packages/frontend-2/public/images/workspace/explainer-video-light.webp b/packages/frontend-2/public/images/workspace/explainer-video-light.webp
new file mode 100644
index 000000000..7eaa8abee
Binary files /dev/null and b/packages/frontend-2/public/images/workspace/explainer-video-light.webp differ