diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc82b1fd5a..68571e0860 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Refactor the `ListItem` component to use the `Flex` components instead of `ItemLayout` @mnajdova ([#886](https://github.com/stardust-ui/react/pull/886))
 - Fixed distance of the `content` and `reactionGroup` from the `badge` in the `ChatMessage` component for Teams theme @mnajdova ([#986](https://github.com/stardust-ui/react/pull/986))
 - Do not propagate keyboard events outside `Popup`'s content @sophieH29 ([#987](https://github.com/stardust-ui/react/pull/987/))
+- Fixed emoji `Icon` spacing issue and added settings `Icon` ([#991](https://github.com/stardust-ui/react/pull/991))
 
 ### Features
 - Add `delay` prop for `Loader` component @layershifter ([#969](https://github.com/stardust-ui/react/pull/969))
diff --git a/packages/react/src/themes/teams/components/Icon/svg/ProcessedIcons/icons-emoji.tsx b/packages/react/src/themes/teams/components/Icon/svg/ProcessedIcons/icons-emoji.tsx
index df348e6625..c49886bddb 100644
--- a/packages/react/src/themes/teams/components/Icon/svg/ProcessedIcons/icons-emoji.tsx
+++ b/packages/react/src/themes/teams/components/Icon/svg/ProcessedIcons/icons-emoji.tsx
@@ -14,7 +14,9 @@ export default {
         </g>
         <path
           className={cx(teamsIconClassNames.filled, classes.filledPart)}
-          d="M24 16.734a7.069 7.069 0 0 1-.262 1.926A7.464 7.464 0 0 1 23 20.395 7.285 7.285 0 0 1 20.395 23a7.381 7.381 0 0 1-1.734.734 7.036 7.036 0 0 1-1.927.266h-.468a7.031 7.031 0 0 1-1.926-.262A7.381 7.381 0 0 1 12.605 23 7.285 7.285 0 0 1 10 20.395a7.4 7.4 0 0 1-.734-1.734A7.031 7.031 0 0 1 9 16.734v-.468a7.033 7.033 0 0 1 .262-1.926A7.4 7.4 0 0 1 10 12.605 7.285 7.285 0 0 1 12.605 10a7.443 7.443 0 0 1 1.734-.734A7.05 7.05 0 0 1 16.266 9h.469a7.055 7.055 0 0 1 1.926.262 7.443 7.443 0 0 1 1.734.738A7.285 7.285 0 0 1 23 12.605a7.464 7.464 0 0 1 .734 1.734A7.071 7.071 0 0 1 24 16.266v.469zm-3.867 2.438l-.7-.7a4.154 4.154 0 0 1-5.859 0l-.7.7a5.1 5.1 0 0 0 1.664 1.113 5.109 5.109 0 0 0 3.938 0 5.114 5.114 0 0 0 1.657-1.113zM15 15a.984.984 0 0 0-.078-.387 1 1 0 0 0-.535-.535 1 1 0 0 0-.773 0 1 1 0 0 0-.535.535 1 1 0 0 0 0 .773 1 1 0 0 0 .535.535 1 1 0 0 0 .773 0 1 1 0 0 0 .535-.535A.981.981 0 0 0 15 15zm5 0a.984.984 0 0 0-.078-.387 1 1 0 0 0-.535-.535 1 1 0 0 0-.773 0 1 1 0 0 0-.535.535 1 1 0 0 0 0 .773 1 1 0 0 0 .535.535 1 1 0 0 0 .773 0 1 1 0 0 0 .535-.535A.981.981 0 0 0 20 15z"
+          d="M16,8c-4.4,0-8,3.6-8,8c0,4.4,3.6,8,8,8c4.4,0,8-3.6,8-8C24,11.6,20.4,8,16,8z M13,14c0.6,0,1,0.4,1,1c0,0.6-0.4,1-1,1
+            c-0.6,0-1-0.4-1-1C12,14.4,12.4,14,13,14z M16,20.5c-1.4,0-2.8-0.5-3.9-1.6l0.7-0.7c1.8,1.8,4.6,1.8,6.4,0l0.7,0.7
+            C18.9,19.9,17.4,20.5,16,20.5z M19,16c-0.6,0-1-0.4-1-1c0-0.6,0.4-1,1-1c0.6,0,1,0.4,1,1C20,15.6,19.6,16,19,16z"
         />
       </g>
     </svg>
diff --git a/packages/react/src/themes/teams/components/Icon/svg/ProcessedIcons/icons-settings.tsx b/packages/react/src/themes/teams/components/Icon/svg/ProcessedIcons/icons-settings.tsx
index f9a1417e8f..063b834609 100644
--- a/packages/react/src/themes/teams/components/Icon/svg/ProcessedIcons/icons-settings.tsx
+++ b/packages/react/src/themes/teams/components/Icon/svg/ProcessedIcons/icons-settings.tsx
@@ -18,4 +18,5 @@ export default {
     </svg>
   ),
   styles: {},
+  exportedAs: 'settings',
 } as TeamsProcessedSvgIconSpec
diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/emoji.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/emoji.tsx
index 76ee0b6220..ade8f0d917 100644
--- a/packages/react/src/themes/teams/components/Icon/svg/icons/emoji.tsx
+++ b/packages/react/src/themes/teams/components/Icon/svg/icons/emoji.tsx
@@ -14,7 +14,9 @@ export default {
         </g>
         <path
           className={cx(teamsIconClassNames.filled, classes.filledPart)}
-          d="M24 16.734a7.069 7.069 0 0 1-.262 1.926A7.464 7.464 0 0 1 23 20.395 7.285 7.285 0 0 1 20.395 23a7.381 7.381 0 0 1-1.734.734 7.036 7.036 0 0 1-1.927.266h-.468a7.031 7.031 0 0 1-1.926-.262A7.381 7.381 0 0 1 12.605 23 7.285 7.285 0 0 1 10 20.395a7.4 7.4 0 0 1-.734-1.734A7.031 7.031 0 0 1 9 16.734v-.468a7.033 7.033 0 0 1 .262-1.926A7.4 7.4 0 0 1 10 12.605 7.285 7.285 0 0 1 12.605 10a7.443 7.443 0 0 1 1.734-.734A7.05 7.05 0 0 1 16.266 9h.469a7.055 7.055 0 0 1 1.926.262 7.443 7.443 0 0 1 1.734.738A7.285 7.285 0 0 1 23 12.605a7.464 7.464 0 0 1 .734 1.734A7.071 7.071 0 0 1 24 16.266v.469zm-3.867 2.438l-.7-.7a4.154 4.154 0 0 1-5.859 0l-.7.7a5.1 5.1 0 0 0 1.664 1.113 5.109 5.109 0 0 0 3.938 0 5.114 5.114 0 0 0 1.657-1.113zM15 15a.984.984 0 0 0-.078-.387 1 1 0 0 0-.535-.535 1 1 0 0 0-.773 0 1 1 0 0 0-.535.535 1 1 0 0 0 0 .773 1 1 0 0 0 .535.535 1 1 0 0 0 .773 0 1 1 0 0 0 .535-.535A.981.981 0 0 0 15 15zm5 0a.984.984 0 0 0-.078-.387 1 1 0 0 0-.535-.535 1 1 0 0 0-.773 0 1 1 0 0 0-.535.535 1 1 0 0 0 0 .773 1 1 0 0 0 .535.535 1 1 0 0 0 .773 0 1 1 0 0 0 .535-.535A.981.981 0 0 0 20 15z"
+          d="M16,8c-4.4,0-8,3.6-8,8c0,4.4,3.6,8,8,8c4.4,0,8-3.6,8-8C24,11.6,20.4,8,16,8z M13,14c0.6,0,1,0.4,1,1c0,0.6-0.4,1-1,1
+            c-0.6,0-1-0.4-1-1C12,14.4,12.4,14,13,14z M16,20.5c-1.4,0-2.8-0.5-3.9-1.6l0.7-0.7c1.8,1.8,4.6,1.8,6.4,0l0.7,0.7
+            C18.9,19.9,17.4,20.5,16,20.5z M19,16c-0.6,0-1-0.4-1-1c0-0.6,0.4-1,1-1c0.6,0,1,0.4,1,1C20,15.6,19.6,16,19,16z"
         />
       </g>
     </svg>
diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/index.ts b/packages/react/src/themes/teams/components/Icon/svg/icons/index.ts
index b8f919f324..8906eccc79 100644
--- a/packages/react/src/themes/teams/components/Icon/svg/icons/index.ts
+++ b/packages/react/src/themes/teams/components/Icon/svg/icons/index.ts
@@ -59,6 +59,7 @@ import reply from './reply'
 import retry from './retry'
 import search from './search'
 import send from './send'
+import settings from './settings'
 import star from './star'
 import sticker from './sticker'
 import strike from './strike'
@@ -136,6 +137,7 @@ export default {
   retry,
   search,
   send,
+  settings,
   star,
   sticker,
   strike,
diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/settings.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/settings.tsx
new file mode 100644
index 0000000000..3785f3a07b
--- /dev/null
+++ b/packages/react/src/themes/teams/components/Icon/svg/icons/settings.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react'
+import cx from 'classnames'
+import { TeamsProcessedSvgIconSpec } from '../types'
+import { teamsIconClassNames } from '../teamsIconClassNames'
+
+export default {
+  icon: ({ classes }) => (
+    <svg role="presentation" focusable="false" viewBox="8 8 16 16" className={classes.svg}>
+      <path
+        className={cx(teamsIconClassNames.outline, classes.outlinePart)}
+        d="M13.82,8.07a.735.735,0,0,1,.5.188l1.438,1.3c.2-.008.4,0,.594.007l1.21-1.25a.724.724,0,0,1,.532-.226,3.117,3.117,0,0,1,.867.226c.469.172,1.3.438,1.328,1.032l.094,1.929a5.5,5.5,0,0,1,.414.422c.594-.007,1.187-.023,1.781-.023a.658.658,0,0,1,.352.117,4.122,4.122,0,0,1,1,2.031.735.735,0,0,1-.188.5l-1.3,1.438c.008.2,0,.4-.007.594l1.25,1.21a.724.724,0,0,1,.226.532,3.117,3.117,0,0,1-.226.867c-.172.461-.438,1.3-1.024,1.328l-1.937.094a5.5,5.5,0,0,1-.422.414c.007.594.023,1.187.023,1.781a.611.611,0,0,1-.117.344A4.1,4.1,0,0,1,18.18,23.93a.735.735,0,0,1-.5-.188l-1.438-1.3c-.2.008-.4,0-.594-.007l-1.21,1.25a.724.724,0,0,1-.532.226,3.117,3.117,0,0,1-.867-.226c-.469-.172-1.3-.438-1.328-1.032l-.094-1.929a5.5,5.5,0,0,1-.414-.422c-.594.007-1.187.023-1.781.023a.611.611,0,0,1-.344-.117A4.1,4.1,0,0,1,8.07,18.18a.735.735,0,0,1,.188-.5l1.3-1.438c-.008-.2,0-.4.007-.594l-1.25-1.21a.724.724,0,0,1-.226-.532,3.117,3.117,0,0,1,.226-.867c.172-.461.446-1.3,1.024-1.328l1.937-.094A5.5,5.5,0,0,1,11.7,11.2c-.007-.594-.023-1.187-.023-1.781a.658.658,0,0,1,.117-.352A4.122,4.122,0,0,1,13.82,8.07ZM12.672,9.617l.023,1.8c.008.312-.859,1.164-1.164,1.18l-1.976.1-.422,1.133,1.289,1.258c.2.2.164.562.164.82a1.781,1.781,0,0,1-.148.844L9.117,18.227l.5,1.1c.6-.008,1.211-.023,1.813-.023.312,0,1.156.859,1.172,1.164l.1,1.976,1.133.422,1.258-1.289c.2-.2.562-.164.82-.164a1.7,1.7,0,0,1,.844.148l1.469,1.321,1.1-.5-.023-1.8c-.008-.312.859-1.164,1.164-1.18l1.976-.1.422-1.133-1.289-1.258c-.2-.2-.164-.562-.164-.82a1.781,1.781,0,0,1,.148-.844l1.321-1.469-.5-1.1c-.6.008-1.211.023-1.813.023-.312,0-1.156-.859-1.172-1.164l-.1-1.976-1.133-.422-1.258,1.289c-.2.2-.562.164-.82.164a1.781,1.781,0,0,1-.844-.148L13.773,9.117ZM16.008,13.5A2.5,2.5,0,1,1,13.5,16,2.531,2.531,0,0,1,16.008,13.5ZM16,14.5a1.5,1.5,0,1,0,1.5,1.461A1.513,1.513,0,0,0,16,14.5Z"
+      />
+      <path
+        className={cx(teamsIconClassNames.filled, classes.filledPart)}
+        fillRule="evenodd"
+        d="M13.82,8.07a.735.735,0,0,1,.5.188l1.438,1.3c.2-.008.4,0,.594.007l1.21-1.25a.756.756,0,0,1,.532-.226,2.863,2.863,0,0,1,.867.226c.469.18,1.3.43,1.328,1.032l.094,1.929a5.5,5.5,0,0,1,.414.422c.594-.007,1.187-.023,1.781-.023a.848.848,0,0,1,.649.437,5.629,5.629,0,0,1,.7,1.711.664.664,0,0,1-.2.5l-1.289,1.438c.008.2,0,.4-.007.594l1.25,1.21a.756.756,0,0,1,.226.532,3.117,3.117,0,0,1-.226.867c-.172.461-.438,1.3-1.024,1.328l-1.937.094a5.5,5.5,0,0,1-.422.414l.023,1.742a.8.8,0,0,1-.437.688,5.382,5.382,0,0,1-1.711.7.735.735,0,0,1-.5-.188l-1.438-1.3c-.2.008-.4,0-.594-.007l-1.21,1.25a.756.756,0,0,1-.532.226,3.064,3.064,0,0,1-.859-.226c-.477-.18-1.3-.422-1.336-1.032l-.094-1.929a5.5,5.5,0,0,1-.414-.422l-1.742.023a.8.8,0,0,1-.688-.437,5.479,5.479,0,0,1-.7-1.711.664.664,0,0,1,.2-.5l1.289-1.438c-.008-.2,0-.4.007-.594l-1.25-1.21a.756.756,0,0,1-.226-.532,2.863,2.863,0,0,1,.226-.867c.172-.469.43-1.3,1.024-1.328l1.937-.094A5.5,5.5,0,0,1,11.7,11.2c-.007-.594-.023-1.187-.023-1.789a.658.658,0,0,1,.117-.352A4.432,4.432,0,0,1,13.82,8.07ZM15.945,14A2,2,0,1,0,18,15.945,2.026,2.026,0,0,0,15.945,14Z"
+      />
+    </svg>
+  ),
+  styles: {},
+} as TeamsProcessedSvgIconSpec