diff --git a/data.json b/data.json
index dc251d1178..8f63bc6d62 100644
--- a/data.json
+++ b/data.json
@@ -4099,15 +4099,6 @@
             ]
         }
     },
-    "clion": {
-        "linux": {
-            "root": "clion",
-            "symlinks": [
-                "com.jetbrains.CLion",
-                "jetbrains-clion"
-            ]
-        }
-    },
     "clipgrab": {
         "linux": {
             "root": "clipgrab"
@@ -4748,15 +4739,6 @@
             ]
         }
     },
-    "datagrip": {
-        "linux": {
-            "root": "datagrip",
-            "symlinks": [
-                "com.jetbrains.DataGrip",
-                "jetbrains-datagrip"
-            ]
-        }
-    },
     "daty": {
         "linux": {
             "root": "daty",
@@ -10560,25 +10542,6 @@
             ]
         }
     },
-    "idea": {
-        "linux": {
-            "root": "idea",
-            "symlinks": [
-                "com.jetbrains.Intellij-Community",
-                "com.jetbrains.IntelliJ-IDEA-Community",
-                "com.jetbrains.IntelliJ-IDEA-Ultimate",
-                "intellij",
-                "intellij-idea",
-                "intellij-idea-ce",
-                "intellij-idea-community",
-                "intellij-idea-ue-bundled-jre",
-                "intellij-idea-ultimate-edition",
-                "intellij_idea",
-                "jetbrains-intellij",
-                "jetbrains-intellij-idea"
-            ]
-        }
-    },
     "iease-music": {
         "linux": {
             "root": "iease-music"
@@ -11082,6 +11045,104 @@
             "root": "steam_icon_319870"
         }
     },
+    "jetbrains-appcode": {
+        "linux": {
+            "root": "jetbrains-appcode",
+            "symlinks": [
+                "appcode"
+            ]
+        }
+    },
+    "jetbrains-clion": {
+        "linux": {
+            "root": "jetbrains-clion",
+            "symlinks": [
+                "clion",
+                "com.jetbrains.CLion"
+            ]
+        }
+    },
+    "jetbrains-datagrip": {
+        "linux": {
+            "root": "jetbrains-datagrip",
+            "symlinks": [
+                "com.jetbrains.DataGrip",
+                "datagrip"
+            ]
+        }
+    },
+    "jetbrains-idea": {
+        "linux": {
+            "root": "jetbrains-idea",
+            "symlinks": [
+                "com.jetbrains.Intellij-Community",
+                "com.jetbrains.IntelliJ-IDEA-Community",
+                "com.jetbrains.IntelliJ-IDEA-Ultimate",
+                "idea",
+                "intellij",
+                "intellij-idea",
+                "intellij-idea-ce",
+                "intellij-idea-community",
+                "intellij-idea-ue-bundled-jre",
+                "intellij-idea-ultimate-edition",
+                "intellij_idea",
+                "jetbrains-intellij",
+                "jetbrains-intellij-idea"
+            ]
+        }
+    },
+    "jetbrains-phpstorm": {
+        "linux": {
+            "root": "jetbrains-phpstorm",
+            "symlinks": [
+                "com.jetbrains.PhpStorm",
+                "phpstorm",
+                "webide"
+            ]
+        }
+    },
+    "jetbrains-pycharm": {
+        "linux": {
+            "root": "jetbrains-pycharm",
+            "symlinks": [
+                "com.jetbrains.PyCharm",
+                "com.jetbrains.PyCharm-Community",
+                "com.jetbrains.PyCharm-Professional",
+                "jetbrains-pycharm-edu",
+                "pycharm",
+                "pycharm-community",
+                "pycharm-education",
+                "pycharm-professional"
+            ]
+        }
+    },
+    "jetbrains-rider": {
+        "linux": {
+            "root": "jetbrains-rider",
+            "symlinks": [
+                "com.jetbrains.Rider",
+                "rider"
+            ]
+        }
+    },
+    "jetbrains-rubymine": {
+        "linux": {
+            "root": "jetbrains-rubymine",
+            "symlinks": [
+                "com.jetbrains.RubyMine",
+                "rubymine"
+            ]
+        }
+    },
+    "jetbrains-webstorm": {
+        "linux": {
+            "root": "jetbrains-webstorm",
+            "symlinks": [
+                "com.jetbrains.WebStorm",
+                "webstorm"
+            ]
+        }
+    },
     "jiten": {
         "linux": {
             "root": "jiten",
@@ -15835,16 +15896,6 @@
             "root": "phototonic"
         }
     },
-    "phpstorm": {
-        "linux": {
-            "root": "phpstorm",
-            "symlinks": [
-                "com.jetbrains.PhpStorm",
-                "jetbrains-phpstorm",
-                "webide"
-            ]
-        }
-    },
     "pia-manager": {
         "linux": {
             "root": "pia-manager",
@@ -16865,21 +16916,6 @@
             ]
         }
     },
-    "pycharm": {
-        "linux": {
-            "root": "pycharm",
-            "symlinks": [
-                "com.jetbrains.PyCharm",
-                "com.jetbrains.PyCharm-Community",
-                "com.jetbrains.PyCharm-Professional",
-                "jetbrains-pycharm",
-                "jetbrains-pycharm-edu",
-                "pycharm-community",
-                "pycharm-education",
-                "pycharm-professional"
-            ]
-        }
-    },
     "pychess": {
         "linux": {
             "root": "pychess",
@@ -17956,15 +17992,6 @@
             "root": "ricochet"
         }
     },
-    "rider": {
-        "linux": {
-            "root": "rider",
-            "symlinks": [
-                "com.jetbrains.Rider",
-                "jetbrains-rider"
-            ]
-        }
-    },
     "rimworld": {
         "linux": {
             "root": "steam_icon_294100"
@@ -18208,15 +18235,6 @@
             "root": "rtwizard"
         }
     },
-    "rubymine": {
-        "linux": {
-            "root": "rubymine",
-            "symlinks": [
-                "com.jetbrains.RubyMine",
-                "jetbrains-rubymine"
-            ]
-        }
-    },
     "rubyripper": {
         "linux": {
             "root": "rubyripper"
@@ -22766,15 +22784,6 @@
             "root": "webservice-office-zoho-sheet"
         }
     },
-    "webstorm": {
-        "linux": {
-            "root": "webstorm",
-            "symlinks": [
-                "com.jetbrains.WebStorm",
-                "jetbrains-webstorm"
-            ]
-        }
-    },
     "webtorrent-desktop": {
         "linux": {
             "root": "webtorrent-desktop",
diff --git a/icons/circle/48/jetbrains-appcode.svg b/icons/circle/48/jetbrains-appcode.svg
new file mode 100644
index 0000000000..51882adf5b
--- /dev/null
+++ b/icons/circle/48/jetbrains-appcode.svg
@@ -0,0 +1,17 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient4195" x1="24" x2="24" y1="2" y2="46" gradientUnits="userSpaceOnUse">
+   <stop style="stop-color:#7debb0" offset="0"/>
+   <stop style="stop-color:#67b5c9" offset="1"/>
+  </linearGradient>
+ </defs>
+ <path d="m36.31 5c5.859 4.062 9.688 10.831 9.688 18.5 0 12.426-10.07 22.5-22.5 22.5-7.669 0-14.438-3.828-18.5-9.688 1.037 1.822 2.306 3.499 3.781 4.969 4.085 3.712 9.514 5.969 15.469 5.969 12.703 0 23-10.298 23-23 0-5.954-2.256-11.384-5.969-15.469-1.469-1.475-3.147-2.744-4.969-3.781zm4.969 3.781c3.854 4.113 6.219 9.637 6.219 15.719 0 12.703-10.297 23-23 23-6.081 0-11.606-2.364-15.719-6.219 4.16 4.144 9.883 6.719 16.219 6.719 12.703 0 23-10.298 23-23 0-6.335-2.575-12.06-6.719-16.219z" style="opacity:.05"/>
+ <path d="m41.28 8.781c3.712 4.085 5.969 9.514 5.969 15.469 0 12.703-10.297 23-23 23-5.954 0-11.384-2.256-15.469-5.969 4.113 3.854 9.637 6.219 15.719 6.219 12.703 0 23-10.298 23-23 0-6.081-2.364-11.606-6.219-15.719z" style="opacity:.1"/>
+ <path d="m31.25 2.375c8.615 3.154 14.75 11.417 14.75 21.13 0 12.426-10.07 22.5-22.5 22.5-9.708 0-17.971-6.135-21.12-14.75a23 23 0 0 0 44.875-7 23 23 0 0 0-16-21.875z" style="opacity:.2"/>
+ <path d="m47 24a23 23 0 0 1-23 23 23 23 0 0 1-23-23 23 23 0 0 1 23-23 23 23 0 0 1 23 23z" style="fill:url(#linearGradient4195)"/>
+ <path d="m40.03 7.531c3.712 4.084 5.969 9.514 5.969 15.469 0 12.703-10.297 23-23 23-5.954 0-11.384-2.256-15.469-5.969 4.178 4.291 10.01 6.969 16.469 6.969 12.703 0 23-10.298 23-23 0-6.462-2.677-12.291-6.969-16.469z" style="opacity:.1"/>
+ <path d="m12 12h26v26h-26z" style="fill-opacity:.1"/>
+ <path d="m11 11h26v26h-26z" style="fill:#303030"/>
+ <path d="m18 14-4 11h2l1.125-3h3.75l1.125 3h2l-4-11h-2zm11 0c-3.3102 0-5 2.372-5 5.4414s1.8102 5.6188 5 5.5586c2.0463 0 3.2878-0.80411 4.3711-2.0078l-1.3711-1.3984c-0.84259 0.78241-1.7963 1.4062-3 1.4062-1.8552 0-2.9853-1.734-2.998-3.5879 0.012699-1.8526 1.2022-3.4121 2.998-3.4121 1.0833 0 2.0012 0.40119 2.8438 1.1836l1.3066-1.5645c-1.0231-1.0231-2.1041-1.6191-4.1504-1.6191zm-10 3 1.125 3h-2.25l1.125-3z" style="fill:#f9f9f9"/>
+ <path d="m13 32h10v2h-10z" style="fill:#f9f9f9"/>
+</svg>
diff --git a/icons/circle/48/clion.svg b/icons/circle/48/jetbrains-clion.svg
similarity index 100%
rename from icons/circle/48/clion.svg
rename to icons/circle/48/jetbrains-clion.svg
diff --git a/icons/circle/48/datagrip.svg b/icons/circle/48/jetbrains-datagrip.svg
similarity index 100%
rename from icons/circle/48/datagrip.svg
rename to icons/circle/48/jetbrains-datagrip.svg
diff --git a/icons/circle/48/idea.svg b/icons/circle/48/jetbrains-idea.svg
similarity index 100%
rename from icons/circle/48/idea.svg
rename to icons/circle/48/jetbrains-idea.svg
diff --git a/icons/circle/48/phpstorm.svg b/icons/circle/48/jetbrains-phpstorm.svg
similarity index 100%
rename from icons/circle/48/phpstorm.svg
rename to icons/circle/48/jetbrains-phpstorm.svg
diff --git a/icons/circle/48/pycharm.svg b/icons/circle/48/jetbrains-pycharm.svg
similarity index 100%
rename from icons/circle/48/pycharm.svg
rename to icons/circle/48/jetbrains-pycharm.svg
diff --git a/icons/circle/48/rider.svg b/icons/circle/48/jetbrains-rider.svg
similarity index 100%
rename from icons/circle/48/rider.svg
rename to icons/circle/48/jetbrains-rider.svg
diff --git a/icons/circle/48/rubymine.svg b/icons/circle/48/jetbrains-rubymine.svg
similarity index 100%
rename from icons/circle/48/rubymine.svg
rename to icons/circle/48/jetbrains-rubymine.svg
diff --git a/icons/circle/48/webstorm.svg b/icons/circle/48/jetbrains-webstorm.svg
similarity index 100%
rename from icons/circle/48/webstorm.svg
rename to icons/circle/48/jetbrains-webstorm.svg
diff --git a/icons/square/48/jetbrains-appcode.svg b/icons/square/48/jetbrains-appcode.svg
new file mode 100644
index 0000000000..4d51203258
--- /dev/null
+++ b/icons/square/48/jetbrains-appcode.svg
@@ -0,0 +1,17 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="bg" x2="0" y1="1" y2="47" gradientUnits="userSpaceOnUse">
+   <stop style="stop-color:#7debb0" offset="0"/>
+   <stop style="stop-color:#67b5c9" offset="1"/>
+  </linearGradient>
+ </defs>
+ <path d="m1 43v0.25c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-0.25c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4zm0 0.5v0.5c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-0.5c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4z" style="opacity:.02"/>
+ <path d="m1 43.25v0.25c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-0.25c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4z" style="opacity:.05"/>
+ <path d="m1 43v0.25c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-0.25c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4z" style="opacity:.1"/>
+ <rect x="1" y="1" width="46" height="46" rx="4" style="fill:url(#bg)"/>
+ <path d="m1 39v4c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-4c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4z" style="opacity:.1"/>
+ <path d="m11 11h26v26h-26z" style="fill-opacity:.1"/>
+ <path d="m11 10h26v26h-26z" style="fill:#303030"/>
+ <path d="m18 13-4 11h2l1.125-3h3.75l1.125 3h2l-4-11zm11 0c-3.3102 0-5 2.372-5 5.4414s1.8102 5.6188 5 5.5586c2.0463 0 3.2878-0.80411 4.3711-2.0078l-1.3711-1.3984c-0.84259 0.78241-1.7963 1.4062-3 1.4062-1.8552 0-2.9853-1.734-2.998-3.5879 0.012699-1.8526 1.2022-3.4121 2.998-3.4121 1.0833 0 2.0012 0.40119 2.8438 1.1836l1.3066-1.5645c-1.0231-1.0231-2.1041-1.6191-4.1504-1.6191zm-10 3 1.125 3h-2.25z" style="fill:#f9f9f9"/>
+ <path d="m13 31h10v2h-10z" style="fill:#f9f9f9"/>
+</svg>
diff --git a/icons/square/48/clion.svg b/icons/square/48/jetbrains-clion.svg
similarity index 100%
rename from icons/square/48/clion.svg
rename to icons/square/48/jetbrains-clion.svg
diff --git a/icons/square/48/datagrip.svg b/icons/square/48/jetbrains-datagrip.svg
similarity index 100%
rename from icons/square/48/datagrip.svg
rename to icons/square/48/jetbrains-datagrip.svg
diff --git a/icons/square/48/idea.svg b/icons/square/48/jetbrains-idea.svg
similarity index 100%
rename from icons/square/48/idea.svg
rename to icons/square/48/jetbrains-idea.svg
diff --git a/icons/square/48/phpstorm.svg b/icons/square/48/jetbrains-phpstorm.svg
similarity index 100%
rename from icons/square/48/phpstorm.svg
rename to icons/square/48/jetbrains-phpstorm.svg
diff --git a/icons/square/48/pycharm.svg b/icons/square/48/jetbrains-pycharm.svg
similarity index 100%
rename from icons/square/48/pycharm.svg
rename to icons/square/48/jetbrains-pycharm.svg
diff --git a/icons/square/48/rider.svg b/icons/square/48/jetbrains-rider.svg
similarity index 100%
rename from icons/square/48/rider.svg
rename to icons/square/48/jetbrains-rider.svg
diff --git a/icons/square/48/rubymine.svg b/icons/square/48/jetbrains-rubymine.svg
similarity index 100%
rename from icons/square/48/rubymine.svg
rename to icons/square/48/jetbrains-rubymine.svg
diff --git a/icons/square/48/webstorm.svg b/icons/square/48/jetbrains-webstorm.svg
similarity index 100%
rename from icons/square/48/webstorm.svg
rename to icons/square/48/jetbrains-webstorm.svg