diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b7abfdd953..238c3a72b74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,10 @@
 
 - Removed `src-framer` files from the repository ([#3487](https://github.com/elastic/eui/pull/3487))
 
+**Theme: Amsterdam**
+
+- Removed borders `EuiModal` ([#3515](https://github.com/elastic/eui/pull/3515))
+- Improve `EuiOverlayMask` colors ([#3515](https://github.com/elastic/eui/pull/3515))
 
 ## [`24.0.0`](https://github.com/elastic/eui/tree/v24.0.0)
 
diff --git a/src/themes/eui-amsterdam/overrides/_image.scss b/src/themes/eui-amsterdam/overrides/_image.scss
new file mode 100644
index 00000000000..34841c071cb
--- /dev/null
+++ b/src/themes/eui-amsterdam/overrides/_image.scss
@@ -0,0 +1,6 @@
+.euiImage-isFullScreen {
+  .euiImage__caption {
+    color: $euiColorGhost;
+    text-shadow: 0 1px 2px transparentize($euiColorInk, .6);
+  }
+}
\ No newline at end of file
diff --git a/src/themes/eui-amsterdam/overrides/_index.scss b/src/themes/eui-amsterdam/overrides/_index.scss
index 7e0fea7c17f..5e90889d844 100644
--- a/src/themes/eui-amsterdam/overrides/_index.scss
+++ b/src/themes/eui-amsterdam/overrides/_index.scss
@@ -1,4 +1,7 @@
 @import 'button';
 @import 'button_empty';
 @import 'button_group';
+@import 'image';
+@import 'modal';
+@import 'overlay_mask';
 @import 'text';
diff --git a/src/themes/eui-amsterdam/overrides/_modal.scss b/src/themes/eui-amsterdam/overrides/_modal.scss
new file mode 100644
index 00000000000..623c2bec624
--- /dev/null
+++ b/src/themes/eui-amsterdam/overrides/_modal.scss
@@ -0,0 +1,3 @@
+.euiModal {
+  border: none;
+}
\ No newline at end of file
diff --git a/src/themes/eui-amsterdam/overrides/_overlay_mask.scss b/src/themes/eui-amsterdam/overrides/_overlay_mask.scss
new file mode 100644
index 00000000000..022a18082f6
--- /dev/null
+++ b/src/themes/eui-amsterdam/overrides/_overlay_mask.scss
@@ -0,0 +1,3 @@
+.euiOverlayMask {
+  background: transparentize($euiColorInk, .5);
+}
\ No newline at end of file