diff --git a/docs/reference/Image.rst b/docs/reference/Image.rst
index 5b1a0d409..54ab9e8ef 100644
--- a/docs/reference/Image.rst
+++ b/docs/reference/Image.rst
@@ -260,57 +260,51 @@ Attributes
 
 Instances of the :py:class:`Image` class have the following attributes:
 
-.. py:attribute:: filename
+.. py:attribute:: Image.filename
+    :type: str
 
     The filename or path of the source file. Only images created with the
     factory function ``open`` have a filename attribute. If the input is a
     file like object, the filename attribute is set to an empty string.
 
-    :type: :py:class:`string`
-
-.. py:attribute:: format
+.. py:attribute:: Image.format
+    :type: Optional[str]
 
     The file format of the source file. For images created by the library
     itself (via a factory function, or by running a method on an existing
     image), this attribute is set to ``None``.
 
-    :type: :py:class:`string` or ``None``
-
-.. py:attribute:: mode
+.. py:attribute:: Image.mode
+    :type: str
 
     Image mode. This is a string specifying the pixel format used by the image.
     Typical values are “1”, “L”, “RGB”, or “CMYK.” See
     :ref:`concept-modes` for a full list.
 
-    :type: :py:class:`string`
-
-.. py:attribute:: size
+.. py:attribute:: Image.size
+    :type: tuple[int]
 
     Image size, in pixels. The size is given as a 2-tuple (width, height).
 
-    :type: ``(width, height)``
-
-.. py:attribute:: width
+.. py:attribute:: Image.width
+    :type: int
 
     Image width, in pixels.
 
-    :type: :py:class:`int`
-
-.. py:attribute:: height
+.. py:attribute:: Image.height
+    :type: int
 
     Image height, in pixels.
 
-    :type: :py:class:`int`
-
-.. py:attribute:: palette
+.. py:attribute:: Image.palette
+    :type: Optional[PIL.ImagePalette.ImagePalette]
 
     Colour palette table, if any. If mode is "P" or "PA", this should be an
     instance of the :py:class:`~PIL.ImagePalette.ImagePalette` class.
     Otherwise, it should be set to ``None``.
 
-    :type: :py:class:`~PIL.ImagePalette.ImagePalette` or ``None``
-
-.. py:attribute:: info
+.. py:attribute:: Image.info
+    :type: dict
 
     A dictionary holding data associated with the image. This dictionary is
     used by file handlers to pass on various non-image information read from
@@ -323,8 +317,6 @@ Instances of the :py:class:`Image` class have the following attributes:
 
     Unless noted elsewhere, this dictionary does not affect saving files.
 
-    :type: :py:class:`dict`
-
 Constants
 ---------