diff --git a/_shared_assets/themes/nextcloud_com/static/styles.css b/_shared_assets/themes/nextcloud_com/static/styles.css
index 8ee969e1b..743c1111f 100644
--- a/_shared_assets/themes/nextcloud_com/static/styles.css
+++ b/_shared_assets/themes/nextcloud_com/static/styles.css
@@ -1153,7 +1153,8 @@ li.next {
     max-width: 40%;
     min-width: 200px;
 }
-.figure.figure-with-code + .code.html {
+.figure.figure-with-code + .code.html,
+.figure.figure-with-code + .highlight-html {
 	max-width: 59%;
 }
 
diff --git a/developer_manual/conf.py b/developer_manual/conf.py
index cf0807356..9ce75ea69 100644
--- a/developer_manual/conf.py
+++ b/developer_manual/conf.py
@@ -292,3 +292,12 @@ epub_copyright = u'2012-2017, The Nextcloud developers'
 
 # Include todos?
 todo_include_todos = True
+
+
+from sphinx.builders.html import StandaloneHTMLBuilder
+StandaloneHTMLBuilder.supported_image_types = [
+    'image/svg+xml',
+    'image/gif',
+    'image/png',
+    'image/jpeg'
+]
diff --git a/developer_manual/design/navigation.rst b/developer_manual/design/navigation.rst
index ac669e84d..485c2d708 100644
--- a/developer_manual/design/navigation.rst
+++ b/developer_manual/design/navigation.rst
@@ -28,7 +28,7 @@ Basic layout
    :alt: Navigation screenshot
    :figclass: figure-with-code
 
-.. code:: html
+.. code-block:: html
 
     <div id="app-navigation">
         <ul>
@@ -55,7 +55,7 @@ Each entry is allowed to have a counter and/or a button for user interaction.
 * You **can't** have more than two buttons, if you need more, you need to add a menu.
 * The order of the button and the counter are **not** interchangeable. You need to put the counter before the menu.
 
-.. code:: html
+.. code-block:: html
 
     <div class="app-navigation-entry-utils">
         <ul>
@@ -80,7 +80,7 @@ For the global rules and/or layout, you can check the dedicated :ref:`popover me
    :alt: Navigation menu
    :figclass: figure-with-code
 
-.. code:: html
+.. code-block:: html
 
     <div class="app-navigation-entry-menu">
         <ul>
@@ -117,7 +117,7 @@ Do not change the alignment of the text. If you're using
    :alt: Navigation entry with counter
    :figclass: figure-with-code
 
-.. code:: html
+.. code-block:: html
 
     <li class="app-navigation-entry-utils-counter">1</li>
 
@@ -135,7 +135,7 @@ The same way we display the menu three-dot-icon button, you're allowed to use up
    :alt: Navigation entry with counter
    :figclass: figure-with-code
 
-.. code:: html
+.. code-block:: html
 
     <div class="app-navigation-entry-utils">
         <ul>
@@ -154,7 +154,7 @@ The class which should be applied to a first level element **li** that hosts or
 This will cause the hovered entry to slide down giving a visual hint that it can accept the dragged element.
 In case of jQuery UI's droppable feature, the **hoverClass** option should be set to the **drag-and-drop** class.
 
-.. code:: html
+.. code-block:: html
 
     <div id="app-navigation">
         <ul>
@@ -191,10 +191,13 @@ The opening of the menu is activated and animated by the class ``open`` on the m
    :alt: Collapsible navigation entry
    :figclass: figure-with-code
 
-.. code:: html
+.. code-block:: html
 
     <li class="collapsible open">
-        <button class="collapse"></button> This is optional
+
+        <!-- This is optional -->
+        <button class="collapse"></button>
+
         <a href="#" class="icon-folder">Folder collapsed menu</a>
         <ul>
             <li><a href="#">Simple entry</a></li>
@@ -219,7 +222,7 @@ We call it a `bullet`.
    :alt: Navigation entry with bullet
    :figclass: figure-with-code
 
-.. code:: html
+.. code-block:: html
 
     <li>
         <div class="app-navigation-entry-bullet"></div>
@@ -238,7 +241,7 @@ Undo entry
    :alt: Navigation entry with undo action
    :figclass: figure-with-code
 
-.. code:: html
+.. code-block:: html
 
     <li class="deleted">
         <a href="#" class="hidden">Important entry</a>
@@ -268,7 +271,7 @@ Edit entry
    :alt: Editable navigation entry
    :figclass: figure-with-code
 
-.. code:: html
+.. code-block:: html
 
     <li class="editing">
         <a href="#" class="icon-folder">Folder entry</a>
@@ -301,7 +304,7 @@ Every top-level entry can be `pinned` at the bottom.
   :alt: Pinned navigation entries
   :figclass: figure-with-code
 
-.. code:: html
+.. code-block:: html
 
     <ul>
         <li><a href="#">Non-pinned entry</a></li>
diff --git a/developer_manual/design/popovermenu.rst b/developer_manual/design/popovermenu.rst
index de029154e..47000e9c0 100644
--- a/developer_manual/design/popovermenu.rst
+++ b/developer_manual/design/popovermenu.rst
@@ -20,7 +20,7 @@ Basic layout
    :alt: Popover image example
    :figclass: figure-with-code
 
-.. code:: html
+.. code-block:: html
 
     <div class="popovermenu">
         <ul>
diff --git a/developer_manual/design/settings.rst b/developer_manual/design/settings.rst
index 6449f315e..a2d676b74 100644
--- a/developer_manual/design/settings.rst
+++ b/developer_manual/design/settings.rst
@@ -5,3 +5,31 @@
 ===============
 Settings
 ===============
+
+To create a settings area create a div with the id ``app-settings`` inside the ``app-navigation`` div.
+
+* The data attribute ``data-apps-slide-toggle`` slides up a target area using a jQuery selector and hides the area if the user clicks outside of it.
+* Max height of the settings area is 300px. Do **not** change that.
+* Keep it clear, organized and simple.
+
+.. figure:: ../images/settings.*
+   :alt: Settings
+   :figclass: figure-with-code
+
+.. code-block:: html
+
+    <div id="app-navigation">
+
+        <!-- Your navigation here -->
+
+        <div id="app-settings">
+            <div id="app-settings-header">
+                <button class="settings-button"
+                        data-apps-slide-toggle="#app-settings-content"
+                ><?php p($l->t('Settings'));?></button>
+            </div>
+            <div id="app-settings-content">
+                <!-- Your settings in here -->
+            </div>
+        </div>
+    </div>
diff --git a/developer_manual/images/navigation-collapsible.jpg b/developer_manual/images/navigation-collapsible.jpg
deleted file mode 100644
index 9cf105ae5..000000000
Binary files a/developer_manual/images/navigation-collapsible.jpg and /dev/null differ
diff --git a/developer_manual/images/navigation-collapsible.png b/developer_manual/images/navigation-collapsible.png
new file mode 100644
index 000000000..61ef54bd1
Binary files /dev/null and b/developer_manual/images/navigation-collapsible.png differ
diff --git a/developer_manual/images/navigation-edit.jpg b/developer_manual/images/navigation-edit.jpg
deleted file mode 100644
index 7d31d9745..000000000
Binary files a/developer_manual/images/navigation-edit.jpg and /dev/null differ
diff --git a/developer_manual/images/navigation-edit.png b/developer_manual/images/navigation-edit.png
new file mode 100644
index 000000000..8dd722cb5
Binary files /dev/null and b/developer_manual/images/navigation-edit.png differ
diff --git a/developer_manual/images/navigation-undo.jpg b/developer_manual/images/navigation-undo.jpg
deleted file mode 100644
index 579c3e655..000000000
Binary files a/developer_manual/images/navigation-undo.jpg and /dev/null differ
diff --git a/developer_manual/images/navigation-undo.png b/developer_manual/images/navigation-undo.png
new file mode 100644
index 000000000..0eecdb47b
Binary files /dev/null and b/developer_manual/images/navigation-undo.png differ
diff --git a/developer_manual/images/settings.gif b/developer_manual/images/settings.gif
new file mode 100644
index 000000000..b281a9bf4
Binary files /dev/null and b/developer_manual/images/settings.gif differ
diff --git a/developer_manual/images/settings.png b/developer_manual/images/settings.png
new file mode 100644
index 000000000..2e6827438
Binary files /dev/null and b/developer_manual/images/settings.png differ