diff --git a/ui.apps/src/main/content/META-INF/vault/filter.xml b/ui.apps/src/main/content/META-INF/vault/filter.xml
index c94029e..f4c0352 100644
--- a/ui.apps/src/main/content/META-INF/vault/filter.xml
+++ b/ui.apps/src/main/content/META-INF/vault/filter.xml
@@ -28,6 +28,5 @@
         <include pattern="/apps/cq/experience-fragments/content/editor/jcr:content/sidepanels/edit/items/tabs/items/includeFrontifyTab(/.*)?"/>
     </filter>
 
-    <filter root="/content/dam/frontify-aem-connector" mode="merge"/>
     <filter root="/etc/cloudservices/ffyconfig" mode="merge"/>
 </workspaceFilter>
diff --git a/ui.apps/src/main/content/jcr_root/apps/frontify-aem-connector/clientlibs/clientlib-author/resources/frontify-nook-gray.svg b/ui.apps/src/main/content/jcr_root/apps/frontify-aem-connector/clientlibs/clientlib-author/resources/frontify-nook-gray.svg
new file mode 100644
index 0000000..b34b08e
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/frontify-aem-connector/clientlibs/clientlib-author/resources/frontify-nook-gray.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 156.42 150"><defs><style>.cls-1{fill:#2d3232;}</style></defs><path class="cls-1" d="M150.75,99.59l-16.87-9.74a4.9,4.9,0,0,1-2.45-4.23V66.14a11.36,11.36,0,0,0-5.68-9.83l-16.87-9.74a4.92,4.92,0,0,1-2.44-4.24V22.85A11.39,11.39,0,0,0,100.76,13L78.21,0,55.66,13A11.39,11.39,0,0,0,50,22.85V42.33a4.92,4.92,0,0,1-2.44,4.24L30.67,56.31A11.38,11.38,0,0,0,25,66.14V85.62a4.89,4.89,0,0,1-2.44,4.23L5.68,99.59A11.41,11.41,0,0,0,0,109.43v26l22.55,13a11.34,11.34,0,0,0,11.35,0l16.87-9.74a4.91,4.91,0,0,1,4.89,0l16.87,9.74a11.37,11.37,0,0,0,11.36,0l16.87-9.74a4.91,4.91,0,0,1,4.89,0l16.87,9.74a11.34,11.34,0,0,0,11.35,0l22.55-13v-26A11.4,11.4,0,0,0,150.75,99.59ZM100,22.85V42.33a11.39,11.39,0,0,0,5.68,9.83l16.87,9.74A4.91,4.91,0,0,1,125,66.14V85.62a11.38,11.38,0,0,0,5.67,9.83l16.87,9.74a4.9,4.9,0,0,1,2.45,4.24V128L81.44,88.44V9.33l16.09,9.29A4.89,4.89,0,0,1,100,22.85ZM8.91,105.19l16.87-9.74a11.39,11.39,0,0,0,5.68-9.83V66.14A4.9,4.9,0,0,1,33.9,61.9l16.87-9.74a11.39,11.39,0,0,0,5.68-9.83V22.85a4.91,4.91,0,0,1,2.44-4.23L75,9.33V88.44L6.47,128V109.43A4.9,4.9,0,0,1,8.91,105.19Zm121.73,37.7a4.91,4.91,0,0,1-4.89,0l-16.87-9.74a11.34,11.34,0,0,0-11.35,0l-16.87,9.74a4.91,4.91,0,0,1-4.89,0L58.9,133.15a11.36,11.36,0,0,0-11.36,0l-16.87,9.74a4.91,4.91,0,0,1-4.89,0L9.7,133.6,78.21,94l68.51,39.56Z"/></svg>
\ No newline at end of file
diff --git a/ui.apps/src/main/content/jcr_root/content/.content.xml b/ui.apps/src/main/content/jcr_root/content/.content.xml
deleted file mode 100644
index b61006f..0000000
--- a/ui.apps/src/main/content/jcr_root/content/.content.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-          xmlns:rep="internal"
-          jcr:mixinTypes="[rep:AccessControllable]"
-          jcr:primaryType="sling:OrderedFolder">
-    <rep:policy/>
-    <dam/>
-</jcr:root>
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/.content.xml b/ui.apps/src/main/content/jcr_root/content/dam/.content.xml
deleted file mode 100644
index 54084a8..0000000
--- a/ui.apps/src/main/content/jcr_root/content/dam/.content.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
-    jcr:mixinTypes="[rep:AccessControllable]"
-    jcr:primaryType="sling:Folder"/>
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/.content.xml b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/.content.xml
deleted file mode 100644
index f8c8c30..0000000
--- a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/.content.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="sling:OrderedFolder">
-    <jcr:content
-        cq:conf="/conf/frontify-aem-connector"
-        jcr:primaryType="nt:unstructured"
-        jcr:title="Frontify AEM Connector">
-        <folderThumbnail/>
-    </jcr:content>
-    <asset.jpg/>
-    <eyJwYXRoIjoid2VhcmVcL2FjY291bnRzXC82ZVwvNDAwMDM4OFwvcHJvamVjdHNcLzQ5OFwvYXNzZXRzXC82YlwvMzM1NjBcLzNiMjUxZGZmNjE2MzE2NDJlMDI5MGNkNTdlZGRiNmYxLTE1ODYyNjU0ODEuanBnIn0_weare_YOz3UULdhX3B.jpg/>
-    <frontify-drop-mark-main-rgb.png/>
-</jcr:root>
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/_jcr_content/folderThumbnail b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/_jcr_content/folderThumbnail
deleted file mode 100644
index 0fa9db8..0000000
Binary files a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/_jcr_content/folderThumbnail and /dev/null differ
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/.content.xml b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/.content.xml
deleted file mode 100644
index ee1f316..0000000
--- a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/.content.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:mixinTypes="[mix:referenceable]"
-    jcr:primaryType="dam:Asset"
-    jcr:uuid="eba5dcb5-b4e1-488b-9169-e1981f1f7e44">
-    <jcr:content
-        dam:assetState="processed"
-        jcr:lastModified="{Date}2020-07-19T03:10:40.248+02:00"
-        jcr:lastModifiedBy="admin"
-        jcr:primaryType="dam:AssetContent">
-        <metadata
-            dam:Bitsperpixel="{Long}32"
-            dam:extracted="{Date}2020-07-19T03:10:39.741+02:00"
-            dam:Fileformat="PNG"
-            dam:MIMEtype="image/png"
-            dam:Numberofimages="{Long}1"
-            dam:Numberoftextualcomments="{Long}0"
-            dam:Physicalheightindpi="{Long}300"
-            dam:Physicalheightininches="{Decimal}1.6400033235549927"
-            dam:Physicalwidthindpi="{Long}300"
-            dam:Physicalwidthininches="{Decimal}1.520003080368042"
-            dam:Progressive="no"
-            dam:sha1="1a92f9e7bdb898f9ccdc367de66ec5c8b75c9384"
-            dam:size="{Long}9634"
-            dc:format="image/png"
-            jcr:mixinTypes="[cq:Taggable]"
-            jcr:primaryType="nt:unstructured"
-            tiff:ImageLength="{Long}492"
-            tiff:ImageWidth="{Long}456"/>
-        <related jcr:primaryType="nt:unstructured"/>
-    </jcr:content>
-</jcr:root>
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.140.100.png b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.140.100.png
deleted file mode 100644
index be21b0f..0000000
Binary files a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.140.100.png and /dev/null differ
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.140.100.png.dir/.content.xml b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.140.100.png.dir/.content.xml
deleted file mode 100644
index 9f6f30a..0000000
--- a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.140.100.png.dir/.content.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:file">
-    <jcr:content
-        jcr:lastModifiedBy="workflow-process-service"
-        jcr:primaryType="oak:Resource"/>
-</jcr:root>
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.319.319.png b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.319.319.png
deleted file mode 100644
index 268b3bd..0000000
Binary files a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.319.319.png and /dev/null differ
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.319.319.png.dir/.content.xml b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.319.319.png.dir/.content.xml
deleted file mode 100644
index 9f6f30a..0000000
--- a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.319.319.png.dir/.content.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:file">
-    <jcr:content
-        jcr:lastModifiedBy="workflow-process-service"
-        jcr:primaryType="oak:Resource"/>
-</jcr:root>
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.48.48.png b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.48.48.png
deleted file mode 100644
index 922c25a..0000000
Binary files a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.48.48.png and /dev/null differ
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.48.48.png.dir/.content.xml b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.48.48.png.dir/.content.xml
deleted file mode 100644
index 9f6f30a..0000000
--- a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.thumbnail.48.48.png.dir/.content.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:file">
-    <jcr:content
-        jcr:lastModifiedBy="workflow-process-service"
-        jcr:primaryType="oak:Resource"/>
-</jcr:root>
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.web.1280.1280.png b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.web.1280.1280.png
deleted file mode 100644
index 77cbc34..0000000
Binary files a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.web.1280.1280.png and /dev/null differ
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.web.1280.1280.png.dir/.content.xml b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.web.1280.1280.png.dir/.content.xml
deleted file mode 100644
index 9f6f30a..0000000
--- a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.web.1280.1280.png.dir/.content.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:file">
-    <jcr:content
-        jcr:lastModifiedBy="workflow-process-service"
-        jcr:primaryType="oak:Resource"/>
-</jcr:root>
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/original b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/original
deleted file mode 100644
index 814072b..0000000
Binary files a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/original and /dev/null differ
diff --git a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/original.dir/.content.xml b/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/original.dir/.content.xml
deleted file mode 100644
index 106403f..0000000
--- a/ui.apps/src/main/content/jcr_root/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/original.dir/.content.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:file">
-    <jcr:content
-        jcr:lastModifiedBy="admin"
-        jcr:mimeType="image/png"
-        jcr:primaryType="oak:Resource"/>
-</jcr:root>
diff --git a/ui.frontend/src/main/webpack/site/components/dialog-style.scss b/ui.frontend/src/main/webpack/site/components/dialog-style.scss
index 8441bdf..ffbed9a 100644
--- a/ui.frontend/src/main/webpack/site/components/dialog-style.scss
+++ b/ui.frontend/src/main/webpack/site/components/dialog-style.scss
@@ -4,7 +4,7 @@
 }
 
 .coral3-Icon--frontify {
-  background-image: url('/content/dam/frontify-aem-connector/frontify-drop-mark-main-rgb.png/_jcr_content/renditions/cq5dam.web.1280.1280.png');
+  background-image: url('/etc.clientlibs/frontify-aem-connector/clientlibs/clientlib-author/resources/frontify-nook-gray.svg');
     width: 24px;
     height: 18px;
     filter: saturate(0%);
@@ -116,4 +116,4 @@
   .sidepanel .frontify-content-panel.content-panel.editor-SidePanel-results {
     max-height: 85vh;
   }
-}
\ No newline at end of file
+}
diff --git a/ui.frontend/src/main/webpack/site/components/ffy-dam-author-panel.js b/ui.frontend/src/main/webpack/site/components/ffy-dam-author-panel.js
index edc063c..6a69c63 100644
--- a/ui.frontend/src/main/webpack/site/components/ffy-dam-author-panel.js
+++ b/ui.frontend/src/main/webpack/site/components/ffy-dam-author-panel.js
@@ -189,7 +189,6 @@ async function handleUpdateAssetList(endpoint, domain) {
    workspaceProject: library(id: "$library") {
     id
     name
-    assetCount
     assets(page: 1, query: {search: $term, type: [$asset_type], sortBy: $sort}) {
       total
       page
diff --git a/ui.frontend/src/main/webpack/site/components/ffy-filter.js b/ui.frontend/src/main/webpack/site/components/ffy-filter.js
index 6e48cd2..791e8b0 100644
--- a/ui.frontend/src/main/webpack/site/components/ffy-filter.js
+++ b/ui.frontend/src/main/webpack/site/components/ffy-filter.js
@@ -41,7 +41,7 @@ export async function handleUpdateLibrariesList(endpoint, domain, callback) {
           ... on Library {
             id
             name
-            assetCount
+            assets {total}
           }
         }
       }