From 0fd79edfa170a97c50ecfc5bbb3c13538c4c7de7 Mon Sep 17 00:00:00 2001
From: Alin Voinea <contact@avoinea.com>
Date: Wed, 18 Nov 2020 21:53:27 +0200
Subject: [PATCH] Restructure add-on

---
 src/Widgets/index.js                          |   1 -
 src/components/index.js                       |   1 +
 .../manage/Blocks/Accordion/Panels.jsx        |   2 +-
 .../manage/Blocks/Accordion/editor.less       |   9 +
 .../Accordion/icons/five-circle-bottom.svg    | 165 ------------------
 .../Accordion/icons/three-circle-bottom.svg   |  95 ----------
 .../manage/Blocks/Accordion/panels.js         |  22 +--
 .../manage}/Widgets/PanelWidget.jsx           |   0
 src/icons/accordion.svg                       |  83 +++++++++
 .../icons/circle-bottom.svg => icons/one.svg} |  52 +++---
 src/icons/three.svg                           |  93 ++++++++++
 src/icons/two.svg                             |  83 +++++++++
 src/index.js                                  |   6 +-
 13 files changed, 313 insertions(+), 299 deletions(-)
 delete mode 100644 src/Widgets/index.js
 delete mode 100644 src/components/manage/Blocks/Accordion/icons/five-circle-bottom.svg
 delete mode 100644 src/components/manage/Blocks/Accordion/icons/three-circle-bottom.svg
 rename src/{ => components/manage}/Widgets/PanelWidget.jsx (100%)
 create mode 100644 src/icons/accordion.svg
 rename src/{components/manage/Blocks/Accordion/icons/circle-bottom.svg => icons/one.svg} (57%)
 create mode 100644 src/icons/three.svg
 create mode 100644 src/icons/two.svg

diff --git a/src/Widgets/index.js b/src/Widgets/index.js
deleted file mode 100644
index 53373cb..0000000
--- a/src/Widgets/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export PanelWidget from './PanelWidget.jsx';
diff --git a/src/components/index.js b/src/components/index.js
index 96da5e4..573f995 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,5 +1,6 @@
 export AccordionBlockEdit from './manage/Blocks/Accordion/Edit';
 export AccordionBlockView from './manage/Blocks/Accordion/View';
 export AccordionBlockSchema from './manage/Blocks/Accordion/Schema';
+export PanelWidget from './manage/Widgets/PanelWidget';
 
 export { options } from './manage/Blocks/Accordion/panels';
diff --git a/src/components/manage/Blocks/Accordion/Panels.jsx b/src/components/manage/Blocks/Accordion/Panels.jsx
index 9b1f232..eff44ba 100644
--- a/src/components/manage/Blocks/Accordion/Panels.jsx
+++ b/src/components/manage/Blocks/Accordion/Panels.jsx
@@ -6,7 +6,7 @@ import './editor.less';
 export default ({ data, onChange, children, variants }) => {
   return (
     <Segment>
-      <h4>Select Panels:</h4>
+      <h4>Accordion Panels:</h4>
       <Card.Group centered itemsPerRow={3}>
         {variants.map(({ icon, defaultData, title }, index) => (
           <Card key={index} onClick={() => onChange(defaultData)}>
diff --git a/src/components/manage/Blocks/Accordion/editor.less b/src/components/manage/Blocks/Accordion/editor.less
index dfe6378..c996551 100644
--- a/src/components/manage/Blocks/Accordion/editor.less
+++ b/src/components/manage/Blocks/Accordion/editor.less
@@ -1,6 +1,15 @@
 .block-editor-accordion {
   margin: 0 -2.2rem;
 
+  .ui.card {
+    .content {
+      color: #68778d;
+      svg {
+        fill: #68778d;
+      }
+    } 
+  }
+
   .block-editor-accordion {
     margin: 0 0.1rem;
   }
diff --git a/src/components/manage/Blocks/Accordion/icons/five-circle-bottom.svg b/src/components/manage/Blocks/Accordion/icons/five-circle-bottom.svg
deleted file mode 100644
index 8c0bb4d..0000000
--- a/src/components/manage/Blocks/Accordion/icons/five-circle-bottom.svg
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="36"
-   viewBox="0 0 36 36"
-   version="1.1"
-   id="svg100"
-   sodipodi:docname="five-circle-bottom.svg"
-   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="791"
-     id="namedview98"
-     showgrid="false"
-     inkscape:zoom="8.681365"
-     inkscape:cx="18.833619"
-     inkscape:cy="14.912521"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg100"
-     inkscape:document-rotation="0"
-     showguides="false" />
-  <metadata
-     id="metadata106">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs104" />
-  <g
-     fill-rule="evenodd"
-     id="g225"
-     transform="matrix(0.39922456,0,0,0.36805964,-0.327151,6.0137525)"
-     style="stroke-width:0.645219">
-    <path
-       d="M 31,18 C 31,10.832 25.168,5 18,5 10.832,5 5,10.832 5,18 c 0,7.168 5.832,13 13,13 7.168,0 13,-5.832 13,-13 M 3,18 C 3,9.729 9.729,3 18,3 26.271,3 33,9.729 33,18 33,26.271 26.271,33 18,33 9.729,33 3,26.271 3,18"
-       id="path221"
-       style="stroke-width:0.645219" />
-    <polygon
-       points="18,23.414 11.293,16.707 12.707,15.293 18,20.586 23.293,15.293 24.707,16.707 "
-       id="polygon223"
-       style="stroke-width:0.645219" />
-  </g>
-  <g
-     fill-rule="evenodd"
-     id="g121"
-     transform="matrix(0.39922456,0,0,0.36805964,10.851137,6.0137525)"
-     style="stroke-width:0.645219">
-    <path
-       d="M 31,18 C 31,10.832 25.168,5 18,5 10.832,5 5,10.832 5,18 c 0,7.168 5.832,13 13,13 7.168,0 13,-5.832 13,-13 M 3,18 C 3,9.729 9.729,3 18,3 26.271,3 33,9.729 33,18 33,26.271 26.271,33 18,33 9.729,33 3,26.271 3,18"
-       id="path117"
-       style="stroke-width:0.645219" />
-    <polygon
-       points="11.293,16.707 12.707,15.293 18,20.586 23.293,15.293 24.707,16.707 18,23.414 "
-       id="polygon119"
-       style="stroke-width:0.645219" />
-  </g>
-  <g
-     fill-rule="evenodd"
-     id="g127"
-     transform="matrix(0.39922456,0,0,0.36805964,10.851137,6.0137525)"
-     style="stroke-width:0.645219">
-    <path
-       d="M 31,18 C 31,10.832 25.168,5 18,5 10.832,5 5,10.832 5,18 c 0,7.168 5.832,13 13,13 7.168,0 13,-5.832 13,-13 M 3,18 C 3,9.729 9.729,3 18,3 26.271,3 33,9.729 33,18 33,26.271 26.271,33 18,33 9.729,33 3,26.271 3,18"
-       id="path123"
-       style="stroke-width:0.645219" />
-    <polygon
-       points="11.293,16.707 12.707,15.293 18,20.586 23.293,15.293 24.707,16.707 18,23.414 "
-       id="polygon125"
-       style="stroke-width:0.645219" />
-  </g>
-  <g
-     fill-rule="evenodd"
-     id="g133"
-     transform="matrix(0.39922456,0,0,0.36805964,10.851137,6.0137525)"
-     style="stroke-width:0.645219">
-    <path
-       d="M 31,18 C 31,10.832 25.168,5 18,5 10.832,5 5,10.832 5,18 c 0,7.168 5.832,13 13,13 7.168,0 13,-5.832 13,-13 M 3,18 C 3,9.729 9.729,3 18,3 26.271,3 33,9.729 33,18 33,26.271 26.271,33 18,33 9.729,33 3,26.271 3,18"
-       id="path129"
-       style="stroke-width:0.645219" />
-    <polygon
-       points="11.293,16.707 12.707,15.293 18,20.586 23.293,15.293 24.707,16.707 18,23.414 "
-       id="polygon131"
-       style="stroke-width:0.645219" />
-  </g>
-  <g
-     fill-rule="evenodd"
-     id="g139"
-     transform="matrix(0.39922456,0,0,0.36805964,10.851137,6.0137525)"
-     style="stroke-width:0.645219">
-    <path
-       d="M 31,18 C 31,10.832 25.168,5 18,5 10.832,5 5,10.832 5,18 c 0,7.168 5.832,13 13,13 7.168,0 13,-5.832 13,-13 M 3,18 C 3,9.729 9.729,3 18,3 26.271,3 33,9.729 33,18 33,26.271 26.271,33 18,33 9.729,33 3,26.271 3,18"
-       id="path135"
-       style="stroke-width:0.645219" />
-    <polygon
-       points="11.293,16.707 12.707,15.293 18,20.586 23.293,15.293 24.707,16.707 18,23.414 "
-       id="polygon137"
-       style="stroke-width:0.645219" />
-  </g>
-  <g
-     fill-rule="evenodd"
-     id="g145"
-     transform="matrix(0.39923333,0,0,0.36805964,22.029399,6.3138211)"
-     style="stroke-width:0.645212">
-    <path
-       d="M 31,18 C 31,10.832 25.168,5 18,5 10.832,5 5,10.832 5,18 c 0,7.168 5.832,13 13,13 7.168,0 13,-5.832 13,-13 M 3,18 C 3,9.729 9.729,3 18,3 26.271,3 33,9.729 33,18 33,26.271 26.271,33 18,33 9.729,33 3,26.271 3,18"
-       id="path141"
-       style="stroke-width:0.645212" />
-    <polygon
-       points="24.707,16.707 18,23.414 11.293,16.707 12.707,15.293 18,20.586 23.293,15.293 "
-       id="polygon143"
-       style="stroke-width:0.645212" />
-  </g>
-  <g
-     fill-rule="evenodd"
-     id="g151"
-     transform="matrix(0.39922456,0,0,0.36805964,0.48903371,16.956732)"
-     style="stroke-width:0.645219">
-    <path
-       d="M 31,18 C 31,10.832 25.168,5 18,5 10.832,5 5,10.832 5,18 c 0,7.168 5.832,13 13,13 7.168,0 13,-5.832 13,-13 M 3,18 C 3,9.729 9.729,3 18,3 26.271,3 33,9.729 33,18 33,26.271 26.271,33 18,33 9.729,33 3,26.271 3,18"
-       id="path147"
-       style="stroke-width:0.645219" />
-    <polygon
-       points="18,20.586 23.293,15.293 24.707,16.707 18,23.414 11.293,16.707 12.707,15.293 "
-       id="polygon149"
-       style="stroke-width:0.645219" />
-  </g>
-  <g
-     fill-rule="evenodd"
-     id="g157"
-     transform="matrix(0.39922456,0,0,0.36805964,11.667321,16.956732)"
-     style="stroke-width:0.645219">
-    <path
-       d="M 31,18 C 31,10.832 25.168,5 18,5 10.832,5 5,10.832 5,18 c 0,7.168 5.832,13 13,13 7.168,0 13,-5.832 13,-13 M 3,18 C 3,9.729 9.729,3 18,3 26.271,3 33,9.729 33,18 33,26.271 26.271,33 18,33 9.729,33 3,26.271 3,18"
-       id="path153"
-       style="stroke-width:0.645219" />
-    <polygon
-       points="23.293,15.293 24.707,16.707 18,23.414 11.293,16.707 12.707,15.293 18,20.586 "
-       id="polygon155"
-       style="stroke-width:0.645219" />
-  </g>
-</svg>
diff --git a/src/components/manage/Blocks/Accordion/icons/three-circle-bottom.svg b/src/components/manage/Blocks/Accordion/icons/three-circle-bottom.svg
deleted file mode 100644
index 4d13a10..0000000
--- a/src/components/manage/Blocks/Accordion/icons/three-circle-bottom.svg
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="36"
-   viewBox="0 0 36 36"
-   version="1.1"
-   id="svg100"
-   sodipodi:docname="three-circle-bottom.svg"
-   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="791"
-     id="namedview98"
-     showgrid="false"
-     inkscape:zoom="9.3029937"
-     inkscape:cx="15.628315"
-     inkscape:cy="17.316499"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg100"
-     inkscape:document-rotation="0"
-     showguides="false" />
-  <metadata
-     id="metadata106">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs104" />
-  <g
-     fill-rule="evenodd"
-     id="g225"
-     transform="matrix(0.39922456,0,0,0.36805964,-0.37209404,8.0041179)"
-     style="stroke-width:0.645219">
-    <path
-       d="M 31,18 C 31,10.832 25.168,5 18,5 10.832,5 5,10.832 5,18 c 0,7.168 5.832,13 13,13 7.168,0 13,-5.832 13,-13 M 3,18 C 3,9.729 9.729,3 18,3 26.271,3 33,9.729 33,18 33,26.271 26.271,33 18,33 9.729,33 3,26.271 3,18"
-       id="path221"
-       style="stroke-width:0.645219" />
-    <polygon
-       points="18,23.414 11.293,16.707 12.707,15.293 18,20.586 23.293,15.293 24.707,16.707 "
-       id="polygon223"
-       style="stroke-width:0.645219" />
-  </g>
-  <g
-     fill-rule="evenodd"
-     id="g319"
-     transform="matrix(0.39922456,0,0,0.36805964,10.806194,8.0041179)"
-     style="stroke-width:0.645219">
-    <path
-       d="M 31,18 C 31,10.832 25.168,5 18,5 10.832,5 5,10.832 5,18 c 0,7.168 5.832,13 13,13 7.168,0 13,-5.832 13,-13 M 3,18 C 3,9.729 9.729,3 18,3 26.271,3 33,9.729 33,18 33,26.271 26.271,33 18,33 9.729,33 3,26.271 3,18"
-       id="path315"
-       style="stroke-width:0.645219" />
-    <polygon
-       points="11.293,16.707 12.707,15.293 18,20.586 23.293,15.293 24.707,16.707 18,23.414 "
-       id="polygon317"
-       style="stroke-width:0.645219" />
-  </g>
-  <g
-     fill-rule="evenodd"
-     id="g325"
-     transform="matrix(0.39922456,0,0,0.36805964,21.984482,8.0041179)"
-     style="stroke-width:0.645219">
-    <path
-       d="M 31,18 C 31,10.832 25.168,5 18,5 10.832,5 5,10.832 5,18 c 0,7.168 5.832,13 13,13 7.168,0 13,-5.832 13,-13 M 3,18 C 3,9.729 9.729,3 18,3 26.271,3 33,9.729 33,18 33,26.271 26.271,33 18,33 9.729,33 3,26.271 3,18"
-       id="path321"
-       style="stroke-width:0.645219" />
-    <polygon
-       points="12.707,15.293 18,20.586 23.293,15.293 24.707,16.707 18,23.414 11.293,16.707 "
-       id="polygon323"
-       style="stroke-width:0.645219" />
-  </g>
-</svg>
diff --git a/src/components/manage/Blocks/Accordion/panels.js b/src/components/manage/Blocks/Accordion/panels.js
index bfeb3b0..d190e8a 100644
--- a/src/components/manage/Blocks/Accordion/panels.js
+++ b/src/components/manage/Blocks/Accordion/panels.js
@@ -1,27 +1,27 @@
-import threeColumnSVG from './icons/three-circle-bottom.svg';
-import fiveColumnSVG from './icons/five-circle-bottom.svg';
-import oneColumnSVG from './icons/circle-bottom.svg';
+import oneSVG from '@eeacms/volto-accordion-block/icons/one.svg';
+import twoSVG from '@eeacms/volto-accordion-block/icons/two.svg';
+import threeSVG from '@eeacms/volto-accordion-block/icons/three.svg';
 
 export const options = [
   {
-    icon: oneColumnSVG,
+    icon: oneSVG,
     defaultData: {
       count: 1,
     },
-    title: '1 Panel',
+    title: '1',
   },
   {
-    icon: threeColumnSVG,
+    icon: twoSVG,
     defaultData: {
-      count: 3,
+      count: 2,
     },
-    title: '3 Panels',
+    title: '2',
   },
   {
-    icon: fiveColumnSVG,
+    icon: threeSVG,
     defaultData: {
-      count: 5,
+      count: 3,
     },
-    title: '5 Panels',
+    title: '3',
   },
 ];
diff --git a/src/Widgets/PanelWidget.jsx b/src/components/manage/Widgets/PanelWidget.jsx
similarity index 100%
rename from src/Widgets/PanelWidget.jsx
rename to src/components/manage/Widgets/PanelWidget.jsx
diff --git a/src/icons/accordion.svg b/src/icons/accordion.svg
new file mode 100644
index 0000000..e9ebd8e
--- /dev/null
+++ b/src/icons/accordion.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="36"
+   height="36"
+   viewBox="0 0 36 36"
+   version="1.1"
+   id="svg100"
+   sodipodi:docname="accordion.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1916"
+     inkscape:window-height="1048"
+     id="namedview98"
+     showgrid="false"
+     inkscape:zoom="17.36273"
+     inkscape:cx="-6.2293828"
+     inkscape:cy="21.677049"
+     inkscape:window-x="0"
+     inkscape:window-y="14"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg100"
+     inkscape:document-rotation="0"
+     showguides="false" />
+  <metadata
+     id="metadata106">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs104">
+    <linearGradient
+       id="linearGradient4893"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4891" />
+    </linearGradient>
+  </defs>
+  <polygon
+     points="11,8.999 11,11 33,11 33,8.999 "
+     id="polygon78"
+     style="fill-rule:evenodd"
+     transform="translate(-4,6.3262278)" />
+  <polygon
+     points="5.091,21 4,19.875 5.818,18 4,16.125 5.091,15 8,18 "
+     id="polygon86"
+     style="fill-rule:evenodd"
+     transform="translate(5,3.6737727)" />
+  <polygon
+     points="5.091,15 8,18 5.091,21 4,19.875 5.818,18 4,16.125 "
+     id="polygon86-9"
+     style="fill-rule:evenodd"
+     transform="translate(5,-7.0223173)" />
+  <polygon
+     points="11,11 33,11 33,8.999 11,8.999 "
+     id="polygon78-2"
+     style="fill-rule:evenodd"
+     transform="translate(-4,17.022317)" />
+</svg>
diff --git a/src/components/manage/Blocks/Accordion/icons/circle-bottom.svg b/src/icons/one.svg
similarity index 57%
rename from src/components/manage/Blocks/Accordion/icons/circle-bottom.svg
rename to src/icons/one.svg
index 1a3e725..592660a 100644
--- a/src/components/manage/Blocks/Accordion/icons/circle-bottom.svg
+++ b/src/icons/one.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -12,8 +13,8 @@
    viewBox="0 0 36 36"
    version="1.1"
    id="svg100"
-   sodipodi:docname="circle-bottom.svg"
-   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
+   sodipodi:docname="one.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -23,15 +24,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="791"
+     inkscape:window-width="1916"
+     inkscape:window-height="1048"
      id="namedview98"
      showgrid="false"
-     inkscape:zoom="9.3029937"
-     inkscape:cx="15.628315"
-     inkscape:cy="17.316499"
+     inkscape:zoom="12.277304"
+     inkscape:cx="3.1066155"
+     inkscape:cy="24.560624"
      inkscape:window-x="0"
-     inkscape:window-y="23"
+     inkscape:window-y="14"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg100"
      inkscape:document-rotation="0"
@@ -49,19 +50,24 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs104" />
-  <g
-     fill-rule="evenodd"
-     id="g225"
-     transform="matrix(0.39922456,0,0,0.36805964,10.807103,10.368948)"
-     style="stroke-width:0.645219">
-    <path
-       d="M 31,18 C 31,10.832 25.168,5 18,5 10.832,5 5,10.832 5,18 c 0,7.168 5.832,13 13,13 7.168,0 13,-5.832 13,-13 M 3,18 C 3,9.729 9.729,3 18,3 26.271,3 33,9.729 33,18 33,26.271 26.271,33 18,33 9.729,33 3,26.271 3,18"
-       id="path221"
-       style="stroke-width:0.645219" />
-    <polygon
-       points="18,23.414 11.293,16.707 12.707,15.293 18,20.586 23.293,15.293 24.707,16.707 "
-       id="polygon223"
-       style="stroke-width:0.645219" />
-  </g>
+     id="defs104">
+    <linearGradient
+       id="linearGradient4893"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4891" />
+    </linearGradient>
+  </defs>
+  <polygon
+     points="11,11 33,11 33,8.999 11,8.999 "
+     id="polygon78-2"
+     style="fill-rule:evenodd"
+     transform="translate(-4,11.674272)" />
+  <polygon
+     points="5.091,21 4,19.875 5.818,18 4,16.125 5.091,15 8,18 "
+     id="polygon86-9"
+     style="fill-rule:evenodd"
+     transform="translate(5,-1.6742724)" />
 </svg>
diff --git a/src/icons/three.svg b/src/icons/three.svg
new file mode 100644
index 0000000..4373d27
--- /dev/null
+++ b/src/icons/three.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="36"
+   height="36"
+   viewBox="0 0 36 36"
+   version="1.1"
+   id="svg100"
+   sodipodi:docname="three.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1916"
+     inkscape:window-height="1048"
+     id="namedview98"
+     showgrid="false"
+     inkscape:zoom="17.36273"
+     inkscape:cx="14.349463"
+     inkscape:cy="16.633187"
+     inkscape:window-x="0"
+     inkscape:window-y="14"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg100"
+     inkscape:document-rotation="0"
+     showguides="false" />
+  <metadata
+     id="metadata106">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs104">
+    <linearGradient
+       id="linearGradient4893"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4891" />
+    </linearGradient>
+  </defs>
+  <polygon
+     points="11,8.999 11,11 33,11 33,8.999 "
+     id="polygon78"
+     style="fill-rule:evenodd"
+     transform="translate(-4,0.9781833)" />
+  <polygon
+     points="11,11 33,11 33,8.999 11,8.999 "
+     id="polygon78-2"
+     style="fill-rule:evenodd"
+     transform="translate(-4,11.674273)" />
+  <polygon
+     points="33,11 33,8.999 11,8.999 11,11 "
+     id="polygon78-2-0"
+     style="fill-rule:evenodd"
+     transform="translate(-4,22.370362)" />
+  <polygon
+     points="5.818,18 4,16.125 5.091,15 8,18 5.091,21 4,19.875 "
+     id="polygon86-9-8"
+     style="fill-rule:evenodd"
+     transform="translate(5,-12.370362)" />
+  <polygon
+     points="4,16.125 5.091,15 8,18 5.091,21 4,19.875 5.818,18 "
+     id="polygon86-9"
+     style="fill-rule:evenodd"
+     transform="translate(5,-1.6742718)" />
+  <polygon
+     points="5.818,18 4,16.125 5.091,15 8,18 5.091,21 4,19.875 "
+     id="polygon86-9-2"
+     style="fill-rule:evenodd"
+     transform="translate(5,9.0218175)" />
+</svg>
diff --git a/src/icons/two.svg b/src/icons/two.svg
new file mode 100644
index 0000000..5933806
--- /dev/null
+++ b/src/icons/two.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="36"
+   height="36"
+   viewBox="0 0 36 36"
+   version="1.1"
+   id="svg100"
+   sodipodi:docname="two.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1916"
+     inkscape:window-height="1048"
+     id="namedview98"
+     showgrid="false"
+     inkscape:zoom="17.36273"
+     inkscape:cx="10.029984"
+     inkscape:cy="21.677049"
+     inkscape:window-x="0"
+     inkscape:window-y="14"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg100"
+     inkscape:document-rotation="0"
+     showguides="false" />
+  <metadata
+     id="metadata106">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs104">
+    <linearGradient
+       id="linearGradient4893"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4891" />
+    </linearGradient>
+  </defs>
+  <polygon
+     points="33,11 33,8.999 11,8.999 11,11 "
+     id="polygon78"
+     style="fill-rule:evenodd"
+     transform="translate(-4,6.3262278)" />
+  <polygon
+     points="33,8.999 11,8.999 11,11 33,11 "
+     id="polygon78-2"
+     style="fill-rule:evenodd"
+     transform="translate(-4,17.022317)" />
+  <polygon
+     points="5.818,18 4,16.125 5.091,15 8,18 5.091,21 4,19.875 "
+     id="polygon86-9"
+     style="fill-rule:evenodd"
+     transform="translate(5,-7.0223175)" />
+  <polygon
+     points="5.091,15 8,18 5.091,21 4,19.875 5.818,18 4,16.125 "
+     id="polygon86"
+     style="fill-rule:evenodd"
+     transform="translate(5,3.6737725)" />
+</svg>
diff --git a/src/index.js b/src/index.js
index ff327b8..32c13cd 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,10 +1,10 @@
-import circleBottomSVG from '@plone/volto/icons/circle-bottom.svg';
+import accordionSVG from '@eeacms/volto-accordion-block/icons/accordion.svg';
 import {
   AccordionBlockEdit,
   AccordionBlockView,
   AccordionBlockSchema,
 } from './components';
-import { PanelWidget } from './Widgets';
+import { PanelWidget } from '@eeacms/volto-accordion-block/components';
 import { options } from '@eeacms/volto-accordion-block/components';
 
 const applyConfig = (config) => {
@@ -36,7 +36,7 @@ const applyConfig = (config) => {
   config.blocks.blocksConfig.accordion = {
     id: 'accordion',
     title: 'Accordion',
-    icon: circleBottomSVG,
+    icon: accordionSVG,
     group: 'common',
     view: AccordionBlockView,
     edit: AccordionBlockEdit,