diff --git a/.build/compat-baseline.txt b/.build/compat-baseline.txt
index f60e66d14..cddb16e3a 100644
--- a/.build/compat-baseline.txt
+++ b/.build/compat-baseline.txt
@@ -12,3 +12,77 @@
 # release is on npm the list no longer applies: the check only warns, and
 # `pnpm run check:compat --reset` empties it and moves the line to that release.
 # against: 1.6.1
+css:tabler-marketing.css:--tblr-azure # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-azure-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-black # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-black-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-blue # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-blue-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-cyan # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-cyan-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-gray # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-gray-200 # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-gray-dark # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-gray-dark-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-gray-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-green # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-green-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-indigo # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-indigo-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-lime # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-lime-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-orange # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-orange-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-pink # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-pink-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-primary-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-purple # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-purple-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-red # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-red-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-shadow-card # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-shape-border-radius # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-shape-icon-size # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-shape-size # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-teal # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-teal-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-white # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-white-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-yellow # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:--tblr-yellow-lt # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.icon # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.pricing # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.pricing-btn # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.pricing-card # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.pricing-features # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.pricing-label # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.pricing-price # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.pricing-price-currency # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.pricing-price-description # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.pricing-title # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-2xl # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-azure # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-black # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-blue # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-cyan # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-gray # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-gray-dark # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-green # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-indigo # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-lg # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-lime # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-md # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-orange # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-pink # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-purple # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-red # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-sm # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-teal # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-white # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-xl # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-xs # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-xxs # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+css:tabler-marketing.css:.shape-yellow # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+file:scss/marketing/_pricing.scss # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
+file:scss/marketing/_shape.scss # accepted: Pricing and Shape ship in tabler.css since 1.7, which every marketing page loads anyway
diff --git a/.changeset/pricing-shape-in-core.md b/.changeset/pricing-shape-in-core.md
index 9dea02ba0..91aeff465 100644
--- a/.changeset/pricing-shape-in-core.md
+++ b/.changeset/pricing-shape-in-core.md
@@ -2,4 +2,4 @@
 "@tabler/core": minor
 ---
 
-Added `.pricing` and `.shape` components to the core `tabler.css` bundle, no longer only in `tabler-marketing.css`.
+Moved the `.pricing` and `.shape` components from `tabler-marketing.css` to the core `tabler.css` bundle.
diff --git a/core/scss/marketing/_pricing.scss b/core/scss/marketing/_pricing.scss
deleted file mode 100644
index 78dd891c4..000000000
--- a/core/scss/marketing/_pricing.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Deprecated since 1.7: `pricing` lives in `ui/_pricing.scss` and ships in `tabler.css`.
-// This file stays so `@use 'marketing/pricing'` keeps working.
-@forward '../ui/pricing';
diff --git a/core/scss/marketing/_shape.scss b/core/scss/marketing/_shape.scss
deleted file mode 100644
index 7bef005a0..000000000
--- a/core/scss/marketing/_shape.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Deprecated since 1.7: `shape` lives in `ui/_shape.scss` and ships in `tabler.css`.
-// This file stays so `@use 'marketing/shape'` keeps working.
-@forward '../ui/shape';
diff --git a/core/scss/tabler-marketing.scss b/core/scss/tabler-marketing.scss
index 992d8369e..123a28806 100644
--- a/core/scss/tabler-marketing.scss
+++ b/core/scss/tabler-marketing.scss
@@ -5,9 +5,6 @@
 @forward 'marketing/browser';
 @forward 'marketing/sections';
 @forward 'marketing/filters';
-// Pricing and Shape moved to the core bundle in 1.7; kept here so the plugin keeps working on its own.
-@forward 'ui/pricing';
-@forward 'ui/shape';
 
 // This bundle uses its own utilities map instead of the global one, so the
 // utilities API is emitted via the parameterized mixin (last, as before).