diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23bf1b2662d..2453199ebce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@
 - Removed the shadow in `EuiComment` ([#4321](https://github.com/elastic/eui/pull/4321))
 - Reduced font size for `xs` size in `EuiButtonEmpty` ([#4325](https://github.com/elastic/eui/pull/4325))
 - Increased font size for `m` size of `EuiListGroupItem` ([#4340](https://github.com/elastic/eui/pull/4340))
+- Reduced padding in `EuiToolTip` ([#4353](https://github.com/elastic/eui/pull/4353))
+- Reduced border-radius in `EuiRange`'s tooltip ([#4353](https://github.com/elastic/eui/pull/4353))
 
 ## [`30.5.1`](https://github.com/elastic/eui/tree/v30.5.1)
 
diff --git a/src/themes/eui-amsterdam/overrides/_index.scss b/src/themes/eui-amsterdam/overrides/_index.scss
index 56330055f51..abd38972f57 100644
--- a/src/themes/eui-amsterdam/overrides/_index.scss
+++ b/src/themes/eui-amsterdam/overrides/_index.scss
@@ -20,5 +20,7 @@
 @import 'overlay_mask';
 @import 'popover';
 @import 'progress';
+@import 'range';
 @import 'text';
 @import 'toast';
+@import 'tooltip';
diff --git a/src/themes/eui-amsterdam/overrides/_range.scss b/src/themes/eui-amsterdam/overrides/_range.scss
new file mode 100644
index 00000000000..2453d251c00
--- /dev/null
+++ b/src/themes/eui-amsterdam/overrides/_range.scss
@@ -0,0 +1,3 @@
+.euiRangeTooltip__value {
+  border-radius: $euiBorderRadiusSmall;
+}
diff --git a/src/themes/eui-amsterdam/overrides/_tooltip.scss b/src/themes/eui-amsterdam/overrides/_tooltip.scss
new file mode 100644
index 00000000000..7f131547f3d
--- /dev/null
+++ b/src/themes/eui-amsterdam/overrides/_tooltip.scss
@@ -0,0 +1,3 @@
+.euiToolTip {
+  padding: $euiSizeS;
+}