diff --git a/README.md b/README.md
index 54e0e6c..102b2b7 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ Also see [Troubleshooting]
 
 
 [Android]:           https://github.com/clowwindy/shadowsocks/wiki/Ports-and-Clients#android
-[Build Status]:      https://travis-ci.org/clowwindy/shadowsocks.svg?branch=master
+[Build Status]:      https://img.shields.io/travis/clowwindy/shadowsocks/master.svg?style=flat
 [Chinese Readme]:    https://github.com/clowwindy/shadowsocks/wiki/Shadowsocks-%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E
 [Chrome Standalone]: https://support.google.com/installer/answer/126299
 [GUI client]:        https://github.com/clowwindy/shadowsocks/wiki/Ports-and-Clients
@@ -124,7 +124,7 @@ Also see [Troubleshooting]
 [OpenWRT]:           https://github.com/clowwindy/shadowsocks/wiki/Ports-and-Clients#openwrt
 [OS X]:              https://github.com/clowwindy/shadowsocks/wiki/Ports-and-Clients#os-x
 [PyPI]:              https://pypi.python.org/pypi/shadowsocks
-[PyPI version]:      https://badge.fury.io/py/shadowsocks.svg
+[PyPI version]:      https://img.shields.io/pypi/v/shadowsocks.svg?style=flat
 [Supervisor]:        https://github.com/clowwindy/shadowsocks/wiki/Configure-Shadowsocks-with-Supervisor
 [TCP_FASTOPEN]:      https://github.com/clowwindy/shadowsocks/wiki/TCP-Fast-Open
 [Travis CI]:         https://travis-ci.org/clowwindy/shadowsocks
diff --git a/README.rst b/README.rst
index a420cbd..f46ea8b 100644
--- a/README.rst
+++ b/README.rst
@@ -151,7 +151,7 @@ Mailing list: http://groups.google.com/group/shadowsocks
 Also see
 `Troubleshooting <https://github.com/clowwindy/shadowsocks/wiki/Troubleshooting>`__
 
-.. |PyPI version| image:: https://badge.fury.io/py/shadowsocks.svg
+.. |PyPI version| image:: https://img.shields.io/pypi/v/shadowsocks.svg?style=flat
    :target: https://pypi.python.org/pypi/shadowsocks
-.. |Build Status| image:: https://travis-ci.org/clowwindy/shadowsocks.svg?branch=master
+.. |Build Status| image:: https://img.shields.io/travis/clowwindy/shadowsocks/master.svg?style=flat
    :target: https://travis-ci.org/clowwindy/shadowsocks