diff --git a/apps/docs/content/guides/database/extensions/wrappers/overview.mdx b/apps/docs/content/guides/database/extensions/wrappers/overview.mdx
index e323a37d396..cf4ec0a9fe6 100644
--- a/apps/docs/content/guides/database/extensions/wrappers/overview.mdx
+++ b/apps/docs/content/guides/database/extensions/wrappers/overview.mdx
@@ -13,7 +13,14 @@ Postgres includes several built-in foreign data wrappers, such as [`postgres_fdw
 
 Wrappers introduce some new terminology and different workflows.
 
-![FDW](/docs/img/database/fdw-light.png)
+<Image
+  alt="Foreign Data Wrappers (FDW)"
+  zoomable
+  src={{
+    dark: '/docs/img/database/foreign-data-wrappers/extracting-data.png',
+    light: '/docs/img/database/foreign-data-wrappers/extracting-data--light.png',
+  }}
+/>
 
 ### Remote servers
 
@@ -105,7 +112,14 @@ select cron.schedule(
 );
 ```
 
-![FDW](/docs/img/database/fdw-qetl-light.png)
+<Image
+  alt="FDW with pg_cron"
+  zoomable
+  src={{
+    dark: '/docs/img/database/foreign-data-wrappers/extracting-data-pgcron.png',
+    light: '/docs/img/database/foreign-data-wrappers/extracting-data-pgcron--light.png',
+  }}
+/>
 
 This process can be taxing on your database if you are moving large amounts of data. Often, it's better to use an external tool for batch ETL, such as [Fivetran](https://fivetran.com/) or [Airbyte](https://airbyte.io/).
 
diff --git a/apps/docs/content/guides/database/postgres/indexes.mdx b/apps/docs/content/guides/database/postgres/indexes.mdx
index 6a8c8dbc623..9796f952733 100644
--- a/apps/docs/content/guides/database/postgres/indexes.mdx
+++ b/apps/docs/content/guides/database/postgres/indexes.mdx
@@ -69,7 +69,14 @@ Luckily Postgres provides us with `create index concurrently` which prevents blo
 
 Here is a simplified diagram of the index we just created (note that in practice, nodes actually have more than two children).
 
-![B-Tree index example in Postgres](/docs/img/b-tree-example.png)
+<Image
+  alt="B-Tree index example in Postgres"
+  zoomable
+  src={{
+    dark: '/docs/img/database/managing-indexes/creating-indexes.png',
+    light: '/docs/img/database/managing-indexes/creating-indexes--light.png',
+  }}
+/>
 
 You can see that in any large data set, traversing the index to locate a given value can be done in much less operations (O(log n)) than compared to scanning the table one value at a time from top to bottom (O(n)).
 
diff --git a/apps/docs/content/guides/database/tables.mdx b/apps/docs/content/guides/database/tables.mdx
index a3ab7f77e76..71a2d2c8fcd 100644
--- a/apps/docs/content/guides/database/tables.mdx
+++ b/apps/docs/content/guides/database/tables.mdx
@@ -23,7 +23,14 @@ There are a few important differences from a spreadsheet, but it's a good starti
 
 When creating a table, it's best practice to add columns at the same time.
 
-![Tables and columns](/docs/img/guides/database/tables-columns.png)
+<Image
+  alt="Tables and columns"
+  zoomable
+  src={{
+    dark: '/docs/img/database/managing-tables/creating-tables.png',
+    light: '/docs/img/database/managing-tables/creating-tables--light.png',
+  }}
+/>
 
 You must define the "data type" of each column when it is created. You can add and remove columns at any time after creating a table.
 
@@ -322,7 +329,14 @@ If you receive an error `FATAL:  password authentication failed for user "postgr
 
 Tables can be "joined" together using Foreign Keys.
 
-![Foreign Keys](/docs/img/guides/database/foreign-keys.png)
+<Image
+  alt="Foreign Keys"
+  zoomable
+  src={{
+    dark: '/docs/img/database/managing-tables/joining-tables.png',
+    light: '/docs/img/database/managing-tables/joining-tables--light.png',
+  }}
+/>
 
 This is where the "Relational" naming comes from, as data typically forms some sort of relationship.
 
@@ -393,7 +407,14 @@ create table performances (
 
 Tables belong to `schemas`. Schemas are a way of organizing your tables, often for security reasons.
 
-![Schemas and tables](/docs/img/guides/database/schema-tables.png)
+<Image
+  alt="Schemas and tables"
+  zoomable
+  src={{
+    dark: '/docs/img/database/managing-tables/schemas.png',
+    light: '/docs/img/database/managing-tables/schemas--light.png',
+  }}
+/>
 
 If you don't explicitly pass a schema when creating a table, Postgres will assume that you want to create the table in the `public` schema.
 
diff --git a/apps/docs/public/img/b-tree-example.png b/apps/docs/public/img/b-tree-example.png
deleted file mode 100644
index b9274c9e43d..00000000000
Binary files a/apps/docs/public/img/b-tree-example.png and /dev/null differ
diff --git a/apps/docs/public/img/database/fdw-light.png b/apps/docs/public/img/database/fdw-light.png
deleted file mode 100644
index 42caa9357aa..00000000000
Binary files a/apps/docs/public/img/database/fdw-light.png and /dev/null differ
diff --git a/apps/docs/public/img/database/fdw-qetl-light.png b/apps/docs/public/img/database/fdw-qetl-light.png
deleted file mode 100644
index ea7af56d5ec..00000000000
Binary files a/apps/docs/public/img/database/fdw-qetl-light.png and /dev/null differ
diff --git a/apps/docs/public/img/database/foreign-data-wrappers/extracting-data--light.png b/apps/docs/public/img/database/foreign-data-wrappers/extracting-data--light.png
new file mode 100644
index 00000000000..cbab488a19a
Binary files /dev/null and b/apps/docs/public/img/database/foreign-data-wrappers/extracting-data--light.png differ
diff --git a/apps/docs/public/img/database/foreign-data-wrappers/extracting-data-pgcron--light.png b/apps/docs/public/img/database/foreign-data-wrappers/extracting-data-pgcron--light.png
new file mode 100644
index 00000000000..506ae874437
Binary files /dev/null and b/apps/docs/public/img/database/foreign-data-wrappers/extracting-data-pgcron--light.png differ
diff --git a/apps/docs/public/img/database/foreign-data-wrappers/extracting-data-pgcron.png b/apps/docs/public/img/database/foreign-data-wrappers/extracting-data-pgcron.png
new file mode 100644
index 00000000000..b2de13d1d61
Binary files /dev/null and b/apps/docs/public/img/database/foreign-data-wrappers/extracting-data-pgcron.png differ
diff --git a/apps/docs/public/img/database/foreign-data-wrappers/extracting-data.png b/apps/docs/public/img/database/foreign-data-wrappers/extracting-data.png
new file mode 100644
index 00000000000..2823b894b05
Binary files /dev/null and b/apps/docs/public/img/database/foreign-data-wrappers/extracting-data.png differ
diff --git a/apps/docs/public/img/database/managing-indexes/creating-indexes--light.png b/apps/docs/public/img/database/managing-indexes/creating-indexes--light.png
new file mode 100644
index 00000000000..3b6dd765b1e
Binary files /dev/null and b/apps/docs/public/img/database/managing-indexes/creating-indexes--light.png differ
diff --git a/apps/docs/public/img/database/managing-indexes/creating-indexes.png b/apps/docs/public/img/database/managing-indexes/creating-indexes.png
new file mode 100644
index 00000000000..d63750a0377
Binary files /dev/null and b/apps/docs/public/img/database/managing-indexes/creating-indexes.png differ
diff --git a/apps/docs/public/img/database/managing-tables/creating-tables--light.png b/apps/docs/public/img/database/managing-tables/creating-tables--light.png
new file mode 100644
index 00000000000..04a9ef807d9
Binary files /dev/null and b/apps/docs/public/img/database/managing-tables/creating-tables--light.png differ
diff --git a/apps/docs/public/img/database/managing-tables/creating-tables.png b/apps/docs/public/img/database/managing-tables/creating-tables.png
new file mode 100644
index 00000000000..c344403fb55
Binary files /dev/null and b/apps/docs/public/img/database/managing-tables/creating-tables.png differ
diff --git a/apps/docs/public/img/database/managing-tables/joining-tables--light.png b/apps/docs/public/img/database/managing-tables/joining-tables--light.png
new file mode 100644
index 00000000000..5e1288ac269
Binary files /dev/null and b/apps/docs/public/img/database/managing-tables/joining-tables--light.png differ
diff --git a/apps/docs/public/img/database/managing-tables/joining-tables.png b/apps/docs/public/img/database/managing-tables/joining-tables.png
new file mode 100644
index 00000000000..3508d4f0c3b
Binary files /dev/null and b/apps/docs/public/img/database/managing-tables/joining-tables.png differ
diff --git a/apps/docs/public/img/database/managing-tables/schemas--light.png b/apps/docs/public/img/database/managing-tables/schemas--light.png
new file mode 100644
index 00000000000..400043f703b
Binary files /dev/null and b/apps/docs/public/img/database/managing-tables/schemas--light.png differ
diff --git a/apps/docs/public/img/database/managing-tables/schemas.png b/apps/docs/public/img/database/managing-tables/schemas.png
new file mode 100644
index 00000000000..64fac5557ec
Binary files /dev/null and b/apps/docs/public/img/database/managing-tables/schemas.png differ
diff --git a/apps/docs/public/img/guides/database/foreign-keys.png b/apps/docs/public/img/guides/database/foreign-keys.png
deleted file mode 100644
index 1025e6e5ee2..00000000000
Binary files a/apps/docs/public/img/guides/database/foreign-keys.png and /dev/null differ
diff --git a/apps/docs/public/img/guides/database/schema-tables.png b/apps/docs/public/img/guides/database/schema-tables.png
deleted file mode 100644
index 6bb2316aa97..00000000000
Binary files a/apps/docs/public/img/guides/database/schema-tables.png and /dev/null differ
diff --git a/apps/docs/public/img/guides/database/tables-columns.png b/apps/docs/public/img/guides/database/tables-columns.png
deleted file mode 100644
index d4d3ab03d3d..00000000000
Binary files a/apps/docs/public/img/guides/database/tables-columns.png and /dev/null differ