diff --git a/lib/java/com/google/android/material/tabs/res/drawable-v21/m3_tabs_background.xml b/lib/java/com/google/android/material/tabs/res/drawable-v21/m3_tabs_background.xml
index 6ce9a8c5823..327fb1ce713 100644
--- a/lib/java/com/google/android/material/tabs/res/drawable-v21/m3_tabs_background.xml
+++ b/lib/java/com/google/android/material/tabs/res/drawable-v21/m3_tabs_background.xml
@@ -19,12 +19,11 @@
   <item>
     <shape
         android:shape="rectangle">
-      <!-- TODO(b/272585197) Manually map this based on the token mapping of divider. -->
-      <solid android:color="?attr/colorSurfaceVariant"/>
+      <solid android:color="@macro/m3_comp_divider_color"/>
     </shape>
   </item>
   <!-- ..., then draws a rectangle with the container color to cover the area not for the divider. -->
-  <item android:bottom="1dp">
+  <item android:bottom="@dimen/m3_comp_divider_thickness">
     <shape
         android:shape="rectangle">
       <solid android:color="@macro/m3_comp_primary_navigation_tab_container_color"/>
diff --git a/lib/java/com/google/android/material/tabs/res/drawable-v23/m3_tabs_background.xml b/lib/java/com/google/android/material/tabs/res/drawable-v23/m3_tabs_background.xml
index a2fb349a890..8ea6fadb411 100644
--- a/lib/java/com/google/android/material/tabs/res/drawable-v23/m3_tabs_background.xml
+++ b/lib/java/com/google/android/material/tabs/res/drawable-v23/m3_tabs_background.xml
@@ -26,9 +26,8 @@
   <item
       android:gravity="bottom">
     <shape>
-      <size android:height="1dp" />
-      <!-- TODO(b/272585197) Manually map this based on the token mapping of divider. -->
-      <solid android:color="?attr/colorSurfaceVariant" />
+      <size android:height="@dimen/m3_comp_divider_thickness" />
+      <solid android:color="@macro/m3_comp_divider_color" />
     </shape>
   </item>
 </layer-list>