diff --git a/packages/utils/block-utils/src/__snapshots__/ErrorBoundary.test.js.snap b/packages/utils/block-utils/src/__snapshots__/ErrorBoundary.test.js.snap
index 494202fcf..fddfa309e 100644
--- a/packages/utils/block-utils/src/__snapshots__/ErrorBoundary.test.js.snap
+++ b/packages/utils/block-utils/src/__snapshots__/ErrorBoundary.test.js.snap
@@ -85,7 +85,7 @@ exports[`display fallback component on error generated by child 1`] = `
 </div>
 `;
 
-exports[`display no error message on error generated by child 1`] = `null`;
+exports[`display no error message on error generated by child 1`] = ``;
 
 exports[`no error 1`] = `
 <div>
diff --git a/packages/utils/block-utils/src/__snapshots__/createIcon.test.js.snap b/packages/utils/block-utils/src/__snapshots__/createIcon.test.js.snap
index f5e838d6c..e6b92e948 100644
--- a/packages/utils/block-utils/src/__snapshots__/createIcon.test.js.snap
+++ b/packages/utils/block-utils/src/__snapshots__/createIcon.test.js.snap
@@ -1,65 +1,100 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Icon default 1`] = `
-<svg
-  class="emotion-0"
-  data-testid="AiOutlineExclamationCircle"
-  id="undefined_id"
-/>
+<span
+  class="anticon"
+  role="img"
+>
+  <svg
+    class="emotion-0"
+    data-testid="AiOutlineExclamationCircle"
+    id="undefined_id"
+  />
+</span>
 `;
 
 exports[`Icon default and id 1`] = `
-<svg
-  class="emotion-0"
-  data-testid="AiOutlineExclamationCircle"
-  id="test-id"
-/>
+<span
+  class="anticon"
+  role="img"
+>
+  <svg
+    class="emotion-0"
+    data-testid="AiOutlineExclamationCircle"
+    id="test-id"
+  />
+</span>
 `;
 
 exports[`Icon onClick.loading false 1`] = `
-<svg
-  class="emotion-0"
-  data-testid="AiIcon"
-  id="test-id"
-  title="AiIcon"
-/>
+<span
+  class="anticon"
+  role="img"
+>
+  <svg
+    class="emotion-0"
+    data-testid="AiIcon"
+    id="test-id"
+    title="AiIcon"
+  />
+</span>
 `;
 
 exports[`Icon onClick.loading true 1`] = `
-<svg
-  class="emotion-0"
-  data-testid="AiOutlineLoading3Quarters"
-  id="test-id"
-  title="AiIcon"
-/>
+<span
+  class="anticon"
+  role="img"
+>
+  <svg
+    class="emotion-0"
+    data-testid="AiOutlineLoading3Quarters"
+    id="test-id"
+    title="AiIcon"
+  />
+</span>
 `;
 
 exports[`Icon properties string 1`] = `
-<svg
-  class="emotion-0"
-  data-testid="AiIcon"
-  id="test-id"
-  title="AiIcon"
-/>
+<span
+  class="anticon"
+  role="img"
+>
+  <svg
+    class="emotion-0"
+    data-testid="AiIcon"
+    id="test-id"
+    title="AiIcon"
+  />
+</span>
 `;
 
 exports[`Icon properties.name 1`] = `
-<svg
-  class="emotion-0"
-  data-testid="AiIcon"
-  id="test-id"
-  title="AiIcon"
-/>
+<span
+  class="anticon"
+  role="img"
+>
+  <svg
+    class="emotion-0"
+    data-testid="AiIcon"
+    id="test-id"
+    title="AiIcon"
+  />
+</span>
 `;
 
 exports[`Icon properties.name error 1`] = `
-<svg
-  class="emotion-0"
-  color="#F00"
-  data-testid="AiOutlineExclamationCircle"
-  id="test-id"
-  title="ErrorIcon"
-/>
+<span
+  class="anticon"
+  role="img"
+>
+  <svg
+    class="emotion-0"
+    color="#F00"
+    data-testid="AiOutlineExclamationCircle"
+    id="test-id"
+    title="ErrorIcon"
+  />
+</span>
 `;
 
 exports[`Icon properties.spin 1`] = `
@@ -84,12 +119,17 @@ exports[`Icon properties.spin 1`] = `
   animation: animation-0 2s infinite linear;
 }
 
-<svg
-  class="emotion-0 emotion-1"
-  data-testid="AiIcon"
-  id="test-id"
-  title="AiIcon"
-/>
+<span
+  class="anticon"
+  role="img"
+>
+  <svg
+    class="emotion-0 emotion-1"
+    data-testid="AiIcon"
+    id="test-id"
+    title="AiIcon"
+  />
+</span>
 `;
 
 exports[`Icon properties.style 1`] = `
@@ -97,10 +137,15 @@ exports[`Icon properties.style 1`] = `
   background: yellow;
 }
 
-<svg
-  class="emotion-0"
-  data-testid="AiIcon"
-  id="test-id"
-  title="AiIcon"
-/>
+<span
+  class="anticon"
+  role="img"
+>
+  <svg
+    class="emotion-0"
+    data-testid="AiIcon"
+    id="test-id"
+    title="AiIcon"
+  />
+</span>
 `;