diff --git a/.travis.yml b/.travis.yml
index a75c80873..f94f8376a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,8 @@ install:
   - "travis_retry sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick"
   - "travis_retry pip install cffi"
   - "travis_retry pip install coverage nose"
-  - "travis_retry pip install pyroma"
+    # Pyroma tests sometimes hang on PyPy; skip for PyPy
+  - if [ $TRAVIS_PYTHON_VERSION != "pypy" ]; then travis_retry pip install pyroma; fi
 
   - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then travis_retry pip install unittest2; fi
 
diff --git a/README.rst b/README.rst
index be50c5531..52e9843a8 100644
--- a/README.rst
+++ b/README.rst
@@ -6,26 +6,27 @@ Python Imaging Library (Fork)
 
 Pillow is the "friendly PIL fork" by `Alex Clark and Contributors <https://github.com/python-pillow/Pillow/graphs/contributors>`_. PIL is the Python Imaging Library by Fredrik Lundh and Contributors.
 
-.. 
-   image:: https://travis-ci.org/python-pillow/Pillow.svg?branch=master
+.. image:: https://travis-ci.org/python-pillow/Pillow.svg?branch=master
    :target: https://travis-ci.org/python-pillow/Pillow
    :alt: Travis CI build status (Linux)
 
-.. 
-   image:: https://pypip.in/v/Pillow/badge.png
-    :target: https://pypi.python.org/pypi/Pillow/
-    :alt: Latest PyPI version
+.. image:: https://travis-ci.org/python-pillow/pillow-wheels.svg?branch=latest
+   :target: https://travis-ci.org/python-pillow/pillow-wheels
+   :alt: Travis CI build status (OS X)
 
-.. 
-   image:: https://pypip.in/d/Pillow/badge.png
-    :target: https://pypi.python.org/pypi/Pillow/
-    :alt: Number of PyPI downloads
+.. image:: https://img.shields.io/pypi/v/pillow.svg
+   :target: https://pypi.python.org/pypi/Pillow/
+   :alt: Latest PyPI version
 
-.. image:: https://coveralls.io/repos/python-pillow/Pillow/badge.png?branch=master
-  :target: https://coveralls.io/r/python-pillow/Pillow?branch=master
+.. image:: https://img.shields.io/pypi/dm/pillow.svg
+   :target: https://pypi.python.org/pypi/Pillow/
+   :alt: Number of PyPI downloads
+
+.. image:: https://coveralls.io/repos/python-pillow/Pillow/badge.svg?branch=master
+   :target: https://coveralls.io/r/python-pillow/Pillow?branch=master
    :alt: Code coverage
 
-.. image:: https://landscape.io/github/python-pillow/Pillow/master/landscape.png
+.. image:: https://landscape.io/github/python-pillow/Pillow/master/landscape.svg
    :target: https://landscape.io/github/python-pillow/Pillow/master
    :alt: Code health
 
diff --git a/docs/index.rst b/docs/index.rst
index 0c7365c64..9bb983179 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -7,19 +7,23 @@ Pillow is the "friendly PIL fork" by `Alex Clark and Contributors <https://githu
    :target: https://travis-ci.org/python-pillow/Pillow
    :alt: Travis CI build status (Linux)
 
-.. image:: https://pypip.in/v/Pillow/badge.png
+.. image:: https://travis-ci.org/python-pillow/pillow-wheels.svg?branch=latest
+   :target: https://travis-ci.org/python-pillow/pillow-wheels
+   :alt: Travis CI build status (OS X)
+
+.. image:: https://img.shields.io/pypi/v/pillow.svg
     :target: https://pypi.python.org/pypi/Pillow/
     :alt: Latest PyPI version
 
-.. image:: https://pypip.in/d/Pillow/badge.png
+.. image:: https://img.shields.io/pypi/dm/pillow.svg
     :target: https://pypi.python.org/pypi/Pillow/
     :alt: Number of PyPI downloads
 
-.. image:: https://coveralls.io/repos/python-pillow/Pillow/badge.png?branch=master
+.. image:: https://coveralls.io/repos/python-pillow/Pillow/badge.svg?branch=master
   :target: https://coveralls.io/r/python-pillow/Pillow?branch=master
    :alt: Code coverage
 
-.. image:: https://landscape.io/github/python-pillow/Pillow/master/landscape.png
+.. image:: https://landscape.io/github/python-pillow/Pillow/master/landscape.svg
    :target: https://landscape.io/github/python-pillow/Pillow/master
    :alt: Code health