diff --git a/docs/framework/guides/contributing/development-environment.md b/docs/framework/guides/contributing/development-environment.md
index 952fe12ed2f..a2c4838cfb7 100644
--- a/docs/framework/guides/contributing/development-environment.md
+++ b/docs/framework/guides/contributing/development-environment.md
@@ -175,6 +175,5 @@ The script reduces the icon size up to 70%, depending on the software used to cr
 
 **Note**: You may still need to tweak the source code of the SVG files manually after using the script:
 
-* The icons should have the `viewBox` attribute (instead of `width` and `height`). The `removeDimensions` SVGO plugin will not remove `width` and `height` if there is no `viewBox` attribute so make sure it is present.
-* Sometimes SVGO leaves empty (transparent) groups `<g>...</g>`. They should be removed from the source.
+* Sometimes SVGO leaves empty (transparent) groups `<g>...</g>`. They should be removed from the source and running `clean-up-svg-icons` again usually does that.
 * Make sure the number of `<path>` elements is minimal. Merge paths whenever possible in the image processor before saving the file.
diff --git a/package.json b/package.json
index 2eb4b76de6c..b2bf7cf6098 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "style-loader": "^1.2.1",
     "stylelint": "^13.5.0",
     "stylelint-config-ckeditor5": "^2.0.0",
-    "svgo": "^1.3.2",
+    "svgo": "^2.2.2",
     "terser-webpack-plugin": "^3.0.2",
     "tippy.js": "^6.2.7",
     "umberto": "^1.6.2",
diff --git a/packages/ckeditor5-core/src/index.js b/packages/ckeditor5-core/src/index.js
index 039c9edf91f..6e006f47abc 100644
--- a/packages/ckeditor5-core/src/index.js
+++ b/packages/ckeditor5-core/src/index.js
@@ -25,6 +25,7 @@ export { default as secureSourceElement } from './editor/utils/securesourceeleme
 export { default as PendingActions } from './pendingactions';
 
 import cancel from './../theme/icons/cancel.svg';
+import caption from './../theme/icons/caption.svg';
 import check from './../theme/icons/check.svg';
 import eraser from './../theme/icons/eraser.svg';
 import lowVision from './../theme/icons/low-vision.svg';
@@ -51,6 +52,7 @@ import threeVerticalDots from './../theme/icons/three-vertical-dots.svg';
 
 export const icons = {
 	cancel,
+	caption,
 	check,
 	eraser,
 	lowVision,
diff --git a/packages/ckeditor5-core/theme/icons/caption.svg b/packages/ckeditor5-core/theme/icons/caption.svg
new file mode 100644
index 00000000000..b0ac8416fa1
--- /dev/null
+++ b/packages/ckeditor5-core/theme/icons/caption.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M2 16h9a1 1 0 0 1 0 2H2a1 1 0 0 1 0-2z"/><path d="M17 1a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h14zm0 1.5H3a.5.5 0 0 0-.492.41L2.5 3v9a.5.5 0 0 0 .41.492L3 12.5h14a.5.5 0 0 0 .492-.41L17.5 12V3a.5.5 0 0 0-.41-.492L17 2.5z" fill-opacity=".6"/></svg>
\ No newline at end of file
diff --git a/scripts/clean-up-svg-icons.sh b/scripts/clean-up-svg-icons.sh
index cd1a76998de..a7738f396a7 100644
--- a/scripts/clean-up-svg-icons.sh
+++ b/scripts/clean-up-svg-icons.sh
@@ -22,6 +22,6 @@ do
 	then
 		echo "\x1B[33m[clean-up-svg-icons]\x1B[0m Note: \"$i\" is blacklisted, skipping."
 	else
-		svgo --config=./scripts/svgo.config.json -i $i
+		svgo --config=./scripts/svgo.config.js -i $i
 	fi
 done
diff --git a/scripts/svgo.config.js b/scripts/svgo.config.js
new file mode 100644
index 00000000000..1a56402b791
--- /dev/null
+++ b/scripts/svgo.config.js
@@ -0,0 +1,34 @@
+/**
+ * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+/* eslint-env node */
+
+const { extendDefaultPlugins } = require( 'svgo' );
+
+module.exports = {
+	plugins: extendDefaultPlugins( [
+		{
+			name: 'removeViewBox',
+			active: false
+		},
+		{ name: 'collapseGroups' },
+		{ name: 'removeDimensions' },
+		{
+			name: 'removeAttrs',
+			params: {
+				attrs: '(fill|stroke|fill-rule)'
+			}
+		},
+		{
+			name: 'convertPathData',
+			params: {
+				noSpaceAfterFlags: false
+			}
+		},
+		{ name: 'removeTitle' },
+		{ name: 'removeComments' },
+		{ name: 'removeMetadata' }
+	] )
+};
diff --git a/scripts/svgo.config.json b/scripts/svgo.config.json
deleted file mode 100644
index dd23855577c..00000000000
--- a/scripts/svgo.config.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"plugins": [
-		"collapseGroups",
-		"removeDimensions",
-		{ "removeAttrs": { "attrs": "(fill|stroke|fill-rule)" } },
-		{ "convertPathData": { "noSpaceAfterFlags": false } },
-		"removeTitle",
-		"removeComments",
-		"removeMetadata"
-	]
-}