diff --git a/elements/rh-button/docs/20-guidelines.md b/elements/rh-button/docs/20-guidelines.md
index d2c7ca7d6a..800a6fcd7a 100644
--- a/elements/rh-button/docs/20-guidelines.md
+++ b/elements/rh-button/docs/20-guidelines.md
@@ -245,58 +245,146 @@ buttons. If buttons are stacked, the spacing between each button should be
## Best practices
-### More than one line of text
-
-Buttons should never have more than one line of text.
-
-
-
-
-
-### Multiple buttons
-
-Do not use multiple Danger or Primary buttons in the same area.
-
-
-
-
+### Lines of text
+
+
+
+
+
+
+
Keep the button’s text on one line.
+
+
+
+
+
+
+
Do not use more than one line of text.
+
+
+
+### Variants in button groups
+
+
+
+
+
+
+
Use one primary or primary danger button per button group.
+
+
+
+
+
+
+
Do not use multiple primary or primary danger buttons in the same button group.
+
+
### Text labels
-Do not write button text labels that are expressive or ambiguous.
-
-
-
-
+
+
+
+
+
+
Label buttons clearly and succinctly.
+
+
+
+
+
+
+
Do not write button text labels that are expressive or ambiguous.
+
+
### Danger button
-Do not use a Danger button for non-destructive purposes.
-
-
-
-
-
-### Button as a call to action
-
-Do not use buttons as links or change the Primary button styling, use a link or
-call to action instead.
-
-
-
-
+
+
+
+
+
+
Use a danger button for destructive actions only.
+
+
+
+
+
+
+
Do not use a danger button for non-destructive actions.
+
+
+
+### Buttons vs. calls to action
+
+
+
+
+
+
+
Use buttons for actions, and retain the primary button styling to make them look different from calls to action.
+
+
+
+
+
+
+
Do not use buttons as links or change the style of a primary button to look more like a call to action.
+
+
+
+### Button icons
+
+
+
+
+
+
+
Use only one icon in a button.
+
+
+
+
+
+
+
Do not use more than one icon in a button.
+
+
\ No newline at end of file
diff --git a/elements/rh-button/docs/button-best-practice-1.png b/elements/rh-button/docs/button-best-practice-1.png
deleted file mode 100755
index da09639eac..0000000000
Binary files a/elements/rh-button/docs/button-best-practice-1.png and /dev/null differ
diff --git a/elements/rh-button/docs/button-best-practice-2.png b/elements/rh-button/docs/button-best-practice-2.png
deleted file mode 100755
index f153f30b7b..0000000000
Binary files a/elements/rh-button/docs/button-best-practice-2.png and /dev/null differ
diff --git a/elements/rh-button/docs/button-best-practice-3.png b/elements/rh-button/docs/button-best-practice-3.png
deleted file mode 100755
index ced4e792e4..0000000000
Binary files a/elements/rh-button/docs/button-best-practice-3.png and /dev/null differ
diff --git a/elements/rh-button/docs/button-best-practice-4.png b/elements/rh-button/docs/button-best-practice-4.png
deleted file mode 100755
index 3b0e7129d1..0000000000
Binary files a/elements/rh-button/docs/button-best-practice-4.png and /dev/null differ
diff --git a/elements/rh-button/docs/button-best-practice-5.png b/elements/rh-button/docs/button-best-practice-5.png
deleted file mode 100755
index e1cbc4e76a..0000000000
Binary files a/elements/rh-button/docs/button-best-practice-5.png and /dev/null differ
diff --git a/elements/rh-button/docs/button-best-practices-buttons-vs-ctas-do.svg b/elements/rh-button/docs/button-best-practices-buttons-vs-ctas-do.svg
new file mode 100644
index 0000000000..38b2021799
--- /dev/null
+++ b/elements/rh-button/docs/button-best-practices-buttons-vs-ctas-do.svg
@@ -0,0 +1,6 @@
+
diff --git a/elements/rh-button/docs/button-best-practices-buttons-vs-ctas-dont.svg b/elements/rh-button/docs/button-best-practices-buttons-vs-ctas-dont.svg
new file mode 100644
index 0000000000..5c321bbe3a
--- /dev/null
+++ b/elements/rh-button/docs/button-best-practices-buttons-vs-ctas-dont.svg
@@ -0,0 +1,6 @@
+
diff --git a/elements/rh-button/docs/button-best-practices-danger-do.svg b/elements/rh-button/docs/button-best-practices-danger-do.svg
new file mode 100644
index 0000000000..294100fbd7
--- /dev/null
+++ b/elements/rh-button/docs/button-best-practices-danger-do.svg
@@ -0,0 +1,7 @@
+
diff --git a/elements/rh-button/docs/button-best-practices-danger-dont.svg b/elements/rh-button/docs/button-best-practices-danger-dont.svg
new file mode 100644
index 0000000000..9ed352d56d
--- /dev/null
+++ b/elements/rh-button/docs/button-best-practices-danger-dont.svg
@@ -0,0 +1,23 @@
+
diff --git a/elements/rh-button/docs/button-best-practices-icons-do.svg b/elements/rh-button/docs/button-best-practices-icons-do.svg
new file mode 100644
index 0000000000..a8a4eddcbb
--- /dev/null
+++ b/elements/rh-button/docs/button-best-practices-icons-do.svg
@@ -0,0 +1,13 @@
+
diff --git a/elements/rh-button/docs/button-best-practices-icons-dont.svg b/elements/rh-button/docs/button-best-practices-icons-dont.svg
new file mode 100644
index 0000000000..28a60f453b
--- /dev/null
+++ b/elements/rh-button/docs/button-best-practices-icons-dont.svg
@@ -0,0 +1,19 @@
+
diff --git a/elements/rh-button/docs/button-best-practices-labels-do.svg b/elements/rh-button/docs/button-best-practices-labels-do.svg
new file mode 100644
index 0000000000..0eb988e096
--- /dev/null
+++ b/elements/rh-button/docs/button-best-practices-labels-do.svg
@@ -0,0 +1,6 @@
+
diff --git a/elements/rh-button/docs/button-best-practices-labels-dont.svg b/elements/rh-button/docs/button-best-practices-labels-dont.svg
new file mode 100644
index 0000000000..8e2659decd
--- /dev/null
+++ b/elements/rh-button/docs/button-best-practices-labels-dont.svg
@@ -0,0 +1,6 @@
+
diff --git a/elements/rh-button/docs/button-best-practices-text-lines-do.svg b/elements/rh-button/docs/button-best-practices-text-lines-do.svg
new file mode 100644
index 0000000000..2603d4de22
--- /dev/null
+++ b/elements/rh-button/docs/button-best-practices-text-lines-do.svg
@@ -0,0 +1,4 @@
+
diff --git a/elements/rh-button/docs/button-best-practices-text-lines-dont.svg b/elements/rh-button/docs/button-best-practices-text-lines-dont.svg
new file mode 100644
index 0000000000..9af86de780
--- /dev/null
+++ b/elements/rh-button/docs/button-best-practices-text-lines-dont.svg
@@ -0,0 +1,4 @@
+
diff --git a/elements/rh-button/docs/button-best-practices-variants-in-groups-do.svg b/elements/rh-button/docs/button-best-practices-variants-in-groups-do.svg
new file mode 100644
index 0000000000..80248e7f0f
--- /dev/null
+++ b/elements/rh-button/docs/button-best-practices-variants-in-groups-do.svg
@@ -0,0 +1,9 @@
+
diff --git a/elements/rh-button/docs/button-best-practices-variants-in-groups-dont.svg b/elements/rh-button/docs/button-best-practices-variants-in-groups-dont.svg
new file mode 100644
index 0000000000..24fd360001
--- /dev/null
+++ b/elements/rh-button/docs/button-best-practices-variants-in-groups-dont.svg
@@ -0,0 +1,10 @@
+