From bc6b28b7acea828e503aeb412987eb6414fe0ccc Mon Sep 17 00:00:00 2001
From: Aspectis <tobias@aspectis.net>
Date: Thu, 11 Mar 2021 15:28:45 +0100
Subject: [PATCH] refs #19346 [fid_bbi] optimize icons

* Optimize SVG code of all icons
* Move "small" icons to parent directory
* Move "big" icons to "media" directory
* Remove horizontal line from person icon
---
 .../View/Helper/Root/Flashmessages.php        |  2 +-
 themes/fid_bbi/icons/{small => }/add-book.svg |  2 +-
 themes/fid_bbi/icons/arrow-left.svg           |  1 +
 themes/fid_bbi/icons/arrow-right.svg          |  1 +
 themes/fid_bbi/icons/big/article-online.svg   |  1 -
 themes/fid_bbi/icons/big/article.svg          |  1 -
 themes/fid_bbi/icons/big/audio.svg            |  1 -
 themes/fid_bbi/icons/big/book-online.svg      |  1 -
 themes/fid_bbi/icons/big/book.svg             |  1 -
 themes/fid_bbi/icons/big/disc.svg             |  1 -
 .../fid_bbi/icons/big/periodical-online.svg   |  1 -
 themes/fid_bbi/icons/big/periodical.svg       |  1 -
 themes/fid_bbi/icons/big/software.svg         |  1 -
 themes/fid_bbi/icons/big/unknown.svg          |  1 -
 themes/fid_bbi/icons/big/video.svg            |  1 -
 themes/fid_bbi/icons/big/website.svg          |  1 -
 themes/fid_bbi/icons/checkmark.svg            |  1 +
 themes/fid_bbi/icons/chevron-down.svg         |  1 +
 themes/fid_bbi/icons/clock.svg                |  1 +
 themes/fid_bbi/icons/download.svg             |  1 +
 themes/fid_bbi/icons/{small => }/error.svg    |  2 +-
 .../icons/{small => }/external-link.svg       |  0
 themes/fid_bbi/icons/face.svg                 |  1 +
 themes/fid_bbi/icons/{small => }/filter.svg   |  2 +-
 themes/fid_bbi/icons/home.svg                 |  1 +
 themes/fid_bbi/icons/info.svg                 |  1 +
 themes/fid_bbi/icons/license.svg              |  1 +
 themes/fid_bbi/icons/lightning.svg            |  1 +
 themes/fid_bbi/icons/link.svg                 |  1 +
 themes/fid_bbi/icons/login.svg                |  1 +
 themes/fid_bbi/icons/{small => }/logout.svg   |  2 +-
 themes/fid_bbi/icons/magnifier.svg            |  1 +
 themes/fid_bbi/icons/{small => }/mail.svg     |  2 +-
 themes/fid_bbi/icons/media/article-online.svg |  1 +
 themes/fid_bbi/icons/media/article.svg        |  1 +
 themes/fid_bbi/icons/media/audio.svg          |  1 +
 themes/fid_bbi/icons/media/book-online.svg    |  1 +
 themes/fid_bbi/icons/media/book.svg           |  1 +
 themes/fid_bbi/icons/media/disc.svg           |  1 +
 .../fid_bbi/icons/media/periodical-online.svg |  1 +
 themes/fid_bbi/icons/media/periodical.svg     |  1 +
 themes/fid_bbi/icons/media/software.svg       |  1 +
 themes/fid_bbi/icons/media/unknown.svg        |  1 +
 themes/fid_bbi/icons/media/video.svg          |  1 +
 themes/fid_bbi/icons/media/website.svg        |  1 +
 themes/fid_bbi/icons/{small => }/menu.svg     |  2 +-
 themes/fid_bbi/icons/minus.svg                |  1 +
 themes/fid_bbi/icons/{small => }/order.svg    |  2 +-
 themes/fid_bbi/icons/{small => }/pen.svg      |  0
 themes/fid_bbi/icons/{small => }/person.svg   |  2 +-
 themes/fid_bbi/icons/{small => }/pin.svg      |  2 +-
 themes/fid_bbi/icons/plus.svg                 |  1 +
 themes/fid_bbi/icons/printer.svg              |  1 +
 themes/fid_bbi/icons/quote.svg                |  1 +
 themes/fid_bbi/icons/{small => }/rss.svg      |  2 +-
 themes/fid_bbi/icons/save.svg                 |  1 +
 .../fid_bbi/icons/{small => }/scan-book.svg   |  2 +-
 themes/fid_bbi/icons/signup.svg               |  1 +
 themes/fid_bbi/icons/small/arrow-left.svg     |  1 -
 themes/fid_bbi/icons/small/arrow-right.svg    |  1 -
 themes/fid_bbi/icons/small/checkmark.svg      |  1 -
 themes/fid_bbi/icons/small/chevron-down.svg   |  1 -
 themes/fid_bbi/icons/small/clock.svg          |  1 -
 themes/fid_bbi/icons/small/download.svg       |  1 -
 themes/fid_bbi/icons/small/face.svg           |  1 -
 themes/fid_bbi/icons/small/home.svg           |  1 -
 themes/fid_bbi/icons/small/info.svg           |  1 -
 themes/fid_bbi/icons/small/license.svg        |  1 -
 themes/fid_bbi/icons/small/lightning.svg      |  1 -
 themes/fid_bbi/icons/small/link.svg           |  1 -
 themes/fid_bbi/icons/small/login.svg          |  1 -
 themes/fid_bbi/icons/small/magnifier.svg      |  1 -
 themes/fid_bbi/icons/small/minus.svg          |  1 -
 themes/fid_bbi/icons/small/plus.svg           |  1 -
 themes/fid_bbi/icons/small/printer.svg        |  1 -
 themes/fid_bbi/icons/small/quote.svg          |  1 -
 themes/fid_bbi/icons/small/save.svg           |  1 -
 themes/fid_bbi/icons/small/signup.svg         |  1 -
 themes/fid_bbi/icons/small/sun.svg            |  1 -
 themes/fid_bbi/icons/small/x.svg              |  1 -
 themes/fid_bbi/icons/{small => }/star.svg     |  2 +-
 themes/fid_bbi/icons/sun.svg                  |  1 +
 themes/fid_bbi/icons/{small => }/trash.svg    |  0
 themes/fid_bbi/icons/{small => }/warning.svg  |  2 +-
 themes/fid_bbi/icons/x.svg                    |  1 +
 .../templates/Auth/AbstractBase/login.phtml   |  2 +-
 .../templates/Recommend/SideFacets.phtml      |  2 +-
 .../Recommend/SideFacets/filter-list.phtml    |  4 +-
 .../Recommend/SideFacets/range-slider.phtml   |  2 +-
 .../RecordDriver/DefaultRecord/core.phtml     | 10 ++--
 .../DefaultRecord/data-rvkNotation.phtml      |  2 +-
 .../DefaultRecord/list-entry.phtml            |  4 +-
 .../DefaultRecord/result-list.phtml           |  4 +-
 .../RecordDriver/DefaultRecord/toolbar.phtml  | 14 +++---
 .../templates/RecordTab/holdingsils.phtml     |  2 +-
 .../fid_bbi/templates/ajax/boss-false.phtml   |  2 +-
 themes/fid_bbi/templates/ajax/boss-true.phtml |  2 +-
 .../templates/ajax/resolverLinks.phtml        |  4 +-
 .../fid_bbi/templates/amsl/sources-list.phtml |  6 +--
 themes/fid_bbi/templates/content/faq-en.phtml | 48 +++++++++---------
 themes/fid_bbi/templates/content/faq.phtml    | 49 +++++++++----------
 themes/fid_bbi/templates/error/404.phtml      |  2 +-
 themes/fid_bbi/templates/error/index.phtml    |  3 +-
 themes/fid_bbi/templates/footer.phtml         |  2 +-
 .../fid_bbi/templates/get-it-box/links.phtml  |  2 +-
 themes/fid_bbi/templates/header.phtml         |  6 +--
 themes/fid_bbi/templates/layout/layout.phtml  |  2 +-
 .../myresearch/bulk-action-buttons.phtml      | 10 ++--
 .../fid_bbi/templates/myresearch/edit.phtml   |  2 +-
 .../fid_bbi/templates/myresearch/menu.phtml   |  2 +-
 .../fid_bbi/templates/myresearch/mylist.phtml |  4 +-
 .../templates/myresearch/profile.phtml        |  2 +-
 .../templates/myresearch/usertags.phtml       |  2 +-
 themes/fid_bbi/templates/nav.phtml            | 20 ++++----
 .../templates/record/cart-buttons.phtml       |  4 +-
 themes/fid_bbi/templates/record/taglist.phtml |  4 +-
 .../search/advanced-search-info.phtml         |  2 +-
 themes/fid_bbi/templates/search/history.phtml |  4 +-
 .../fid_bbi/templates/search/pagination.phtml |  4 +-
 themes/fid_bbi/templates/search/results.phtml | 18 +++----
 .../fid_bbi/templates/search/searchbox.phtml  |  4 +-
 121 files changed, 175 insertions(+), 177 deletions(-)
 rename themes/fid_bbi/icons/{small => }/add-book.svg (70%)
 create mode 100644 themes/fid_bbi/icons/arrow-left.svg
 create mode 100644 themes/fid_bbi/icons/arrow-right.svg
 delete mode 100644 themes/fid_bbi/icons/big/article-online.svg
 delete mode 100644 themes/fid_bbi/icons/big/article.svg
 delete mode 100644 themes/fid_bbi/icons/big/audio.svg
 delete mode 100644 themes/fid_bbi/icons/big/book-online.svg
 delete mode 100644 themes/fid_bbi/icons/big/book.svg
 delete mode 100644 themes/fid_bbi/icons/big/disc.svg
 delete mode 100644 themes/fid_bbi/icons/big/periodical-online.svg
 delete mode 100644 themes/fid_bbi/icons/big/periodical.svg
 delete mode 100644 themes/fid_bbi/icons/big/software.svg
 delete mode 100644 themes/fid_bbi/icons/big/unknown.svg
 delete mode 100644 themes/fid_bbi/icons/big/video.svg
 delete mode 100644 themes/fid_bbi/icons/big/website.svg
 create mode 100644 themes/fid_bbi/icons/checkmark.svg
 create mode 100644 themes/fid_bbi/icons/chevron-down.svg
 create mode 100644 themes/fid_bbi/icons/clock.svg
 create mode 100644 themes/fid_bbi/icons/download.svg
 rename themes/fid_bbi/icons/{small => }/error.svg (75%)
 rename themes/fid_bbi/icons/{small => }/external-link.svg (100%)
 create mode 100644 themes/fid_bbi/icons/face.svg
 rename themes/fid_bbi/icons/{small => }/filter.svg (82%)
 create mode 100644 themes/fid_bbi/icons/home.svg
 create mode 100644 themes/fid_bbi/icons/info.svg
 create mode 100644 themes/fid_bbi/icons/license.svg
 create mode 100644 themes/fid_bbi/icons/lightning.svg
 create mode 100644 themes/fid_bbi/icons/link.svg
 create mode 100644 themes/fid_bbi/icons/login.svg
 rename themes/fid_bbi/icons/{small => }/logout.svg (78%)
 create mode 100644 themes/fid_bbi/icons/magnifier.svg
 rename themes/fid_bbi/icons/{small => }/mail.svg (80%)
 create mode 100644 themes/fid_bbi/icons/media/article-online.svg
 create mode 100644 themes/fid_bbi/icons/media/article.svg
 create mode 100644 themes/fid_bbi/icons/media/audio.svg
 create mode 100644 themes/fid_bbi/icons/media/book-online.svg
 create mode 100644 themes/fid_bbi/icons/media/book.svg
 create mode 100644 themes/fid_bbi/icons/media/disc.svg
 create mode 100644 themes/fid_bbi/icons/media/periodical-online.svg
 create mode 100644 themes/fid_bbi/icons/media/periodical.svg
 create mode 100644 themes/fid_bbi/icons/media/software.svg
 create mode 100644 themes/fid_bbi/icons/media/unknown.svg
 create mode 100644 themes/fid_bbi/icons/media/video.svg
 create mode 100644 themes/fid_bbi/icons/media/website.svg
 rename themes/fid_bbi/icons/{small => }/menu.svg (83%)
 create mode 100644 themes/fid_bbi/icons/minus.svg
 rename themes/fid_bbi/icons/{small => }/order.svg (82%)
 rename themes/fid_bbi/icons/{small => }/pen.svg (100%)
 rename themes/fid_bbi/icons/{small => }/person.svg (58%)
 rename themes/fid_bbi/icons/{small => }/pin.svg (74%)
 create mode 100644 themes/fid_bbi/icons/plus.svg
 create mode 100644 themes/fid_bbi/icons/printer.svg
 create mode 100644 themes/fid_bbi/icons/quote.svg
 rename themes/fid_bbi/icons/{small => }/rss.svg (84%)
 create mode 100644 themes/fid_bbi/icons/save.svg
 rename themes/fid_bbi/icons/{small => }/scan-book.svg (64%)
 create mode 100644 themes/fid_bbi/icons/signup.svg
 delete mode 100644 themes/fid_bbi/icons/small/arrow-left.svg
 delete mode 100644 themes/fid_bbi/icons/small/arrow-right.svg
 delete mode 100644 themes/fid_bbi/icons/small/checkmark.svg
 delete mode 100644 themes/fid_bbi/icons/small/chevron-down.svg
 delete mode 100644 themes/fid_bbi/icons/small/clock.svg
 delete mode 100644 themes/fid_bbi/icons/small/download.svg
 delete mode 100644 themes/fid_bbi/icons/small/face.svg
 delete mode 100644 themes/fid_bbi/icons/small/home.svg
 delete mode 100644 themes/fid_bbi/icons/small/info.svg
 delete mode 100644 themes/fid_bbi/icons/small/license.svg
 delete mode 100644 themes/fid_bbi/icons/small/lightning.svg
 delete mode 100644 themes/fid_bbi/icons/small/link.svg
 delete mode 100644 themes/fid_bbi/icons/small/login.svg
 delete mode 100644 themes/fid_bbi/icons/small/magnifier.svg
 delete mode 100644 themes/fid_bbi/icons/small/minus.svg
 delete mode 100644 themes/fid_bbi/icons/small/plus.svg
 delete mode 100644 themes/fid_bbi/icons/small/printer.svg
 delete mode 100644 themes/fid_bbi/icons/small/quote.svg
 delete mode 100644 themes/fid_bbi/icons/small/save.svg
 delete mode 100644 themes/fid_bbi/icons/small/signup.svg
 delete mode 100644 themes/fid_bbi/icons/small/sun.svg
 delete mode 100644 themes/fid_bbi/icons/small/x.svg
 rename themes/fid_bbi/icons/{small => }/star.svg (84%)
 create mode 100644 themes/fid_bbi/icons/sun.svg
 rename themes/fid_bbi/icons/{small => }/trash.svg (100%)
 rename themes/fid_bbi/icons/{small => }/warning.svg (50%)
 create mode 100644 themes/fid_bbi/icons/x.svg

diff --git a/module/fid_bbi/src/fid_bbi/View/Helper/Root/Flashmessages.php b/module/fid_bbi/src/fid_bbi/View/Helper/Root/Flashmessages.php
index 295d26a3b25..dff69ef11ab 100644
--- a/module/fid_bbi/src/fid_bbi/View/Helper/Root/Flashmessages.php
+++ b/module/fid_bbi/src/fid_bbi/View/Helper/Root/Flashmessages.php
@@ -74,7 +74,7 @@ class Flashmessages extends \VuFind\View\Helper\Bootstrap3\Flashmessages
                 // BBI-specific
                 // Add icon based on namespace
                 $iconHelper = $this->getView()->plugin('icon');
-                $html .= $iconHelper("small/{$icons[$ns]}");
+                $html .= $iconHelper($icons[$ns]);
 
                 // Advanced form
                 if (is_array($msg)) {
diff --git a/themes/fid_bbi/icons/small/add-book.svg b/themes/fid_bbi/icons/add-book.svg
similarity index 70%
rename from themes/fid_bbi/icons/small/add-book.svg
rename to themes/fid_bbi/icons/add-book.svg
index 864930e287d..29d51d0d6eb 100644
--- a/themes/fid_bbi/icons/small/add-book.svg
+++ b/themes/fid_bbi/icons/add-book.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M22 14V3H6v22h16v-5M13 17h10M18 22V12M9 8h10M9 12h6" fill="none" stroke-width="2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M22 14V3H6v22h16v-5M13 17h10M18 22V12M9 8h10M9 12h6" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/arrow-left.svg b/themes/fid_bbi/icons/arrow-left.svg
new file mode 100644
index 00000000000..2983bef52a3
--- /dev/null
+++ b/themes/fid_bbi/icons/arrow-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M12 19l-5-5 5-5m8 5H8" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/arrow-right.svg b/themes/fid_bbi/icons/arrow-right.svg
new file mode 100644
index 00000000000..ad04b60a19e
--- /dev/null
+++ b/themes/fid_bbi/icons/arrow-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><path d="M15 9l5 5-5 5m-8-5h12" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/big/article-online.svg b/themes/fid_bbi/icons/big/article-online.svg
deleted file mode 100644
index 5dd65e2eefb..00000000000
--- a/themes/fid_bbi/icons/big/article-online.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M16 5h52v74H16z" fill="none" stroke="#000" stroke-width="2"/><path fill="#00a376" fill-rule="evenodd" d="M21 10h42v4H21zM21 16h42v4H21z" stroke="none"/><g fill="#00a376"><path fill-rule="evenodd" d="M21 24h19v27H21zM44 47h19v27H44z" stroke="none"/><path d="M44 24v19h19V24zm2 2h15v15H46zM21 55v19h19V55zm2 2h15v15H23z" stroke="none"/></g><path d="M42 42h37v27H36z" stroke="none"/><path d="M49 47v-1h2v4h1v1h-3v-1h1v-3zM45 46v5h3v-5zm1 1h1v3h-1zM53 46v5h3v-5zm1 1h1v3h-1zM57 46v5h3v-5zm1 1h1v3h-1zM61 46v5h3v-5zm1 1h1v3h-1zM65 47v-1h2v4h1v1h-3v-1h1v-3zM69 47v-1h2v4h1v1h-3v-1h1v-3zM73 46v5h3v-5zm1 1h1v3h-1zM49 54v-1h2v4h1v1h-3v-1h1v-3zM45 53v5h3v-5zm1 1h1v3h-1zM53 53v5h3v-5zm1 1h1v3h-1zM57 53v5h3v-5zm1 1h1v3h-1zM61 54v-1h2v4h1v1h-3v-1h1v-3zM65 53v5h3v-5zm1 1h1v3h-1zM69 53v5h3v-5zm1 1h1v3h-1zM73 54v-1h2v4h1v1h-3v-1h1v-3zM49 61v-1h2v4h1v1h-3v-1h1v-3zM45 60v5h3v-5zm1 1h1v3h-1zM53 60v5h3v-5zm1 1h1v3h-1zM57 60v5h3v-5zm1 1h1v3h-1zM65 61v-1h2v4h1v1h-3v-1h1v-3zM61 60v5h3v-5zm1 1h1v3h-1zM69 60v5h3v-5zm1 1h1v3h-1zM73 60v5h3v-5zm1 1h1v3h-1z" fill="#fff" stroke="none"/><path d="M79 42l-4-4h-6v2h5.17l2.002 2z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/big/article.svg b/themes/fid_bbi/icons/big/article.svg
deleted file mode 100644
index 2768fbeb0b8..00000000000
--- a/themes/fid_bbi/icons/big/article.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M16 5h52v74H16z" fill="none" stroke="#000" stroke-width="2"/><path fill="#00a376" fill-rule="evenodd" d="M21 10h42v4H21zM21 16h42v4H21z" stroke="none"/><g fill="#00a376"><path fill-rule="evenodd" d="M21 24h19v27H21zM44 47h19v27H44z" stroke="none"/><path d="M44 24v19h19V24zm2 2h15v15H46zM21 55v19h19V55zm2 2h15v15H23z" stroke="none"/></g></svg>
diff --git a/themes/fid_bbi/icons/big/audio.svg b/themes/fid_bbi/icons/big/audio.svg
deleted file mode 100644
index 44eb21b7020..00000000000
--- a/themes/fid_bbi/icons/big/audio.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M10 53V31h17l15-15v52L27 53z" fill="none" stroke="#000" stroke-width="2"/><path d="M68.861 15.139l-2.81 2.81A33.894 33.894 0 0176 42c0 9.4-3.8 17.901-9.95 24.05l2.811 2.811C75.741 61.981 80 52.481 80 42c0-10.482-4.26-19.982-11.139-26.861zm-7.07 7.07l-2.812 2.812A23.923 23.923 0 0166 42c0 6.64-2.681 12.638-7.021 16.979l2.812 2.812C66.861 56.721 70 49.721 70 42c0-7.72-3.139-14.721-8.209-19.791zm-7.072 7.072l-2.81 2.81A13.955 13.955 0 0156 42c0 3.878-1.561 7.378-4.092 9.908l2.81 2.81C57.98 51.459 60 46.959 60 42c0-4.959-2.02-9.458-5.281-12.719z" fill="#00a376" fill-rule="evenodd" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/big/book-online.svg b/themes/fid_bbi/icons/big/book-online.svg
deleted file mode 100644
index 41dce9f5262..00000000000
--- a/themes/fid_bbi/icons/big/book-online.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M62 11V3H13v69l8 9h50V11H21v70" fill="none" stroke="#000" stroke-width="2"/><path d="M17 6h42l4 4H21z" fill="#00a376" stroke="none"/><path d="M13 3l9 9" fill="none" stroke="#000" stroke-width="2"/><path fill="#00a376" fill-rule="evenodd" d="M30 26h32v4H30zM26 34h40v6H26zM30 44h32v4H30z" stroke="none"/><path d="M42 42h37v27H36z" stroke="none"/><path d="M49 47v-1h2v4h1v1h-3v-1h1v-3zM45 46v5h3v-5zm1 1h1v3h-1zM53 46v5h3v-5zm1 1h1v3h-1zM57 46v5h3v-5zm1 1h1v3h-1zM61 46v5h3v-5zm1 1h1v3h-1zM65 47v-1h2v4h1v1h-3v-1h1v-3zM69 47v-1h2v4h1v1h-3v-1h1v-3zM73 46v5h3v-5zm1 1h1v3h-1zM49 54v-1h2v4h1v1h-3v-1h1v-3zM45 53v5h3v-5zm1 1h1v3h-1zM53 53v5h3v-5zm1 1h1v3h-1zM57 53v5h3v-5zm1 1h1v3h-1zM61 54v-1h2v4h1v1h-3v-1h1v-3zM65 53v5h3v-5zm1 1h1v3h-1zM69 53v5h3v-5zm1 1h1v3h-1zM73 54v-1h2v4h1v1h-3v-1h1v-3zM49 61v-1h2v4h1v1h-3v-1h1v-3zM45 60v5h3v-5zm1 1h1v3h-1zM53 60v5h3v-5zm1 1h1v3h-1zM57 60v5h3v-5zm1 1h1v3h-1zM65 61v-1h2v4h1v1h-3v-1h1v-3zM61 60v5h3v-5zm1 1h1v3h-1zM69 60v5h3v-5zm1 1h1v3h-1zM73 60v5h3v-5zm1 1h1v3h-1z" fill="#fff" stroke="none"/><path d="M79 42l-4-4h-4v2h3.17l2.002 2z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/big/book.svg b/themes/fid_bbi/icons/big/book.svg
deleted file mode 100644
index e351aa17af3..00000000000
--- a/themes/fid_bbi/icons/big/book.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M62 11V3H13v69l8 9h50V11H21v70" fill="none" stroke="#000" stroke-width="2"/><path d="M17 6h42l4 4H21z" fill="#00a376" stroke="none"/><path d="M13 3l9 9" fill="none" stroke="#000" stroke-width="2"/><path fill="#00a376" fill-rule="evenodd" d="M30 26h32v4H30zM26 34h40v6H26zM30 44h32v4H30z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/big/disc.svg b/themes/fid_bbi/icons/big/disc.svg
deleted file mode 100644
index 9b932185446..00000000000
--- a/themes/fid_bbi/icons/big/disc.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><circle r="37" cy="42" cx="42" fill="none" stroke="#000" stroke-width="2"/><circle cx="42" cy="42" r="12" fill="none" stroke="#000" stroke-width="2"/><circle r="4" cy="42" cx="42" fill="none" stroke="#000" stroke-width="2"/><path d="M56.19 8.889l-9.073 21.17a13.101 13.101 0 016.824 6.824l21.17-9.072A35.968 35.968 0 0056.19 8.889zM30.058 47.117L8.889 56.19A35.968 35.968 0 0027.81 75.111l9.072-21.17a13.101 13.101 0 01-6.824-6.824z" fill="#00a376" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/big/periodical-online.svg b/themes/fid_bbi/icons/big/periodical-online.svg
deleted file mode 100644
index 46007b8cf63..00000000000
--- a/themes/fid_bbi/icons/big/periodical-online.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M20 79h-4V5h52v4" fill="none" stroke="#000" stroke-width="2"/><path fill="#00a376" fill-rule="evenodd" d="M67 14H25v4h42zM67 20H25v4h42z" stroke="none"/><path d="M16 75h-4V1h52v4" fill="none" stroke="#000" stroke-width="2"/><path d="M72 83H20V9h52z" fill="none" stroke="#000" stroke-width="2"/><g fill="#00a376"><path fill-rule="evenodd" d="M25 28h19v27H25zM48 51h19v27H48z" stroke="none"/><path d="M48 28v19h19V28zm2 2h15v15H50zM25 59v19h19V59zm2 2h15v15H27z" stroke="none"/></g><path d="M42 42h37v27H36z" stroke="none"/><path d="M49 47v-1h2v4h1v1h-3v-1h1v-3zM45 46v5h3v-5zm1 1h1v3h-1zM53 46v5h3v-5zm1 1h1v3h-1zM57 46v5h3v-5zm1 1h1v3h-1zM61 46v5h3v-5zm1 1h1v3h-1zM65 47v-1h2v4h1v1h-3v-1h1v-3zM69 47v-1h2v4h1v1h-3v-1h1v-3zM73 46v5h3v-5zm1 1h1v3h-1zM49 54v-1h2v4h1v1h-3v-1h1v-3zM45 53v5h3v-5zm1 1h1v3h-1zM53 53v5h3v-5zm1 1h1v3h-1zM57 53v5h3v-5zm1 1h1v3h-1zM61 54v-1h2v4h1v1h-3v-1h1v-3zM65 53v5h3v-5zm1 1h1v3h-1zM69 53v5h3v-5zm1 1h1v3h-1zM73 54v-1h2v4h1v1h-3v-1h1v-3zM49 61v-1h2v4h1v1h-3v-1h1v-3zM45 60v5h3v-5zm1 1h1v3h-1zM53 60v5h3v-5zm1 1h1v3h-1zM57 60v5h3v-5zm1 1h1v3h-1zM65 61v-1h2v4h1v1h-3v-1h1v-3zM61 60v5h3v-5zm1 1h1v3h-1zM69 60v5h3v-5zm1 1h1v3h-1zM73 60v5h3v-5zm1 1h1v3h-1z" fill="#fff" stroke="none"/><path d="M79 42l-4-4h-3v2h2.17l2.002 2z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/big/periodical.svg b/themes/fid_bbi/icons/big/periodical.svg
deleted file mode 100644
index fd7c660f967..00000000000
--- a/themes/fid_bbi/icons/big/periodical.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M20 79h-4V5h52v4" fill="none" stroke="#000" stroke-width="2"/><path fill="#00a376" fill-rule="evenodd" d="M25 14h42v4H25zM25 20h42v4H25z" stroke="none"/><path d="M16 75h-4V1h52v4" fill="none" stroke="#000" stroke-width="2"/><path d="M72 83H20V9h52z" fill="none" stroke="#000" stroke-width="2"/><g fill="#00a376"><path fill-rule="evenodd" d="M25 28h19v27H25zM48 51h19v27H48z" stroke="none"/><path d="M48 28v19h19V28zm2 2h15v15H50zM25 59v19h19V59zm2 2h15v15H27z" stroke="none"/></g></svg>
diff --git a/themes/fid_bbi/icons/big/software.svg b/themes/fid_bbi/icons/big/software.svg
deleted file mode 100644
index 3c1a2587f8a..00000000000
--- a/themes/fid_bbi/icons/big/software.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><g fill="none"><path stroke="#000" stroke-width="2" d="M5 10h74v52H5z"/><path d="M28 76h28" stroke="#000" stroke-width="2"/><path stroke="#000" stroke-width="2" d="M33 62h18v14H33z"/><path stroke="#00a376" stroke-width="2" d="M9 14h66v44H9z"/><path d="M42 35v15M30 29l12 6 12-6m-24 0l12-6 12 6v15l-12 6-12-6z" stroke="#00a376" stroke-width="4"/></g></svg>
diff --git a/themes/fid_bbi/icons/big/unknown.svg b/themes/fid_bbi/icons/big/unknown.svg
deleted file mode 100644
index 05dfab2df31..00000000000
--- a/themes/fid_bbi/icons/big/unknown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M16 5h52v74H16z" fill="none" stroke="#000" stroke-width="2"/><path d="M34 28h16v12h-8v10" fill="none" stroke="#00a376" stroke-width="4"/><path fill="#00a376" d="M40 54h4v4h-4z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/big/video.svg b/themes/fid_bbi/icons/big/video.svg
deleted file mode 100644
index 3828d88c87f..00000000000
--- a/themes/fid_bbi/icons/big/video.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path fill="none" stroke="#000" stroke-width="2" d="M5 16h74v52H5z" stroke="none"/><path d="M35 31l18 11-18 11zM8 19h6v6H8zM8 29h6v6H8zM8 49h6v6H8zM8 59h6v6H8zM8 39h6v6H8zM70 19h6v6h-6zM70 29h6v6h-6zM70 49h6v6h-6zM70 59h6v6h-6zM70 39h6v6h-6z" fill="#00a376" stroke="none"/><path d="M17 16v52M67 17v52" fill="none" stroke="#000" stroke-width="2"/></svg>
diff --git a/themes/fid_bbi/icons/big/website.svg b/themes/fid_bbi/icons/big/website.svg
deleted file mode 100644
index 2a63b0bb0ef..00000000000
--- a/themes/fid_bbi/icons/big/website.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><rect width="74" height="52" x="5" y="16" ry="0" fill="none" stroke="#000" stroke-width="2"/><path d="M6 26h73" fill="none" stroke="#000" stroke-width="2"/><path fill="#00a376" fill-rule="evenodd" d="M8 19h46v4H8zM56 19h20v4H56z" stroke="none"/><path d="M30.577 40h-3.5l-1.344 10.696-1.904-8.176h-3.304l-2.044 8.176L17.165 40H13.44l2.156 14h4.76l1.652-6.888L23.52 54h4.9zM50.57 40h-3.5l-1.344 10.696-1.904-8.176h-3.304l-2.044 8.176L37.158 40h-3.724l2.156 14h4.76l1.652-6.888L43.514 54h4.9zM70.563 40h-3.5l-1.344 10.696-1.904-8.176H60.51l-2.044 8.176L57.15 40h-3.724l2.156 14h4.76l1.652-6.888L63.507 54h4.9z" fill="#00a376" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/checkmark.svg b/themes/fid_bbi/icons/checkmark.svg
new file mode 100644
index 00000000000..266f60b2db0
--- /dev/null
+++ b/themes/fid_bbi/icons/checkmark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M24 7L14 22l-9-6" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/chevron-down.svg b/themes/fid_bbi/icons/chevron-down.svg
new file mode 100644
index 00000000000..439cde39e0e
--- /dev/null
+++ b/themes/fid_bbi/icons/chevron-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M6 11l8 8 8-8" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/clock.svg b/themes/fid_bbi/icons/clock.svg
new file mode 100644
index 00000000000..bbc10cf5892
--- /dev/null
+++ b/themes/fid_bbi/icons/clock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none"><circle cx="14" cy="14" r="10"/><path d="M14 7v7l3 3"/></g></svg>
diff --git a/themes/fid_bbi/icons/download.svg b/themes/fid_bbi/icons/download.svg
new file mode 100644
index 00000000000..eb58f8c1ea9
--- /dev/null
+++ b/themes/fid_bbi/icons/download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><g fill="none"><path d="M24 15v7H4v-7"/><path d="M19 12l-5 5-5-5m5-8v12"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/error.svg b/themes/fid_bbi/icons/error.svg
similarity index 75%
rename from themes/fid_bbi/icons/small/error.svg
rename to themes/fid_bbi/icons/error.svg
index 38916849c97..121a4900b65 100644
--- a/themes/fid_bbi/icons/small/error.svg
+++ b/themes/fid_bbi/icons/error.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none"><path d="M3 18.556V9.444L9.444 3h9.112L25 9.444v9.112L18.556 25H9.444z" stroke-width="2.0002752"/><path d="M9 9l10 10M19 9L9 19" stroke-width="2"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none"><path d="M3 18.556V9.444L9.444 3h9.112L25 9.444v9.112L18.556 25H9.444z" stroke-width="2.0002752"/><path d="M9 9l10 10M19 9L9 19"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/external-link.svg b/themes/fid_bbi/icons/external-link.svg
similarity index 100%
rename from themes/fid_bbi/icons/small/external-link.svg
rename to themes/fid_bbi/icons/external-link.svg
diff --git a/themes/fid_bbi/icons/face.svg b/themes/fid_bbi/icons/face.svg
new file mode 100644
index 00000000000..4d34eb9314b
--- /dev/null
+++ b/themes/fid_bbi/icons/face.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g><circle cx="14" cy="14" r="10" fill="none"/><path d="M10 10h2v2h-2zm6 0h2v2h-2z" stroke="none"/><path d="M17.54 17.536A5 5 0 0114.003 19a5 5 0 01-3.536-1.464" fill="none"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/filter.svg b/themes/fid_bbi/icons/filter.svg
similarity index 82%
rename from themes/fid_bbi/icons/small/filter.svg
rename to themes/fid_bbi/icons/filter.svg
index c19570e014c..682649e7956 100644
--- a/themes/fid_bbi/icons/small/filter.svg
+++ b/themes/fid_bbi/icons/filter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M4 4h20l-8 8v11l-4 2V12z" fill="none" stroke-width="2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M4 4h20l-8 8v11l-4 2V12z" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/home.svg b/themes/fid_bbi/icons/home.svg
new file mode 100644
index 00000000000..5b148dd99f4
--- /dev/null
+++ b/themes/fid_bbi/icons/home.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none"><path d="M7 11v11h14V11"/><path d="M4 14L14 4l10 10M11 22v-8h6v8"/></g></svg>
diff --git a/themes/fid_bbi/icons/info.svg b/themes/fid_bbi/icons/info.svg
new file mode 100644
index 00000000000..59859a45e16
--- /dev/null
+++ b/themes/fid_bbi/icons/info.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><circle cy="14" cx="14" r="10" fill="none"/><path d="M14 19v-6" fill="none"/><path d="M13 9h2v2h-2z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/license.svg b/themes/fid_bbi/icons/license.svg
new file mode 100644
index 00000000000..bd4171d805d
--- /dev/null
+++ b/themes/fid_bbi/icons/license.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none"><circle cx="18" cy="14" r="3"/><path d="M16 16v7l2-1 2 1v-7M6 11h6M6 15h6"/><path d="M13 22H3V6h22v16h-2"/></g></svg>
diff --git a/themes/fid_bbi/icons/lightning.svg b/themes/fid_bbi/icons/lightning.svg
new file mode 100644
index 00000000000..575d31f293d
--- /dev/null
+++ b/themes/fid_bbi/icons/lightning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none"><path d="M17 3l-5 10h4l-5 10"/><path d="M9 17l2 6 6-2"/></g></svg>
diff --git a/themes/fid_bbi/icons/link.svg b/themes/fid_bbi/icons/link.svg
new file mode 100644
index 00000000000..97c6e027d34
--- /dev/null
+++ b/themes/fid_bbi/icons/link.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none"><path d="M12 16l-2-2 9-9 7 7-10 10"/><path d="M16 12l2 2-9 9-7-7L12 6"/></g></svg>
diff --git a/themes/fid_bbi/icons/login.svg b/themes/fid_bbi/icons/login.svg
new file mode 100644
index 00000000000..32cbf75bb51
--- /dev/null
+++ b/themes/fid_bbi/icons/login.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><g fill="none"><path d="M15 5h7v18h-7"/><path d="M12 9l5 5-5 5m-8-5h12"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/logout.svg b/themes/fid_bbi/icons/logout.svg
similarity index 78%
rename from themes/fid_bbi/icons/small/logout.svg
rename to themes/fid_bbi/icons/logout.svg
index 14ede949776..cef2d992a1b 100644
--- a/themes/fid_bbi/icons/small/logout.svg
+++ b/themes/fid_bbi/icons/logout.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M13 23H6V5h7m5 4l5 5-5 5m-8-5h12" fill="none" stroke-width="2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M13 23H6V5h7m5 4l5 5-5 5m-8-5h12" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/magnifier.svg b/themes/fid_bbi/icons/magnifier.svg
new file mode 100644
index 00000000000..9178973a197
--- /dev/null
+++ b/themes/fid_bbi/icons/magnifier.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none"><circle cx="12" cy="12" r="10"/><path d="M19 19l7 7"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/mail.svg b/themes/fid_bbi/icons/mail.svg
similarity index 80%
rename from themes/fid_bbi/icons/small/mail.svg
rename to themes/fid_bbi/icons/mail.svg
index c93de3c18b0..6b101705ec1 100644
--- a/themes/fid_bbi/icons/small/mail.svg
+++ b/themes/fid_bbi/icons/mail.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M3 6h22v16H3z M3 6l11 9 11-9" fill="none" stroke-width="2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M3 6h22v16H3z M3 6l11 9 11-9" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/media/article-online.svg b/themes/fid_bbi/icons/media/article-online.svg
new file mode 100644
index 00000000000..801f1853bd4
--- /dev/null
+++ b/themes/fid_bbi/icons/media/article-online.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M16 5h52v74H16z" fill="none" stroke="#000"/><path fill="#00a376" fill-rule="evenodd" d="M21 10h42v4H21zM21 16h42v4H21z" stroke="none"/><g fill="#00a376"><path fill-rule="evenodd" d="M21 24h19v27H21zM44 47h19v27H44z" stroke="none"/><path d="M44 24v19h19V24zm2 2h15v15H46zM21 55v19h19V55zm2 2h15v15H23z" stroke="none"/></g><path d="M42 42h37v27H36z" stroke="none"/><path d="M49 47v-1h2v4h1v1h-3v-1h1v-3zM45 46v5h3v-5zm1 1h1v3h-1zM53 46v5h3v-5zm1 1h1v3h-1zM57 46v5h3v-5zm1 1h1v3h-1zM61 46v5h3v-5zm1 1h1v3h-1zM65 47v-1h2v4h1v1h-3v-1h1v-3zM69 47v-1h2v4h1v1h-3v-1h1v-3zM73 46v5h3v-5zm1 1h1v3h-1zM49 54v-1h2v4h1v1h-3v-1h1v-3zM45 53v5h3v-5zm1 1h1v3h-1zM53 53v5h3v-5zm1 1h1v3h-1zM57 53v5h3v-5zm1 1h1v3h-1zM61 54v-1h2v4h1v1h-3v-1h1v-3zM65 53v5h3v-5zm1 1h1v3h-1zM69 53v5h3v-5zm1 1h1v3h-1zM73 54v-1h2v4h1v1h-3v-1h1v-3zM49 61v-1h2v4h1v1h-3v-1h1v-3zM45 60v5h3v-5zm1 1h1v3h-1zM53 60v5h3v-5zm1 1h1v3h-1zM57 60v5h3v-5zm1 1h1v3h-1zM65 61v-1h2v4h1v1h-3v-1h1v-3zM61 60v5h3v-5zm1 1h1v3h-1zM69 60v5h3v-5zm1 1h1v3h-1zM73 60v5h3v-5zm1 1h1v3h-1z" fill="#fff" stroke="none"/><path d="M79 42l-4-4h-6v2h5.17l2.002 2z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/media/article.svg b/themes/fid_bbi/icons/media/article.svg
new file mode 100644
index 00000000000..6c163cae8f4
--- /dev/null
+++ b/themes/fid_bbi/icons/media/article.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M16 5h52v74H16z" fill="none" stroke="#000"/><path fill="#00a376" fill-rule="evenodd" d="M21 10h42v4H21zM21 16h42v4H21z" stroke="none"/><g fill="#00a376"><path fill-rule="evenodd" d="M21 24h19v27H21zM44 47h19v27H44z" stroke="none"/><path d="M44 24v19h19V24zm2 2h15v15H46zM21 55v19h19V55zm2 2h15v15H23z" stroke="none"/></g></svg>
diff --git a/themes/fid_bbi/icons/media/audio.svg b/themes/fid_bbi/icons/media/audio.svg
new file mode 100644
index 00000000000..c384f6d012b
--- /dev/null
+++ b/themes/fid_bbi/icons/media/audio.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M10 53V31h17l15-15v52L27 53z" fill="none" stroke="#000"/><path d="M68.861 15.139l-2.81 2.81A33.894 33.894 0 0176 42c0 9.4-3.8 17.901-9.95 24.05l2.811 2.811C75.741 61.981 80 52.481 80 42c0-10.482-4.26-19.982-11.139-26.861zm-7.07 7.07l-2.812 2.812A23.923 23.923 0 0166 42c0 6.64-2.681 12.638-7.021 16.979l2.812 2.812C66.861 56.721 70 49.721 70 42c0-7.72-3.139-14.721-8.209-19.791zm-7.072 7.072l-2.81 2.81A13.955 13.955 0 0156 42c0 3.878-1.561 7.378-4.092 9.908l2.81 2.81C57.98 51.459 60 46.959 60 42c0-4.959-2.02-9.458-5.281-12.719z" fill="#00a376" fill-rule="evenodd" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/media/book-online.svg b/themes/fid_bbi/icons/media/book-online.svg
new file mode 100644
index 00000000000..dcc215563a1
--- /dev/null
+++ b/themes/fid_bbi/icons/media/book-online.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M62 11V3H13v69l8 9h50V11H21v70" fill="none" stroke="#000"/><path d="M17 6h42l4 4H21z" fill="#00a376" stroke="none"/><path d="M13 3l9 9" fill="none" stroke="#000"/><path fill="#00a376" fill-rule="evenodd" d="M30 26h32v4H30zM26 34h40v6H26zM30 44h32v4H30z" stroke="none"/><path d="M42 42h37v27H36z" stroke="none"/><path d="M49 47v-1h2v4h1v1h-3v-1h1v-3zM45 46v5h3v-5zm1 1h1v3h-1zM53 46v5h3v-5zm1 1h1v3h-1zM57 46v5h3v-5zm1 1h1v3h-1zM61 46v5h3v-5zm1 1h1v3h-1zM65 47v-1h2v4h1v1h-3v-1h1v-3zM69 47v-1h2v4h1v1h-3v-1h1v-3zM73 46v5h3v-5zm1 1h1v3h-1zM49 54v-1h2v4h1v1h-3v-1h1v-3zM45 53v5h3v-5zm1 1h1v3h-1zM53 53v5h3v-5zm1 1h1v3h-1zM57 53v5h3v-5zm1 1h1v3h-1zM61 54v-1h2v4h1v1h-3v-1h1v-3zM65 53v5h3v-5zm1 1h1v3h-1zM69 53v5h3v-5zm1 1h1v3h-1zM73 54v-1h2v4h1v1h-3v-1h1v-3zM49 61v-1h2v4h1v1h-3v-1h1v-3zM45 60v5h3v-5zm1 1h1v3h-1zM53 60v5h3v-5zm1 1h1v3h-1zM57 60v5h3v-5zm1 1h1v3h-1zM65 61v-1h2v4h1v1h-3v-1h1v-3zM61 60v5h3v-5zm1 1h1v3h-1zM69 60v5h3v-5zm1 1h1v3h-1zM73 60v5h3v-5zm1 1h1v3h-1z" fill="#fff" stroke="none"/><path d="M79 42l-4-4h-4v2h3.17l2.002 2z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/media/book.svg b/themes/fid_bbi/icons/media/book.svg
new file mode 100644
index 00000000000..f26f5ab3828
--- /dev/null
+++ b/themes/fid_bbi/icons/media/book.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M62 11V3H13v69l8 9h50V11H21v70" fill="none" stroke="#000"/><path d="M17 6h42l4 4H21z" fill="#00a376" stroke="none"/><path d="M13 3l9 9" fill="none" stroke="#000"/><path fill="#00a376" fill-rule="evenodd" d="M30 26h32v4H30zM26 34h40v6H26zM30 44h32v4H30z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/media/disc.svg b/themes/fid_bbi/icons/media/disc.svg
new file mode 100644
index 00000000000..8d5b123cd55
--- /dev/null
+++ b/themes/fid_bbi/icons/media/disc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><circle r="37" cy="42" cx="42" fill="none" stroke="#000"/><circle cx="42" cy="42" r="12" fill="none" stroke="#000"/><circle r="4" cy="42" cx="42" fill="none" stroke="#000"/><path d="M56.19 8.889l-9.073 21.17a13.101 13.101 0 016.824 6.824l21.17-9.072A35.968 35.968 0 0056.19 8.889zM30.058 47.117L8.889 56.19A35.968 35.968 0 0027.81 75.111l9.072-21.17a13.101 13.101 0 01-6.824-6.824z" fill="#00a376" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/media/periodical-online.svg b/themes/fid_bbi/icons/media/periodical-online.svg
new file mode 100644
index 00000000000..76b3a5605f7
--- /dev/null
+++ b/themes/fid_bbi/icons/media/periodical-online.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M20 79h-4V5h52v4" fill="none" stroke="#000"/><path fill="#00a376" fill-rule="evenodd" d="M67 14H25v4h42zM67 20H25v4h42z" stroke="none"/><path d="M16 75h-4V1h52v4" fill="none" stroke="#000"/><path d="M72 83H20V9h52z" fill="none" stroke="#000"/><g fill="#00a376"><path fill-rule="evenodd" d="M25 28h19v27H25zM48 51h19v27H48z" stroke="none"/><path d="M48 28v19h19V28zm2 2h15v15H50zM25 59v19h19V59zm2 2h15v15H27z" stroke="none"/></g><path d="M42 42h37v27H36z" stroke="none"/><path d="M49 47v-1h2v4h1v1h-3v-1h1v-3zM45 46v5h3v-5zm1 1h1v3h-1zM53 46v5h3v-5zm1 1h1v3h-1zM57 46v5h3v-5zm1 1h1v3h-1zM61 46v5h3v-5zm1 1h1v3h-1zM65 47v-1h2v4h1v1h-3v-1h1v-3zM69 47v-1h2v4h1v1h-3v-1h1v-3zM73 46v5h3v-5zm1 1h1v3h-1zM49 54v-1h2v4h1v1h-3v-1h1v-3zM45 53v5h3v-5zm1 1h1v3h-1zM53 53v5h3v-5zm1 1h1v3h-1zM57 53v5h3v-5zm1 1h1v3h-1zM61 54v-1h2v4h1v1h-3v-1h1v-3zM65 53v5h3v-5zm1 1h1v3h-1zM69 53v5h3v-5zm1 1h1v3h-1zM73 54v-1h2v4h1v1h-3v-1h1v-3zM49 61v-1h2v4h1v1h-3v-1h1v-3zM45 60v5h3v-5zm1 1h1v3h-1zM53 60v5h3v-5zm1 1h1v3h-1zM57 60v5h3v-5zm1 1h1v3h-1zM65 61v-1h2v4h1v1h-3v-1h1v-3zM61 60v5h3v-5zm1 1h1v3h-1zM69 60v5h3v-5zm1 1h1v3h-1zM73 60v5h3v-5zm1 1h1v3h-1z" fill="#fff" stroke="none"/><path d="M79 42l-4-4h-3v2h2.17l2.002 2z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/media/periodical.svg b/themes/fid_bbi/icons/media/periodical.svg
new file mode 100644
index 00000000000..a19290ab033
--- /dev/null
+++ b/themes/fid_bbi/icons/media/periodical.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M20 79h-4V5h52v4" fill="none" stroke="#000"/><path fill="#00a376" fill-rule="evenodd" d="M25 14h42v4H25zM25 20h42v4H25z" stroke="none"/><path d="M16 75h-4V1h52v4" fill="none" stroke="#000"/><path d="M72 83H20V9h52z" fill="none" stroke="#000"/><g fill="#00a376"><path fill-rule="evenodd" d="M25 28h19v27H25zM48 51h19v27H48z" stroke="none"/><path d="M48 28v19h19V28zm2 2h15v15H50zM25 59v19h19V59zm2 2h15v15H27z" stroke="none"/></g></svg>
diff --git a/themes/fid_bbi/icons/media/software.svg b/themes/fid_bbi/icons/media/software.svg
new file mode 100644
index 00000000000..16dd8e46864
--- /dev/null
+++ b/themes/fid_bbi/icons/media/software.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><g fill="none"><path stroke="#000" d="M5 10h74v52H5z"/><path d="M28 76h28" stroke="#000"/><path stroke="#000" d="M33 62h18v14H33z"/><path stroke="#00a376" d="M9 14h66v44H9z"/><path d="M42 35v15M30 29l12 6 12-6m-24 0l12-6 12 6v15l-12 6-12-6z" stroke="#00a376" stroke-width="4"/></g></svg>
diff --git a/themes/fid_bbi/icons/media/unknown.svg b/themes/fid_bbi/icons/media/unknown.svg
new file mode 100644
index 00000000000..21fed3bcb5a
--- /dev/null
+++ b/themes/fid_bbi/icons/media/unknown.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path d="M16 5h52v74H16z" fill="none" stroke="#000"/><path d="M34 28h16v12h-8v10" fill="none" stroke="#00a376" stroke-width="4"/><path fill="#00a376" d="M40 54h4v4h-4z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/media/video.svg b/themes/fid_bbi/icons/media/video.svg
new file mode 100644
index 00000000000..00bbfe26cd7
--- /dev/null
+++ b/themes/fid_bbi/icons/media/video.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><path fill="none" stroke="#000" d="M5 16h74v52H5z"/><path d="M35 31l18 11-18 11zM8 19h6v6H8zM8 29h6v6H8zM8 49h6v6H8zM8 59h6v6H8zM8 39h6v6H8zM70 19h6v6h-6zM70 29h6v6h-6zM70 49h6v6h-6zM70 59h6v6h-6zM70 39h6v6h-6z" fill="#00a376" stroke="none"/><path d="M17 16v52M67 17v52" fill="none" stroke="#000"/></svg>
diff --git a/themes/fid_bbi/icons/media/website.svg b/themes/fid_bbi/icons/media/website.svg
new file mode 100644
index 00000000000..92707470f74
--- /dev/null
+++ b/themes/fid_bbi/icons/media/website.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 84" height="84" width="84"><rect width="74" height="52" x="5" y="16" ry="0" fill="none" stroke="#000"/><path d="M6 26h73" fill="none" stroke="#000"/><path fill="#00a376" fill-rule="evenodd" d="M8 19h46v4H8zM56 19h20v4H56z" stroke="none"/><path d="M30.577 40h-3.5l-1.344 10.696-1.904-8.176h-3.304l-2.044 8.176L17.165 40H13.44l2.156 14h4.76l1.652-6.888L23.52 54h4.9zM50.57 40h-3.5l-1.344 10.696-1.904-8.176h-3.304l-2.044 8.176L37.158 40h-3.724l2.156 14h4.76l1.652-6.888L43.514 54h4.9zM70.563 40h-3.5l-1.344 10.696-1.904-8.176H60.51l-2.044 8.176L57.15 40h-3.724l2.156 14h4.76l1.652-6.888L63.507 54h4.9z" fill="#00a376" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/small/menu.svg b/themes/fid_bbi/icons/menu.svg
similarity index 83%
rename from themes/fid_bbi/icons/small/menu.svg
rename to themes/fid_bbi/icons/menu.svg
index d0ec17d46f9..50060b5578e 100644
--- a/themes/fid_bbi/icons/small/menu.svg
+++ b/themes/fid_bbi/icons/menu.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M2 14h24M2 6h24M2 22h24" fill="none" stroke-width="2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M2 14h24M2 6h24M2 22h24" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/minus.svg b/themes/fid_bbi/icons/minus.svg
new file mode 100644
index 00000000000..84d8ff561b6
--- /dev/null
+++ b/themes/fid_bbi/icons/minus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M6 14h16" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/small/order.svg b/themes/fid_bbi/icons/order.svg
similarity index 82%
rename from themes/fid_bbi/icons/small/order.svg
rename to themes/fid_bbi/icons/order.svg
index 72e44b4f449..f9b691f6f13 100644
--- a/themes/fid_bbi/icons/small/order.svg
+++ b/themes/fid_bbi/icons/order.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M5 2v24h18v-6.592l-2 3V24H7V4h14v7.592l2-3V2z" stroke="none"/><path d="M9 8h10M9 12h10M25 11l-6 9-6-4" fill="none" stroke-width="2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M5 2v24h18v-6.592l-2 3V24H7V4h14v7.592l2-3V2z" stroke="none"/><path d="M9 8h10M9 12h10M25 11l-6 9-6-4" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/small/pen.svg b/themes/fid_bbi/icons/pen.svg
similarity index 100%
rename from themes/fid_bbi/icons/small/pen.svg
rename to themes/fid_bbi/icons/pen.svg
diff --git a/themes/fid_bbi/icons/small/person.svg b/themes/fid_bbi/icons/person.svg
similarity index 58%
rename from themes/fid_bbi/icons/small/person.svg
rename to themes/fid_bbi/icons/person.svg
index b81cfb41b96..e077e8a3015 100644
--- a/themes/fid_bbi/icons/small/person.svg
+++ b/themes/fid_bbi/icons/person.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><circle cx="14" cy="8" r="5" fill="none"/><path d="M19.787 14.894a9 9 0 01-11.57 0M9.35 15L4 18v6h20v-6l-5.35-3" fill="none"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><circle cx="14" cy="8" r="5" fill="none"/><path d="M19.787 14.894a9 9 0 01-11.57 0M9.35 15L4 18v6m20 0v-6l-5.35-3" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/small/pin.svg b/themes/fid_bbi/icons/pin.svg
similarity index 74%
rename from themes/fid_bbi/icons/small/pin.svg
rename to themes/fid_bbi/icons/pin.svg
index c58d068c473..54145818102 100644
--- a/themes/fid_bbi/icons/small/pin.svg
+++ b/themes/fid_bbi/icons/pin.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M8 4h12v4h-2l2 8h2v4H6v-4h2l2-8H8zm6 17v6" fill="none" stroke-width="2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M8 4h12v4h-2l2 8h2v4H6v-4h2l2-8H8zm6 17v6" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/plus.svg b/themes/fid_bbi/icons/plus.svg
new file mode 100644
index 00000000000..5aa33d85574
--- /dev/null
+++ b/themes/fid_bbi/icons/plus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M6 14h16m-8-8v16" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/printer.svg b/themes/fid_bbi/icons/printer.svg
new file mode 100644
index 00000000000..50ca6075f09
--- /dev/null
+++ b/themes/fid_bbi/icons/printer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none"><rect width="14" height="12" x="7" y="14" ry="0"/><path d="M6 19H3V9h22v10h-3M7 8V3h14v5M10 18h8m-8 4h8"/></g></svg>
diff --git a/themes/fid_bbi/icons/quote.svg b/themes/fid_bbi/icons/quote.svg
new file mode 100644
index 00000000000..f27ccbb5e45
--- /dev/null
+++ b/themes/fid_bbi/icons/quote.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none"><path d="M12 8v8l-3 6M20 8v8l-3 6"/><path d="M12 9H8v4h4m8-4h-4v4h4"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/rss.svg b/themes/fid_bbi/icons/rss.svg
similarity index 84%
rename from themes/fid_bbi/icons/small/rss.svg
rename to themes/fid_bbi/icons/rss.svg
index 1826257ad0a..c5ec6118402 100644
--- a/themes/fid_bbi/icons/small/rss.svg
+++ b/themes/fid_bbi/icons/rss.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><circle cx="8" cy="19.671" r="3" stroke="none"/><path d="M5 10.671a12 12 0 0112 12m-12-18a18 18 0 0118 18" fill="none" stroke-width="2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><circle cx="8" cy="19.671" r="3" stroke="none"/><path d="M5 10.671a12 12 0 0112 12m-12-18a18 18 0 0118 18" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/save.svg b/themes/fid_bbi/icons/save.svg
new file mode 100644
index 00000000000..1af0589dc7f
--- /dev/null
+++ b/themes/fid_bbi/icons/save.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><g fill="none"><path d="M19 12l-5 5-5-5m5-8v12"/><path d="M10 5H5v18h18V5h-5"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/scan-book.svg b/themes/fid_bbi/icons/scan-book.svg
similarity index 64%
rename from themes/fid_bbi/icons/small/scan-book.svg
rename to themes/fid_bbi/icons/scan-book.svg
index ad27490d121..31c5c7e6043 100644
--- a/themes/fid_bbi/icons/small/scan-book.svg
+++ b/themes/fid_bbi/icons/scan-book.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M13 1v2h12v10.666l2 2.668V1zm14 21.875l-2 .334V25c-3.999.011-19.013 0-23 0v2h25z" stroke="none"/><path d="M14 13l6-1 6 8-12 2-12-2 6-8 6 1v9" fill="none" stroke-width="2"/><path d="M10 7l2-2h4l2 2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M13 1v2h12v10.666l2 2.668V1zm14 21.875l-2 .334V25c-3.999.011-19.013 0-23 0v2h25z" stroke="none"/><path d="M14 13l6-1 6 8-12 2-12-2 6-8 6 1v9" fill="none"/><path d="M10 7l2-2h4l2 2z"/></svg>
diff --git a/themes/fid_bbi/icons/signup.svg b/themes/fid_bbi/icons/signup.svg
new file mode 100644
index 00000000000..ad7ed3b3195
--- /dev/null
+++ b/themes/fid_bbi/icons/signup.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M21 4l3 3-11 11h-3v-3zM10 15l3 3" fill="none"/><path d="M3.889 3.889V24.11H24.11V11.13l-2.222 2.222v8.536H6.11V6.11h8.536l2.222-2.222z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/small/arrow-left.svg b/themes/fid_bbi/icons/small/arrow-left.svg
deleted file mode 100644
index 3f99d6bfcd6..00000000000
--- a/themes/fid_bbi/icons/small/arrow-left.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M12 19l-5-5 5-5m8 5H8" fill="none" stroke-width="2"/></svg>
diff --git a/themes/fid_bbi/icons/small/arrow-right.svg b/themes/fid_bbi/icons/small/arrow-right.svg
deleted file mode 100644
index 79fe6fee145..00000000000
--- a/themes/fid_bbi/icons/small/arrow-right.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><path d="M15 9l5 5-5 5m-8-5h12" fill="none" stroke-width="2"/></svg>
diff --git a/themes/fid_bbi/icons/small/checkmark.svg b/themes/fid_bbi/icons/small/checkmark.svg
deleted file mode 100644
index a121ff8a8f7..00000000000
--- a/themes/fid_bbi/icons/small/checkmark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M24 7L14 22l-9-6" fill="none" stroke-width="2"/></svg>
\ No newline at end of file
diff --git a/themes/fid_bbi/icons/small/chevron-down.svg b/themes/fid_bbi/icons/small/chevron-down.svg
deleted file mode 100644
index c358002e718..00000000000
--- a/themes/fid_bbi/icons/small/chevron-down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M6 11l8 8 8-8" fill="none" stroke-width="2"/></svg>
diff --git a/themes/fid_bbi/icons/small/clock.svg b/themes/fid_bbi/icons/small/clock.svg
deleted file mode 100644
index bc677dfa3fc..00000000000
--- a/themes/fid_bbi/icons/small/clock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none" stroke-width="2"><circle cx="14" cy="14" r="10"/><path d="M14 7v7l3 3"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/download.svg b/themes/fid_bbi/icons/small/download.svg
deleted file mode 100644
index 51e58f8c681..00000000000
--- a/themes/fid_bbi/icons/small/download.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><g fill="none" stroke-width="2"><path d="M24 15v7H4v-7"/><path d="M19 12l-5 5-5-5m5-8v12"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/face.svg b/themes/fid_bbi/icons/small/face.svg
deleted file mode 100644
index 89204146739..00000000000
--- a/themes/fid_bbi/icons/small/face.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g stroke-width="2"><circle cx="14" cy="14" r="10" fill="none"/><path d="M10 10h2v2h-2zm6 0h2v2h-2z" stroke="none"/><path d="M17.54 17.536A5 5 0 0114.003 19a5 5 0 01-3.536-1.464" fill="none"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/home.svg b/themes/fid_bbi/icons/small/home.svg
deleted file mode 100644
index d791237652a..00000000000
--- a/themes/fid_bbi/icons/small/home.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none" stroke-width="2"><path d="M7 11v11h14V11"/><path d="M4 14L14 4l10 10M11 22v-8h6v8"/></g></svg>
\ No newline at end of file
diff --git a/themes/fid_bbi/icons/small/info.svg b/themes/fid_bbi/icons/small/info.svg
deleted file mode 100644
index 0d06d5ee62b..00000000000
--- a/themes/fid_bbi/icons/small/info.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><circle cy="14" cx="14" r="10" fill="none" stroke-width="2"/><path d="M14 19v-6" fill="none" stroke-width="2"/><path d="M13 9h2v2h-2z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/small/license.svg b/themes/fid_bbi/icons/small/license.svg
deleted file mode 100644
index d29e79cdfb0..00000000000
--- a/themes/fid_bbi/icons/small/license.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none" stroke-width="2"><circle cx="18" cy="14" r="3"/><path d="M16 16v7l2-1 2 1v-7M6 11h6M6 15h6"/><path d="M13 22H3V6h22v16h-2"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/lightning.svg b/themes/fid_bbi/icons/small/lightning.svg
deleted file mode 100644
index db9456cf091..00000000000
--- a/themes/fid_bbi/icons/small/lightning.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none" stroke-width="2"><path d="M17 3l-5 10h4l-5 10"/><path d="M9 17l2 6 6-2"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/link.svg b/themes/fid_bbi/icons/small/link.svg
deleted file mode 100644
index a5374857d2f..00000000000
--- a/themes/fid_bbi/icons/small/link.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none" stroke-width="2"><path d="M12 16l-2-2 9-9 7 7-10 10"/><path d="M16 12l2 2-9 9-7-7L12 6"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/login.svg b/themes/fid_bbi/icons/small/login.svg
deleted file mode 100644
index a045fd95041..00000000000
--- a/themes/fid_bbi/icons/small/login.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><g fill="none" stroke-width="2"><path d="M15 5h7v18h-7"/><path d="M12 9l5 5-5 5m-8-5h12"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/magnifier.svg b/themes/fid_bbi/icons/small/magnifier.svg
deleted file mode 100644
index 08c4e704034..00000000000
--- a/themes/fid_bbi/icons/small/magnifier.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none" stroke-width="2"><circle cx="12" cy="12" r="10"/><path d="M19 19l7 7"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/minus.svg b/themes/fid_bbi/icons/small/minus.svg
deleted file mode 100644
index e9a28354829..00000000000
--- a/themes/fid_bbi/icons/small/minus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M6 14h16" fill="none" stroke-width="2"/></svg>
diff --git a/themes/fid_bbi/icons/small/plus.svg b/themes/fid_bbi/icons/small/plus.svg
deleted file mode 100644
index 24d2c0bc459..00000000000
--- a/themes/fid_bbi/icons/small/plus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M6 14h16m-8-8v16" fill="none" stroke-width="2"/></svg>
diff --git a/themes/fid_bbi/icons/small/printer.svg b/themes/fid_bbi/icons/small/printer.svg
deleted file mode 100644
index 5d9bb539012..00000000000
--- a/themes/fid_bbi/icons/small/printer.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none" stroke-width="2"><rect width="14" height="12" x="7" y="14" ry="0"/><path d="M6 19H3V9h22v10h-3M7 8V3h14v5M10 18h8m-8 4h8"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/quote.svg b/themes/fid_bbi/icons/small/quote.svg
deleted file mode 100644
index ab02b3b8f23..00000000000
--- a/themes/fid_bbi/icons/small/quote.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none" stroke-width="2"><path d="M12 8v8l-3 6M20 8v8l-3 6"/><path d="M12 9H8v4h4m8-4h-4v4h4"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/save.svg b/themes/fid_bbi/icons/small/save.svg
deleted file mode 100644
index 465c59b53a9..00000000000
--- a/themes/fid_bbi/icons/small/save.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><g fill="none" stroke-width="2"><path d="M19 12l-5 5-5-5m5-8v12"/><path d="M10 5H5v18h18V5h-5"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/signup.svg b/themes/fid_bbi/icons/small/signup.svg
deleted file mode 100644
index 9a7cc43485c..00000000000
--- a/themes/fid_bbi/icons/small/signup.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M21 4l3 3-11 11h-3v-3zM10 15l3 3" fill="none" stroke-width="2"/><path d="M3.889 3.889V24.11H24.11V11.13l-2.222 2.222v8.536H6.11V6.11h8.536l2.222-2.222z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/small/sun.svg b/themes/fid_bbi/icons/small/sun.svg
deleted file mode 100644
index 43ce2cb559a..00000000000
--- a/themes/fid_bbi/icons/small/sun.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none" stroke-width="2"><circle cx="14" cy="14" r="4"/><path d="M14 7V2m0 24v-5m4.95-11.95l3.535-3.535m-16.97 16.97L9.05 18.95M14 7V2m0 24v-5m7-7h5M2 14h5m11.95 4.95l3.535 3.535M5.515 5.515L9.05 9.05"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/x.svg b/themes/fid_bbi/icons/small/x.svg
deleted file mode 100644
index 765d14ac0f1..00000000000
--- a/themes/fid_bbi/icons/small/x.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M8 8l12 12M20 8L8 20" fill="none" stroke-width="2"/></svg>
diff --git a/themes/fid_bbi/icons/small/star.svg b/themes/fid_bbi/icons/star.svg
similarity index 84%
rename from themes/fid_bbi/icons/small/star.svg
rename to themes/fid_bbi/icons/star.svg
index cdbbb990eca..444b450ebc8 100644
--- a/themes/fid_bbi/icons/small/star.svg
+++ b/themes/fid_bbi/icons/star.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M14 3l3.233 6.55 7.229 1.05-5.231 5.1 1.235 7.2L14 19.5l-6.466 3.4 1.235-7.2-5.23-5.1 7.228-1.05z" fill="none" stroke-width="2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M14 3l3.233 6.55 7.229 1.05-5.231 5.1 1.235 7.2L14 19.5l-6.466 3.4 1.235-7.2-5.23-5.1 7.228-1.05z" fill="none"/></svg>
diff --git a/themes/fid_bbi/icons/sun.svg b/themes/fid_bbi/icons/sun.svg
new file mode 100644
index 00000000000..41b23b58c47
--- /dev/null
+++ b/themes/fid_bbi/icons/sun.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><g fill="none"><circle cx="14" cy="14" r="4"/><path d="M14 7V2m0 24v-5m4.95-11.95l3.535-3.535m-16.97 16.97L9.05 18.95M14 7V2m0 24v-5m7-7h5M2 14h5m11.95 4.95l3.535 3.535M5.515 5.515L9.05 9.05"/></g></svg>
diff --git a/themes/fid_bbi/icons/small/trash.svg b/themes/fid_bbi/icons/trash.svg
similarity index 100%
rename from themes/fid_bbi/icons/small/trash.svg
rename to themes/fid_bbi/icons/trash.svg
diff --git a/themes/fid_bbi/icons/small/warning.svg b/themes/fid_bbi/icons/warning.svg
similarity index 50%
rename from themes/fid_bbi/icons/small/warning.svg
rename to themes/fid_bbi/icons/warning.svg
index f1986f640dc..7f7cf85fdea 100644
--- a/themes/fid_bbi/icons/small/warning.svg
+++ b/themes/fid_bbi/icons/warning.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M14 4l11.436 19.807H2.564z" fill="none" stroke-width="2.091"/><path d="M14 11v6" fill="none" stroke-width="2"/><path d="M15 21h-2v-2h2z" stroke="none"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M14 4l11.436 19.807H2.564z" fill="none" stroke-width="2.091"/><path d="M14 11v6" fill="none"/><path d="M15 21h-2v-2h2z" stroke="none"/></svg>
diff --git a/themes/fid_bbi/icons/x.svg b/themes/fid_bbi/icons/x.svg
new file mode 100644
index 00000000000..2f1a02e384f
--- /dev/null
+++ b/themes/fid_bbi/icons/x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path d="M8 8l12 12M20 8L8 20" fill="none"/></svg>
diff --git a/themes/fid_bbi/templates/Auth/AbstractBase/login.phtml b/themes/fid_bbi/templates/Auth/AbstractBase/login.phtml
index 51f297fcbfe..332b0892636 100644
--- a/themes/fid_bbi/templates/Auth/AbstractBase/login.phtml
+++ b/themes/fid_bbi/templates/Auth/AbstractBase/login.phtml
@@ -10,7 +10,7 @@
 
     <div class="form_footer">
       <button class="-icon" type="submit" name="processLogin">
-        <?=$this->icon('small/login')?>
+        <?=$this->icon('login')?>
         <?=$this->transEsc('Login')?>
       </button>
 
diff --git a/themes/fid_bbi/templates/Recommend/SideFacets.phtml b/themes/fid_bbi/templates/Recommend/SideFacets.phtml
index 3629187e0d8..61b96cb5aa7 100644
--- a/themes/fid_bbi/templates/Recommend/SideFacets.phtml
+++ b/themes/fid_bbi/templates/Recommend/SideFacets.phtml
@@ -66,7 +66,7 @@ $filterList = array_merge($results->getParams()->getFilterList(true), $extraFilt
         aria-expanded="<?=$isOpen ? 'true' : 'false'?>"
       >
         <?=$this->transEsc($cluster['label'])?>
-        <?=$this->icon('small/chevron-down')?>
+        <?=$this->icon('chevron-down')?>
       </button>
       <div id="side-collapse-<?=$escapedTitle?>" class="facet_links -collapsed" <?=$isOpen ? '' : 'hidden'?>>
         <ol>
diff --git a/themes/fid_bbi/templates/Recommend/SideFacets/filter-list.phtml b/themes/fid_bbi/templates/Recommend/SideFacets/filter-list.phtml
index 11ab584ec70..ea314940cde 100644
--- a/themes/fid_bbi/templates/Recommend/SideFacets/filter-list.phtml
+++ b/themes/fid_bbi/templates/Recommend/SideFacets/filter-list.phtml
@@ -4,7 +4,7 @@
 
   <p class="facet -border-bottom">
     <a class="facet_link" href="<?=$this->currentPath() . $results->getUrlQuery()->removeAllFilters()?>">
-      <?=$this->icon('small/x')?>
+      <?=$this->icon('x')?>
       <?=$this->transEsc('Remove all filters')?>
     </a>
   </p>
@@ -33,7 +33,7 @@
 
         <li class="facet">
           <a class="facet_link" href="<?=$removeLink?>">
-            <?=$this->icon('small/x')?>
+            <?=$this->icon('x')?>
             <span class="sr-only"><?=$this->transEsc('clear_tag_filter')?></span>
             <span>
               <?php if ($filter['operator'] == 'NOT'): ?>
diff --git a/themes/fid_bbi/templates/Recommend/SideFacets/range-slider.phtml b/themes/fid_bbi/templates/Recommend/SideFacets/range-slider.phtml
index a21e829ded0..9ed9c2bed4d 100644
--- a/themes/fid_bbi/templates/Recommend/SideFacets/range-slider.phtml
+++ b/themes/fid_bbi/templates/Recommend/SideFacets/range-slider.phtml
@@ -38,7 +38,7 @@
         >
       </label>
       <button class="-icon-only" type="submit">
-        <?=$this->icon('small/checkmark')?>
+        <?=$this->icon('checkmark')?>
         <span class="sr-only"><?=$this->transEsc('Set')?></span>
       </button>
     </div>
diff --git a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/core.phtml b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/core.phtml
index 4709622094e..03fa4ab3f15 100644
--- a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/core.phtml
+++ b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/core.phtml
@@ -13,9 +13,9 @@
     ?>
 
     <?php if (!empty($formatIconMappings[$format])): ?>
-      <?=$this->icon("big/{$formatIconMappings[$format]}")?>
+      <?=$this->icon("media/{$formatIconMappings[$format]}")?>
     <?php else: ?>
-      <?=$this->icon('big/unknown')?>
+      <?=$this->icon('media/unknown')?>
     <?php endif; ?>
   </div>
   <div class="record_header">
@@ -83,7 +83,7 @@
       id="permalink"
       href="<?=$permalink?>"
     >
-      <?=$this->icon('small/link')?>
+      <?=$this->icon('link')?>
       <?=$this->transEsc('Permalink')?>
     </a>
   </li>
@@ -95,7 +95,7 @@
       href="<?=$this->recordLink()->getActionUrl($this->driver, 'Acquisition')?>"
       rel="nofollow"
     >
-      <?=$this->icon('small/add-book')?>
+      <?=$this->icon('add-book')?>
       <?=$this->transEsc('Book Suggestion')?>
     </a>
   </li>
@@ -107,7 +107,7 @@
       href="<?=$this->recordLink()->getActionUrl($this->driver, 'ReportErrors')?>"
       rel="nofollow"
     >
-      <?=$this->icon('small/lightning')?>
+      <?=$this->icon('lightning')?>
       <?=$this->transEsc('ReportErrors')?>
     </a>
   </li>
diff --git a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/data-rvkNotation.phtml b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/data-rvkNotation.phtml
index f8683ccad93..29fb30f4c0d 100644
--- a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/data-rvkNotation.phtml
+++ b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/data-rvkNotation.phtml
@@ -30,7 +30,7 @@
           href="#collapse_rvk_<?=$index?>"
           aria-expanded="false"
         >
-          <?=$this->icon('small/chevron-down')?>
+          <?=$this->icon('chevron-down')?>
           <?=$item['name']?>
         </a>
       </div>
diff --git a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/list-entry.phtml b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/list-entry.phtml
index f6f5e3e4fb5..ef8b7a7490a 100644
--- a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/list-entry.phtml
+++ b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/list-entry.phtml
@@ -255,7 +255,7 @@ $icon = $formatIconMappings[$format] ?? 'unknown';
         href="<?=$this->url('myresearch-edit')?>?id=<?=urlencode($id)?>&amp;source=<?=urlencode($source)?><?=$list_id !== null ? '&amp;list_id=' . urlencode($list_id) : ''?>"
         class="edit tool"
       >
-        <?=$this->icon('small/pen')?>
+        <?=$this->icon('pen')?>
         <div class="tooltip">
           <?=$this->transEsc('Edit')?>
         </div>
@@ -272,7 +272,7 @@ $icon = $formatIconMappings[$format] ?? 'unknown';
       ?>
       <div class="dropdown">
         <a class="dropdown-toggle" id="<?=$dLabel?>" role="button" data-toggle="dropdown" href="<?=$deleteUrlGet?>">
-          <?=$this->icon('small/trash')?>
+          <?=$this->icon('trash')?>
           <div class="tooltip">
             <?=$this->transEsc('Delete')?>
           </div>
diff --git a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/result-list.phtml b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/result-list.phtml
index dba8cc23347..b14327a7beb 100644
--- a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/result-list.phtml
+++ b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/result-list.phtml
@@ -13,7 +13,7 @@ $icon = $this->record($this->driver)->getIconMapping($format);
 <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getSourceIdentifier())?>" class="hiddenSource">
 
 <div class="result_type">
-  <?=$this->icon("big/$icon")?>
+  <?=$this->icon("media/$icon")?>
 </div>
 
 <div class="result_details">
@@ -210,7 +210,7 @@ $icon = $this->record($this->driver)->getIconMapping($format);
         class="save-record result-link-label"
         data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>"
       >
-        <?=$this->icon('small/star')?>
+        <?=$this->icon('star')?>
         <div class="tooltip">
           <?=$this->transEsc('Add to favorites')?>
         </div>
diff --git a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/toolbar.phtml b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/toolbar.phtml
index d78dbce0a3d..d45f7117e2c 100644
--- a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/toolbar.phtml
+++ b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/toolbar.phtml
@@ -26,11 +26,11 @@ $cartId = $this->driver->getSourceIdentifier() . '|' . $this->driver->getUniqueI
         data-cart-source="<?=$this->escapeHtmlAttr($source)?>"
       >
         <a class="record_action cart-add hidden" href="javascript:;">
-          <?=$this->icon('small/pin')?>
+          <?=$this->icon('pin')?>
           <?=$this->transEsc('Add to Book Bag')?>
         </a>
         <a class="record_action cart-remove hidden" href="javascript:;">
-          <?=$this->icon('small/pin', 'icon -beat')?>
+          <?=$this->icon('pin', 'icon -beat')?>
           <?=$this->transEsc('Remove from Book Bag')?>
         </a>
     </div>
@@ -44,7 +44,7 @@ $cartId = $this->driver->getSourceIdentifier() . '|' . $this->driver->getUniqueI
         title="<?=$this->transEsc('Add to favorites')?>"
         rel="nofollow"
       >
-        <?=$this->icon('small/star')?>
+        <?=$this->icon('star')?>
         <?=$this->transEsc('Add to favorites')?>
       </a>
     <?php elseif ($block = $this->permission()->getAlternateContent('feature.Favorites')): ?>
@@ -59,7 +59,7 @@ $cartId = $this->driver->getSourceIdentifier() . '|' . $this->driver->getUniqueI
       href="<?=$this->recordLink()->getActionUrl($this->driver, 'Cite')?>"
       rel="nofollow"
     >
-      <?=$this->icon('small/quote')?>
+      <?=$this->icon('quote')?>
       <?=$this->transEsc('Cite this')?>
     </a>
 
@@ -77,7 +77,7 @@ $cartId = $this->driver->getSourceIdentifier() . '|' . $this->driver->getUniqueI
     <?php if (count($exportFormats) > 0): ?>
       <!-- TODO: ARIA -->
       <a class="record_action dropdown-toggle" href="javascript:;" role="button" data-toggle="dropdown">
-        <?=$this->icon('small/download')?>
+        <?=$this->icon('download')?>
         <?=$this->transEsc('Export')?>
       </a>
       <!-- TODO: Dropdown -->
@@ -98,12 +98,12 @@ $cartId = $this->driver->getSourceIdentifier() . '|' . $this->driver->getUniqueI
       href="<?=$this->recordLink()->getActionUrl($this->driver, 'Email')?>"
       rel="nofollow"
     >
-      <?=$this->icon('small/mail')?>
+      <?=$this->icon('mail')?>
       <?=$this->transEsc('Email this')?>
     </a>
 
     <a class="record_action" href="javascript:window.print()">
-      <?=$this->icon('small/printer')?>
+      <?=$this->icon('printer')?>
       <?=$this->transEsc('Print')?>
     </a>
   </div>
diff --git a/themes/fid_bbi/templates/RecordTab/holdingsils.phtml b/themes/fid_bbi/templates/RecordTab/holdingsils.phtml
index f5398074b4d..1a7ce7fda38 100644
--- a/themes/fid_bbi/templates/RecordTab/holdingsils.phtml
+++ b/themes/fid_bbi/templates/RecordTab/holdingsils.phtml
@@ -86,7 +86,7 @@ $isFree = in_array('Free', $this->driver->tryMethod('getFacetAvail'));
     <?php foreach ($onlineUrls as $current): ?>
       <li>
         <a class="link-with-icon" href="<?=$this->escapeHtmlAttr($this->proxyUrl($current['link']))?>">
-          <?=$this->icon('small/arrow-right')?>
+          <?=$this->icon('arrow-right')?>
           <?=$this->escapeHtml($current['text'])?>
         </a>
       </li>
diff --git a/themes/fid_bbi/templates/ajax/boss-false.phtml b/themes/fid_bbi/templates/ajax/boss-false.phtml
index e8bf4144ea6..8fc20c30529 100644
--- a/themes/fid_bbi/templates/ajax/boss-false.phtml
+++ b/themes/fid_bbi/templates/ajax/boss-false.phtml
@@ -18,7 +18,7 @@
         <?=$this->translate('boss_false')?>
       <?php endif; ?>
       <?php if ($this->isAddNetwork): ?>
-        <?php $linkText = $this->icon('small/external-link') . $this->translate('boss_holding'); ?>
+        <?php $linkText = $this->icon('external-link') . $this->translate('boss_holding'); ?>
         <?=$this->externalLink($this->url, $iconHtml . $linkText, ['class' => 'link-with-icon'])?>
         <br>
         <a href="<?=$this->url('content-page', ['page' => 'networknotice'])?>" data-lightbox>
diff --git a/themes/fid_bbi/templates/ajax/boss-true.phtml b/themes/fid_bbi/templates/ajax/boss-true.phtml
index 5d6830ae3ae..79d168b0b60 100644
--- a/themes/fid_bbi/templates/ajax/boss-true.phtml
+++ b/themes/fid_bbi/templates/ajax/boss-true.phtml
@@ -14,7 +14,7 @@
     <?=$this->translate('boss_default')?>
   <?php else: ?>
     <?php if ($this->isISXNZBD): ?>
-      <?php $linkText = $this->icon('small/external-link') . $this->transEsc('boss_true'); ?>
+      <?php $linkText = $this->icon('external-link') . $this->transEsc('boss_true'); ?>
       <?=$this->externalLink($this->url, $linkText, ['class' => 'link-with-icon'])?>
       <?php if (!empty($this->callnumber)): ?>
         <div class="pda-part-text">
diff --git a/themes/fid_bbi/templates/ajax/resolverLinks.phtml b/themes/fid_bbi/templates/ajax/resolverLinks.phtml
index 1d169263bbb..97ab6bfd28b 100644
--- a/themes/fid_bbi/templates/ajax/resolverLinks.phtml
+++ b/themes/fid_bbi/templates/ajax/resolverLinks.phtml
@@ -12,7 +12,7 @@
           <li>
             <?php if (!empty($link['href'])): ?>
               <?php
-              $linkText = $this->icon('small/external-link')
+              $linkText = $this->icon('external-link')
                 . $this->transEsc($this->escapeHtml($link['title'] ?? 'unknown'));
               $linkAttr = [
                 'class' => 'link-with-icon' . (!empty($link['access']) ? ' access-' . $link['access'] : ''),
@@ -26,7 +26,7 @@
               <small>
                 <?=isset($link['coverage']) ? $this->escapeHtml($link['coverage']) : ''?>
                 <?php if (isset($link['coverageHref'])): ?>
-                  <?php $labelHtml = $this->icon('small/external-link') . $this->translate('Readme'); ?>
+                  <?php $labelHtml = $this->icon('external-link') . $this->translate('Readme'); ?>
                   <?=$this->externalLink($link['coverageHref'], $labelHtml)?>
                 <?php endif; ?>
               </small>
diff --git a/themes/fid_bbi/templates/amsl/sources-list.phtml b/themes/fid_bbi/templates/amsl/sources-list.phtml
index 676976af177..bfc635135d0 100644
--- a/themes/fid_bbi/templates/amsl/sources-list.phtml
+++ b/themes/fid_bbi/templates/amsl/sources-list.phtml
@@ -50,7 +50,7 @@ $this->layout()->breadcrumbs .= '</li> <li class="active">' . $this->transEsc('L
         <li>
       <button data-toggle="collapse" class="filters_title collapse-toggler" href="javascript:void(0)">
           <?=$label?>
-          <?=$this->icon('small/chevron-down')?>
+          <?=$this->icon('chevron-down')?>
           <span class="sr-only"><?=$this->transEsc('Expand')?></span>
       </button>
       <ul class="panel-collapse collapse" aria-expanded="false">
@@ -67,7 +67,7 @@ $this->layout()->breadcrumbs .= '</li> <li class="active">' . $this->transEsc('L
         <li>
           <button data-toggle="collapse" class="filters_title collapse-toggler">
             <?=$label?>
-            <?=$this->icon('small/chevron-down')?>
+            <?=$this->icon('chevron-down')?>
             <span class="sr-only"><?=$this->transEsc('Expand')?></span>
           </button>
           <ul class="panel-collapse collapse" aria-expanded="false">
@@ -112,4 +112,4 @@ $this->layout()->breadcrumbs .= '</li> <li class="active">' . $this->transEsc('L
 <?php /* run collapse togglers + introduce a case-insensitive filter that is capable of filtering multiple filtering terms */
 echo $this->inlineScript(\Zend\View\Helper\HeadScript::FILE, 'sources-display.js', 'SET');
 ?>
-<!-- fid_bbi: amsl/sources-list - home - END -->
\ No newline at end of file
+<!-- fid_bbi: amsl/sources-list - home - END -->
diff --git a/themes/fid_bbi/templates/content/faq-en.phtml b/themes/fid_bbi/templates/content/faq-en.phtml
index caa8497d5e6..111717c1ae7 100644
--- a/themes/fid_bbi/templates/content/faq-en.phtml
+++ b/themes/fid_bbi/templates/content/faq-en.phtml
@@ -11,7 +11,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="contact-1" aria-expanded="false">
     How can I keep me updated about the FID BBI?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="contact-1" hidden>
@@ -21,7 +21,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="contact-2" aria-expanded="false">
     Who can I contact with questions and suggestions?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="contact-2" hidden>
@@ -31,7 +31,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="contact-3" aria-expanded="false">
     How can I unsubscribe from the mailing list?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="contact-3" hidden>
@@ -43,7 +43,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-1" aria-expanded="false">
     How do I create a user account?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-1" hidden>
@@ -54,7 +54,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-2" aria-expanded="false">
     Do I have to register to use the FID BBI portal?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-2" hidden>
@@ -64,7 +64,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-3" aria-expanded="false">
     Why should I create an user account in the FID BBI portal?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-3" hidden>
@@ -74,7 +74,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-4" aria-expanded="false">
     Why should I define a home library?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-4" hidden>
@@ -85,7 +85,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-5" aria-expanded="false">
     How do I change my personal data?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-5" hidden>
@@ -95,7 +95,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-6" aria-expanded="false">
     What do I do if I forget my password?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-6" hidden>
@@ -105,7 +105,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-7" aria-expanded="false">
     How can I change my password?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-7" hidden>
@@ -115,7 +115,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-8" aria-expanded="false">
     How can I change my email address?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-8" hidden>
@@ -127,7 +127,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-9" aria-expanded="false">
     Are my data secure?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-9" hidden>
@@ -140,7 +140,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-10" aria-expanded="false">
     How do I delete my account?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-10" hidden>
@@ -153,7 +153,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="groups-1" aria-expanded="false">
     What are user groups?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="groups-1" hidden>
@@ -163,7 +163,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="groups-2" aria-expanded="false">
     What additional services are available for working professionals active in research?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="groups-2" hidden>
@@ -173,7 +173,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="groups-3" aria-expanded="false">
     What additional services are available for researchers?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="groups-3" hidden>
@@ -183,7 +183,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="groups-4" aria-expanded="false">
     How do I change my user group?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="groups-4" hidden>
@@ -195,7 +195,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-1" aria-expanded="false">
     What can I research in the BBI portal?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-1" hidden>
@@ -210,7 +210,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-2" aria-expanded="false">
     How do I search in the BBI portal?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-2" hidden>
@@ -220,7 +220,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-3" aria-expanded="false">
     How can I narrow down my results list?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-3" hidden>
@@ -250,7 +250,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-4" aria-expanded="false">
     What can I find under “Further research entries”?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-4" hidden>
@@ -260,7 +260,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-5" aria-expanded="false">
     Can I initiate an interlibrary loan directly from the portal?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-5" hidden>
@@ -270,7 +270,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-6" aria-expanded="false">
     What is the Digitization-on-Demand service and how does it work?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-6" hidden>
@@ -282,7 +282,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-7" aria-expanded="false">
     Can I also make acquisition suggestions?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-7" hidden>
diff --git a/themes/fid_bbi/templates/content/faq.phtml b/themes/fid_bbi/templates/content/faq.phtml
index d28a5ae0378..ebd7476f0fe 100644
--- a/themes/fid_bbi/templates/content/faq.phtml
+++ b/themes/fid_bbi/templates/content/faq.phtml
@@ -11,7 +11,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="contact-1" aria-expanded="false">
     Wie kann ich mich über den FID BBI auf dem Laufenden halten?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="contact-1" hidden>
@@ -21,7 +21,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="contact-2" aria-expanded="false">
     An wen kann ich mich mit Fragen und Anregungen wenden?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="contact-2" hidden>
@@ -31,7 +31,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="contact-3" aria-expanded="false">
     Wie kann ich mich von der Mailingliste abmelden?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="contact-3" hidden>
@@ -43,7 +43,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-1" aria-expanded="false">
     Wie lege ich ein Nutzerkonto an?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-1" hidden>
@@ -54,7 +54,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-2" aria-expanded="false">
     Muss ich mich anmelden, um das Portal des FID BBI nutzen zu können?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-2" hidden>
@@ -64,7 +64,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-3" aria-expanded="false">
     Warum sollte ich mir im Portal des FID BBI ein Konto erstellen?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-3" hidden>
@@ -74,7 +74,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-4" aria-expanded="false">
     Warum sollte ich eine Heimatbibliothek angeben?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-4" hidden>
@@ -85,7 +85,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-5" aria-expanded="false">
     Wie ändere ich meine persönlichen Angaben?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-5" hidden>
@@ -95,7 +95,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-6" aria-expanded="false">
     Was mache ich, wenn ich mein Passwort vergessen habe?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-6" hidden>
@@ -105,7 +105,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-8" aria-expanded="false">
     Wie kann ich mein Passwort ändern?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-8" hidden>
@@ -115,7 +115,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-9" aria-expanded="false">
     Wie kann ich meine E-Mail-Adresse ändern?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-9" hidden>
@@ -127,7 +127,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-10" aria-expanded="false">
     Sind meine Daten sicher?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-10" hidden>
@@ -140,7 +140,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="account-11" aria-expanded="false">
     Wie lösche ich mein Konto?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="account-11" hidden>
@@ -153,7 +153,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="groups-1" aria-expanded="false">
     Was sind Nutzergruppen?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="groups-1" hidden>
@@ -163,7 +163,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="groups-2" aria-expanded="false">
     Welche Zusatzdienstleistungen gibt es für in der Forschung aktive Berufspraktiker*innen?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="groups-2" hidden>
@@ -173,7 +173,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="groups-3" aria-expanded="false">
     Welche Zusatzdienstleistungen gibt es für Forschende?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="groups-3" hidden>
@@ -183,7 +183,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="groups-4" aria-expanded="false">
     Wie ändere ich meine Nutzergruppe?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="groups-4" hidden>
@@ -195,7 +195,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-1" aria-expanded="false">
     Was kann ich im BBI-Portal recherchieren?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-1" hidden>
@@ -210,7 +210,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-2" aria-expanded="false">
     Wie suche ich im BBI-Portal?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-2" hidden>
@@ -220,7 +220,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-3" aria-expanded="false">
     Wie kann ich meine Ergebnisliste eingrenzen?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-3" hidden>
@@ -252,7 +252,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-4" aria-expanded="false">
     Was finde ich unter „Weitere Rechercheeinstiege“?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-4" hidden>
@@ -262,7 +262,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-5" aria-expanded="false">
     Kann ich direkt aus dem Portal eine Fernleihe auslösen?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-5" hidden>
@@ -272,7 +272,7 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-6" aria-expanded="false">
     Was ist der Digitization-on-Demand-Service und wie funktioniert er?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-6" hidden>
@@ -284,12 +284,11 @@ $account = $this->auth()->getManager();
 <h3>
   <button class="filters_title" type="button" aria-controls="search-7" aria-expanded="false">
     Kann ich auch Anschaffungsvorschläge machen?
-    <?=$this->icon('small/chevron-down')?>
+    <?=$this->icon('chevron-down')?>
   </button>
 </h3>
 <div id="search-7" hidden>
   <p>Sehr gerne, Sie können uns jederzeit Anschaffungsvorschläge unterbreiten.</p>
   <p>Wenn Sie eine Monografie, eine Zeitschrift oder einen Zeitschriftenartikel nicht im Katalog finden, versuchen wir, Ihnen diese Ressource zu beschaffen. Schreiben Sie uns über unser <a href="<?=$this->url('feedback-home')?>">Kontaktformular</a> und geben Sie möglichst detailliert an, welches Medium Sie im Katalog vermissen. Wir prüfen dann, ob wir dieses im Rahmen des Fachinformationsdienstes bestellen können und informieren Sie.</p>
 </div>
-<!-- TODO: More questions and answers -->
 <!-- fid_bbi: content - faq - END -->
diff --git a/themes/fid_bbi/templates/error/404.phtml b/themes/fid_bbi/templates/error/404.phtml
index facc50a062b..5da5797337b 100644
--- a/themes/fid_bbi/templates/error/404.phtml
+++ b/themes/fid_bbi/templates/error/404.phtml
@@ -24,7 +24,7 @@
 
 <?php if (isset($this->reason) && $this->reason): ?>
   <div class="alert -error">
-    <?=$this->icon('small/error')?>
+    <?=$this->icon('error')?>
     <p>
       <?=$this->transEsc($this->reason)?>
     </p>
diff --git a/themes/fid_bbi/templates/error/index.phtml b/themes/fid_bbi/templates/error/index.phtml
index 58746faf6e9..e171b0ddb19 100644
--- a/themes/fid_bbi/templates/error/index.phtml
+++ b/themes/fid_bbi/templates/error/index.phtml
@@ -1,9 +1,8 @@
 <!-- fid_bbi: error - index -->
 <?php $this->headTitle($this->translate('Error')); ?>
 
-
 <div class="alert alert-danger">
-  <?=$this->icon('small/error')?>
+  <?=$this->icon('error')?>
   <h1 class="sr-only"><?=$this->translate('Error')?></h1>
   <p><strong><?=$this->transEsc('An error has occurred')?></strong></p>
   <p>
diff --git a/themes/fid_bbi/templates/footer.phtml b/themes/fid_bbi/templates/footer.phtml
index 57341adc8a8..72bc0cff302 100644
--- a/themes/fid_bbi/templates/footer.phtml
+++ b/themes/fid_bbi/templates/footer.phtml
@@ -60,7 +60,7 @@
   </div>
 
   <button class="to-top" id="to-top" type="button" onclick="theme.scrollToTop()">
-    <?=$this->icon('small/arrow-right')?>
+    <?=$this->icon('arrow-right')?>
     <span class="sr-only"><?=$this->translate('Scroll to top')?></span>
   </button>
 </footer>
diff --git a/themes/fid_bbi/templates/get-it-box/links.phtml b/themes/fid_bbi/templates/get-it-box/links.phtml
index a2ebe7a1df1..087e087e8a3 100644
--- a/themes/fid_bbi/templates/get-it-box/links.phtml
+++ b/themes/fid_bbi/templates/get-it-box/links.phtml
@@ -5,7 +5,7 @@
       <ul class="unstyled-list">
         <?php foreach ($urls as $current): ?>
           <li>
-            <?php $linkText = $this->icon('small/external-link') . $this->escapeHtml($current['desc']); ?>
+            <?php $linkText = $this->icon('external-link') . $this->escapeHtml($current['desc']); ?>
             <?=$this->externalLink($this->escapeHtmlAttr($current['url']), $linkText, ['class' => 'link-with-icon'])?>
           </li>
         <?php endforeach; ?>
diff --git a/themes/fid_bbi/templates/header.phtml b/themes/fid_bbi/templates/header.phtml
index 034adf4bd37..7c2aa9953c0 100644
--- a/themes/fid_bbi/templates/header.phtml
+++ b/themes/fid_bbi/templates/header.phtml
@@ -37,13 +37,13 @@
               <ul>
                 <li>
                   <a class="link-with-icon" href="<?=$this->url('search-sources')?>">
-                    <?=$this->icon('small/arrow-right')?>
+                    <?=$this->icon('arrow-right')?>
                     <?=$this->transEsc('Data Collection')?>
                   </a>
                 </li>
                 <li>
                   <a class="link-with-icon" href="<?=$this->url('search-advanced')?>">
-                    <?=$this->icon('small/arrow-right')?>
+                    <?=$this->icon('arrow-right')?>
                     <?=$this->transEsc('Advanced Search')?>
                   </a>
                 </li>
@@ -59,7 +59,7 @@
                 aria-controls="search"
                 aria-label="<?=$this->transEsc('Close search')?>"
               >
-                <?=$this->icon('small/x')?>
+                <?=$this->icon('x')?>
                 <span class="sr-only"><?=$this->transEsc('Close')?>"</span>
               </button>
             </div>
diff --git a/themes/fid_bbi/templates/layout/layout.phtml b/themes/fid_bbi/templates/layout/layout.phtml
index ca5af9e63ea..6141b3a8600 100644
--- a/themes/fid_bbi/templates/layout/layout.phtml
+++ b/themes/fid_bbi/templates/layout/layout.phtml
@@ -47,7 +47,7 @@
   >
     <section class="modal_content">
       <button class="-icon-only -small close" data-dismiss="modal" tabindex="0">
-        <?=$this->icon('small/x')?>
+        <?=$this->icon('x')?>
         <span class="sr-only"><?=$this->transEsc('Close')?></span>
       </button>
       <div class="sr-only" id="modal-description"><?=$this->transEsc('Modal_description')?></div>
diff --git a/themes/fid_bbi/templates/myresearch/bulk-action-buttons.phtml b/themes/fid_bbi/templates/myresearch/bulk-action-buttons.phtml
index 9291f29affc..d225ee726d2 100644
--- a/themes/fid_bbi/templates/myresearch/bulk-action-buttons.phtml
+++ b/themes/fid_bbi/templates/myresearch/bulk-action-buttons.phtml
@@ -24,13 +24,13 @@
   <div class="results_bulk-buttons">
     <?php if ($this->cart()->isActive()): ?>
       <button class="button -icon -small" id="<?=$this->idPrefix?>updateCart" type="submit" name="add">
-        <?=$this->icon('small/pin')?>
+        <?=$this->icon('pin')?>
         <?=$this->translate('Add to Book Bag')?>
       </button>
     <?php endif; ?>
 
     <button class="button -icon -small" type="submit" name="email" title="<?=$this->translate('email_selected')?>">
-      <?=$this->icon('small/mail')?>
+      <?=$this->icon('mail')?>
       <?=$this->translate('Email')?>
     </button>
 
@@ -42,14 +42,14 @@
         type="submit" name="delete"
         title="<?=$this->translate('delete_selected')?>"
       >
-        <?=$this->icon('small/trash')?>
+        <?=$this->icon('trash')?>
         <?=$this->translate('Delete')?>
       </button>
     <?php endif; ?>
 
     <?php $exportOptions = $this->export()->getActiveFormats('bulk'); if (count($exportOptions) > 0): ?>
       <button class="button -icon -small" type="submit" name="export" title="<?=$this->translate('export_selected')?>">
-      <?=$this->icon('small/download')?>
+      <?=$this->icon('download')?>
         <?=$this->translate('Export')?>
       </button>
     <?php endif; ?>
@@ -61,7 +61,7 @@
       title="<?=$this->translate('print_selected')?>"
       data-lightbox-ignore
     >
-      <?=$this->icon('small/printer')?>
+      <?=$this->icon('printer')?>
       <?=$this->translate('Print')?>
     </button>
   </div>
diff --git a/themes/fid_bbi/templates/myresearch/edit.phtml b/themes/fid_bbi/templates/myresearch/edit.phtml
index a9d77b5f869..35f5fa4cb34 100644
--- a/themes/fid_bbi/templates/myresearch/edit.phtml
+++ b/themes/fid_bbi/templates/myresearch/edit.phtml
@@ -21,7 +21,7 @@
 <form class="form-list-edit" method="post" name="editForm">
 <?php if (empty($this->savedData)): ?>
   <div class="alert -info">
-    <?=$this->icon('small/info')?>
+    <?=$this->icon('info')?>
     <p>
       <?php if (isset($listFilter)): ?>
         <?=$this->translate('The record you selected is not part of the selected list.')?>
diff --git a/themes/fid_bbi/templates/myresearch/menu.phtml b/themes/fid_bbi/templates/myresearch/menu.phtml
index fb4cf216676..8557531b3c8 100644
--- a/themes/fid_bbi/templates/myresearch/menu.phtml
+++ b/themes/fid_bbi/templates/myresearch/menu.phtml
@@ -9,7 +9,7 @@
         type="button"
         aria-controls="profile-menu"
       >
-        <?=$this->icon('small/x')?>
+        <?=$this->icon('x')?>
         <span class="sr-only"><?=$this->translate('Close')?></span>
       </button>
     </div>
diff --git a/themes/fid_bbi/templates/myresearch/mylist.phtml b/themes/fid_bbi/templates/myresearch/mylist.phtml
index 0211d51f666..6313a08cfd0 100644
--- a/themes/fid_bbi/templates/myresearch/mylist.phtml
+++ b/themes/fid_bbi/templates/myresearch/mylist.phtml
@@ -37,7 +37,7 @@ $user = $this->auth()->isLoggedIn();
 
 <div class="results">
   <button class="results_sidebar-toggle" type="button" aria-controls="profile-menu">
-    <?=$this->icon('small/person')?>
+    <?=$this->icon('person')?>
     <span><?=$this->transEsc('Profile Menu')?></span>
   </button>
 
@@ -110,7 +110,7 @@ $user = $this->auth()->isLoggedIn();
       <?=$this->paginationControl($this->results->getPaginator(), 'Sliding', 'search/pagination.phtml', ['results' => $this->results])?>
     <?php else: ?>
       <div class="alert -info">
-        <?=$this->icon('small/info')?>
+        <?=$this->icon('info')?>
         <p><?=$this->transEsc('You do not have any saved resources')?></p>
       </div>
     <?php endif; ?>
diff --git a/themes/fid_bbi/templates/myresearch/profile.phtml b/themes/fid_bbi/templates/myresearch/profile.phtml
index a7865f8427c..67071c27e01 100644
--- a/themes/fid_bbi/templates/myresearch/profile.phtml
+++ b/themes/fid_bbi/templates/myresearch/profile.phtml
@@ -28,7 +28,7 @@ if (is_array($profile)) {
 
 <div class="results">
   <button class="results_sidebar-toggle" type="button" aria-controls="profile-menu">
-    <?=$this->icon('small/person')?>
+    <?=$this->icon('person')?>
     <span><?=$this->transEsc('Profile Menu')?></span>
   </button>
 
diff --git a/themes/fid_bbi/templates/myresearch/usertags.phtml b/themes/fid_bbi/templates/myresearch/usertags.phtml
index df5090a986f..a1511444706 100644
--- a/themes/fid_bbi/templates/myresearch/usertags.phtml
+++ b/themes/fid_bbi/templates/myresearch/usertags.phtml
@@ -5,7 +5,7 @@
 
 <div class="results">
   <button class="results_sidebar-toggle" type="button" aria-controls="profile-menu">
-    <?=$this->icon('small/person')?>
+    <?=$this->icon('person')?>
     <span><?=$this->transEsc('Profile Menu')?></span>
   </button>
 
diff --git a/themes/fid_bbi/templates/nav.phtml b/themes/fid_bbi/templates/nav.phtml
index d7cc260a460..a8cac21504d 100644
--- a/themes/fid_bbi/templates/nav.phtml
+++ b/themes/fid_bbi/templates/nav.phtml
@@ -6,7 +6,7 @@
     aria-controls="search"
     aria-label="<?=$this->transEsc('Open search')?>"
   >
-    <?=$this->icon('small/magnifier')?>
+    <?=$this->icon('magnifier')?>
     <?=$this->transEsc('Search')?>
   </button>
   <button
@@ -15,7 +15,7 @@
     aria-controls="menu"
     aria-label="<?=$this->transEsc('Open navigation')?>"
   >
-    <?=$this->icon('small/menu')?>
+    <?=$this->icon('menu')?>
     <?=$this->transEsc('Info')?>
   </button>
 
@@ -28,7 +28,7 @@
         aria-controls="menu"
         aria-label="<?=$this->transEsc('Close functions & filters')?>"
       >
-        <?=$this->icon('small/x')?>
+        <?=$this->icon('x')?>
         <span class="sr-only"><?=$this->transEsc('Close')?></span>
       </button>
     </div>
@@ -36,7 +36,7 @@
       <?php $fallbackUrl = $this->config()->get('config')->RssConsumer['fallback_url'] ?? ''; ?>
       <li class="nav_home">
         <a href="<?=$this->url('home')?>">
-          <?=$this->icon('small/home')?>
+          <?=$this->icon('home')?>
           <span class="sr-only"><?=$this->transEsc('Home')?></span>
         </a>
       </li>
@@ -71,7 +71,7 @@
           <?php if ($account->isLoggedIn()): ?>
             <a href="<?=$this->url('myresearch-home', [], ['query' => ['redirect' => 0]])?>">
               <span>
-                <?=$this->icon('small/person')?>
+                <?=$this->icon('person')?>
                 <?=$this->transEsc("Your Account")?>
               </span>
             </a>
@@ -79,14 +79,14 @@
             <?php if ($account->getSessionInitiator($this->serverUrl($this->url('myresearch-home')))): ?>
               <a href="<?=$this->url('myresearch-userlogin')?>">
                 <span>
-                  <?=$this->icon('small/login')?>
+                  <?=$this->icon('login')?>
                   <?=$this->transEsc('Institutional Login')?>
                 </span>
               </a>
             <?php else: ?>
               <a href="<?=$this->url('myresearch-userlogin')?>" data-lightbox>
                 <span>
-                  <?=$this->icon('small/login')?>
+                  <?=$this->icon('login')?>
                   <?=$this->transEsc('Login')?>
                 </span>
               </a>
@@ -97,14 +97,14 @@
           <?php if ($account->isLoggedIn()): ?>
             <a href="<?=$this->url('myresearch-logout')?>">
               <span>
-                <?=$this->icon('small/logout')?>
+                <?=$this->icon('logout')?>
                 <?=$this->transEsc('Log Out')?>
               </span>
             </a>
-          <?php else : ?>
+          <?php else: ?>
             <a href="<?=$this->url('myresearch-account')?>?auth_method=<?=$account->getAuthMethod()?>">
               <span>
-                <?=$this->icon('small/signup')?>
+                <?=$this->icon('signup')?>
                 <?=$this->transEsc('Create New Account')?>
               </span>
             </a>
diff --git a/themes/fid_bbi/templates/record/cart-buttons.phtml b/themes/fid_bbi/templates/record/cart-buttons.phtml
index 9b58ece3c8f..a235659011c 100644
--- a/themes/fid_bbi/templates/record/cart-buttons.phtml
+++ b/themes/fid_bbi/templates/record/cart-buttons.phtml
@@ -8,13 +8,13 @@
     data-cart-source="<?=$this->escapeHtmlAttr($this->source)?>"
   >
     <a class="cart-add hidden<?php if (!$cart->contains($cartId)): ?> correct<?php endif ?>" href="javascript:;">
-      <?=$this->icon('small/pin')?>
+      <?=$this->icon('pin')?>
       <div class="tooltip">
         <?=$this->transEsc('Add to Book Bag')?>
       </div>
     </a>
     <a class="cart-remove hidden<?php if ($cart->contains($cartId)): ?> correct<?php endif ?>" href="javascript:;">
-      <?=$this->icon('small/pin', 'icon -beat')?>
+      <?=$this->icon('pin', 'icon -beat')?>
       <div class="tooltip">
         <?=$this->transEsc('Remove from Book Bag')?>
       </div>
diff --git a/themes/fid_bbi/templates/record/taglist.phtml b/themes/fid_bbi/templates/record/taglist.phtml
index 5c20bff0dc3..4ce8108078e 100644
--- a/themes/fid_bbi/templates/record/taglist.phtml
+++ b/themes/fid_bbi/templates/record/taglist.phtml
@@ -28,9 +28,9 @@
               title="<?=$buttonLabel?>"
             >
               <?php if ($taggedByCurrentUser): ?>
-                <?=$this->icon('small/x')?>
+                <?=$this->icon('x')?>
               <?php else: ?>
-                <?=$this->icon('small/checkmark')?>
+                <?=$this->icon('checkmark')?>
               <?php endif; ?>
             </button>
           </form>
diff --git a/themes/fid_bbi/templates/search/advanced-search-info.phtml b/themes/fid_bbi/templates/search/advanced-search-info.phtml
index bdfe5acbb98..99a693622f7 100644
--- a/themes/fid_bbi/templates/search/advanced-search-info.phtml
+++ b/themes/fid_bbi/templates/search/advanced-search-info.phtml
@@ -19,7 +19,7 @@ $advSearch = $options->getAdvancedSearchAction();
 ?>
 
   <div class="results_advanced-search-info">
-    <?=$this->icon('small/magnifier')?>
+    <?=$this->icon('magnifier')?>
 
     <h3><?=$this->translate('Advanced Search')?></h3>
 
diff --git a/themes/fid_bbi/templates/search/history.phtml b/themes/fid_bbi/templates/search/history.phtml
index 9e7db4dc424..70a3a8b5449 100644
--- a/themes/fid_bbi/templates/search/history.phtml
+++ b/themes/fid_bbi/templates/search/history.phtml
@@ -25,7 +25,7 @@ $saveSupported = $this->accountCapabilities()->getSavedSearchSetting() === 'enab
 
 <div class="results">
   <button class="results_sidebar-toggle" type="button" aria-controls="profile-menu">
-    <?=$this->icon('small/person')?>
+    <?=$this->icon('person')?>
     <span><?=$this->transEsc('Profile Menu')?></span>
   </button>
 
@@ -45,7 +45,7 @@ $saveSupported = $this->accountCapabilities()->getSavedSearchSetting() === 'enab
       </p>
     <?php else: ?>
       <div class="alert -info">
-        <?=$this->icon('small/info')?>
+        <?=$this->icon('info')?>
         <p><?=$this->translate('history_no_searches')?></p>
       </div>
     <?php endif; ?>
diff --git a/themes/fid_bbi/templates/search/pagination.phtml b/themes/fid_bbi/templates/search/pagination.phtml
index 0765ecc8bfb..42774b63d67 100644
--- a/themes/fid_bbi/templates/search/pagination.phtml
+++ b/themes/fid_bbi/templates/search/pagination.phtml
@@ -7,7 +7,7 @@
           class="pagination_link -previous"
           href="<?=$this->currentPath() . $this->results->getUrlQuery()->setPage($this->previous)?>"
         >
-          <?=$this->icon('small/arrow-left')?>
+          <?=$this->icon('arrow-left')?>
           <span class="pagination_link-label">
             <?=$this->translate('Previous')?>
           </span>
@@ -31,7 +31,7 @@
           <span class="pagination_link-label">
             <?=$this->translate('Next')?>
           </span>
-          <?=$this->icon('small/arrow-right')?>
+          <?=$this->icon('arrow-right')?>
         </a>
       <?php endif; ?>
     </div>
diff --git a/themes/fid_bbi/templates/search/results.phtml b/themes/fid_bbi/templates/search/results.phtml
index 06f104a19c0..496cf3cfd50 100644
--- a/themes/fid_bbi/templates/search/results.phtml
+++ b/themes/fid_bbi/templates/search/results.phtml
@@ -66,7 +66,7 @@ $this->headScript()->appendFile("check_save_statuses.js");
     aria-controls="sidebar"
     aria-label="<?=$this->transEsc('Show functions & filters')?>"
   >
-    <?=$this->icon('small/filter')?>
+    <?=$this->icon('filter')?>
     <span><?=$this->transEsc('Functions & Filters')?></span>
   </button>
 
@@ -139,7 +139,7 @@ $this->headScript()->appendFile("check_save_statuses.js");
         aria-controls="sidebar"
         aria-label="<?=$this->transEsc('Close functions & filters')?>"
       >
-        <?=$this->icon('small/x')?>
+        <?=$this->icon('x')?>
         <span class="sr-only"><?=$this->transEsc('Close')?></span>
       </button>
     </div>
@@ -155,7 +155,7 @@ $this->headScript()->appendFile("check_save_statuses.js");
               href="<?=$this->url('cart-home')?>"
               data-lightbox
             >
-              <?=$this->icon('small/pin')?>
+              <?=$this->icon('pin')?>
               <?=$this->transEsc('Book Bag')?>
               <?php // NOTE: Pin count updated via JS, must be <strong> ?>
               (<strong><?=count($cart->getItems())?></strong>)
@@ -163,12 +163,12 @@ $this->headScript()->appendFile("check_save_statuses.js");
           <?php endif; ?>
 
           <a href="<?=$this->url('myresearch-favorites')?>">
-            <?=$this->icon('small/star')?>
+            <?=$this->icon('star')?>
             <?=$this->transEsc('Favorites')?>
           </a>
 
           <a href="<?=$this->results->getUrlQuery()->setViewParam('rss')?>">
-            <?=$this->icon('small/rss')?>
+            <?=$this->icon('rss')?>
             <?=$this->transEsc('RSS Feed')?>
           </a>
 
@@ -177,7 +177,7 @@ $this->headScript()->appendFile("check_save_statuses.js");
             href="<?=$this->url('search-email')?>"
             data-lightbox
           >
-            <?=$this->icon('small/mail')?>
+            <?=$this->icon('mail')?>
             <?=$this->transEsc('Email')?>
           </a>
 
@@ -185,7 +185,7 @@ $this->headScript()->appendFile("check_save_statuses.js");
             href="<?=$this->url('search-history')?>"
             data-lightbox
           >
-            <?=$this->icon('small/clock')?>
+            <?=$this->icon('clock')?>
             <?=$this->transEsc('History')?>
           </a>
 
@@ -194,12 +194,12 @@ $this->headScript()->appendFile("check_save_statuses.js");
               <?php if ($this->results->isSavedSearch()): ?>
                 <a href="<?=$this->url('myresearch-savesearch')?>?delete=<?=urlencode($this->results->getSearchId())?>">
                   <?php // TODO: Change icon? ?>
-                  <?=$this->icon('small/save')?>
+                  <?=$this->icon('save')?>
                   <?=$this->transEsc('Remove')?>
                 </a>
               <?php else: ?>
                 <a href="<?=$this->url('myresearch-savesearch')?>?save=<?=urlencode($this->results->getSearchId())?>">
-                  <?=$this->icon('small/save')?>
+                  <?=$this->icon('save')?>
                   <?=$this->transEsc('Save')?>
                 </a>
               <?php endif; ?>
diff --git a/themes/fid_bbi/templates/search/searchbox.phtml b/themes/fid_bbi/templates/search/searchbox.phtml
index 155e4512ea2..a13d35b7cb3 100644
--- a/themes/fid_bbi/templates/search/searchbox.phtml
+++ b/themes/fid_bbi/templates/search/searchbox.phtml
@@ -127,7 +127,7 @@ $tabConfig = $this->searchTabs()->getTabConfig(
         <?php // NOTE: ID keepfilters and class searchFormKeepFilters required by JS ?>
         <label>
           <input id="keepfilters" type="checkbox" <?=$defaultFilterState?> class="searchFormKeepFilters">
-          <?=$this->icon('small/filter')?>
+          <?=$this->icon('filter')?>
           <div class="tooltip">
             <span>
               <?=$this->translate('Filters are kept')?>
@@ -172,7 +172,7 @@ $tabConfig = $this->searchTabs()->getTabConfig(
     <?php endif; ?>
 
     <button class="search_submit" type="submit">
-      <?=$this->icon('small/magnifier')?>
+      <?=$this->icon('magnifier')?>
       <?=$this->transEsc('Find')?>
     </button>
   </form>
-- 
GitLab