diff --git a/docs/apps.rst b/docs/apps.rst
index 7b24401..9decb62 100644
--- a/docs/apps.rst
+++ b/docs/apps.rst
@@ -37,3 +37,13 @@ Games
 This is enabled by default in the simulator. The app is bundled in the
 firmware image but it is disabled by default to keep RAM available for
 user developed applications. It can be enabled by modifying ``main.py``.
+
+Integration
+-----------
+
+.. automodule:: apps.musicplayer
+
+This app is enabled by default in the simulator.
+The app is also frozen into the firmware image but it is disabled by
+default in order to keep RAM available for user developed applications.
+It can be enabled by modifying ``main.py``.
diff --git a/res/MusicApp.png b/res/MusicApp.png
new file mode 100644
index 0000000..0d034b6
Binary files /dev/null and b/res/MusicApp.png differ
diff --git a/res/MusicPlayerApp.png b/res/MusicPlayerApp.png
deleted file mode 100644
index 9b6b7e3..0000000
Binary files a/res/MusicPlayerApp.png and /dev/null differ
diff --git a/wasp/apps/musicplayer.py b/wasp/apps/musicplayer.py
index cf96ca1..91483c3 100644
--- a/wasp/apps/musicplayer.py
+++ b/wasp/apps/musicplayer.py
@@ -3,12 +3,18 @@
 # Copyright (C) 2020 Carlos Gil
 
 """Music Player for GadgetBridge
-~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    .. figure:: res/MusicApp.png
+        :width: 179
+
+        Screenshot of the Music Player application
 
 Music Player Controller:
-- Touch: play/pause
-- Swipe UPDOWN: Volume down/up
-- Swipe LEFTRIGHT: next/previous
+
+* Touch: play/pause
+* Swipe UPDOWN: Volume down/up
+* Swipe LEFTRIGHT: next/previous
 """
 
 import wasp
@@ -16,15 +22,8 @@ import wasp
 import icons
 import time
 
-
 class MusicPlayerApp(object):
-    """ Music Player Controller application.
-
-    .. figure:: res/MusicPlayerApp.png
-        :width: 179
-
-        Screenshot of the Music Player application
-    """
+    """ Music Player Controller application."""
     NAME = 'Music'
     ICON = icons.headset