diff --git a/README.rst b/README.rst
index e18639e57..4b0cba179 100644
--- a/README.rst
+++ b/README.rst
@@ -28,7 +28,7 @@ Pillow is the friendly PIL fork by `Alex Clark and Contributors <https://github.
    :target: https://travis-ci.org/python-pillow/Pillow
    :alt: Travis CI build status (Linux)
 
-.. |macos| image:: https://img.shields.io/travis/python-pillow/pillow-wheels/latest.svg?label=macOS%20build
+.. |macos| image:: https://img.shields.io/travis/python-pillow/pillow-wheels/master.svg?label=macOS%20build
    :target: https://travis-ci.org/python-pillow/pillow-wheels
    :alt: Travis CI build status (macOS)
 
@@ -48,7 +48,7 @@ Pillow is the friendly PIL fork by `Alex Clark and Contributors <https://github.
    :alt: Latest PyPI version
 
 .. |downloads| image:: https://img.shields.io/pypi/dm/pillow.svg
-   :target: https://pypi.python.org/pypi/Pillow/
+   :target: https://pypi.org/project/Pillow/
    :alt: Number of PyPI downloads
 
 .. |gitter| image:: https://badges.gitter.im/python-pillow/Pillow.svg
diff --git a/docs/index.rst b/docs/index.rst
index 112798c94..71313bf2b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -10,11 +10,11 @@ Pillow is the friendly PIL fork by `Alex Clark and Contributors <https://github.
    :target: https://pillow.readthedocs.io/?badge=latest
    :alt: Documentation Status
 
-.. image:: https://travis-ci.org/python-pillow/Pillow.svg?branch=master
+.. image:: https://img.shields.io/travis/python-pillow/Pillow/master.svg?label=Linux%20build
    :target: https://travis-ci.org/python-pillow/Pillow
    :alt: Travis CI build status (Linux)
 
-.. image:: https://travis-ci.org/python-pillow/pillow-wheels.svg?branch=latest
+.. image:: https://img.shields.io/travis/python-pillow/pillow-wheels/master.svg?label=macOS%20build
    :target: https://travis-ci.org/python-pillow/pillow-wheels
    :alt: Travis CI build status (macOS)
 
@@ -27,10 +27,10 @@ Pillow is the friendly PIL fork by `Alex Clark and Contributors <https://github.
    :alt: Latest PyPI version
 
 .. image:: https://img.shields.io/pypi/dm/pillow.svg
-   :target: https://pypi.python.org/pypi/Pillow/
+   :target: https://pypi.org/project/Pillow/
    :alt: Number of PyPI downloads
 
-.. image:: https://coveralls.io/repos/python-pillow/Pillow/badge.svg?branch=master
+.. image:: https://coveralls.io/repos/python-pillow/Pillow/badge.svg?branch=master&service=github
    :target: https://coveralls.io/github/python-pillow/Pillow?branch=master
    :alt: Code coverage