diff --git a/browser/extensions/api/brave_shields_api.cc b/browser/extensions/api/brave_shields_api.cc
index 4b06be89fa7..b979bcef50e 100644
--- a/browser/extensions/api/brave_shields_api.cc
+++ b/browser/extensions/api/brave_shields_api.cc
@@ -56,9 +56,9 @@ ExtensionFunction::ResponseAction BraveShieldsAllowScriptsOnceFunction::Run() {
 }
 
 ExtensionFunction::ResponseAction
-BraveShieldsSetBraveShieldsControlTypeFunction::Run() {
-  std::unique_ptr<brave_shields::SetBraveShieldsControlType::Params> params(
-      brave_shields::SetBraveShieldsControlType::Params::Create(*args_));
+BraveShieldsSetBraveShieldsEnabledFunction::Run() {
+  std::unique_ptr<brave_shields::SetBraveShieldsEnabled::Params> params(
+      brave_shields::SetBraveShieldsEnabled::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   const GURL url(params->url);
@@ -67,21 +67,16 @@ BraveShieldsSetBraveShieldsControlTypeFunction::Run() {
     return RespondNow(Error(kInvalidUrlError, params->url));
   }
 
-  auto control_type = ControlTypeFromString(params->control_type);
-  if (control_type == ControlType::INVALID) {
-    return RespondNow(Error(kInvalidControlTypeError, params->control_type));
-  }
-
   Profile* profile = Profile::FromBrowserContext(browser_context());
-  ::brave_shields::SetBraveShieldsControlType(profile, control_type, url);
+  ::brave_shields::SetBraveShieldsEnabled(profile, params->enabled, url);
 
   return RespondNow(NoArguments());
 }
 
 ExtensionFunction::ResponseAction
-BraveShieldsGetBraveShieldsControlTypeFunction::Run() {
-  std::unique_ptr<brave_shields::GetBraveShieldsControlType::Params> params(
-      brave_shields::GetBraveShieldsControlType::Params::Create(*args_));
+BraveShieldsGetBraveShieldsEnabledFunction::Run() {
+  std::unique_ptr<brave_shields::GetBraveShieldsEnabled::Params> params(
+      brave_shields::GetBraveShieldsEnabled::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   const GURL url(params->url);
@@ -91,8 +86,8 @@ BraveShieldsGetBraveShieldsControlTypeFunction::Run() {
   }
 
   Profile* profile = Profile::FromBrowserContext(browser_context());
-  auto type = ::brave_shields::GetBraveShieldsControlType(profile, url);
-  auto result = std::make_unique<base::Value>(ControlTypeToString(type));
+  auto enabled = ::brave_shields::GetBraveShieldsEnabled(profile, url);
+  auto result = std::make_unique<base::Value>(enabled);
 
   return RespondNow(OneArgument(std::move(result)));
 }
@@ -222,9 +217,9 @@ BraveShieldsGetFingerprintingControlTypeFunction::Run() {
 }
 
 ExtensionFunction::ResponseAction
-BraveShieldsSetHTTPSEverywhereControlTypeFunction::Run() {
-  std::unique_ptr<brave_shields::SetHTTPSEverywhereControlType::Params> params(
-      brave_shields::SetHTTPSEverywhereControlType::Params::Create(*args_));
+BraveShieldsSetHTTPSEverywhereEnabledFunction::Run() {
+  std::unique_ptr<brave_shields::SetHTTPSEverywhereEnabled::Params> params(
+      brave_shields::SetHTTPSEverywhereEnabled::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   const GURL url(params->url);
@@ -233,21 +228,16 @@ BraveShieldsSetHTTPSEverywhereControlTypeFunction::Run() {
     return RespondNow(Error(kInvalidUrlError, params->url));
   }
 
-  auto control_type = ControlTypeFromString(params->control_type);
-  if (control_type == ControlType::INVALID) {
-    return RespondNow(Error(kInvalidControlTypeError, params->control_type));
-  }
-
   Profile* profile = Profile::FromBrowserContext(browser_context());
-  ::brave_shields::SetHTTPSEverywhereControlType(profile, control_type, url);
+  ::brave_shields::SetHTTPSEverywhereEnabled(profile, params->enabled, url);
 
   return RespondNow(NoArguments());
 }
 
 ExtensionFunction::ResponseAction
-BraveShieldsGetHTTPSEverywhereControlTypeFunction::Run() {
-  std::unique_ptr<brave_shields::GetHTTPSEverywhereControlType::Params> params(
-      brave_shields::GetHTTPSEverywhereControlType::Params::Create(*args_));
+BraveShieldsGetHTTPSEverywhereEnabledFunction::Run() {
+  std::unique_ptr<brave_shields::GetHTTPSEverywhereEnabled::Params> params(
+      brave_shields::GetHTTPSEverywhereEnabled::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   const GURL url(params->url);
@@ -257,8 +247,8 @@ BraveShieldsGetHTTPSEverywhereControlTypeFunction::Run() {
   }
 
   Profile* profile = Profile::FromBrowserContext(browser_context());
-  auto type = ::brave_shields::GetHTTPSEverywhereControlType(profile, url);
-  auto result = std::make_unique<base::Value>(ControlTypeToString(type));
+  auto type = ::brave_shields::GetHTTPSEverywhereEnabled(profile, url);
+  auto result = std::make_unique<base::Value>(type);
 
   return RespondNow(OneArgument(std::move(result)));
 }
diff --git a/browser/extensions/api/brave_shields_api.h b/browser/extensions/api/brave_shields_api.h
index 509ca0ac304..59380d2de9e 100644
--- a/browser/extensions/api/brave_shields_api.h
+++ b/browser/extensions/api/brave_shields_api.h
@@ -21,24 +21,24 @@ class BraveShieldsAllowScriptsOnceFunction : public UIThreadExtensionFunction {
   ResponseAction Run() override;
 };
 
-class BraveShieldsSetBraveShieldsControlTypeFunction
+class BraveShieldsSetBraveShieldsEnabledFunction
     : public UIThreadExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("braveShields.setBraveShieldsControlType", UNKNOWN)
+  DECLARE_EXTENSION_FUNCTION("braveShields.setBraveShieldsEnabled", UNKNOWN)
 
  protected:
-  ~BraveShieldsSetBraveShieldsControlTypeFunction() override {}
+  ~BraveShieldsSetBraveShieldsEnabledFunction() override {}
 
   ResponseAction Run() override;
 };
 
-class BraveShieldsGetBraveShieldsControlTypeFunction
+class BraveShieldsGetBraveShieldsEnabledFunction
     : public UIThreadExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("braveShields.getBraveShieldsControlType", UNKNOWN)
+  DECLARE_EXTENSION_FUNCTION("braveShields.getBraveShieldsEnabled", UNKNOWN)
 
  protected:
-  ~BraveShieldsGetBraveShieldsControlTypeFunction() override {}
+  ~BraveShieldsGetBraveShieldsEnabledFunction() override {}
 
   ResponseAction Run() override;
 };
@@ -109,26 +109,26 @@ class BraveShieldsGetFingerprintingControlTypeFunction
   ResponseAction Run() override;
 };
 
-class BraveShieldsSetHTTPSEverywhereControlTypeFunction
+class BraveShieldsSetHTTPSEverywhereEnabledFunction
     : public UIThreadExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("braveShields.setHTTPSEverywhereControlType",
+  DECLARE_EXTENSION_FUNCTION("braveShields.setHTTPSEverywhereEnabled",
                              UNKNOWN)
 
  protected:
-  ~BraveShieldsSetHTTPSEverywhereControlTypeFunction() override {}
+  ~BraveShieldsSetHTTPSEverywhereEnabledFunction() override {}
 
   ResponseAction Run() override;
 };
 
-class BraveShieldsGetHTTPSEverywhereControlTypeFunction
+class BraveShieldsGetHTTPSEverywhereEnabledFunction
     : public UIThreadExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("braveShields.getHTTPSEverywhereControlType",
+  DECLARE_EXTENSION_FUNCTION("braveShields.getHTTPSEverywhereEnabled",
                              UNKNOWN)
 
  protected:
-  ~BraveShieldsGetHTTPSEverywhereControlTypeFunction() override {}
+  ~BraveShieldsGetHTTPSEverywhereEnabledFunction() override {}
 
   ResponseAction Run() override;
 };
diff --git a/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.js b/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.js
index f4635c7bb49..77e1a38027c 100644
--- a/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.js
+++ b/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.js
@@ -35,7 +35,7 @@ cr.define('settings', function() {
     /**
      * @param {string} value name.
      */
-    setHTTPSEverywhereControlType(value) {}
+    setHTTPSEverywhereEnabled(value) {}
 
     /**
      * @param {string} value name.
@@ -78,8 +78,8 @@ cr.define('settings', function() {
     }
 
     /** @override */
-    setHTTPSEverywhereControlType(value) {
-      chrome.send('setHTTPSEverywhereControlType', [value]);
+    setHTTPSEverywhereEnabled(value) {
+      chrome.send('setHTTPSEverywhereEnabled', [value]);
     }
 
     /** @override */
diff --git a/browser/resources/settings/default_brave_shields_page/default_brave_shields_page.js b/browser/resources/settings/default_brave_shields_page/default_brave_shields_page.js
index 06e8ad9be1c..dbb3924e689 100644
--- a/browser/resources/settings/default_brave_shields_page/default_brave_shields_page.js
+++ b/browser/resources/settings/default_brave_shields_page/default_brave_shields_page.js
@@ -85,7 +85,7 @@ Polymer({
     this.browserProxy_.setFingerprintingControlType(this.$.fingerprintingControlType.value);
   },
   onHTTPSEverywhereControlChange_: function() {
-    this.browserProxy_.setHTTPSEverywhereControlType(this.$.httpsEverywhereControlType.checked);
+    this.browserProxy_.setHTTPSEverywhereEnabled(this.$.httpsEverywhereControlType.checked);
   },
   onNoScriptControlChange_: function() {
     this.browserProxy_.setNoScriptControlType(this.$.noScriptControlType.checked);
diff --git a/browser/ui/webui/settings/default_brave_shields_handler.cc b/browser/ui/webui/settings/default_brave_shields_handler.cc
index 1d9241c6b59..22ab715b4b5 100644
--- a/browser/ui/webui/settings/default_brave_shields_handler.cc
+++ b/browser/ui/webui/settings/default_brave_shields_handler.cc
@@ -46,9 +46,9 @@ void DefaultBraveShieldsHandler::RegisterMessages() {
           &DefaultBraveShieldsHandler::SetFingerprintingControlType,
           base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
-      "setHTTPSEverywhereControlType",
+      "setHTTPSEverywhereEnabled",
       base::BindRepeating(
-          &DefaultBraveShieldsHandler::SetHTTPSEverywhereControlType,
+          &DefaultBraveShieldsHandler::SetHTTPSEverywhereEnabled,
           base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "setNoScriptControlType",
@@ -131,17 +131,16 @@ void DefaultBraveShieldsHandler::SetFingerprintingControlType(
                                               GURL());
 }
 
-void DefaultBraveShieldsHandler::SetHTTPSEverywhereControlType(
+void DefaultBraveShieldsHandler::SetHTTPSEverywhereEnabled(
     const base::ListValue* args) {
   CHECK_EQ(args->GetSize(), 1U);
   CHECK(profile_);
   bool value;
   args->GetBoolean(0, &value);
 
-  brave_shields::SetHTTPSEverywhereControlType(profile_,
-                                               value ? ControlType::BLOCK
-                                                     : ControlType::ALLOW,
-                                               GURL());
+  brave_shields::SetHTTPSEverywhereEnabled(profile_,
+                                           value,
+                                           GURL());
 }
 
 void DefaultBraveShieldsHandler::SetNoScriptControlType(
diff --git a/browser/ui/webui/settings/default_brave_shields_handler.h b/browser/ui/webui/settings/default_brave_shields_handler.h
index a2711cc5119..37955d80a24 100644
--- a/browser/ui/webui/settings/default_brave_shields_handler.h
+++ b/browser/ui/webui/settings/default_brave_shields_handler.h
@@ -1,4 +1,5 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
@@ -26,8 +27,8 @@ class DefaultBraveShieldsHandler : public settings::SettingsPageUIHandler {
   void GetCookieControlType(const base::ListValue* args);
   void SetFingerprintingControlType(const base::ListValue* args);
   void GetFingerprintingControlType(const base::ListValue* args);
-  void SetHTTPSEverywhereControlType(const base::ListValue* args);
-  void GetHTTPSEverywhereControlType(const base::ListValue* args);
+  void SetHTTPSEverywhereEnabled(const base::ListValue* args);
+  void GetHTTPSEverywhereEnabled(const base::ListValue* args);
   void SetNoScriptControlType(const base::ListValue* args);
   void GetNoScriptControlType(const base::ListValue* args);
 
diff --git a/common/extensions/api/brave_shields.json b/common/extensions/api/brave_shields.json
index f60b6008ac4..e52b041cfd4 100644
--- a/common/extensions/api/brave_shields.json
+++ b/common/extensions/api/brave_shields.json
@@ -29,22 +29,28 @@
     ],
     "functions": [
       {
-        "name": "setBraveShieldsControlType",
+        "name": "setBraveShieldsEnabled",
         "type": "function",
         "description": "Set brave shields control type for a url",
         "parameters": [
           {
-            "name": "controlType",
-            "type": "string"
+            "name": "enabled",
+            "type": "boolean"
           },
           {
             "name": "url",
             "type": "string"
+          },
+          {
+            "type": "function",
+            "name": "callback",
+            "optional": true,
+            "parameters": []
           }
         ]
       },
       {
-        "name": "getBraveShieldsControlType",
+        "name": "getBraveShieldsEnabled",
         "type": "function",
         "description": "Get brave shields control type for a url",
         "parameters": [
@@ -57,8 +63,8 @@
             "name": "callback",
             "parameters": [
               {
-                "name": "controlType",
-                "type": "string"
+                "name": "enabled",
+                "type": "boolean"
               }
             ]
           }
@@ -76,6 +82,12 @@
           {
             "name": "url",
             "type": "string"
+          },
+          {
+            "type": "function",
+            "name": "callback",
+            "optional": true,
+            "parameters": []
           }
         ]
       },
@@ -112,6 +124,12 @@
           {
             "name": "url",
             "type": "string"
+          },
+          {
+            "type": "function",
+            "name": "callback",
+            "optional": true,
+            "parameters": []
           }
         ]
       },
@@ -148,6 +166,12 @@
           {
             "name": "url",
             "type": "string"
+          },
+          {
+            "type": "function",
+            "name": "callback",
+            "optional": true,
+            "parameters": []
           }
         ]
       },
@@ -173,22 +197,28 @@
         ]
       },
       {
-        "name": "setHTTPSEverywhereControlType",
+        "name": "setHTTPSEverywhereEnabled",
         "type": "function",
         "description": "Set httpse control type for a url",
         "parameters": [
           {
-            "name": "controlType",
-            "type": "string"
+            "name": "enabled",
+            "type": "boolean"
           },
           {
             "name": "url",
             "type": "string"
+          },
+          {
+            "type": "function",
+            "name": "callback",
+            "optional": true,
+            "parameters": []
           }
         ]
       },
       {
-        "name": "getHTTPSEverywhereControlType",
+        "name": "getHTTPSEverywhereEnabled",
         "type": "function",
         "description": "Get httpse control type for a url",
         "parameters": [
@@ -201,8 +231,8 @@
             "name": "callback",
             "parameters": [
               {
-                "name": "controlType",
-                "type": "string"
+                "name": "enabled",
+                "type": "boolean"
               }
             ]
           }
@@ -220,6 +250,12 @@
           {
             "name": "url",
             "type": "string"
+          },
+          {
+            "type": "function",
+            "name": "callback",
+            "optional": true,
+            "parameters": []
           }
         ]
       },
diff --git a/components/brave_extension/extension/brave_extension/background.ts b/components/brave_extension/extension/brave_extension/background.ts
index 35ee4f1de77..d7cb83657df 100644
--- a/components/brave_extension/extension/brave_extension/background.ts
+++ b/components/brave_extension/extension/brave_extension/background.ts
@@ -7,7 +7,7 @@ global.Promise = bluebird
 
 function promisifier (method: any) {
   // return a function
-  return function promisified (...args: string[]) {
+  return function promisified (...args: any[]) {
     // which returns a promise
     return new Promise((resolve: any) => {
       args.push(resolve)
diff --git a/components/brave_extension/extension/brave_extension/background/api/shieldsAPI.ts b/components/brave_extension/extension/brave_extension/background/api/shieldsAPI.ts
index 45abb28b951..707480cbbde 100644
--- a/components/brave_extension/extension/brave_extension/background/api/shieldsAPI.ts
+++ b/components/brave_extension/extension/brave_extension/background/api/shieldsAPI.ts
@@ -21,9 +21,9 @@ export const getShieldSettingsForTabData = (tabData?: chrome.tabs.Tab) => {
   const hostname = url.hostname
 
   return Promise.all([
-    chrome.braveShields.getBraveShieldsControlTypeAsync(tabData.url),
+    chrome.braveShields.getBraveShieldsEnabledAsync(tabData.url),
     chrome.braveShields.getAdControlTypeAsync(tabData.url),
-    chrome.braveShields.getHTTPSEverywhereControlTypeAsync(tabData.url),
+    chrome.braveShields.getHTTPSEverywhereEnabledAsync(tabData.url),
     chrome.braveShields.getNoScriptControlTypeAsync(tabData.url),
     chrome.braveShields.getFingerprintingControlTypeAsync(tabData.url),
     chrome.braveShields.getCookieControlTypeAsync(tabData.url)
@@ -33,10 +33,10 @@ export const getShieldSettingsForTabData = (tabData?: chrome.tabs.Tab) => {
       origin,
       hostname,
       id: tabData.id,
-      braveShields: details[0],
+      braveShields: details[0] ? 'allow' : 'block',
       ads: details[1],
       trackers: details[1],
-      httpUpgradableResources: details[2],
+      httpUpgradableResources: details[2] ? 'block' : 'allow',
       javascript: details[3],
       fingerprinting: details[4],
       cookies: details[5]
@@ -83,7 +83,7 @@ export const requestShieldPanelData = (tabId: number) =>
  * @return a promise which resolves when the setting is set
  */
 export const setAllowBraveShields = (origin: string, setting: string) =>
-  chrome.braveShields.setBraveShieldsControlTypeAsync(setting, origin)
+  chrome.braveShields.setBraveShieldsEnabledAsync(setting === 'allow' ? true : false, origin)
 
 /**
  * Changes the ads at origin to be allowed or blocked.
@@ -102,8 +102,9 @@ export const setAllowAds = (origin: string, setting: string) =>
  * @param {string} setting 'allow' or 'block'
  * @return a promise which resolves with the setting is set
  */
-export const setAllowTrackers = (origin: string, setting: string) =>
-  chrome.braveShields.setAdControlTypeAsync(setting, origin)
+export const setAllowTrackers = (origin: string, setting: string) => {
+  return chrome.braveShields.setAdControlTypeAsync(setting, origin)
+}
 
 /**
  * Changes the http upgrdabable resources to be allows as is or blocked.
@@ -112,7 +113,7 @@ export const setAllowTrackers = (origin: string, setting: string) =>
  * @return a promise which resolves when the setting is set
  */
 export const setAllowHTTPUpgradableResources = (origin: string, setting: BlockOptions) =>
-  chrome.braveShields.setHTTPSEverywhereControlTypeAsync(setting, origin)
+  chrome.braveShields.setHTTPSEverywhereEnabledAsync(setting === 'allow' ? false : true, origin)
 
 /**
  * Changes the Javascript to be on (allow) or off (block)
diff --git a/components/brave_extension/extension/brave_extension/components/advancedView/header.tsx b/components/brave_extension/extension/brave_extension/components/advancedView/header.tsx
index 4c1194278b0..4f0ba5d17fe 100644
--- a/components/brave_extension/extension/brave_extension/components/advancedView/header.tsx
+++ b/components/brave_extension/extension/brave_extension/components/advancedView/header.tsx
@@ -28,8 +28,7 @@ import {
 import { getLocale } from '../../background/api/localeAPI'
 import {
   blockedResourcesSize,
-  getTotalBlockedSizeStrings,
-  getToggleStateViaEventTarget
+  getTotalBlockedSizeStrings
 } from '../../helpers/shieldsUtils'
 
 // Types
@@ -71,8 +70,8 @@ export default class Header extends React.PureComponent<Props, {}> {
     return getTotalBlockedSizeStrings(this.blockedItemsSize, httpsUpgrades)
   }
 
-  onToggleShields = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const shieldsOption: BlockOptions = getToggleStateViaEventTarget(event)
+  onToggleShieldsMain = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const shieldsOption: BlockOptions = event.target.checked ? 'allow' : 'block'
     this.props.shieldsToggled(shieldsOption)
   }
 
@@ -91,7 +90,7 @@ export default class Header extends React.PureComponent<Props, {}> {
             </MainToggleHeading>
             {enabled ? <MainToggleText>{getLocale('enabledMessage')}</MainToggleText> : null}
           </div>
-          <Toggle id='mainToggle' size='large' checked={enabled} onChange={this.onToggleShields} disabled={isBlockedListOpen} />
+          <Toggle id='mainToggle' size='large' checked={enabled} onChange={this.onToggleShieldsMain} disabled={isBlockedListOpen} />
         </MainToggle>
         <SiteOverview status={enabled ? 'enabled' : 'disabled'}>
           <SiteInfo>
diff --git a/components/brave_shields/browser/brave_shields_util.cc b/components/brave_shields/browser/brave_shields_util.cc
index 364b7c13884..9cc76fec838 100644
--- a/components/brave_shields/browser/brave_shields_util.cc
+++ b/components/brave_shields/browser/brave_shields_util.cc
@@ -97,11 +97,27 @@ ControlType ControlTypeFromString(const std::string& string) {
   }
 }
 
-void SetBraveShieldsControlType(Profile* profile,
-                                ControlType type,
-                                const GURL& url) {
-  DCHECK(type != ControlType::BLOCK_THIRD_PARTY);
+void SetBraveShieldsEnabled(Profile* profile,
+                        bool enable,
+                        const GURL& url) {
+  if (url.is_valid() && !url.SchemeIsHTTPOrHTTPS())
+    return;
+
+  auto primary_pattern = GetPatternFromURL(url, true);
 
+  if (!primary_pattern.IsValid())
+    return;
+
+  HostContentSettingsMapFactory::GetForProfile(profile)
+      ->SetContentSettingCustomScope(
+          primary_pattern, ContentSettingsPattern::Wildcard(),
+          CONTENT_SETTINGS_TYPE_PLUGINS, kBraveShields,
+          // this is 'allow_brave_shields' so 'enable' == 'allow'
+          enable ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
+}
+
+void ResetBraveShieldsEnabled(Profile* profile,
+                              const GURL& url) {
   if (url.is_valid() && !url.SchemeIsHTTPOrHTTPS())
     return;
 
@@ -114,27 +130,28 @@ void SetBraveShieldsControlType(Profile* profile,
       ->SetContentSettingCustomScope(
           primary_pattern, ContentSettingsPattern::Wildcard(),
           CONTENT_SETTINGS_TYPE_PLUGINS, kBraveShields,
-          GetDefaultAllowFromControlType(type));
+          CONTENT_SETTING_DEFAULT);
 }
 
-ControlType GetBraveShieldsControlType(Profile* profile, const GURL& url) {
+bool GetBraveShieldsEnabled(Profile* profile, const GURL& url) {
   if (url.is_valid() && !url.SchemeIsHTTPOrHTTPS())
-    return ControlType::BLOCK;
+    return false;
 
   ContentSetting setting =
       HostContentSettingsMapFactory::GetForProfile(profile)->GetContentSetting(
           url, GURL(), CONTENT_SETTINGS_TYPE_PLUGINS, kBraveShields);
 
-  return setting == CONTENT_SETTING_BLOCK ? ControlType::BLOCK
-                                          : ControlType::ALLOW;
+  // see EnableBraveShields - allow and default == true
+  return setting == CONTENT_SETTING_BLOCK ? false : true;
 }
 
 void SetAdControlType(Profile* profile, ControlType type, const GURL& url) {
   DCHECK(type != ControlType::BLOCK_THIRD_PARTY);
   auto primary_pattern = GetPatternFromURL(url);
 
-  if (!primary_pattern.IsValid())
+  if (!primary_pattern.IsValid()) {
     return;
+  }
 
   HostContentSettingsMapFactory::GetForProfile(profile)
       ->SetContentSettingCustomScope(primary_pattern,
@@ -239,10 +256,9 @@ ControlType GetFingerprintingControlType(Profile* profile, const GURL& url) {
   }
 }
 
-void SetHTTPSEverywhereControlType(Profile* profile,
-                                   ControlType type,
-                                   const GURL& url) {
-  DCHECK(type != ControlType::BLOCK_THIRD_PARTY);
+void SetHTTPSEverywhereEnabled(Profile* profile,
+                               bool enable,
+                               const GURL& url) {
   auto primary_pattern = GetPatternFromURL(url, true);
 
   if (!primary_pattern.IsValid())
@@ -252,17 +268,32 @@ void SetHTTPSEverywhereControlType(Profile* profile,
       ->SetContentSettingCustomScope(
           primary_pattern, ContentSettingsPattern::Wildcard(),
           CONTENT_SETTINGS_TYPE_PLUGINS, kHTTPUpgradableResources,
-          type == ControlType::ALLOW ? CONTENT_SETTING_ALLOW
-                                     : CONTENT_SETTING_BLOCK);
+          // this is 'allow_http_upgradeable_resources' so enabling
+          // httpse will set the value to 'BLOCK'
+          enable ? CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW);
 }
 
-ControlType GetHTTPSEverywhereControlType(Profile* profile, const GURL& url) {
+void ResetHTTPSEverywhereEnabled(Profile* profile,
+                               bool enable,
+                               const GURL& url) {
+  auto primary_pattern = GetPatternFromURL(url, true);
+
+  if (!primary_pattern.IsValid())
+    return;
+
+  HostContentSettingsMapFactory::GetForProfile(profile)
+      ->SetContentSettingCustomScope(
+          primary_pattern, ContentSettingsPattern::Wildcard(),
+          CONTENT_SETTINGS_TYPE_PLUGINS, kHTTPUpgradableResources,
+          CONTENT_SETTING_DEFAULT);
+}
+
+bool GetHTTPSEverywhereEnabled(Profile* profile, const GURL& url) {
   ContentSetting setting =
       HostContentSettingsMapFactory::GetForProfile(profile)->GetContentSetting(
           url, GURL(), CONTENT_SETTINGS_TYPE_PLUGINS, kHTTPUpgradableResources);
 
-  return setting == CONTENT_SETTING_ALLOW ? ControlType::ALLOW
-                                          : ControlType::BLOCK;
+  return setting == CONTENT_SETTING_ALLOW ? false : true;
 }
 
 void SetNoScriptControlType(Profile* profile,
diff --git a/components/brave_shields/browser/brave_shields_util.h b/components/brave_shields/browser/brave_shields_util.h
index eab6be22273..ad54c83a463 100644
--- a/components/brave_shields/browser/brave_shields_util.h
+++ b/components/brave_shields/browser/brave_shields_util.h
@@ -35,10 +35,10 @@ ContentSettingsPattern GetPatternFromURL(const GURL& url,
 std::string ControlTypeToString(ControlType type);
 ControlType ControlTypeFromString(const std::string& string);
 
-void SetBraveShieldsControlType(Profile* profile,
-                                ControlType type,
-                                const GURL& url);
-ControlType GetBraveShieldsControlType(Profile* profile, const GURL& url);
+void SetBraveShieldsEnabled(Profile* profile, bool enable, const GURL& url);
+// reset to the default value
+void ResetBraveShieldsEnabled(Profile* profile, const GURL& url);
+bool GetBraveShieldsEnabled(Profile* profile, const GURL& url);
 
 void SetAdControlType(Profile* profile, ControlType type, const GURL& url);
 ControlType GetAdControlType(Profile* profile, const GURL& url);
@@ -51,10 +51,11 @@ void SetFingerprintingControlType(Profile* profile,
                                   const GURL& url);
 ControlType GetFingerprintingControlType(Profile* profile, const GURL& url);
 
-void SetHTTPSEverywhereControlType(Profile* profile,
-                                   ControlType type,
-                                   const GURL& url);
-ControlType GetHTTPSEverywhereControlType(Profile* profile, const GURL& url);
+void SetHTTPSEverywhereEnabled(Profile* profile, bool enable, const GURL& url);
+// reset to the default value
+void SetHTTPSEverywhereEnabled(Profile* profile, bool enable, const GURL& url);
+void ResetHTTPSEverywhereEnabled(Profile* profile, const GURL& url);
+bool GetHTTPSEverywhereEnabled(Profile* profile, const GURL& url);
 
 void SetNoScriptControlType(Profile* profile,
                             ControlType type,
diff --git a/components/brave_shields/browser/brave_shields_util_unittest.cc b/components/brave_shields/browser/brave_shields_util_unittest.cc
index 6db17035099..c808f54dde8 100644
--- a/components/brave_shields/browser/brave_shields_util_unittest.cc
+++ b/components/brave_shields/browser/brave_shields_util_unittest.cc
@@ -108,7 +108,7 @@ TEST_F(BraveShieldsUtilTest, ControlTypeFromString) {
 }
 
 /* BRAVE_SHIELDS CONTROL */
-TEST_F(BraveShieldsUtilTest, SetBraveShieldsControlType_Default) {
+TEST_F(BraveShieldsUtilTest, SetBraveShieldsEnabled_Default) {
   auto* map = HostContentSettingsMapFactory::GetForProfile(profile());
   // settings should be default
   auto setting =
@@ -120,9 +120,8 @@ TEST_F(BraveShieldsUtilTest, SetBraveShieldsControlType_Default) {
                                    brave_shields::kBraveShields);
   EXPECT_EQ(CONTENT_SETTING_DEFAULT, setting);
 
-  /* ALLOW */
-  brave_shields::SetBraveShieldsControlType(profile(), ControlType::ALLOW,
-                                            GURL());
+  /* enabled */
+  brave_shields::SetBraveShieldsEnabled(profile(), true, GURL());
   setting =
       map->GetContentSetting(GURL(), GURL(), CONTENT_SETTINGS_TYPE_PLUGINS,
                              brave_shields::kBraveShields);
@@ -134,9 +133,8 @@ TEST_F(BraveShieldsUtilTest, SetBraveShieldsControlType_Default) {
                                    brave_shields::kBraveShields);
   EXPECT_EQ(CONTENT_SETTING_ALLOW, setting);
 
-  /* BLOCK */
-  brave_shields::SetBraveShieldsControlType(profile(), ControlType::BLOCK,
-                                            GURL());
+  /* disabled */
+  brave_shields::SetBraveShieldsEnabled(profile(), false, GURL());
   setting =
       map->GetContentSetting(GURL(), GURL(), CONTENT_SETTINGS_TYPE_PLUGINS,
                              brave_shields::kBraveShields);
@@ -149,8 +147,7 @@ TEST_F(BraveShieldsUtilTest, SetBraveShieldsControlType_Default) {
   EXPECT_EQ(CONTENT_SETTING_BLOCK, setting);
 
   /* DEFAULT */
-  brave_shields::SetBraveShieldsControlType(profile(), ControlType::DEFAULT,
-                                            GURL());
+  brave_shields::ResetBraveShieldsEnabled(profile(), GURL());
   setting =
       map->GetContentSetting(GURL(), GURL(), CONTENT_SETTINGS_TYPE_PLUGINS,
                              brave_shields::kBraveShields);
@@ -163,11 +160,11 @@ TEST_F(BraveShieldsUtilTest, SetBraveShieldsControlType_Default) {
   EXPECT_EQ(CONTENT_SETTING_DEFAULT, setting);
 }
 
-TEST_F(BraveShieldsUtilTest, SetBraveShieldsControlType_ForOrigin) {
+TEST_F(BraveShieldsUtilTest, SetBraveShieldsEnabled_ForOrigin) {
   auto* map = HostContentSettingsMapFactory::GetForProfile(profile());
 
-  brave_shields::SetBraveShieldsControlType(profile(), ControlType::ALLOW,
-                                            GURL("http://brave.com"));
+  brave_shields::SetBraveShieldsEnabled(profile(), true,
+                                        GURL("http://brave.com"));
   // setting should apply to origin
   auto setting = map->GetContentSetting(GURL("http://brave.com"), GURL(),
                                         CONTENT_SETTINGS_TYPE_PLUGINS,
@@ -187,76 +184,76 @@ TEST_F(BraveShieldsUtilTest, SetBraveShieldsControlType_ForOrigin) {
   EXPECT_EQ(CONTENT_SETTING_DEFAULT, setting);
 }
 
-TEST_F(BraveShieldsUtilTest, SetBraveShieldsControlType_IsNotHttpHttps) {
-  auto setting = brave_shields::GetBraveShieldsControlType(
+TEST_F(BraveShieldsUtilTest, SetBraveShieldsEnabled_IsNotHttpHttps) {
+  auto setting = brave_shields::GetBraveShieldsEnabled(
       profile(), GURL("chrome://preferences"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
-  brave_shields::SetBraveShieldsControlType(profile(), ControlType::ALLOW,
-                                            GURL("chrome://preferences"));
-  setting = brave_shields::GetBraveShieldsControlType(
-      profile(), GURL("chrome://preferences"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  EXPECT_EQ(false, setting);
+  brave_shields::SetBraveShieldsEnabled(profile(), ControlType::ALLOW,
+                                        GURL("chrome://preferences"));
+  setting = brave_shields::GetBraveShieldsEnabled(profile(),
+                                                  GURL("chrome://preferences"));
+  EXPECT_EQ(false, setting);
 
   setting =
-      brave_shields::GetBraveShieldsControlType(profile(), GURL("about:blank"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
-  brave_shields::SetBraveShieldsControlType(profile(), ControlType::ALLOW,
-                                            GURL("about:blank"));
-  setting = brave_shields::GetBraveShieldsControlType(
-      profile(), GURL("about:blank"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
+      brave_shields::GetBraveShieldsEnabled(profile(), GURL("about:blank"));
+  EXPECT_EQ(false, setting);
+  brave_shields::SetBraveShieldsEnabled(profile(), ControlType::ALLOW,
+                                        GURL("about:blank"));
+  setting =
+      brave_shields::GetBraveShieldsEnabled(profile(), GURL("about:blank"));
+  EXPECT_EQ(false, setting);
 }
 
-TEST_F(BraveShieldsUtilTest, GetBraveShieldsControlType_Default) {
+TEST_F(BraveShieldsUtilTest, GetBraveShieldsEnabled_Default) {
   auto* map = HostContentSettingsMapFactory::GetForProfile(profile());
 
-  auto setting = brave_shields::GetBraveShieldsControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::ALLOW, setting);
+  auto setting = brave_shields::GetBraveShieldsEnabled(profile(), GURL());
+  EXPECT_EQ(true, setting);
 
   /* BLOCK */
   map->SetContentSettingCustomScope(
       ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_PLUGINS, brave_shields::kBraveShields,
       CONTENT_SETTING_BLOCK);
-  setting = brave_shields::GetBraveShieldsControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(), GURL());
+  EXPECT_EQ(false, setting);
 
   /* ALLOW */
   map->SetContentSettingCustomScope(
       ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_PLUGINS, brave_shields::kBraveShields,
       CONTENT_SETTING_ALLOW);
-  setting = brave_shields::GetBraveShieldsControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::ALLOW, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(), GURL());
+  EXPECT_EQ(true, setting);
 }
 
-TEST_F(BraveShieldsUtilTest, GetBraveShieldsControlType_ForOrigin) {
+TEST_F(BraveShieldsUtilTest, GetBraveShieldsEnabled_ForOrigin) {
   auto* map = HostContentSettingsMapFactory::GetForProfile(profile());
 
-  auto setting = brave_shields::GetBraveShieldsControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::ALLOW, setting);
-  setting = brave_shields::GetBraveShieldsControlType(profile(),
-                                                      GURL("http://brave.com"));
-  EXPECT_EQ(ControlType::ALLOW, setting);
-  setting = brave_shields::GetBraveShieldsControlType(
-      profile(), GURL("https://brave.com"));
-  EXPECT_EQ(ControlType::ALLOW, setting);
+  auto setting = brave_shields::GetBraveShieldsEnabled(profile(), GURL());
+  EXPECT_EQ(true, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(),
+                                                  GURL("http://brave.com"));
+  EXPECT_EQ(true, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(),
+                                                  GURL("https://brave.com"));
+  EXPECT_EQ(true, setting);
 
   /* BLOCK */
   map->SetContentSettingCustomScope(
       ContentSettingsPattern::FromString("http://brave.com/*"),
       ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_PLUGINS,
       brave_shields::kBraveShields, CONTENT_SETTING_BLOCK);
-  setting = brave_shields::GetBraveShieldsControlType(
-      profile(), GURL("http://brave.com/*"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(),
+                                                  GURL("http://brave.com/*"));
+  EXPECT_EQ(false, setting);
   // https in unchanged
-  setting = brave_shields::GetBraveShieldsControlType(
-      profile(), GURL("https://brave.com"));
-  EXPECT_EQ(ControlType::ALLOW, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(),
+                                                  GURL("https://brave.com"));
+  EXPECT_EQ(true, setting);
   // default is unchanged
-  setting = brave_shields::GetBraveShieldsControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::ALLOW, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(), GURL());
+  EXPECT_EQ(true, setting);
 
   /* ALLOW */
   // change default to block
@@ -264,41 +261,41 @@ TEST_F(BraveShieldsUtilTest, GetBraveShieldsControlType_ForOrigin) {
       ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_PLUGINS, brave_shields::kBraveShields,
       CONTENT_SETTING_BLOCK);
-  setting = brave_shields::GetBraveShieldsControlType(profile(),
-                                                      GURL("http://brave.com"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
-  setting = brave_shields::GetBraveShieldsControlType(
-      profile(), GURL("https://brave.com"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
-  setting = brave_shields::GetBraveShieldsControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(),
+                                                  GURL("http://brave.com"));
+  EXPECT_EQ(false, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(),
+                                                  GURL("https://brave.com"));
+  EXPECT_EQ(false, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(), GURL());
+  EXPECT_EQ(false, setting);
 
   // set override to allow
   map->SetContentSettingCustomScope(
       ContentSettingsPattern::FromString("http://brave.com/*"),
       ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_PLUGINS,
       brave_shields::kBraveShields, CONTENT_SETTING_ALLOW);
-  setting = brave_shields::GetBraveShieldsControlType(profile(),
-                                                      GURL("http://brave.com"));
-  EXPECT_EQ(ControlType::ALLOW, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(),
+                                                  GURL("http://brave.com"));
+  EXPECT_EQ(true, setting);
 
   // https in unchanged
-  setting = brave_shields::GetBraveShieldsControlType(
-      profile(), GURL("https://brave.com"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(),
+                                                  GURL("https://brave.com"));
+  EXPECT_EQ(false, setting);
   // default is unchanged
-  setting = brave_shields::GetBraveShieldsControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  setting = brave_shields::GetBraveShieldsEnabled(profile(), GURL());
+  EXPECT_EQ(false, setting);
 }
 
-TEST_F(BraveShieldsUtilTest, GetBraveShieldsControlType_IsNotHttpHttps) {
-  auto setting = brave_shields::GetBraveShieldsControlType(
+TEST_F(BraveShieldsUtilTest, GetBraveShieldsEnabled_IsNotHttpHttps) {
+  auto setting = brave_shields::GetBraveShieldsEnabled(
       profile(), GURL("chrome://preferences"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  EXPECT_EQ(false, setting);
 
   setting =
-      brave_shields::GetBraveShieldsControlType(profile(), GURL("about:blank"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
+      brave_shields::GetBraveShieldsEnabled(profile(), GURL("about:blank"));
+  EXPECT_EQ(false, setting);
 }
 
 /* AD CONTROL */
@@ -909,7 +906,7 @@ TEST_F(BraveShieldsUtilTest, GetFingerprintingControlType_ForOrigin) {
 }
 
 /* HTTPSEVERYWHERE CONTROL */
-TEST_F(BraveShieldsUtilTest, SetHTTPSEverywhereControlType_Default) {
+TEST_F(BraveShieldsUtilTest, SetHTTPSEverywhereEnabled_Default) {
   auto* map = HostContentSettingsMapFactory::GetForProfile(profile());
   // settings should be default
   auto setting =
@@ -921,9 +918,8 @@ TEST_F(BraveShieldsUtilTest, SetHTTPSEverywhereControlType_Default) {
                                    brave_shields::kHTTPUpgradableResources);
   EXPECT_EQ(CONTENT_SETTING_DEFAULT, setting);
 
-  /* ALLOW */
-  brave_shields::SetHTTPSEverywhereControlType(profile(), ControlType::ALLOW,
-                                               GURL());
+  /* disabled */
+  brave_shields::SetHTTPSEverywhereEnabled(profile(), false, GURL());
   setting =
       map->GetContentSetting(GURL(), GURL(), CONTENT_SETTINGS_TYPE_PLUGINS,
                              brave_shields::kHTTPUpgradableResources);
@@ -935,9 +931,8 @@ TEST_F(BraveShieldsUtilTest, SetHTTPSEverywhereControlType_Default) {
                                    brave_shields::kHTTPUpgradableResources);
   EXPECT_EQ(CONTENT_SETTING_ALLOW, setting);
 
-  /* BLOCK */
-  brave_shields::SetHTTPSEverywhereControlType(profile(), ControlType::BLOCK,
-                                               GURL());
+  /* enabled */
+  brave_shields::SetHTTPSEverywhereEnabled(profile(), true, GURL());
   setting =
       map->GetContentSetting(GURL(), GURL(), CONTENT_SETTINGS_TYPE_PLUGINS,
                              brave_shields::kHTTPUpgradableResources);
@@ -950,11 +945,11 @@ TEST_F(BraveShieldsUtilTest, SetHTTPSEverywhereControlType_Default) {
   EXPECT_EQ(CONTENT_SETTING_BLOCK, setting);
 }
 
-TEST_F(BraveShieldsUtilTest, SetHTTPSEverywhereControlType_ForOrigin) {
+TEST_F(BraveShieldsUtilTest, SetHTTPSEverywhereEnabled_ForOrigin) {
   auto* map = HostContentSettingsMapFactory::GetForProfile(profile());
 
-  brave_shields::SetHTTPSEverywhereControlType(profile(), ControlType::ALLOW,
-                                               GURL("http://brave.com"));
+  brave_shields::SetHTTPSEverywhereEnabled(profile(), false,
+                                           GURL("http://brave.com"));
   // setting should apply to origin
   auto setting = map->GetContentSetting(
       GURL("http://brave.com"), GURL(), CONTENT_SETTINGS_TYPE_PLUGINS,
@@ -974,59 +969,57 @@ TEST_F(BraveShieldsUtilTest, SetHTTPSEverywhereControlType_ForOrigin) {
   EXPECT_EQ(CONTENT_SETTING_DEFAULT, setting);
 }
 
-TEST_F(BraveShieldsUtilTest, GetHTTPSEverywhereControlType_Default) {
+TEST_F(BraveShieldsUtilTest, GetHTTPSEverywhereEnabled_Default) {
   auto* map = HostContentSettingsMapFactory::GetForProfile(profile());
 
-  auto setting =
-      brave_shields::GetHTTPSEverywhereControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  auto setting = brave_shields::GetHTTPSEverywhereEnabled(profile(), GURL());
+  EXPECT_EQ(true, setting);
 
   /* ALLOW */
   map->SetContentSettingCustomScope(
       ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_PLUGINS, brave_shields::kHTTPUpgradableResources,
       CONTENT_SETTING_ALLOW);
-  setting = brave_shields::GetHTTPSEverywhereControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::ALLOW, setting);
+  setting = brave_shields::GetHTTPSEverywhereEnabled(profile(), GURL());
+  EXPECT_EQ(false, setting);
 
   /* BLOCK */
   map->SetContentSettingCustomScope(
       ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_PLUGINS, brave_shields::kHTTPUpgradableResources,
       CONTENT_SETTING_BLOCK);
-  setting = brave_shields::GetHTTPSEverywhereControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  setting = brave_shields::GetHTTPSEverywhereEnabled(profile(), GURL());
+  EXPECT_EQ(true, setting);
 }
 
-TEST_F(BraveShieldsUtilTest, GetHTTPSEverywhereControlType_ForOrigin) {
+TEST_F(BraveShieldsUtilTest, GetHTTPSEverywhereEnabled_ForOrigin) {
   auto* map = HostContentSettingsMapFactory::GetForProfile(profile());
 
-  auto setting =
-      brave_shields::GetHTTPSEverywhereControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::BLOCK, setting);
-  setting = brave_shields::GetHTTPSEverywhereControlType(
-      profile(), GURL("http://brave.com"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
-  setting = brave_shields::GetHTTPSEverywhereControlType(
-      profile(), GURL("https://brave.com"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  auto setting = brave_shields::GetHTTPSEverywhereEnabled(profile(), GURL());
+  EXPECT_EQ(true, setting);
+  setting = brave_shields::GetHTTPSEverywhereEnabled(profile(),
+                                                     GURL("http://brave.com"));
+  EXPECT_EQ(true, setting);
+  setting = brave_shields::GetHTTPSEverywhereEnabled(profile(),
+                                                     GURL("https://brave.com"));
+  EXPECT_EQ(true, setting);
 
   /* ALLOW */
   map->SetContentSettingCustomScope(
       ContentSettingsPattern::FromString("http://brave.com/*"),
       ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_PLUGINS,
       brave_shields::kHTTPUpgradableResources, CONTENT_SETTING_ALLOW);
-  setting = brave_shields::GetHTTPSEverywhereControlType(
-      profile(), GURL("http://brave.com"));
+  setting = brave_shields::GetHTTPSEverywhereEnabled(profile(),
+                                                     GURL("http://brave.com"));
   EXPECT_EQ(ControlType::ALLOW, setting);
 
   // https in unchanged
-  setting = brave_shields::GetHTTPSEverywhereControlType(
-      profile(), GURL("https://brave.com"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  setting = brave_shields::GetHTTPSEverywhereEnabled(profile(),
+                                                     GURL("https://brave.com"));
+  EXPECT_EQ(true, setting);
   // default is unchanged
-  setting = brave_shields::GetHTTPSEverywhereControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  setting = brave_shields::GetHTTPSEverywhereEnabled(profile(), GURL());
+  EXPECT_EQ(true, setting);
 
   /* BLOCK */
   // change default to allow
@@ -1034,13 +1027,13 @@ TEST_F(BraveShieldsUtilTest, GetHTTPSEverywhereControlType_ForOrigin) {
       ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_PLUGINS, brave_shields::kHTTPUpgradableResources,
       CONTENT_SETTING_ALLOW);
-  setting = brave_shields::GetHTTPSEverywhereControlType(
-      profile(), GURL("http://brave.com"));
+  setting = brave_shields::GetHTTPSEverywhereEnabled(profile(),
+                                                     GURL("http://brave.com"));
   EXPECT_EQ(ControlType::ALLOW, setting);
-  setting = brave_shields::GetHTTPSEverywhereControlType(
-      profile(), GURL("https://brave.com"));
+  setting = brave_shields::GetHTTPSEverywhereEnabled(profile(),
+                                                     GURL("https://brave.com"));
   EXPECT_EQ(ControlType::ALLOW, setting);
-  setting = brave_shields::GetHTTPSEverywhereControlType(profile(), GURL());
+  setting = brave_shields::GetHTTPSEverywhereEnabled(profile(), GURL());
   EXPECT_EQ(ControlType::ALLOW, setting);
 
   // set override to block
@@ -1048,16 +1041,16 @@ TEST_F(BraveShieldsUtilTest, GetHTTPSEverywhereControlType_ForOrigin) {
       ContentSettingsPattern::FromString("http://brave.com/*"),
       ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_PLUGINS,
       brave_shields::kHTTPUpgradableResources, CONTENT_SETTING_BLOCK);
-  setting = brave_shields::GetHTTPSEverywhereControlType(
+  setting = brave_shields::GetHTTPSEverywhereEnabled(
       profile(), GURL("http://brave.com/*"));
-  EXPECT_EQ(ControlType::BLOCK, setting);
+  EXPECT_EQ(true, setting);
   // https in unchanged
-  setting = brave_shields::GetHTTPSEverywhereControlType(
-      profile(), GURL("https://brave.com"));
-  EXPECT_EQ(ControlType::ALLOW, setting);
+  setting = brave_shields::GetHTTPSEverywhereEnabled(profile(),
+                                                     GURL("https://brave.com"));
+  EXPECT_EQ(false, setting);
   // default is unchanged
-  setting = brave_shields::GetHTTPSEverywhereControlType(profile(), GURL());
-  EXPECT_EQ(ControlType::ALLOW, setting);
+  setting = brave_shields::GetHTTPSEverywhereEnabled(profile(), GURL());
+  EXPECT_EQ(false, setting);
 }
 
 /* NOSCRIPT CONTROL */
diff --git a/components/definitions/chromel.d.ts b/components/definitions/chromel.d.ts
index e593183539f..9f73ddf5e9c 100644
--- a/components/definitions/chromel.d.ts
+++ b/components/definitions/chromel.d.ts
@@ -139,16 +139,16 @@ declare namespace chrome.braveShields {
   }
 
   const allowScriptsOnce: any
-  const setBraveShieldsControlTypeAsync: any
-  const getBraveShieldsControlTypeAsync: any
+  const setBraveShieldsEnabledAsync: any
+  const getBraveShieldsEnabledAsync: any
   const setAdControlTypeAsync: any
   const getAdControlTypeAsync: any
   const setCookieControlTypeAsync: any
   const getCookieControlTypeAsync: any
   const setFingerprintingControlTypeAsync: any
   const getFingerprintingControlTypeAsync: any
-  const setHTTPSEverywhereControlTypeAsync: any
-  const getHTTPSEverywhereControlTypeAsync: any
+  const setHTTPSEverywhereEnabledAsync: any
+  const getHTTPSEverywhereEnabledAsync: any
   const setNoScriptControlTypeAsync: any
   const getNoScriptControlTypeAsync: any
 }
diff --git a/components/test/brave_extension/background/api/shieldsAPI_test.ts b/components/test/brave_extension/background/api/shieldsAPI_test.ts
index 178948e72db..0617eac5aa7 100644
--- a/components/test/brave_extension/background/api/shieldsAPI_test.ts
+++ b/components/test/brave_extension/background/api/shieldsAPI_test.ts
@@ -142,12 +142,12 @@ describe('Shields API', () => {
   describe('setAllowHTTPUpgradableResource', () => {
     let spy: jest.SpyInstance
     beforeEach(() => {
-      spy = jest.spyOn(chrome.braveShields, 'setHTTPSEverywhereControlTypeAsync')
+      spy = jest.spyOn(chrome.braveShields, 'setHTTPSEverywhereEnabledAsync')
     })
     afterEach(() => {
       spy.mockRestore()
     })
-    it('calls chrome.braveShields.setHTTPSEverywhereControlTypeAsync with the correct args', () => {
+    it('calls chrome.braveShields.setHTTPSEverywhereEnabledAsync with the correct args', () => {
       shieldsAPI.setAllowHTTPUpgradableResources('https://www.brave.com', 'block')
         .catch(() => {
           expect(true).toBe(false)
@@ -155,7 +155,7 @@ describe('Shields API', () => {
       const arg0 = spy.mock.calls[0][0]
       const arg1 = spy.mock.calls[0][1]
       expect.assertions(2)
-      expect(arg0).toEqual('block')
+      expect(arg0).toEqual(true)
       expect(arg1).toEqual('https://www.brave.com')
     })
   })
diff --git a/components/test/testData.ts b/components/test/testData.ts
index b41964082a9..faea53a0265 100644
--- a/components/test/testData.ts
+++ b/components/test/testData.ts
@@ -191,8 +191,8 @@ export const getMockChrome = () => {
       allowScriptsOnce: function (origins: Array<string>, tabId: number, cb: () => void) {
         setImmediate(cb)
       },
-      getBraveShieldsControlTypeAsync: function (url: string) {
-        return Promise.resolve('block')
+      getBraveShieldsEnabledAsync: function (url: string) {
+        return Promise.resolve(false)
       },
       getAdControlTypeAsync: function (url: string) {
         return Promise.resolve('block')
@@ -203,13 +203,13 @@ export const getMockChrome = () => {
       getFingerprintingControlTypeAsync: function (url: string) {
         return Promise.resolve('block')
       },
-      getHTTPSEverywhereControlTypeAsync: function (url: string) {
-        return Promise.resolve('block')
+      getHTTPSEverywhereEnabledAsync: function (url: string) {
+        return Promise.resolve(true)
       },
       getNoScriptControlTypeAsync: function (url: string) {
         return Promise.resolve('block')
       },
-      setBraveShieldsControlTypeAsync: function (url: string, controlType: string) {
+      setBraveShieldsEnabledAsync: function (url: string, enabled: boolean) {
         return new Promise(() => [])
       },
       setAdControlTypeAsync: function (url: string, controlType: string) {
@@ -221,7 +221,7 @@ export const getMockChrome = () => {
       setFingerprintingControlTypeAsync: function (url: string, controlType: string) {
         return new Promise(() => [])
       },
-      setHTTPSEverywhereControlTypeAsync: function (url: string, controlType: string) {
+      setHTTPSEverywhereEnabledAsync: function (url: string, enabled: boolean) {
         return new Promise(() => [])
       },
       setNoScriptControlTypeAsync: function (url: string, controlType: string) {