diff --git a/packages/react/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot b/packages/react/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
index f7bdefbc9b..0831f858e2 100644
--- a/packages/react/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
+++ b/packages/react/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
@@ -2090,251 +2090,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/D
                                   <div
                                     className="iot--empty-state--content"
                                   >
-                                    <svg
-                                      alt=""
-                                      className="iot--empty-state--icon"
-                                      data-testid="EmptyState-icon"
-                                      height={80}
-                                      width={80}
-                                    >
-                                      <defs>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__a-defaultIcon"
-                                          x1="37.502%"
-                                          x2="55.959%"
-                                          y1="34.928%"
-                                          y2="57.808%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopOpacity={0.04}
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopOpacity={0.04}
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__b-defaultIcon"
-                                          x1="-63.062%"
-                                          x2="101.194%"
-                                          y1="77.587%"
-                                          y2="37.496%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#767676"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#929292"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__c-defaultIcon"
-                                          x1="73.167%"
-                                          x2="44.204%"
-                                          y1="89.948%"
-                                          y2="39.998%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#969696"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__d-defaultIcon"
-                                          x1="-23.114%"
-                                          x2="57.391%"
-                                          y1="-11.496%"
-                                          y2="56.197%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#393939"
-                                          />
-                                          <stop
-                                            offset="99%"
-                                            stopColor="#525252"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__e-defaultIcon"
-                                          x1="5.255%"
-                                          x2="56.521%"
-                                          y1="115.2%"
-                                          y2="40.489%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#9C9C9C"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#C5C5C5"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__f-defaultIcon"
-                                          x1="45.625%"
-                                          x2="61.212%"
-                                          y1="38.922%"
-                                          y2="78.234%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#8A8A8A"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#B5B5B5"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__g-defaultIcon"
-                                          x1="57.243%"
-                                          x2="41.531%"
-                                          y1="31.727%"
-                                          y2="71.327%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#A4A4A4"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#BEBEBE"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__h-defaultIcon"
-                                          x1="27.599%"
-                                          x2="45.796%"
-                                          y1="69.394%"
-                                          y2="53.639%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#C2C2C2"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__i-defaultIcon"
-                                          x1="62.356%"
-                                          x2="31.337%"
-                                          y1="64.634%"
-                                          y2="27.889%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#C6C6C6"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__j-defaultIcon"
-                                          x1="62.354%"
-                                          x2="43.81%"
-                                          y1="114.244%"
-                                          y2="17.782%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#B7B7B7"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#EEE"
-                                          />
-                                        </linearGradient>
-                                      </defs>
-                                      <g
-                                        fill="none"
-                                        fillRule="nonzero"
-                                      >
-                                        <path
-                                          d="M36.131 27.683c.03.03.065.053.103.069h.042l-.159-.09s0 .02.014.02z"
-                                          fill="#A8A8A8"
-                                        />
-                                        <path
-                                          d="M28.793.593L.041 17.241l28.835 16.697 28.758-16.62z"
-                                          fill="url(#emptystate-Default-icon_svg__a-defaultIcon)"
-                                          transform="translate(11.724 43)"
-                                        />
-                                        <path
-                                          d="M.069 16.207v24.476L28.062 24.51V.034L.07 16.207z"
-                                          fill="url(#emptystate-Default-icon_svg__b-defaultIcon)"
-                                          transform="translate(12.414 7.138)"
-                                        />
-                                        <path
-                                          d="M40.455 2.807L27.945.33 0 16.551l12.483 2.477z"
-                                          fill="url(#emptystate-Default-icon_svg__c-defaultIcon)"
-                                          transform="translate(0 4.38)"
-                                        />
-                                        <path
-                                          d="M27.986.276L0 16.462l28.048 16.241 27.986-16.151z"
-                                          fill="url(#emptystate-Default-icon_svg__d-defaultIcon)"
-                                          transform="translate(12.414 31.276)"
-                                        />
-                                        <path
-                                          d="M28.434 40.641V16.207L.47.034V24.47l27.965 16.172z"
-                                          fill="url(#emptystate-Default-icon_svg__e-defaultIcon)"
-                                          transform="translate(40 7.138)"
-                                        />
-                                        <path
-                                          d="M28.476 24.828V.352l-28 16.2v24.482l28-16.206z"
-                                          fill="url(#emptystate-Default-icon_svg__f-defaultIcon)"
-                                          transform="translate(40 23)"
-                                        />
-                                        <path
-                                          d="M28.062 41.007V16.524L.097.36v24.475l27.965 16.173z"
-                                          fill="url(#emptystate-Default-icon_svg__g-defaultIcon)"
-                                          transform="translate(12.414 23)"
-                                        />
-                                        <path
-                                          d="M28.517 20.407L40 16.84 11.952.607.469 4.172z"
-                                          fill="url(#emptystate-Default-icon_svg__h-defaultIcon)"
-                                          transform="translate(40 3)"
-                                        />
-                                        <path
-                                          d="M39.559 10.834L28.524.317.517 16.503l11.076 10.51z"
-                                          fill="url(#emptystate-Default-icon_svg__i-defaultIcon)"
-                                          transform="translate(40 23)"
-                                        />
-                                        <path
-                                          d="M28.276 31.848l10.227-15.296L10.455.276.235 15.606z"
-                                          fill="url(#emptystate-Default-icon_svg__j-defaultIcon)"
-                                          transform="translate(2.069 23)"
-                                        />
-                                        <path
-                                          d="M2.303 38.607l.063.041 10.158-15.227 27.966 16.2.082-.104-28.048-16.241z"
-                                          fill="#FFF"
-                                        />
-                                        <path
-                                          d="M68.69 23.503l-.2-.186-27.973 16.186 11.076 10.51.076-.054-10.855-10.345z"
-                                          fill="#FFF"
-                                        />
-                                        <path
-                                          d="M80 19.841l-.159-.09-11.324 3.511-27.89-16.124-.158.055 28.048 16.235z"
-                                          fill="#999"
-                                        />
-                                        <path
-                                          d="M68.517 23.262h.09L40.614 7.028v-.042l-.131.042 28.034 16.234z"
-                                          fill="#FFF"
-                                        />
-                                      </g>
-                                    </svg>
+                                    
                                     <h3
                                       className="iot--empty-state--title"
                                       data-testid="EmptyState-title"
@@ -5003,251 +4759,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/D
                                   <div
                                     className="iot--empty-state--content"
                                   >
-                                    <svg
-                                      alt=""
-                                      className="iot--empty-state--icon"
-                                      data-testid="EmptyState-icon"
-                                      height={80}
-                                      width={80}
-                                    >
-                                      <defs>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__a-defaultIcon"
-                                          x1="37.502%"
-                                          x2="55.959%"
-                                          y1="34.928%"
-                                          y2="57.808%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopOpacity={0.04}
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopOpacity={0.04}
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__b-defaultIcon"
-                                          x1="-63.062%"
-                                          x2="101.194%"
-                                          y1="77.587%"
-                                          y2="37.496%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#767676"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#929292"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__c-defaultIcon"
-                                          x1="73.167%"
-                                          x2="44.204%"
-                                          y1="89.948%"
-                                          y2="39.998%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#969696"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__d-defaultIcon"
-                                          x1="-23.114%"
-                                          x2="57.391%"
-                                          y1="-11.496%"
-                                          y2="56.197%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#393939"
-                                          />
-                                          <stop
-                                            offset="99%"
-                                            stopColor="#525252"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__e-defaultIcon"
-                                          x1="5.255%"
-                                          x2="56.521%"
-                                          y1="115.2%"
-                                          y2="40.489%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#9C9C9C"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#C5C5C5"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__f-defaultIcon"
-                                          x1="45.625%"
-                                          x2="61.212%"
-                                          y1="38.922%"
-                                          y2="78.234%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#8A8A8A"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#B5B5B5"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__g-defaultIcon"
-                                          x1="57.243%"
-                                          x2="41.531%"
-                                          y1="31.727%"
-                                          y2="71.327%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#A4A4A4"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#BEBEBE"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__h-defaultIcon"
-                                          x1="27.599%"
-                                          x2="45.796%"
-                                          y1="69.394%"
-                                          y2="53.639%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#C2C2C2"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__i-defaultIcon"
-                                          x1="62.356%"
-                                          x2="31.337%"
-                                          y1="64.634%"
-                                          y2="27.889%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#C6C6C6"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__j-defaultIcon"
-                                          x1="62.354%"
-                                          x2="43.81%"
-                                          y1="114.244%"
-                                          y2="17.782%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#B7B7B7"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#EEE"
-                                          />
-                                        </linearGradient>
-                                      </defs>
-                                      <g
-                                        fill="none"
-                                        fillRule="nonzero"
-                                      >
-                                        <path
-                                          d="M36.131 27.683c.03.03.065.053.103.069h.042l-.159-.09s0 .02.014.02z"
-                                          fill="#A8A8A8"
-                                        />
-                                        <path
-                                          d="M28.793.593L.041 17.241l28.835 16.697 28.758-16.62z"
-                                          fill="url(#emptystate-Default-icon_svg__a-defaultIcon)"
-                                          transform="translate(11.724 43)"
-                                        />
-                                        <path
-                                          d="M.069 16.207v24.476L28.062 24.51V.034L.07 16.207z"
-                                          fill="url(#emptystate-Default-icon_svg__b-defaultIcon)"
-                                          transform="translate(12.414 7.138)"
-                                        />
-                                        <path
-                                          d="M40.455 2.807L27.945.33 0 16.551l12.483 2.477z"
-                                          fill="url(#emptystate-Default-icon_svg__c-defaultIcon)"
-                                          transform="translate(0 4.38)"
-                                        />
-                                        <path
-                                          d="M27.986.276L0 16.462l28.048 16.241 27.986-16.151z"
-                                          fill="url(#emptystate-Default-icon_svg__d-defaultIcon)"
-                                          transform="translate(12.414 31.276)"
-                                        />
-                                        <path
-                                          d="M28.434 40.641V16.207L.47.034V24.47l27.965 16.172z"
-                                          fill="url(#emptystate-Default-icon_svg__e-defaultIcon)"
-                                          transform="translate(40 7.138)"
-                                        />
-                                        <path
-                                          d="M28.476 24.828V.352l-28 16.2v24.482l28-16.206z"
-                                          fill="url(#emptystate-Default-icon_svg__f-defaultIcon)"
-                                          transform="translate(40 23)"
-                                        />
-                                        <path
-                                          d="M28.062 41.007V16.524L.097.36v24.475l27.965 16.173z"
-                                          fill="url(#emptystate-Default-icon_svg__g-defaultIcon)"
-                                          transform="translate(12.414 23)"
-                                        />
-                                        <path
-                                          d="M28.517 20.407L40 16.84 11.952.607.469 4.172z"
-                                          fill="url(#emptystate-Default-icon_svg__h-defaultIcon)"
-                                          transform="translate(40 3)"
-                                        />
-                                        <path
-                                          d="M39.559 10.834L28.524.317.517 16.503l11.076 10.51z"
-                                          fill="url(#emptystate-Default-icon_svg__i-defaultIcon)"
-                                          transform="translate(40 23)"
-                                        />
-                                        <path
-                                          d="M28.276 31.848l10.227-15.296L10.455.276.235 15.606z"
-                                          fill="url(#emptystate-Default-icon_svg__j-defaultIcon)"
-                                          transform="translate(2.069 23)"
-                                        />
-                                        <path
-                                          d="M2.303 38.607l.063.041 10.158-15.227 27.966 16.2.082-.104-28.048-16.241z"
-                                          fill="#FFF"
-                                        />
-                                        <path
-                                          d="M68.69 23.503l-.2-.186-27.973 16.186 11.076 10.51.076-.054-10.855-10.345z"
-                                          fill="#FFF"
-                                        />
-                                        <path
-                                          d="M80 19.841l-.159-.09-11.324 3.511-27.89-16.124-.158.055 28.048 16.235z"
-                                          fill="#999"
-                                        />
-                                        <path
-                                          d="M68.517 23.262h.09L40.614 7.028v-.042l-.131.042 28.034 16.234z"
-                                          fill="#FFF"
-                                        />
-                                      </g>
-                                    </svg>
+                                    
                                     <h3
                                       className="iot--empty-state--title"
                                       data-testid="EmptyState-title"
@@ -7951,251 +7463,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/D
                                   <div
                                     className="iot--empty-state--content"
                                   >
-                                    <svg
-                                      alt=""
-                                      className="iot--empty-state--icon"
-                                      data-testid="EmptyState-icon"
-                                      height={80}
-                                      width={80}
-                                    >
-                                      <defs>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__a-defaultIcon"
-                                          x1="37.502%"
-                                          x2="55.959%"
-                                          y1="34.928%"
-                                          y2="57.808%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopOpacity={0.04}
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopOpacity={0.04}
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__b-defaultIcon"
-                                          x1="-63.062%"
-                                          x2="101.194%"
-                                          y1="77.587%"
-                                          y2="37.496%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#767676"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#929292"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__c-defaultIcon"
-                                          x1="73.167%"
-                                          x2="44.204%"
-                                          y1="89.948%"
-                                          y2="39.998%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#969696"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__d-defaultIcon"
-                                          x1="-23.114%"
-                                          x2="57.391%"
-                                          y1="-11.496%"
-                                          y2="56.197%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#393939"
-                                          />
-                                          <stop
-                                            offset="99%"
-                                            stopColor="#525252"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__e-defaultIcon"
-                                          x1="5.255%"
-                                          x2="56.521%"
-                                          y1="115.2%"
-                                          y2="40.489%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#9C9C9C"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#C5C5C5"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__f-defaultIcon"
-                                          x1="45.625%"
-                                          x2="61.212%"
-                                          y1="38.922%"
-                                          y2="78.234%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#8A8A8A"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#B5B5B5"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__g-defaultIcon"
-                                          x1="57.243%"
-                                          x2="41.531%"
-                                          y1="31.727%"
-                                          y2="71.327%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#A4A4A4"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#BEBEBE"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__h-defaultIcon"
-                                          x1="27.599%"
-                                          x2="45.796%"
-                                          y1="69.394%"
-                                          y2="53.639%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#C2C2C2"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__i-defaultIcon"
-                                          x1="62.356%"
-                                          x2="31.337%"
-                                          y1="64.634%"
-                                          y2="27.889%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#C6C6C6"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__j-defaultIcon"
-                                          x1="62.354%"
-                                          x2="43.81%"
-                                          y1="114.244%"
-                                          y2="17.782%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#B7B7B7"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#EEE"
-                                          />
-                                        </linearGradient>
-                                      </defs>
-                                      <g
-                                        fill="none"
-                                        fillRule="nonzero"
-                                      >
-                                        <path
-                                          d="M36.131 27.683c.03.03.065.053.103.069h.042l-.159-.09s0 .02.014.02z"
-                                          fill="#A8A8A8"
-                                        />
-                                        <path
-                                          d="M28.793.593L.041 17.241l28.835 16.697 28.758-16.62z"
-                                          fill="url(#emptystate-Default-icon_svg__a-defaultIcon)"
-                                          transform="translate(11.724 43)"
-                                        />
-                                        <path
-                                          d="M.069 16.207v24.476L28.062 24.51V.034L.07 16.207z"
-                                          fill="url(#emptystate-Default-icon_svg__b-defaultIcon)"
-                                          transform="translate(12.414 7.138)"
-                                        />
-                                        <path
-                                          d="M40.455 2.807L27.945.33 0 16.551l12.483 2.477z"
-                                          fill="url(#emptystate-Default-icon_svg__c-defaultIcon)"
-                                          transform="translate(0 4.38)"
-                                        />
-                                        <path
-                                          d="M27.986.276L0 16.462l28.048 16.241 27.986-16.151z"
-                                          fill="url(#emptystate-Default-icon_svg__d-defaultIcon)"
-                                          transform="translate(12.414 31.276)"
-                                        />
-                                        <path
-                                          d="M28.434 40.641V16.207L.47.034V24.47l27.965 16.172z"
-                                          fill="url(#emptystate-Default-icon_svg__e-defaultIcon)"
-                                          transform="translate(40 7.138)"
-                                        />
-                                        <path
-                                          d="M28.476 24.828V.352l-28 16.2v24.482l28-16.206z"
-                                          fill="url(#emptystate-Default-icon_svg__f-defaultIcon)"
-                                          transform="translate(40 23)"
-                                        />
-                                        <path
-                                          d="M28.062 41.007V16.524L.097.36v24.475l27.965 16.173z"
-                                          fill="url(#emptystate-Default-icon_svg__g-defaultIcon)"
-                                          transform="translate(12.414 23)"
-                                        />
-                                        <path
-                                          d="M28.517 20.407L40 16.84 11.952.607.469 4.172z"
-                                          fill="url(#emptystate-Default-icon_svg__h-defaultIcon)"
-                                          transform="translate(40 3)"
-                                        />
-                                        <path
-                                          d="M39.559 10.834L28.524.317.517 16.503l11.076 10.51z"
-                                          fill="url(#emptystate-Default-icon_svg__i-defaultIcon)"
-                                          transform="translate(40 23)"
-                                        />
-                                        <path
-                                          d="M28.276 31.848l10.227-15.296L10.455.276.235 15.606z"
-                                          fill="url(#emptystate-Default-icon_svg__j-defaultIcon)"
-                                          transform="translate(2.069 23)"
-                                        />
-                                        <path
-                                          d="M2.303 38.607l.063.041 10.158-15.227 27.966 16.2.082-.104-28.048-16.241z"
-                                          fill="#FFF"
-                                        />
-                                        <path
-                                          d="M68.69 23.503l-.2-.186-27.973 16.186 11.076 10.51.076-.054-10.855-10.345z"
-                                          fill="#FFF"
-                                        />
-                                        <path
-                                          d="M80 19.841l-.159-.09-11.324 3.511-27.89-16.124-.158.055 28.048 16.235z"
-                                          fill="#999"
-                                        />
-                                        <path
-                                          d="M68.517 23.262h.09L40.614 7.028v-.042l-.131.042 28.034 16.234z"
-                                          fill="#FFF"
-                                        />
-                                      </g>
-                                    </svg>
+                                    
                                     <h3
                                       className="iot--empty-state--title"
                                       data-testid="EmptyState-title"
@@ -13338,251 +12606,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/D
                                   <div
                                     className="iot--empty-state--content"
                                   >
-                                    <svg
-                                      alt=""
-                                      className="iot--empty-state--icon"
-                                      data-testid="EmptyState-icon"
-                                      height={80}
-                                      width={80}
-                                    >
-                                      <defs>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__a-defaultIcon"
-                                          x1="37.502%"
-                                          x2="55.959%"
-                                          y1="34.928%"
-                                          y2="57.808%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopOpacity={0.04}
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopOpacity={0.04}
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__b-defaultIcon"
-                                          x1="-63.062%"
-                                          x2="101.194%"
-                                          y1="77.587%"
-                                          y2="37.496%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#767676"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#929292"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__c-defaultIcon"
-                                          x1="73.167%"
-                                          x2="44.204%"
-                                          y1="89.948%"
-                                          y2="39.998%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#969696"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__d-defaultIcon"
-                                          x1="-23.114%"
-                                          x2="57.391%"
-                                          y1="-11.496%"
-                                          y2="56.197%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#393939"
-                                          />
-                                          <stop
-                                            offset="99%"
-                                            stopColor="#525252"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__e-defaultIcon"
-                                          x1="5.255%"
-                                          x2="56.521%"
-                                          y1="115.2%"
-                                          y2="40.489%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#9C9C9C"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#C5C5C5"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__f-defaultIcon"
-                                          x1="45.625%"
-                                          x2="61.212%"
-                                          y1="38.922%"
-                                          y2="78.234%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#8A8A8A"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#B5B5B5"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__g-defaultIcon"
-                                          x1="57.243%"
-                                          x2="41.531%"
-                                          y1="31.727%"
-                                          y2="71.327%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#A4A4A4"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#BEBEBE"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__h-defaultIcon"
-                                          x1="27.599%"
-                                          x2="45.796%"
-                                          y1="69.394%"
-                                          y2="53.639%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#C2C2C2"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__i-defaultIcon"
-                                          x1="62.356%"
-                                          x2="31.337%"
-                                          y1="64.634%"
-                                          y2="27.889%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#C6C6C6"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__j-defaultIcon"
-                                          x1="62.354%"
-                                          x2="43.81%"
-                                          y1="114.244%"
-                                          y2="17.782%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#B7B7B7"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#EEE"
-                                          />
-                                        </linearGradient>
-                                      </defs>
-                                      <g
-                                        fill="none"
-                                        fillRule="nonzero"
-                                      >
-                                        <path
-                                          d="M36.131 27.683c.03.03.065.053.103.069h.042l-.159-.09s0 .02.014.02z"
-                                          fill="#A8A8A8"
-                                        />
-                                        <path
-                                          d="M28.793.593L.041 17.241l28.835 16.697 28.758-16.62z"
-                                          fill="url(#emptystate-Default-icon_svg__a-defaultIcon)"
-                                          transform="translate(11.724 43)"
-                                        />
-                                        <path
-                                          d="M.069 16.207v24.476L28.062 24.51V.034L.07 16.207z"
-                                          fill="url(#emptystate-Default-icon_svg__b-defaultIcon)"
-                                          transform="translate(12.414 7.138)"
-                                        />
-                                        <path
-                                          d="M40.455 2.807L27.945.33 0 16.551l12.483 2.477z"
-                                          fill="url(#emptystate-Default-icon_svg__c-defaultIcon)"
-                                          transform="translate(0 4.38)"
-                                        />
-                                        <path
-                                          d="M27.986.276L0 16.462l28.048 16.241 27.986-16.151z"
-                                          fill="url(#emptystate-Default-icon_svg__d-defaultIcon)"
-                                          transform="translate(12.414 31.276)"
-                                        />
-                                        <path
-                                          d="M28.434 40.641V16.207L.47.034V24.47l27.965 16.172z"
-                                          fill="url(#emptystate-Default-icon_svg__e-defaultIcon)"
-                                          transform="translate(40 7.138)"
-                                        />
-                                        <path
-                                          d="M28.476 24.828V.352l-28 16.2v24.482l28-16.206z"
-                                          fill="url(#emptystate-Default-icon_svg__f-defaultIcon)"
-                                          transform="translate(40 23)"
-                                        />
-                                        <path
-                                          d="M28.062 41.007V16.524L.097.36v24.475l27.965 16.173z"
-                                          fill="url(#emptystate-Default-icon_svg__g-defaultIcon)"
-                                          transform="translate(12.414 23)"
-                                        />
-                                        <path
-                                          d="M28.517 20.407L40 16.84 11.952.607.469 4.172z"
-                                          fill="url(#emptystate-Default-icon_svg__h-defaultIcon)"
-                                          transform="translate(40 3)"
-                                        />
-                                        <path
-                                          d="M39.559 10.834L28.524.317.517 16.503l11.076 10.51z"
-                                          fill="url(#emptystate-Default-icon_svg__i-defaultIcon)"
-                                          transform="translate(40 23)"
-                                        />
-                                        <path
-                                          d="M28.276 31.848l10.227-15.296L10.455.276.235 15.606z"
-                                          fill="url(#emptystate-Default-icon_svg__j-defaultIcon)"
-                                          transform="translate(2.069 23)"
-                                        />
-                                        <path
-                                          d="M2.303 38.607l.063.041 10.158-15.227 27.966 16.2.082-.104-28.048-16.241z"
-                                          fill="#FFF"
-                                        />
-                                        <path
-                                          d="M68.69 23.503l-.2-.186-27.973 16.186 11.076 10.51.076-.054-10.855-10.345z"
-                                          fill="#FFF"
-                                        />
-                                        <path
-                                          d="M80 19.841l-.159-.09-11.324 3.511-27.89-16.124-.158.055 28.048 16.235z"
-                                          fill="#999"
-                                        />
-                                        <path
-                                          d="M68.517 23.262h.09L40.614 7.028v-.042l-.131.042 28.034 16.234z"
-                                          fill="#FFF"
-                                        />
-                                      </g>
-                                    </svg>
+                                    
                                     <h3
                                       className="iot--empty-state--title"
                                       data-testid="EmptyState-title"
@@ -30991,251 +30015,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/D
                                   <div
                                     className="iot--empty-state--content"
                                   >
-                                    <svg
-                                      alt=""
-                                      className="iot--empty-state--icon"
-                                      data-testid="EmptyState-icon"
-                                      height={80}
-                                      width={80}
-                                    >
-                                      <defs>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__a-defaultIcon"
-                                          x1="37.502%"
-                                          x2="55.959%"
-                                          y1="34.928%"
-                                          y2="57.808%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopOpacity={0.04}
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopOpacity={0.04}
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__b-defaultIcon"
-                                          x1="-63.062%"
-                                          x2="101.194%"
-                                          y1="77.587%"
-                                          y2="37.496%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#767676"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#929292"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__c-defaultIcon"
-                                          x1="73.167%"
-                                          x2="44.204%"
-                                          y1="89.948%"
-                                          y2="39.998%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#969696"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__d-defaultIcon"
-                                          x1="-23.114%"
-                                          x2="57.391%"
-                                          y1="-11.496%"
-                                          y2="56.197%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#393939"
-                                          />
-                                          <stop
-                                            offset="99%"
-                                            stopColor="#525252"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__e-defaultIcon"
-                                          x1="5.255%"
-                                          x2="56.521%"
-                                          y1="115.2%"
-                                          y2="40.489%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#9C9C9C"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#C5C5C5"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__f-defaultIcon"
-                                          x1="45.625%"
-                                          x2="61.212%"
-                                          y1="38.922%"
-                                          y2="78.234%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#8A8A8A"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#B5B5B5"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__g-defaultIcon"
-                                          x1="57.243%"
-                                          x2="41.531%"
-                                          y1="31.727%"
-                                          y2="71.327%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#A4A4A4"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#BEBEBE"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__h-defaultIcon"
-                                          x1="27.599%"
-                                          x2="45.796%"
-                                          y1="69.394%"
-                                          y2="53.639%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#C2C2C2"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__i-defaultIcon"
-                                          x1="62.356%"
-                                          x2="31.337%"
-                                          y1="64.634%"
-                                          y2="27.889%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#C6C6C6"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#E8E8E8"
-                                          />
-                                        </linearGradient>
-                                        <linearGradient
-                                          id="emptystate-Default-icon_svg__j-defaultIcon"
-                                          x1="62.354%"
-                                          x2="43.81%"
-                                          y1="114.244%"
-                                          y2="17.782%"
-                                        >
-                                          <stop
-                                            offset="0%"
-                                            stopColor="#B7B7B7"
-                                          />
-                                          <stop
-                                            offset="100%"
-                                            stopColor="#EEE"
-                                          />
-                                        </linearGradient>
-                                      </defs>
-                                      <g
-                                        fill="none"
-                                        fillRule="nonzero"
-                                      >
-                                        <path
-                                          d="M36.131 27.683c.03.03.065.053.103.069h.042l-.159-.09s0 .02.014.02z"
-                                          fill="#A8A8A8"
-                                        />
-                                        <path
-                                          d="M28.793.593L.041 17.241l28.835 16.697 28.758-16.62z"
-                                          fill="url(#emptystate-Default-icon_svg__a-defaultIcon)"
-                                          transform="translate(11.724 43)"
-                                        />
-                                        <path
-                                          d="M.069 16.207v24.476L28.062 24.51V.034L.07 16.207z"
-                                          fill="url(#emptystate-Default-icon_svg__b-defaultIcon)"
-                                          transform="translate(12.414 7.138)"
-                                        />
-                                        <path
-                                          d="M40.455 2.807L27.945.33 0 16.551l12.483 2.477z"
-                                          fill="url(#emptystate-Default-icon_svg__c-defaultIcon)"
-                                          transform="translate(0 4.38)"
-                                        />
-                                        <path
-                                          d="M27.986.276L0 16.462l28.048 16.241 27.986-16.151z"
-                                          fill="url(#emptystate-Default-icon_svg__d-defaultIcon)"
-                                          transform="translate(12.414 31.276)"
-                                        />
-                                        <path
-                                          d="M28.434 40.641V16.207L.47.034V24.47l27.965 16.172z"
-                                          fill="url(#emptystate-Default-icon_svg__e-defaultIcon)"
-                                          transform="translate(40 7.138)"
-                                        />
-                                        <path
-                                          d="M28.476 24.828V.352l-28 16.2v24.482l28-16.206z"
-                                          fill="url(#emptystate-Default-icon_svg__f-defaultIcon)"
-                                          transform="translate(40 23)"
-                                        />
-                                        <path
-                                          d="M28.062 41.007V16.524L.097.36v24.475l27.965 16.173z"
-                                          fill="url(#emptystate-Default-icon_svg__g-defaultIcon)"
-                                          transform="translate(12.414 23)"
-                                        />
-                                        <path
-                                          d="M28.517 20.407L40 16.84 11.952.607.469 4.172z"
-                                          fill="url(#emptystate-Default-icon_svg__h-defaultIcon)"
-                                          transform="translate(40 3)"
-                                        />
-                                        <path
-                                          d="M39.559 10.834L28.524.317.517 16.503l11.076 10.51z"
-                                          fill="url(#emptystate-Default-icon_svg__i-defaultIcon)"
-                                          transform="translate(40 23)"
-                                        />
-                                        <path
-                                          d="M28.276 31.848l10.227-15.296L10.455.276.235 15.606z"
-                                          fill="url(#emptystate-Default-icon_svg__j-defaultIcon)"
-                                          transform="translate(2.069 23)"
-                                        />
-                                        <path
-                                          d="M2.303 38.607l.063.041 10.158-15.227 27.966 16.2.082-.104-28.048-16.241z"
-                                          fill="#FFF"
-                                        />
-                                        <path
-                                          d="M68.69 23.503l-.2-.186-27.973 16.186 11.076 10.51.076-.054-10.855-10.345z"
-                                          fill="#FFF"
-                                        />
-                                        <path
-                                          d="M80 19.841l-.159-.09-11.324 3.511-27.89-16.124-.158.055 28.048 16.235z"
-                                          fill="#999"
-                                        />
-                                        <path
-                                          d="M68.517 23.262h.09L40.614 7.028v-.042l-.131.042 28.034 16.234z"
-                                          fill="#FFF"
-                                        />
-                                      </g>
-                                    </svg>
+                                    
                                     <h3
                                       className="iot--empty-state--title"
                                       data-testid="EmptyState-title"
diff --git a/packages/react/src/components/RuleBuilder/__snapshots__/RuleBuilder.story.storyshot b/packages/react/src/components/RuleBuilder/__snapshots__/RuleBuilder.story.storyshot
index e24daacf32..3da8bcbfcb 100644
--- a/packages/react/src/components/RuleBuilder/__snapshots__/RuleBuilder.story.storyshot
+++ b/packages/react/src/components/RuleBuilder/__snapshots__/RuleBuilder.story.storyshot
@@ -1109,251 +1109,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
                                     <div
                                       className="iot--empty-state--content"
                                     >
-                                      <svg
-                                        alt=""
-                                        className="iot--empty-state--icon"
-                                        data-testid="EmptyState-icon"
-                                        height={80}
-                                        width={80}
-                                      >
-                                        <defs>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__a-defaultIcon"
-                                            x1="37.502%"
-                                            x2="55.959%"
-                                            y1="34.928%"
-                                            y2="57.808%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopOpacity={0.04}
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopOpacity={0.04}
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__b-defaultIcon"
-                                            x1="-63.062%"
-                                            x2="101.194%"
-                                            y1="77.587%"
-                                            y2="37.496%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#767676"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#929292"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__c-defaultIcon"
-                                            x1="73.167%"
-                                            x2="44.204%"
-                                            y1="89.948%"
-                                            y2="39.998%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#969696"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#E8E8E8"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__d-defaultIcon"
-                                            x1="-23.114%"
-                                            x2="57.391%"
-                                            y1="-11.496%"
-                                            y2="56.197%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#393939"
-                                            />
-                                            <stop
-                                              offset="99%"
-                                              stopColor="#525252"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__e-defaultIcon"
-                                            x1="5.255%"
-                                            x2="56.521%"
-                                            y1="115.2%"
-                                            y2="40.489%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#9C9C9C"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#C5C5C5"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__f-defaultIcon"
-                                            x1="45.625%"
-                                            x2="61.212%"
-                                            y1="38.922%"
-                                            y2="78.234%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#8A8A8A"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#B5B5B5"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__g-defaultIcon"
-                                            x1="57.243%"
-                                            x2="41.531%"
-                                            y1="31.727%"
-                                            y2="71.327%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#A4A4A4"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#BEBEBE"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__h-defaultIcon"
-                                            x1="27.599%"
-                                            x2="45.796%"
-                                            y1="69.394%"
-                                            y2="53.639%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#C2C2C2"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#E8E8E8"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__i-defaultIcon"
-                                            x1="62.356%"
-                                            x2="31.337%"
-                                            y1="64.634%"
-                                            y2="27.889%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#C6C6C6"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#E8E8E8"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__j-defaultIcon"
-                                            x1="62.354%"
-                                            x2="43.81%"
-                                            y1="114.244%"
-                                            y2="17.782%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#B7B7B7"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#EEE"
-                                            />
-                                          </linearGradient>
-                                        </defs>
-                                        <g
-                                          fill="none"
-                                          fillRule="nonzero"
-                                        >
-                                          <path
-                                            d="M36.131 27.683c.03.03.065.053.103.069h.042l-.159-.09s0 .02.014.02z"
-                                            fill="#A8A8A8"
-                                          />
-                                          <path
-                                            d="M28.793.593L.041 17.241l28.835 16.697 28.758-16.62z"
-                                            fill="url(#emptystate-Default-icon_svg__a-defaultIcon)"
-                                            transform="translate(11.724 43)"
-                                          />
-                                          <path
-                                            d="M.069 16.207v24.476L28.062 24.51V.034L.07 16.207z"
-                                            fill="url(#emptystate-Default-icon_svg__b-defaultIcon)"
-                                            transform="translate(12.414 7.138)"
-                                          />
-                                          <path
-                                            d="M40.455 2.807L27.945.33 0 16.551l12.483 2.477z"
-                                            fill="url(#emptystate-Default-icon_svg__c-defaultIcon)"
-                                            transform="translate(0 4.38)"
-                                          />
-                                          <path
-                                            d="M27.986.276L0 16.462l28.048 16.241 27.986-16.151z"
-                                            fill="url(#emptystate-Default-icon_svg__d-defaultIcon)"
-                                            transform="translate(12.414 31.276)"
-                                          />
-                                          <path
-                                            d="M28.434 40.641V16.207L.47.034V24.47l27.965 16.172z"
-                                            fill="url(#emptystate-Default-icon_svg__e-defaultIcon)"
-                                            transform="translate(40 7.138)"
-                                          />
-                                          <path
-                                            d="M28.476 24.828V.352l-28 16.2v24.482l28-16.206z"
-                                            fill="url(#emptystate-Default-icon_svg__f-defaultIcon)"
-                                            transform="translate(40 23)"
-                                          />
-                                          <path
-                                            d="M28.062 41.007V16.524L.097.36v24.475l27.965 16.173z"
-                                            fill="url(#emptystate-Default-icon_svg__g-defaultIcon)"
-                                            transform="translate(12.414 23)"
-                                          />
-                                          <path
-                                            d="M28.517 20.407L40 16.84 11.952.607.469 4.172z"
-                                            fill="url(#emptystate-Default-icon_svg__h-defaultIcon)"
-                                            transform="translate(40 3)"
-                                          />
-                                          <path
-                                            d="M39.559 10.834L28.524.317.517 16.503l11.076 10.51z"
-                                            fill="url(#emptystate-Default-icon_svg__i-defaultIcon)"
-                                            transform="translate(40 23)"
-                                          />
-                                          <path
-                                            d="M28.276 31.848l10.227-15.296L10.455.276.235 15.606z"
-                                            fill="url(#emptystate-Default-icon_svg__j-defaultIcon)"
-                                            transform="translate(2.069 23)"
-                                          />
-                                          <path
-                                            d="M2.303 38.607l.063.041 10.158-15.227 27.966 16.2.082-.104-28.048-16.241z"
-                                            fill="#FFF"
-                                          />
-                                          <path
-                                            d="M68.69 23.503l-.2-.186-27.973 16.186 11.076 10.51.076-.054-10.855-10.345z"
-                                            fill="#FFF"
-                                          />
-                                          <path
-                                            d="M80 19.841l-.159-.09-11.324 3.511-27.89-16.124-.158.055 28.048 16.235z"
-                                            fill="#999"
-                                          />
-                                          <path
-                                            d="M68.517 23.262h.09L40.614 7.028v-.042l-.131.042 28.034 16.234z"
-                                            fill="#FFF"
-                                          />
-                                        </g>
-                                      </svg>
+                                      
                                       <h3
                                         className="iot--empty-state--title"
                                         data-testid="EmptyState-title"
@@ -1638,251 +1394,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
                                     <div
                                       className="iot--empty-state--content"
                                     >
-                                      <svg
-                                        alt=""
-                                        className="iot--empty-state--icon"
-                                        data-testid="EmptyState-icon"
-                                        height={80}
-                                        width={80}
-                                      >
-                                        <defs>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__a-defaultIcon"
-                                            x1="37.502%"
-                                            x2="55.959%"
-                                            y1="34.928%"
-                                            y2="57.808%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopOpacity={0.04}
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopOpacity={0.04}
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__b-defaultIcon"
-                                            x1="-63.062%"
-                                            x2="101.194%"
-                                            y1="77.587%"
-                                            y2="37.496%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#767676"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#929292"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__c-defaultIcon"
-                                            x1="73.167%"
-                                            x2="44.204%"
-                                            y1="89.948%"
-                                            y2="39.998%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#969696"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#E8E8E8"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__d-defaultIcon"
-                                            x1="-23.114%"
-                                            x2="57.391%"
-                                            y1="-11.496%"
-                                            y2="56.197%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#393939"
-                                            />
-                                            <stop
-                                              offset="99%"
-                                              stopColor="#525252"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__e-defaultIcon"
-                                            x1="5.255%"
-                                            x2="56.521%"
-                                            y1="115.2%"
-                                            y2="40.489%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#9C9C9C"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#C5C5C5"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__f-defaultIcon"
-                                            x1="45.625%"
-                                            x2="61.212%"
-                                            y1="38.922%"
-                                            y2="78.234%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#8A8A8A"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#B5B5B5"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__g-defaultIcon"
-                                            x1="57.243%"
-                                            x2="41.531%"
-                                            y1="31.727%"
-                                            y2="71.327%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#A4A4A4"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#BEBEBE"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__h-defaultIcon"
-                                            x1="27.599%"
-                                            x2="45.796%"
-                                            y1="69.394%"
-                                            y2="53.639%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#C2C2C2"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#E8E8E8"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__i-defaultIcon"
-                                            x1="62.356%"
-                                            x2="31.337%"
-                                            y1="64.634%"
-                                            y2="27.889%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#C6C6C6"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#E8E8E8"
-                                            />
-                                          </linearGradient>
-                                          <linearGradient
-                                            id="emptystate-Default-icon_svg__j-defaultIcon"
-                                            x1="62.354%"
-                                            x2="43.81%"
-                                            y1="114.244%"
-                                            y2="17.782%"
-                                          >
-                                            <stop
-                                              offset="0%"
-                                              stopColor="#B7B7B7"
-                                            />
-                                            <stop
-                                              offset="100%"
-                                              stopColor="#EEE"
-                                            />
-                                          </linearGradient>
-                                        </defs>
-                                        <g
-                                          fill="none"
-                                          fillRule="nonzero"
-                                        >
-                                          <path
-                                            d="M36.131 27.683c.03.03.065.053.103.069h.042l-.159-.09s0 .02.014.02z"
-                                            fill="#A8A8A8"
-                                          />
-                                          <path
-                                            d="M28.793.593L.041 17.241l28.835 16.697 28.758-16.62z"
-                                            fill="url(#emptystate-Default-icon_svg__a-defaultIcon)"
-                                            transform="translate(11.724 43)"
-                                          />
-                                          <path
-                                            d="M.069 16.207v24.476L28.062 24.51V.034L.07 16.207z"
-                                            fill="url(#emptystate-Default-icon_svg__b-defaultIcon)"
-                                            transform="translate(12.414 7.138)"
-                                          />
-                                          <path
-                                            d="M40.455 2.807L27.945.33 0 16.551l12.483 2.477z"
-                                            fill="url(#emptystate-Default-icon_svg__c-defaultIcon)"
-                                            transform="translate(0 4.38)"
-                                          />
-                                          <path
-                                            d="M27.986.276L0 16.462l28.048 16.241 27.986-16.151z"
-                                            fill="url(#emptystate-Default-icon_svg__d-defaultIcon)"
-                                            transform="translate(12.414 31.276)"
-                                          />
-                                          <path
-                                            d="M28.434 40.641V16.207L.47.034V24.47l27.965 16.172z"
-                                            fill="url(#emptystate-Default-icon_svg__e-defaultIcon)"
-                                            transform="translate(40 7.138)"
-                                          />
-                                          <path
-                                            d="M28.476 24.828V.352l-28 16.2v24.482l28-16.206z"
-                                            fill="url(#emptystate-Default-icon_svg__f-defaultIcon)"
-                                            transform="translate(40 23)"
-                                          />
-                                          <path
-                                            d="M28.062 41.007V16.524L.097.36v24.475l27.965 16.173z"
-                                            fill="url(#emptystate-Default-icon_svg__g-defaultIcon)"
-                                            transform="translate(12.414 23)"
-                                          />
-                                          <path
-                                            d="M28.517 20.407L40 16.84 11.952.607.469 4.172z"
-                                            fill="url(#emptystate-Default-icon_svg__h-defaultIcon)"
-                                            transform="translate(40 3)"
-                                          />
-                                          <path
-                                            d="M39.559 10.834L28.524.317.517 16.503l11.076 10.51z"
-                                            fill="url(#emptystate-Default-icon_svg__i-defaultIcon)"
-                                            transform="translate(40 23)"
-                                          />
-                                          <path
-                                            d="M28.276 31.848l10.227-15.296L10.455.276.235 15.606z"
-                                            fill="url(#emptystate-Default-icon_svg__j-defaultIcon)"
-                                            transform="translate(2.069 23)"
-                                          />
-                                          <path
-                                            d="M2.303 38.607l.063.041 10.158-15.227 27.966 16.2.082-.104-28.048-16.241z"
-                                            fill="#FFF"
-                                          />
-                                          <path
-                                            d="M68.69 23.503l-.2-.186-27.973 16.186 11.076 10.51.076-.054-10.855-10.345z"
-                                            fill="#FFF"
-                                          />
-                                          <path
-                                            d="M80 19.841l-.159-.09-11.324 3.511-27.89-16.124-.158.055 28.048 16.235z"
-                                            fill="#999"
-                                          />
-                                          <path
-                                            d="M68.517 23.262h.09L40.614 7.028v-.042l-.131.042 28.034 16.234z"
-                                            fill="#FFF"
-                                          />
-                                        </g>
-                                      </svg>
+                                      
                                       <h3
                                         className="iot--empty-state--title"
                                         data-testid="EmptyState-title"
diff --git a/packages/react/src/utils/__tests__/__snapshots__/publicAPI.test.js.snap b/packages/react/src/utils/__tests__/__snapshots__/publicAPI.test.js.snap
index d91e00994e..2046825146 100644
--- a/packages/react/src/utils/__tests__/__snapshots__/publicAPI.test.js.snap
+++ b/packages/react/src/utils/__tests__/__snapshots__/publicAPI.test.js.snap
@@ -563,8 +563,8 @@ Map {
   },
   "EmptyTable" => Object {
     "defaultProps": Object {
+      "emptyStateIcon": "",
       "id": "EmptyTable",
-      "noDataIcon": "",
       "onEmptyStateAction": null,
       "testId": "",
     },
@@ -666,14 +666,7 @@ Map {
         "isRequired": true,
         "type": "oneOfType",
       },
-      "id": Object {
-        "type": "string",
-      },
-      "isFiltered": Object {
-        "isRequired": true,
-        "type": "bool",
-      },
-      "noDataIcon": Object {
+      "emptyStateIcon": Object {
         "args": Array [
           Array [
             Object {
@@ -697,6 +690,13 @@ Map {
         ],
         "type": "oneOfType",
       },
+      "id": Object {
+        "type": "string",
+      },
+      "isFiltered": Object {
+        "isRequired": true,
+        "type": "bool",
+      },
       "onEmptyStateAction": Object {
         "type": "func",
       },
@@ -750,6 +750,7 @@ Map {
         },
       },
       "columnGroups": Array [],
+      "emptyStateIcon": "",
       "enablePercentageColumnWidth": false,
       "error": null,
       "i18n": Object {
@@ -822,7 +823,6 @@ Map {
       "id": null,
       "lightweight": undefined,
       "locale": null,
-      "noDataIcon": "",
       "options": Object {
         "hasAdvancedFilter": false,
         "hasAggregations": false,
@@ -1627,6 +1627,30 @@ Map {
       "options": Object {
         "args": Array [
           Object {
+            "emptyStateIcon": Object {
+              "args": Array [
+                Array [
+                  Object {
+                    "type": "func",
+                  },
+                  Object {
+                    "args": Array [
+                      Array [
+                        "error",
+                        "error404",
+                        "empty",
+                        "not-authorized",
+                        "no-result",
+                        "success",
+                        "",
+                      ],
+                    ],
+                    "type": "oneOf",
+                  },
+                ],
+              ],
+              "type": "oneOfType",
+            },
             "hasAdvancedFilter": [Function],
             "hasAggregations": Object {
               "type": "bool",
@@ -1751,30 +1775,6 @@ Map {
             "hasUserViewManagement": Object {
               "type": "bool",
             },
-            "noDataIcon": Object {
-              "args": Array [
-                Array [
-                  Object {
-                    "type": "func",
-                  },
-                  Object {
-                    "args": Array [
-                      Array [
-                        "error",
-                        "error404",
-                        "empty",
-                        "not-authorized",
-                        "no-result",
-                        "success",
-                        "",
-                      ],
-                    ],
-                    "type": "oneOf",
-                  },
-                ],
-              ],
-              "type": "oneOfType",
-            },
             "pinColumn": Object {
               "args": Array [
                 Array [