diff --git a/doc/admin/contentstudio/images/inputs-content-selector.jpg b/doc/admin/contentstudio/images/inputs-content-selector.jpg
deleted file mode 100644
index c468fd1..0000000
Binary files a/doc/admin/contentstudio/images/inputs-content-selector.jpg and /dev/null differ
diff --git a/doc/admin/contentstudio/images/inputs-content-selector.png b/doc/admin/contentstudio/images/inputs-content-selector.png
new file mode 100644
index 0000000..0afa07b
Binary files /dev/null and b/doc/admin/contentstudio/images/inputs-content-selector.png differ
diff --git a/doc/admin/contentstudio/inputs-selectors.rst b/doc/admin/contentstudio/inputs-selectors.rst
index 4d3a936..a8ee3ec 100644
--- a/doc/admin/contentstudio/inputs-selectors.rst
+++ b/doc/admin/contentstudio/inputs-selectors.rst
@@ -42,7 +42,7 @@ filter the content by name. When more than one content has been selected, the or
 to the left of each content. Any selected content may be opened for editing by clicking the pencil icon. Selected content can be removed
 with the X icon.
 
-.. image:: images/inputs-content-selector.jpg
+.. image:: images/inputs-content-selector.png
 
 Image selector
 --------------
diff --git a/doc/developer/schema/input-types/code/contentselector.xml b/doc/developer/schema/input-types/code/contentselector.xml
index e5a951d..4aa7bd0 100644
--- a/doc/developer/schema/input-types/code/contentselector.xml
+++ b/doc/developer/schema/input-types/code/contentselector.xml
@@ -8,5 +8,8 @@
     <allowPath>${site}/people/</allowPath>
     <allowPath>./*</allowPath>
     <allowPath>/quotes*</allowPath>
+    <treeMode>true</treeMode>
+    <showStatus>true</showStatus>
+    <hideToggleIcon>true</hideToggleIcon>
   </config>
 </input>
diff --git a/doc/developer/schema/input-types/content-selector.rst b/doc/developer/schema/input-types/content-selector.rst
index bc7137b..9364617 100644
--- a/doc/developer/schema/input-types/content-selector.rst
+++ b/doc/developer/schema/input-types/content-selector.rst
@@ -3,7 +3,7 @@
 ContentSelector
 ---------------
 
-References to other content are specified by this input type.
+References to other content are specified by this input type. Use the toggle icon to switch between the list mode (default) and the tree mode.
 
 .. literalinclude:: code/contentselector.xml
    :language: xml
@@ -22,3 +22,18 @@ allowPath
 
 .. literalinclude:: code/allowpath-samples.xml
     :language: xml
+
+treeMode
+  By default content selector is displaying content in the list mode but you can switch it to default tree-mode (same as in the Content grid) by setting `treeMode` to `true`.
+
+.. image:: images/content-selector-tree.png
+
+showStatus
+  You can display current status for each content item inside the content selector by setting `showStatus` to `true`.
+
+.. image:: images/content-selector-status.png
+
+hideToggleIcon
+  The toggle mode icon can be hidden by setting `hideToggleIcon` to `true`.
+
+.. image:: images/content-selector-no-toggle.png
diff --git a/doc/developer/schema/input-types/images/content-selector-no-toggle.png b/doc/developer/schema/input-types/images/content-selector-no-toggle.png
new file mode 100644
index 0000000..2bd31a6
Binary files /dev/null and b/doc/developer/schema/input-types/images/content-selector-no-toggle.png differ
diff --git a/doc/developer/schema/input-types/images/content-selector-status.png b/doc/developer/schema/input-types/images/content-selector-status.png
new file mode 100644
index 0000000..d5fa87b
Binary files /dev/null and b/doc/developer/schema/input-types/images/content-selector-status.png differ
diff --git a/doc/developer/schema/input-types/images/content-selector-tree.png b/doc/developer/schema/input-types/images/content-selector-tree.png
new file mode 100644
index 0000000..e334f00
Binary files /dev/null and b/doc/developer/schema/input-types/images/content-selector-tree.png differ