diff --git a/platform/collaboration-tools/resources/CollaborationToolsIconMappings.json b/platform/collaboration-tools/resources/CollaborationToolsIconMappings.json
new file mode 100644
index 000000000000..68fe05f622da
--- /dev/null
+++ b/platform/collaboration-tools/resources/CollaborationToolsIconMappings.json
@@ -0,0 +1,15 @@
+{
+  "icons": {
+    "expui": {
+      "review": {
+        "commentUnread.svg": "icons/review/commentUnread.svg",
+        "fileUnread.svg": "icons/review/fileUnread.svg"
+      },
+      "addEmoji.svg": "icons/addEmoji.svg",
+      "comment.svg": [
+        "icons/comment.svg",
+        "icons/review/commentUnresolved.svg"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/platform/collaboration-tools/resources/CollaborationToolsMappings.json b/platform/collaboration-tools/resources/CollaborationToolsMappings.json
deleted file mode 100644
index 5e0d872482de..000000000000
--- a/platform/collaboration-tools/resources/CollaborationToolsMappings.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "icons": {
-    "expui": {
-    }
-  }
-}
\ No newline at end of file
diff --git a/platform/collaboration-tools/resources/META-INF/collaboration-tools.xml b/platform/collaboration-tools/resources/META-INF/collaboration-tools.xml
index e1df2f1d602c..0b66ec35c571 100644
--- a/platform/collaboration-tools/resources/META-INF/collaboration-tools.xml
+++ b/platform/collaboration-tools/resources/META-INF/collaboration-tools.xml
@@ -1,5 +1,5 @@
 <idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
-    <iconMapper mappingFile="CollaborationToolsMappings.json"/>
+    <iconMapper mappingFile="CollaborationToolsIconMappings.json"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/platform/collaboration-tools/resources/icons/expui/addEmoji.svg b/platform/collaboration-tools/resources/icons/expui/addEmoji.svg
new file mode 100644
index 000000000000..131c4885f657
--- /dev/null
+++ b/platform/collaboration-tools/resources/icons/expui/addEmoji.svg
@@ -0,0 +1,8 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5 11C13.2239 11 13 11.2239 13 11.5V13H11.5C11.2239 13 11 13.2239 11 13.5C11 13.7761 11.2239 14 11.5 14H13V15.5C13 15.7761 13.2239 16 13.5 16C13.7761 16 14 15.7761 14 15.5V14H15.5C15.7761 14 16 13.7761 16 13.5C16 13.2239 15.7761 13 15.5 13H14V11.5C14 11.2239 13.7761 11 13.5 11Z" fill="#6C707E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 8C2 4.68629 4.68629 2 8 2C11.3137 2 14 4.68629 14 8C14 8.70127 13.8797 9.37444 13.6586 10H14.7101C14.8987 9.36629 15 8.69497 15 8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15C8.69497 15 9.36629 14.8987 10 14.7101V13.6586C9.37444 13.8797 8.70127 14 8 14C4.68629 14 2 11.3137 2 8Z" fill="#6C707E"/>
+<circle cx="6" cy="6" r="1" fill="#6C707E"/>
+<circle cx="10" cy="6" r="1" fill="#6C707E"/>
+<path d="M10.7632 9.43809C9.74436 11.5683 6.2445 11.5276 5.21858 9.43527" stroke="#6C707E" stroke-linecap="round"/>
+</svg>
diff --git a/platform/collaboration-tools/resources/icons/expui/addEmoji_dark.svg b/platform/collaboration-tools/resources/icons/expui/addEmoji_dark.svg
new file mode 100644
index 000000000000..f6d399352d37
--- /dev/null
+++ b/platform/collaboration-tools/resources/icons/expui/addEmoji_dark.svg
@@ -0,0 +1,8 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5 11C13.2239 11 13 11.2239 13 11.5V13H11.5C11.2239 13 11 13.2239 11 13.5C11 13.7761 11.2239 14 11.5 14H13V15.5C13 15.7761 13.2239 16 13.5 16C13.7761 16 14 15.7761 14 15.5V14H15.5C15.7761 14 16 13.7761 16 13.5C16 13.2239 15.7761 13 15.5 13H14V11.5C14 11.2239 13.7761 11 13.5 11Z" fill="#CED0D6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 8C2 4.68629 4.68629 2 8 2C11.3137 2 14 4.68629 14 8C14 8.70127 13.8797 9.37444 13.6586 10H14.7101C14.8987 9.36629 15 8.69497 15 8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15C8.69497 15 9.36629 14.8987 10 14.7101V13.6586C9.37444 13.8797 8.70127 14 8 14C4.68629 14 2 11.3137 2 8Z" fill="#CED0D6"/>
+<circle cx="6" cy="6" r="1" fill="#CED0D6"/>
+<circle cx="10" cy="6" r="1" fill="#CED0D6"/>
+<path d="M10.7632 9.43809C9.74436 11.5683 6.2445 11.5276 5.21858 9.43527" stroke="#CED0D6" stroke-linecap="round"/>
+</svg>
diff --git a/platform/collaboration-tools/resources/icons/expui/comment.svg b/platform/collaboration-tools/resources/icons/expui/comment.svg
new file mode 100644
index 000000000000..0d08b50e3733
--- /dev/null
+++ b/platform/collaboration-tools/resources/icons/expui/comment.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.31235 10.6096C9.22369 10.5386 9.11354 10.5 9 10.5H4C3.17157 10.5 2.5 9.82843 2.5 9V4C2.5 3.17157 3.17157 2.5 4 2.5H12C12.8284 2.5 13.5 3.17157 13.5 4V13.9597L9.31235 10.6096Z" fill="#EBECF0" stroke="#6C707E" stroke-linejoin="round"/>
+</svg>
diff --git a/platform/collaboration-tools/resources/icons/expui/comment_dark.svg b/platform/collaboration-tools/resources/icons/expui/comment_dark.svg
new file mode 100644
index 000000000000..b43f06de6feb
--- /dev/null
+++ b/platform/collaboration-tools/resources/icons/expui/comment_dark.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.31235 10.6096C9.22369 10.5386 9.11354 10.5 9 10.5H4C3.17157 10.5 2.5 9.82843 2.5 9V4C2.5 3.17157 3.17157 2.5 4 2.5H12C12.8284 2.5 13.5 3.17157 13.5 4V13.9597L9.31235 10.6096Z" fill="#43454A" stroke="#CED0D6" stroke-linejoin="round"/>
+</svg>
diff --git a/platform/collaboration-tools/resources/icons/expui/icon-robots.txt b/platform/collaboration-tools/resources/icons/expui/icon-robots.txt
new file mode 100644
index 000000000000..f21601437b7f
--- /dev/null
+++ b/platform/collaboration-tools/resources/icons/expui/icon-robots.txt
@@ -0,0 +1 @@
+skip: *
\ No newline at end of file
diff --git a/platform/collaboration-tools/resources/icons/expui/review/commentUnread.svg b/platform/collaboration-tools/resources/icons/expui/review/commentUnread.svg
new file mode 100644
index 000000000000..f8e05be9f79a
--- /dev/null
+++ b/platform/collaboration-tools/resources/icons/expui/review/commentUnread.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.31235 10.6096C9.22369 10.5386 9.11354 10.5 9 10.5H4C3.17157 10.5 2.5 9.82843 2.5 9V4C2.5 3.17157 3.17157 2.5 4 2.5H12C12.8284 2.5 13.5 3.17157 13.5 4V13.9597L9.31235 10.6096Z" fill="#E7EFFD" stroke="#3574F0" stroke-linejoin="round"/>
+</svg>
diff --git a/platform/collaboration-tools/resources/icons/expui/review/commentUnread_dark.svg b/platform/collaboration-tools/resources/icons/expui/review/commentUnread_dark.svg
new file mode 100644
index 000000000000..74286a3a4715
--- /dev/null
+++ b/platform/collaboration-tools/resources/icons/expui/review/commentUnread_dark.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.31235 10.6096C9.22369 10.5386 9.11354 10.5 9 10.5H4C3.17157 10.5 2.5 9.82843 2.5 9V4C2.5 3.17157 3.17157 2.5 4 2.5H12C12.8284 2.5 13.5 3.17157 13.5 4V13.9597L9.31235 10.6096Z" fill="#25324D" stroke="#548AF7" stroke-linejoin="round"/>
+</svg>
diff --git a/platform/collaboration-tools/resources/icons/expui/review/fileUnread.svg b/platform/collaboration-tools/resources/icons/expui/review/fileUnread.svg
new file mode 100644
index 000000000000..a88c4f4eac66
--- /dev/null
+++ b/platform/collaboration-tools/resources/icons/expui/review/fileUnread.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="3" fill="#3574F0"/>
+</svg>
diff --git a/platform/collaboration-tools/resources/icons/expui/review/fileUnread_dark.svg b/platform/collaboration-tools/resources/icons/expui/review/fileUnread_dark.svg
new file mode 100644
index 000000000000..2c174a135b9e
--- /dev/null
+++ b/platform/collaboration-tools/resources/icons/expui/review/fileUnread_dark.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="3" fill="#548AF7"/>
+</svg>