Merge branch 'twbs/v4-dev' into dropdown-keyboard

2 files changed, 24 insertions, 6 deletions

diff --git a/docs/extend/icon-fonts.md b/docs/extend/icon-fonts.md
deleted file mode 100644
index 9cddafeea..000000000
--- a/docs/extend/icon-fonts.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: docs
-title: Icon fonts
----
-
-TODO
diff --git a/docs/extend/icons.md b/docs/extend/icons.md
new file mode 100644
index 000000000..c619ed2ce
--- /dev/null
+++ b/docs/extend/icons.md
@@ -0,0 +1,24 @@
+---
+layout: docs
+title: Icons
+group: extend
+---
+
+Bootstrap doesn't include an icon library by default, but we have a handful of recommendations for you to choose from. While most icon sets include multiple file formats, we prefer SVG implementations for their improved accessibility and vector support.
+
+## Preferred
+We've tested and used these icon sets ourselves.
+
+- [Iconic](https://useiconic.com/open/)
+- [Octicons](https://octicons.github.com/)
+- [Entypo](http://www.entypo.com/)
+
+## More options
+While we haven't tried these out, they do look promising and provide multiple formats—including SVG.
+
+- [Google Material icons](https://material.io/icons/)
+- [Ionicons](http://ionicons.com/)
+- [Feather](http://colebemis.com/feather/)
+- [Dripicons](http://demo.amitjakhu.com/dripicons/)
+- [Ikons](http://ikons.piotrkwiatkowski.co.uk/)
+- [Glyph](http://glyph.smarticons.co/)