diff --git a/apps/common/main/resources/img/toolbar/1.25x/big/btn-add-comment.png b/apps/common/main/resources/img/toolbar/1.25x/big/btn-add-comment.png
new file mode 100644
index 0000000000..9b73d7cc56
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/big/btn-add-comment.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.25x/big/btn-menu-comments.png b/apps/common/main/resources/img/toolbar/1.25x/big/btn-menu-comments.png
new file mode 100644
index 0000000000..1c3c0cdd5f
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/big/btn-menu-comments.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.25x/big/btn-resolve-all.png b/apps/common/main/resources/img/toolbar/1.25x/big/btn-resolve-all.png
index 2ff576a78f..3a3c9ebca6 100644
Binary files a/apps/common/main/resources/img/toolbar/1.25x/big/btn-resolve-all.png and b/apps/common/main/resources/img/toolbar/1.25x/big/btn-resolve-all.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-add-comment.png b/apps/common/main/resources/img/toolbar/1.25x/btn-add-comment.png
new file mode 100644
index 0000000000..b59863ae49
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/btn-add-comment.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-menu-comments.png b/apps/common/main/resources/img/toolbar/1.25x/btn-menu-comments.png
index 65eb921838..9b6c222a6c 100644
Binary files a/apps/common/main/resources/img/toolbar/1.25x/btn-menu-comments.png and b/apps/common/main/resources/img/toolbar/1.25x/btn-menu-comments.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-add-comment.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-add-comment.png
new file mode 100644
index 0000000000..ed9a179223
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/big/btn-add-comment.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-menu-comments.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-menu-comments.png
new file mode 100644
index 0000000000..2d68c41c17
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/big/btn-menu-comments.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-resolve-all.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-resolve-all.png
index 00b70454af..efb2b1ebfe 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/big/btn-resolve-all.png and b/apps/common/main/resources/img/toolbar/1.5x/big/btn-resolve-all.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-add-comment.png b/apps/common/main/resources/img/toolbar/1.5x/btn-add-comment.png
new file mode 100644
index 0000000000..5273463d9b
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/btn-add-comment.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-menu-comments.png b/apps/common/main/resources/img/toolbar/1.5x/btn-menu-comments.png
index c721b4efd7..fcf377df68 100644
Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-menu-comments.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-menu-comments.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.75x/big/btn-add-comment.png b/apps/common/main/resources/img/toolbar/1.75x/big/btn-add-comment.png
new file mode 100644
index 0000000000..0dd0aaa623
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/big/btn-add-comment.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.75x/big/btn-menu-comments.png b/apps/common/main/resources/img/toolbar/1.75x/big/btn-menu-comments.png
new file mode 100644
index 0000000000..fa8274dafe
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/big/btn-menu-comments.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.75x/big/btn-resolve-all.png b/apps/common/main/resources/img/toolbar/1.75x/big/btn-resolve-all.png
index 301d4b5413..d4d51259b4 100644
Binary files a/apps/common/main/resources/img/toolbar/1.75x/big/btn-resolve-all.png and b/apps/common/main/resources/img/toolbar/1.75x/big/btn-resolve-all.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-add-comment.png b/apps/common/main/resources/img/toolbar/1.75x/btn-add-comment.png
new file mode 100644
index 0000000000..9b73d7cc56
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/btn-add-comment.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-menu-comments.png b/apps/common/main/resources/img/toolbar/1.75x/btn-menu-comments.png
index 1adcca3792..1c3c0cdd5f 100644
Binary files a/apps/common/main/resources/img/toolbar/1.75x/btn-menu-comments.png and b/apps/common/main/resources/img/toolbar/1.75x/btn-menu-comments.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-add-comment.png b/apps/common/main/resources/img/toolbar/1x/big/btn-add-comment.png
new file mode 100644
index 0000000000..3e242b768d
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/big/btn-add-comment.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-menu-comments.png b/apps/common/main/resources/img/toolbar/1x/big/btn-menu-comments.png
new file mode 100644
index 0000000000..25061cc53d
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/big/btn-menu-comments.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-resolve-all.png b/apps/common/main/resources/img/toolbar/1x/big/btn-resolve-all.png
index 274bd19dc9..5a6420ae0e 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/big/btn-resolve-all.png and b/apps/common/main/resources/img/toolbar/1x/big/btn-resolve-all.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-add-comment.png b/apps/common/main/resources/img/toolbar/1x/btn-add-comment.png
new file mode 100644
index 0000000000..66e1ec3aed
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/btn-add-comment.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-menu-comments.png b/apps/common/main/resources/img/toolbar/1x/btn-menu-comments.png
index 7b4476d46c..b9ea9bd627 100644
Binary files a/apps/common/main/resources/img/toolbar/1x/btn-menu-comments.png and b/apps/common/main/resources/img/toolbar/1x/btn-menu-comments.png differ
diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-add-comment.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-add-comment.svg
new file mode 100644
index 0000000000..2a87f54b3e
--- /dev/null
+++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-add-comment.svg
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M20 5h1v3h3v1h-3v3h-1V9h-3V8h3V5Z" fill="#000"/>
+    <path d="M8 18v3.826L12.463 18H22v-5h1v5a1 1 0 0 1-1 1h-9.167l-5.008 4.293a.5.5 0 0 1-.825-.38V19H5a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h11v1H5v11h3Z" fill="#000"/>
+</svg>
diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-menu-comments.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-menu-comments.svg
new file mode 100644
index 0000000000..95180a61fe
--- /dev/null
+++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-menu-comments.svg
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M9 10h11v1H9v-1Zm8 4H9v1h8v-1Z" fill="#000"/>
+    <path d="M8.825 23.293 13.833 19H23a1 1 0 0 0 1-1V7a1 1 0 0 0-1-1H6a1 1 0 0 0-1 1v11a1 1 0 0 0 1 1h2v3.913a.5.5 0 0 0 .825.38ZM9 18H6V7h17v11h-9.537L9 21.826V18Z" fill="#000"/>
+</svg>
diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-resolve-all.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-resolve-all.svg
index 6cf1478843..716b592d33 100644
--- a/apps/common/main/resources/img/toolbar/2.5x/big/btn-resolve-all.svg
+++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-resolve-all.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" fill="none" viewBox="0 0 28 28">
-  <path fill="#000" fill-rule="evenodd" d="M9.5 22.586 6.914 20H5a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h18a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H12.086L9.5 22.586ZM6.5 21l3 3 3-3H23a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h1.5Zm3.5-7.314L12.686 17 18 9.686 17.314 9l-4.628 6-2-2-.686.686Z" clip-rule="evenodd"/>
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M8.825 23.293 13.833 19H23a1 1 0 0 0 1-1V7a1 1 0 0 0-1-1H6a1 1 0 0 0-1 1v11a1 1 0 0 0 1 1h2v3.913a.5.5 0 0 0 .825.38ZM9 18H6V7h17v11h-9.537L9 21.826V18Z" fill="#000"/>
+    <path d="m13.536 14.985 4.95-4.95-.707-.707-4.243 4.243-2.122-2.121-.707.707 2.829 2.828Z" fill="#000"/>
 </svg>
diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-add-comment.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-add-comment.svg
new file mode 100644
index 0000000000..73b788919d
--- /dev/null
+++ b/apps/common/main/resources/img/toolbar/2.5x/btn-add-comment.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M15 3h1v2h2v1h-2v2h-1V6h-2V5h2V3Z" fill="#000"/>
+    <path d="M6 13v1.92L8.4 13H16V9h1v4a1 1 0 0 1-1 1H8.75l-2.938 2.35A.5.5 0 0 1 5 15.96V14H4a1 1 0 0 1-1-1V5a1 1 0 0 1 1-1h8v1H4v8h2Z" fill="#000"/>
+</svg>
diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-comments.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-comments.svg
index 76dbe870ba..e738af07d2 100644
--- a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-comments.svg
+++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-comments.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20">
-  <path fill="#000" fill-rule="evenodd" d="M7.5 16.086 5.414 14H3V4h14v10H9.586L7.5 16.086ZM5 15l2.5 2.5L10 15h7a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H3a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h2Zm0-9h10v1H5V6Zm0 2h10v1H5V8Zm7 2H5v1h7v-1Z" clip-rule="evenodd"/>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M6 7h8v1H6V7Zm6 3H6v1h6v-1Z" fill="#000"/>
+    <path d="M5.812 16.35 8.75 14H16a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h1v1.96a.5.5 0 0 0 .812.39ZM6 13H4V5h12v8H8.4L6 14.92V13Z" fill="#000"/>
 </svg>
diff --git a/apps/common/main/resources/img/toolbar/2x/big/btn-add-comment.png b/apps/common/main/resources/img/toolbar/2x/big/btn-add-comment.png
new file mode 100644
index 0000000000..af735a7f62
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/big/btn-add-comment.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/big/btn-menu-comments.png b/apps/common/main/resources/img/toolbar/2x/big/btn-menu-comments.png
new file mode 100644
index 0000000000..e0173face2
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/big/btn-menu-comments.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/big/btn-resolve-all.png b/apps/common/main/resources/img/toolbar/2x/big/btn-resolve-all.png
index db7d796d3b..d09b34e7f9 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/big/btn-resolve-all.png and b/apps/common/main/resources/img/toolbar/2x/big/btn-resolve-all.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-add-comment.png b/apps/common/main/resources/img/toolbar/2x/btn-add-comment.png
new file mode 100644
index 0000000000..b2d164e7b1
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/btn-add-comment.png differ
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-menu-comments.png b/apps/common/main/resources/img/toolbar/2x/btn-menu-comments.png
index 293a506647..cc1704ef9d 100644
Binary files a/apps/common/main/resources/img/toolbar/2x/btn-menu-comments.png and b/apps/common/main/resources/img/toolbar/2x/btn-menu-comments.png differ