diff --git a/docs/components/BadgeDrawable.md b/docs/components/BadgeDrawable.md
index a71959d77..f5c934073 100644
--- a/docs/components/BadgeDrawable.md
+++ b/docs/components/BadgeDrawable.md
@@ -11,9 +11,9 @@ path: /catalog/badging/
 
 ## Using badges
 
-Badge                                   | Badge with number                              | Badge with a maximum character count
---------------------------------------- | ---------------------------------------------- | ------------------------------------
-![badge_icon](assets/IconOnlyBadge.png) | ![badge_with_number_8](assets/BadgeNumber.png) | ![badge_with_999+](assets/BadgeNumberLongerThanMaxCharCount.png)
+Badge                                         | Badge with number                                    | Badge with a maximum character count
+--------------------------------------------- | ---------------------------------------------------- | ------------------------------------
+![badge_icon](assets/badge/IconOnlyBadge.png) | ![badge_with_number_8](assets/badge/BadgeNumber.png) | ![badge_with_999+](assets/badge/BadgeNumberLongerThanMaxCharCount.png)
 
 NOTE: This component is still under development and may not support the full
 range of customization Material Android components generally support (e.g.
diff --git a/docs/components/assets/BadgeNumber.png b/docs/components/assets/badge/BadgeNumber.png
similarity index 100%
rename from docs/components/assets/BadgeNumber.png
rename to docs/components/assets/badge/BadgeNumber.png
diff --git a/docs/components/assets/BadgeNumberLongerThanMaxCharCount.png b/docs/components/assets/badge/BadgeNumberLongerThanMaxCharCount.png
similarity index 100%
rename from docs/components/assets/BadgeNumberLongerThanMaxCharCount.png
rename to docs/components/assets/badge/BadgeNumberLongerThanMaxCharCount.png
diff --git a/docs/components/assets/IconOnlyBadge.png b/docs/components/assets/badge/IconOnlyBadge.png
similarity index 100%
rename from docs/components/assets/IconOnlyBadge.png
rename to docs/components/assets/badge/IconOnlyBadge.png
diff --git a/docs/components/assets/tablayout-badges.png b/docs/components/assets/tablayout-badges.png
deleted file mode 100644
index eda62085f..000000000
Binary files a/docs/components/assets/tablayout-badges.png and /dev/null differ