diff --git a/.travis.yml b/.travis.yml
index ff4daa06..180c8eb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+# Travis config file
+# ==================
+
 language:
   python
 
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 2f385cd6..97d2a3ef 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -1,34 +1,18 @@
 Flask-User |release|
 ==========
 
-.. image:: https://pypip.in/v/Flask-User/badge.png
+.. image:: https://img.shields.io/pypi/v/Flask-User.svg
     :target: https://pypi.python.org/pypi/Flask-User
 
-.. comment .. image:: https://travis-ci.org/lingthio/Flask-User.png?branch=master
-.. image:: /images/build_passing.png
+.. image:: https://img.shields.io/travis/lingthio/Flask-User.svg
     :target: https://travis-ci.org/lingthio/Flask-User
 
-.. image:: https://pypip.in/d/Flask-User/badge.png
+.. image:: https://img.shields.io/pypi/dm/Flask-User.svg
     :target: https://pypi.python.org/pypi/Flask-User
 
-.. comment .. image:: https://pypip.in/license/Flask-User/badge.png
-.. image:: /images/BSD_license.png
+.. image:: https://img.shields.io/pypi/l/Flask-User.svg
     :target: https://pypi.python.org/pypi/Flask-User
 
-.. comment .. image:: https://coveralls.io/repos/lingthio/Flask-User/badge.png?branch=master
-.. comment     :target: https://coveralls.io/r/lingthio/Flask-User?branch=master
-
-.. topic:: Missing a feature?
-
-   |Tell_us_about_it|. |Help_shape_flask_user|.
-
-.. |Tell_us_about_it| raw:: html
-
-   <a href="https://docs.google.com/forms/d/1p01lA9o9amlx4_0JjjOyAzdoM-C4lUVUgV0LUhMumaU/viewform?usp=send_form" target="_blank"><b>Tell us about it</b></a>
-
-.. |Help_shape_flask_user| raw:: html
-
-   <a href="https://docs.google.com/forms/d/1p01lA9o9amlx4_0JjjOyAzdoM-C4lUVUgV0LUhMumaU/viewform?usp=send_form" target="_blank"><b>Help shape Flask-User</b></a>
 
 Customizable User Account Management for Flask
 ----------------------------------------------
diff --git a/setup.py b/setup.py
index 65d182ca..8bd24085 100644
--- a/setup.py
+++ b/setup.py
@@ -2,13 +2,16 @@
 Flask-User
 ==========
 
-.. image:: https://pypip.in/v/Flask-User/badge.png
+.. image:: https://img.shields.io/pypi/v/Flask-User.svg
     :target: https://pypi.python.org/pypi/Flask-User
 
-.. image:: https://pypip.in/d/Flask-User/badge.png
+.. image:: https://img.shields.io/travis/lingthio/Flask-User.svg
+    :target: https://travis-ci.org/lingthio/Flask-User
+
+.. image:: https://img.shields.io/pypi/dm/Flask-User.svg
     :target: https://pypi.python.org/pypi/Flask-User
 
-.. image:: https://pypip.in/license/Flask-User/badge.png
+.. image:: https://img.shields.io/pypi/l/Flask-User.svg
     :target: https://pypi.python.org/pypi/Flask-User
 
 Customizable User Account Management for Flask
@@ -111,7 +114,7 @@
     ],
     test_suite="flask_user.tests.run_tests",
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Flask',
         'Intended Audience :: Developers',