diff --git a/README.rst b/README.rst
index 85bd6fa..1ba5d5c 100644
--- a/README.rst
+++ b/README.rst
@@ -1,26 +1,9 @@
*calistar*
==========
-.. image:: https://img.shields.io/pypi/v/calistar
- :target: https://pypi.python.org/pypi/calistar
-
-.. image:: https://img.shields.io/pypi/pyversions/calistar
- :target: https://pypi.python.org/pypi/calistar
+.. container::
-.. image:: https://github.com/tomasstolker/calistar/actions/workflows/main.yml/badge.svg
- :target: https://github.com/tomasstolker/calistar/actions
-
-.. image:: https://img.shields.io/readthedocs/calistar
- :target: http://calistar.readthedocs.io
-
-.. image:: https://codecov.io/gh/tomasstolker/calistar/branch/main/graph/badge.svg?token=LSSCPMJ5JH
- :target: https://codecov.io/gh/tomasstolker/calistar
-
-.. image:: https://img.shields.io/codefactor/grade/github/tomasstolker/calistar
- :target: https://www.codefactor.io/repository/github/tomasstolker/calistar
-
-.. image:: https://img.shields.io/github/license/tomasstolker/calistar
- :target: https://github.com/tomasstolker/calistar/blob/main/LICENSE
+ |PyPI Status| |Python Versions| |CI Status| |Docs Status| |Code Coverage| |Code Quality| |License|
*calistar* is a tool to search for a single calibration star. For example to be used for reference-star differential imaging or aperture masking interferometry. The package has been released on `PyPI `_ and is actively developed and maintained on Github.
@@ -40,3 +23,24 @@ License
Copyright 2023-2024 Tomas Stolker
*calistar* is distributed under the MIT License. See `LICENSE `_ for the terms and conditions.
+
+.. |PyPI Status| image:: https://img.shields.io/pypi/v/calistar
+ :target: https://pypi.python.org/pypi/calistar
+
+.. |Python Versions| image:: https://img.shields.io/pypi/pyversions/calistar
+ :target: https://pypi.python.org/pypi/calistar
+
+.. |CI Status| image:: https://github.com/tomasstolker/calistar/actions/workflows/main.yml/badge.svg
+ :target: https://github.com/tomasstolker/calistar/actions
+
+.. |Docs Status| image:: https://img.shields.io/readthedocs/calistar
+ :target: http://calistar.readthedocs.io
+
+.. |Code Coverage| image:: https://codecov.io/gh/tomasstolker/calistar/branch/main/graph/badge.svg?token=LSSCPMJ5JH
+ :target: https://codecov.io/gh/tomasstolker/calistar
+
+.. |Code Quality| image:: https://img.shields.io/codefactor/grade/github/tomasstolker/calistar
+ :target: https://www.codefactor.io/repository/github/tomasstolker/calistar
+
+.. |License| image:: https://img.shields.io/github/license/tomasstolker/calistar
+ :target: https://github.com/tomasstolker/calistar/blob/main/LICENSE