diff --git a/src/views/gutenberg-blocks/blocks/collections-list/edit.js b/src/views/gutenberg-blocks/blocks/collections-list/edit.js
index 7c490fe91..e8a1cad68 100644
--- a/src/views/gutenberg-blocks/blocks/collections-list/edit.js
+++ b/src/views/gutenberg-blocks/blocks/collections-list/edit.js
@@ -35,11 +35,13 @@ export default function({ attributes, setAttributes, className, isSelected }) {
                         icon="no-alt"
                         label={__('Remove', 'tainacan')}/>
                     :
-                    <Button
-                        onClick={ () => removeCollectionOfId(collection.id) }
-                        icon="no-alt"
-                        showTooltip={false}
-                        label={__('Remove', 'tainacan')} />
+                    <button
+                            onClick={ () => removeCollectionOfId(collection.id) }
+                            type="button"
+                            class="components-button has-icon"
+                            aria-label={__('Remove', 'tainacan')}>
+                        <span class="dashicon dashicons dashicons-no-alt" />
+                    </button>
                 }
                 <a 
                     id={ isNaN(collection.id) ? collection.id : 'collection-id-' + collection.id }
diff --git a/src/views/gutenberg-blocks/blocks/terms-list/edit.js b/src/views/gutenberg-blocks/blocks/terms-list/edit.js
index 93a631c64..d15f9e57d 100644
--- a/src/views/gutenberg-blocks/blocks/terms-list/edit.js
+++ b/src/views/gutenberg-blocks/blocks/terms-list/edit.js
@@ -33,11 +33,13 @@ export default function({ attributes, setAttributes, className, isSelected }){
                         icon="no-alt"
                         label={__('Remove', 'tainacan')}/>
                         :
-                    <Button
-                        onClick={ () => removeTermOfId(term.id) }
-                        icon="no-alt"
-                        showTooltip={false}
-                        label={__('Remove', 'tainacan')}/>
+                    <button
+                            onClick={ () => removeTermOfId(term.id) }
+                            type="button"
+                            class="components-button has-icon"
+                            aria-label={__('Remove', 'tainacan')}>
+                        <span class="dashicon dashicons dashicons-no-alt" />
+                    </button>
                 }         
                 <a 
                     id={ isNaN(term.id) ? term.id : 'term-id-' + term.id }