diff --git a/docs/components/Checkbox.md b/docs/components/Checkbox.md
index 7d56d0b8b..c4025812e 100644
--- a/docs/components/Checkbox.md
+++ b/docs/components/Checkbox.md
@@ -37,8 +37,8 @@ page.
 
 _**Note:** `<CheckBox>` is auto-inflated as
 `<com.google.android.material.button.MaterialCheckBox>` via
-`MaterialComponentsViewInflater` when using a non-Bridge
-`Theme.MaterialComponents.*` theme._
+`MaterialComponentsViewInflater` when using a `Theme.Material3.*`
+theme._
 
 ### Making checkboxes accessible
 
@@ -116,11 +116,11 @@ checkbox.setOnCheckedChangeListener { buttonView, isChecked
 Element                    | Attribute                                  | Related method(s)                                          | Default value
 -------------------------- | ------------------------------------------ | ---------------------------------------------------------- | -------------
 **To use material colors** | `app:useMaterialThemeColors`               | `setUseMaterialThemeColors`<br/>`isUseMaterialThemeColors` | `true` (ignored if `app:buttonTint` is set)
-**Color**                  | `app:buttonTint`                           | `setButtonTintList`<br/>`getButtonTintList`                | `null`
+**Color**                  | `app:buttonTint`                           | `setButtonTintList`<br/>`getButtonTintList`                | `?attr/colorOnSurface` (see all [states](https://github.com/material-components/material-components-android/tree/master/lib/java/com/google/android/material/color/res/color/m3_selection_control_button_tint.xml))
 **Min size**               | `android:minWidth`<br/>`android:minHeight` | `(set/get)MinWidth`<br/>`(set/get)MinHeight`               | `?attr/minTouchTargetSize`
 
 The color of the checkbox defaults to `?attr/colorOnSurface` (unchecked) and
-`?attr/colorSecondary` (checked) defined in your app theme. If you want to
+`?attr/colorPrimary` (checked) defined in your app theme. If you want to
 override this behavior, as you might with a custom drawable that should not be
 tinted, set `app:useMaterialThemeColors` to `false`:
 
@@ -137,7 +137,7 @@ Element        | Attribute                | Related method(s)                  |
 -------------- | ------------------------ | ---------------------------------- | -------------
 **Text label** | `android:text`           | `setText`<br/>`getText`            | `null`
 **Color**      | `android:textColor`      | `setTextColor`<br/>`getTextColors` | inherits from `AppCompatCheckBox`
-**Typography** | `android:textAppearance` | `setTextAppearance`                | inherits from `AppCompatCheckBox`
+**Typography** | `android:textAppearance` | `setTextAppearance`                | `?attr/textAppearanceBodyMedium`
 
 ### Checkbox states
 
@@ -155,7 +155,7 @@ selected and unselected states are supported._
 
 Element           | Style
 ----------------- | ---------------------------------------------------
-**Default style** | `Widget.MaterialComponents.CompoundButton.CheckBox`
+**Default style** | `Widget.Material3.CompoundButton.CheckBox`
 
 Default style theme attribute: `?attr/checkboxStyle`
 
@@ -189,7 +189,7 @@ Using theme attributes in `res/values/styles.xml` (themes all checkboxes and
 affects other components):
 
 ```xml
-<style name="Theme.App" parent="Theme.MaterialComponents.*">
+<style name="Theme.App" parent="Theme.Material3.*">
     ...
     <item name="colorOnSurface">@color/shrine_pink_900</item>
     <item name="colorSecondary">@color/shrine_pink_100</item>
@@ -201,12 +201,12 @@ or using default style theme attributes, styles and theme overlays (themes all
 checkboxes but does not affect other components):
 
 ```xml
-<style name="Theme.App" parent="Theme.MaterialComponents.*">
+<style name="Theme.App" parent="Theme.Material3.*">
     ...
     <item name="checkboxStyle">@style/Widget.App.CheckBox</item>
 </style>
 
-<style name="Widget.App.CheckBox" parent="Widget.MaterialComponents.CompoundButton.CheckBox">
+<style name="Widget.App.CheckBox" parent="Widget.Material3.CompoundButton.CheckBox">
     <item name="materialThemeOverlay">@style/ThemeOverlay.App.CheckBox</item>
 </style>
 
@@ -219,7 +219,7 @@ checkboxes but does not affect other components):
 you can also change the checkbox colors via the `?attr/buttonTint` attribute:
 
 ```xml
-<style name="Widget.App.CheckBox" parent="Widget.MaterialComponents.CompoundButton.CheckBox">
+<style name="Widget.App.CheckBox" parent="Widget.Material3.CompoundButton.CheckBox">
    <item name="buttonTint">@color/button_tint</item>
 </style>
 ```
diff --git a/docs/components/assets/checkbox/checkbox_example.png b/docs/components/assets/checkbox/checkbox_example.png
index a905d26e0..aad95f92c 100644
Binary files a/docs/components/assets/checkbox/checkbox_example.png and b/docs/components/assets/checkbox/checkbox_example.png differ
diff --git a/lib/java/com/google/android/material/checkbox/res-public/values/public.xml b/lib/java/com/google/android/material/checkbox/res-public/values/public.xml
new file mode 100644
index 000000000..e3913feb7
--- /dev/null
+++ b/lib/java/com/google/android/material/checkbox/res-public/values/public.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+
+<!-- Definitions of attributes to be exposed as public -->
+<resources>
+  <public name="Widget.Material3.CompoundButton.CheckBox" type="style"/>
+</resources>