diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a5e7fd8e9..427b2ef83a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,29 @@
 # Changelog
+## 3.6.0 (2018-09-10)
+### New icons
+- authors ([@danielbankhead](https://github.com/danielbankhead) in [#306](https://github.com/PKief/vscode-material-icon-theme/pull/306))
+- Godot ([@chrsmutti](https://github.com/chrsmutti) in [#316](https://github.com/PKief/vscode-material-icon-theme/pull/316))
+- Bazel
+- Mint ([issue #308](https://github.com/PKief/vscode-material-icon-theme/issues/308))
+- Velocity ([issue #311](https://github.com/PKief/vscode-material-icon-theme/issues/311))
+- ScriptCS (.csx) ([@arpadbarta](https://github.com/arpadbarta) in [#313](https://github.com/PKief/vscode-material-icon-theme/pull/313))
+- .clang-format
+- android, iOS folder ([issue #312](https://github.com/PKief/vscode-material-icon-theme/issues/312))
+- client, server folder ([issue #296](https://github.com/PKief/vscode-material-icon-theme/issues/296))
+- upload, download folder ([issue #218](https://github.com/PKief/vscode-material-icon-theme/issues/218))
+- helpers folder
+- tasks folder ([issue #218](https://github.com/PKief/vscode-material-icon-theme/issues/218))
+- themes folder
+
+### Updated icons
+- Babel ([issue #315](https://github.com/PKief/vscode-material-icon-theme/issues/315))
+- tools folder
+- android
+
+### Other improvements
+- Adapted the extension to the new settings GUI
+- Improved code quality
+
 ## 3.5.3 (2018-08-19)
 ### New icons
 - D ([issue #291](https://github.com/PKief/vscode-material-icon-theme/issues/291))
diff --git a/images/fileIcons.png b/images/fileIcons.png
index 108b7c9854..46baf68f40 100644
Binary files a/images/fileIcons.png and b/images/fileIcons.png differ
diff --git a/images/folderIcons.png b/images/folderIcons.png
index 7b9d95ba6a..d72d3a033d 100644
Binary files a/images/folderIcons.png and b/images/folderIcons.png differ
diff --git a/package-lock.json b/package-lock.json
index bae1d2256d..6298205896 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "material-icon-theme",
-  "version": "3.5.3",
+  "version": "3.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 566fae5a53..bfba1208db 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "material-icon-theme",
   "displayName": "Material Icon Theme",
   "description": "Material Design Icons for Visual Studio Code",
-  "version": "3.5.3",
+  "version": "3.6.0",
   "publisher": "PKief",
   "engines": {
     "vscode": "^1.5.0"