diff --git a/drivers/chrome/js/options.js b/drivers/chrome/js/options.js
index ed17041e3..7ee9be839 100644
--- a/drivers/chrome/js/options.js
+++ b/drivers/chrome/js/options.js
@@ -21,8 +21,9 @@ document.addEventListener('DOMContentLoaded', function() {
 				}
 			}
 
-			if ( parseInt(options.opts.autoAnalyzeHeaders) ) {
-				d.getElementById('option-auto-analyze-headers').setAttribute('checked', 'checked');
+			if ( options.opts.autoAnalyzeHeaders === "0" || options.opts.autoAnalyzeHeaders === "1" ) {
+				//Remove old stored option from localStorage because it's no longer needed. This can be entirely removed in future versions
+				delete localStorage['autoAnalyzeHeaders'];
 			}
 
 			if ( parseInt(options.opts.upgradeMessage) ) {
@@ -35,7 +36,6 @@ document.addEventListener('DOMContentLoaded', function() {
 		},
 
 		save: function() {
-			options.opts.autoAnalyzeHeaders = d.getElementById('option-auto-analyze-headers').checked ? 1 : 0;
 			options.opts.upgradeMessage     = d.getElementById('option-upgrade-message'     ).checked ? 1 : 0;
 			options.opts.tracking           = d.getElementById('option-tracking'            ).checked ? 1 : 0;
 
diff --git a/share/images/icons/CMSimple.png b/share/images/icons/CMSimple.png
index 39c8ddea8..0b995e129 100644
Binary files a/share/images/icons/CMSimple.png and b/share/images/icons/CMSimple.png differ
diff --git a/share/images/icons/Google Tag Manager.png b/share/images/icons/Google Tag Manager.png
deleted file mode 100644
index 1031c9054..000000000
Binary files a/share/images/icons/Google Tag Manager.png and /dev/null differ