diff --git a/website/site/content/docs/features/_index.md b/website/site/content/docs/features/_index.md
index 23fa40d9..03db3604 100644
--- a/website/site/content/docs/features/_index.md
+++ b/website/site/content/docs/features/_index.md
@@ -19,6 +19,7 @@ description = "A list of features and limitations."
into searchable PDF/A pdfs.
- A powerful [query language](@/docs/query/_index.md) to find
documents
+- use [bookmarks](@/docs/webapp/bookmarks.md) to save more complex queries
- Non-destructive: all your uploaded files are never modified and can
always be downloaded untouched
- Organize files using tags, folders, [Custom
diff --git a/website/site/content/docs/webapp/bookmarks-01.png b/website/site/content/docs/webapp/bookmarks-01.png
new file mode 100644
index 00000000..2aeadfcd
Binary files /dev/null and b/website/site/content/docs/webapp/bookmarks-01.png differ
diff --git a/website/site/content/docs/webapp/bookmarks-02.png b/website/site/content/docs/webapp/bookmarks-02.png
new file mode 100644
index 00000000..46309d26
Binary files /dev/null and b/website/site/content/docs/webapp/bookmarks-02.png differ
diff --git a/website/site/content/docs/webapp/bookmarks-03.png b/website/site/content/docs/webapp/bookmarks-03.png
new file mode 100644
index 00000000..bc0f1999
Binary files /dev/null and b/website/site/content/docs/webapp/bookmarks-03.png differ
diff --git a/website/site/content/docs/webapp/bookmarks-04.png b/website/site/content/docs/webapp/bookmarks-04.png
new file mode 100644
index 00000000..535a582c
Binary files /dev/null and b/website/site/content/docs/webapp/bookmarks-04.png differ
diff --git a/website/site/content/docs/webapp/bookmarks.md b/website/site/content/docs/webapp/bookmarks.md
new file mode 100644
index 00000000..e18c6b0c
--- /dev/null
+++ b/website/site/content/docs/webapp/bookmarks.md
@@ -0,0 +1,54 @@
++++
+title = "Bookmarks"
+weight = 35
+[extra]
+mktoc = true
++++
+
+Bookmarks allow you to save queries under a name and refer to it from the search menu.
+
+## Creating bookmarks
+
+Bookmarks can be created from the search view. Apply some criteria to
+select items and then click on the top left menu.
+
+{{ figure(file="bookmarks-02.png") }}
+
+This opens a small form right below the search bar where you can
+adjust the query and enter the name. You can also decide whether this
+bookmark is for all users or just for you.
+
+{{ figure(file="bookmarks-03.png") }}
+
+The other way is to go to *Manage Data* where you can edit and delete
+existing bookmarks and also create new ones.
+
+
+## Using bookmarks
+
+Once you save a bookmark, the search menu will display a new section
+that shows you all your bookmarks as well as your shares. Clicking one
+"enables" it, meaning the query is used in conjunction with other
+criteria.
+
+
+ {{ imgnormal(file="bookmarks-01.png", width="") }}
+
+
+An active bookmark has a check icon next to its name.
+
+Note about shares: Shares are also displayed, since they are also
+bookmarks. However, the list is restricted to only show shares that
+have a name and are enabled. Since this is an internal view (only for
+registered users), expired shares are shown as well.
+
+## Managing bookmarks
+
+The *Manage Data* page has a section for bookmarks. There you can
+delete and edit bookmarks.
+
+{{ figure(file="bookmarks-04.png") }}
+
+The personal bookmarks are only visible to you. The collective
+bookmarks are visible to every user in the collective, which also
+means that every user can edit and delete them.
diff --git a/website/site/content/docs/webapp/itemcard-customize.md b/website/site/content/docs/webapp/itemcard-customize.md
index 84ce52fe..db7b2df0 100644
--- a/website/site/content/docs/webapp/itemcard-customize.md
+++ b/website/site/content/docs/webapp/itemcard-customize.md
@@ -1,6 +1,6 @@
+++
title = "Customize Item Card"
-weight = 32
+weight = 39
[extra]
mktoc = true
+++
diff --git a/website/site/content/docs/webapp/share-01.png b/website/site/content/docs/webapp/share-01.png
index 5c0447f3..f3effe78 100644
Binary files a/website/site/content/docs/webapp/share-01.png and b/website/site/content/docs/webapp/share-01.png differ
diff --git a/website/site/content/docs/webapp/share-02.png b/website/site/content/docs/webapp/share-02.png
index 3a3ed5fd..30c17b34 100644
Binary files a/website/site/content/docs/webapp/share-02.png and b/website/site/content/docs/webapp/share-02.png differ
diff --git a/website/site/content/docs/webapp/share-03.png b/website/site/content/docs/webapp/share-03.png
index ceba5e13..97ad036f 100644
Binary files a/website/site/content/docs/webapp/share-03.png and b/website/site/content/docs/webapp/share-03.png differ
diff --git a/website/site/content/docs/webapp/share.md b/website/site/content/docs/webapp/share.md
index 860e00c7..714eaa18 100644
--- a/website/site/content/docs/webapp/share.md
+++ b/website/site/content/docs/webapp/share.md
@@ -87,7 +87,8 @@ settings](@/docs/webapp/emailsettings.md#smtp-settings) defined).
When at the search page, add some criteria until you have the results
you want to publish. In the screenshot below all items with tag
-`Manual` are selected. Then click the *Share Button*.
+`Manual` are selected. Then click the *Share Results* item in the
+menu.
{{ figure(file="share-01.png") }}
@@ -119,8 +120,9 @@ provided from your address book. If you type in an arbitrary address
current address. You can hit *Backspace* two times to remove the last
e-mail address.
-The new share can now be found in *Collective Profile -> Shares*.
-Clicking *Done* brings you back to the search results.
+The new share can now be found in *Collective Profile -> Shares* and
+is also added to the *Bookmarks* section in the search menu. Clicking
+*Done* brings you back to the search results.
## Creating from selecting items