diff --git a/gulpfile.js b/gulpfile.js
index df3ea844..93280f69 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -222,7 +222,11 @@ Object.entries(build.sprite).forEach(([filename, entry]) => {
         gulp
             .src(src)
             .pipe(plumber())
-            .pipe(imagemin())
+            .pipe(imagemin([
+                imagemin.svgo({
+                  plugins: [{ removeViewBox: false }]
+                })
+              ]))
             .pipe(svgstore())
             .pipe(rename({ basename: path.parse(filename).name }))
             .pipe(size(sizeOptions))
diff --git a/src/js/config/defaults.js b/src/js/config/defaults.js
index c50a8900..197554a2 100644
--- a/src/js/config/defaults.js
+++ b/src/js/config/defaults.js
@@ -164,6 +164,7 @@ const defaults = {
         frameTitle: 'Player for {title}',
         captions: 'Captions',
         settings: 'Settings',
+        pip: 'PIP',
         menuBack: 'Go back to previous menu',
         speed: 'Speed',
         normal: 'Normal',
diff --git a/src/js/plugins/vimeo.js b/src/js/plugins/vimeo.js
index 91019abf..8df5ad15 100644
--- a/src/js/plugins/vimeo.js
+++ b/src/js/plugins/vimeo.js
@@ -335,6 +335,14 @@ const vimeo = {
             }
         });
 
+        player.embed.on('bufferstart', () => {
+            triggerEvent.call(player, player.media, 'waiting');
+        });
+
+        player.embed.on('bufferend', () => {
+            triggerEvent.call(player, player.media, 'playing');
+        });
+
         player.embed.on('play', () => {
             assurePlaybackState.call(player, true);
             triggerEvent.call(player, player.media, 'playing');
diff --git a/src/js/plugins/youtube.js b/src/js/plugins/youtube.js
index 31d22bb4..ba5d8de9 100644
--- a/src/js/plugins/youtube.js
+++ b/src/js/plugins/youtube.js
@@ -416,6 +416,12 @@ const youtube = {
 
                             break;
 
+                        case 3:
+                            // Trigger waiting event to add loading classes to container as the video buffers.
+                            triggerEvent.call(player, player.media, 'waiting');
+
+                            break;
+
                         default:
                             break;
                     }
diff --git a/src/js/ui.js b/src/js/ui.js
index 953ecba2..9febab8b 100644
--- a/src/js/ui.js
+++ b/src/js/ui.js
@@ -214,6 +214,7 @@ const ui = {
         // Set state
         Array.from(this.elements.buttons.play || []).forEach(target => {
             Object.assign(target, { pressed: this.playing });
+            target.setAttribute('aria-label', i18n.get(this.playing ? 'pause' : 'play', this.config));
         });
 
         // Only update controls on non timeupdate events