diff --git a/CHANGELOG.md b/CHANGELOG.md
index 907adf30..71c18bf0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Support for `localeSwitcher`.
+
+## [2.18.0] - 2019-05-25
 
 ## [2.17.0] - 2019-04-29
+### Added
+- Added CSS Override class to header row background.
 
 ### Added
 - Allow `drawer` block on `header-row`. 
diff --git a/README.md b/README.md
index 48d5c01b..b3bc3f55 100644
--- a/README.md
+++ b/README.md
@@ -107,18 +107,18 @@ Note that every `header` implementation must append all required blocks within i
 
 Through the Storefront, you can change the headers's behavior and interface. However, you also can make in your theme app, as Store theme does.
 
-| Prop name              | Type      | Description                                       | Default value                                                            |
-| ---------------------- | --------- | ------------------------------------------------- | ------------------------------------------------------------------------ |
-| `leanWhen`             | `String`  | Cases in which the menu is in lean mode           | 'a^'                                                                     |
-| `linkUrl`              | `String`  | Address opened when the user clicks the logo      | '/'                                                                      |
-| `logoUrl`              | `String`  | URL of the logo image                             | N/A                                                                      |
-| `logoTitle`            | `String`  | Alt text for the logo                             | N/A                                                                      |
-| `logoSize`             | `Object`  | Sizes of logo in desktop and mobile               | `desktop: { width: 132, height: 40 }, mobile: { width: 90, height: 40 }` |
-| `showSearchBar`        | `Boolean` | Sets whether the search bar is visible or not     | true                                                                     |
-| `showLogin`            | `Boolean` | Sets whether the login button is displayed or not | true                                                                     |
-| `iconClasses`          | `String`  | Classes for icons                                 | 'c-on-base'                                                              |
-| `labelClasses`         | `String`  | Classes for labels                                | 'c-on-base'                                                              |
-| `collapsibleAnimation` | `Object`  | Collapsible animation controlling                 | [Collapsible Animation](#collapsible-animation)                          |
+| Prop name              | Type      | Description                                          | Default value                                                              |
+| ---------------------- | --------- | ---------------------------------------------------- | ------------------------------------------------------------------------ |
+| `leanWhen`             | `String`  | Cases in which the menu is in lean mode              | 'a^'                                                                       |
+| `linkUrl`              | `String`  | Address opened when the user clicks the logo         | '/'                                                                        |
+| `logoUrl`              | `String`  | URL of the logo image                                | N/A                                                                        |
+| `logoTitle`            | `String`  | Alt text for the logo                                | N/A                                                                        |
+| `logoSize`             | `Object`  | Sizes of logo in desktop and mobile                  | `desktop: { width: 132, height: 40 }, mobile: { width: 90, height: 40 }` |
+| `showSearchBar`        | `Boolean` | Sets whether the search bar is visible or not        | true                                                                       |
+| `showLogin`            | `Boolean` | Sets whether the login button is displayed or not    | true                                                                       |
+| `iconClasses`          | `String`  | Classes for icons                                    | 'c-on-base'                                                                |
+| `labelClasses`         | `String`  | Classes for labels                                   | 'c-on-base'                                                                |
+| `collapsibleAnimation` | `Object`  | Collapsible animation controlling                    | [Collapsible Animation](#collapsible-animation)                            |
 
 ##### Collapsible Animation
 
diff --git a/manifest.json b/manifest.json
index e32a94c9..2ecd2bf3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "vendor": "vtex",
   "name": "store-header",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "title": "VTEX Store Header",
   "defaultLocale": "pt-BR",
   "description": "The VTEX Store Header component",
@@ -28,6 +28,7 @@
     "vtex.store-components": "3.x",
     "vtex.store-icons": "0.x",
     "vtex.rich-text": "0.x",
-    "vtex.store-drawer": "0.x"
+    "vtex.store-drawer": "0.x",
+    "vtex.locale-switcher": "0.x"
   }
 }
diff --git a/messages/context.json b/messages/context.json
index 5ef69e20..910038e9 100644
--- a/messages/context.json
+++ b/messages/context.json
@@ -6,6 +6,7 @@
   "admin/editor.header.link.url": "admin/editor.header.link.url",
   "admin/editor.header.show.searchbar.title": "admin/editor.header.show.searchbar.title",
   "admin/editor.header.show.login.title": "admin/editor.header.show.login.title",
+  "admin/editor.header.show.localeswitcher.title": "admin/editor.header.show.localeswitcher.title",
   "store/header.search-placeholder": "store/header.search-placeholder",
   "store/header.search-emptyPlaceholder": "store/header.search-emptyPlaceholder",
   "store/header.topMenu.minicart.icon.label": "store/header.topMenu.minicart.icon.label",
diff --git a/messages/en.json b/messages/en.json
index 375b9ad3..9067452d 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -6,6 +6,7 @@
   "admin/editor.header.link.url": "Logo link",
   "admin/editor.header.show.searchbar.title": "Show SearchBar",
   "admin/editor.header.show.login.title": "Show Login",
+  "admin/editor.header.show.localeswitcher.title": "Show Locale Switcher",
   "store/header.search-placeholder": "Search for products, brands...",
   "store/header.search-emptyPlaceholder": "No matches found",
   "store/header.topMenu.minicart.icon.label": "My Cart",
diff --git a/messages/es.json b/messages/es.json
index 6374a1ea..9dd2eb71 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -5,6 +5,7 @@
   "admin/editor.header.logo.image": "Imagen del logotipo",
   "admin/editor.header.link.url": "Link del logotipo",
   "admin/editor.header.show.searchbar.title": "Mostrar Busca",
+  "admin/editor.header.show.localeswitcher.title": "Mostrar selector de localidade",
   "admin/editor.header.show.login.title": "Mostrar Login",
   "store/header.search-placeholder": "Búsqueda por productos, marcas...",
   "store/header.search-emptyPlaceholder": "Ningún resultado encontrado",
diff --git a/messages/pt.json b/messages/pt.json
index 7752486d..e4213b10 100644
--- a/messages/pt.json
+++ b/messages/pt.json
@@ -6,6 +6,7 @@
   "admin/editor.header.link.url": "Link da Logo",
   "admin/editor.header.show.searchbar.title": "Mostrar Busca",
   "admin/editor.header.show.login.title": "Mostrar Login",
+  "admin/editor.header.show.localeswitcher.title": "Mostrar seletor de localidade",
   "store/header.search-placeholder": "Busque por produtos, marcas...",
   "store/header.search-emptyPlaceholder": "Nenhum resultado encontrado",
   "store/header.topMenu.minicart.icon.label": "Meu Carrinho",
diff --git a/react/__tests__/__snapshots__/Header.test.js.snap b/react/__tests__/__snapshots__/Header.test.js.snap
index 8640d205..75854922 100644
--- a/react/__tests__/__snapshots__/Header.test.js.snap
+++ b/react/__tests__/__snapshots__/Header.test.js.snap
@@ -47,6 +47,11 @@ exports[`Header Component should match snapshot mobile with leanmode 1`] = `
                 </div>
               </div>
             </div>
+            <div
+              class="extension-point-mock"
+            >
+              locale-switcher
+            </div>
             <div
               class="topMenuIcons flex justify-end flex-grow-1 flex-grow-0-ns items-center order-1-s ml-auto-s order-2-ns"
             >
@@ -145,6 +150,11 @@ exports[`Header Component should match snapshot mobile without leanmode 1`] = `
                 </div>
               </div>
             </div>
+            <div
+              class="extension-point-mock"
+            >
+              locale-switcher
+            </div>
             <div
               class="topMenuIcons flex justify-end flex-grow-1 flex-grow-0-ns items-center order-1-s ml-auto-s order-2-ns"
             >
@@ -241,6 +251,11 @@ exports[`Header Component should match snapshot with leanmode 1`] = `
                 </div>
               </div>
             </div>
+            <div
+              class="extension-point-mock"
+            >
+              locale-switcher
+            </div>
             <div
               class="topMenuIcons flex justify-end flex-grow-1 flex-grow-0-ns items-center order-1-s ml-auto-s order-2-ns"
             >
@@ -339,6 +354,11 @@ exports[`Header Component should match snapshot without leanmode 1`] = `
                 </div>
               </div>
             </div>
+            <div
+              class="extension-point-mock"
+            >
+              locale-switcher
+            </div>
             <div
               class="topMenuIcons flex justify-end flex-grow-1 flex-grow-0-ns items-center order-1-s ml-auto-s order-2-ns"
             >
diff --git a/react/components/Row.css b/react/components/Row.css
index a5c04107..392df4ff 100644
--- a/react/components/Row.css
+++ b/react/components/Row.css
@@ -1 +1,3 @@
-.headerRow {}
\ No newline at end of file
+.headerRow {}
+.headerRowBackground {}
+.headerRowContainer {}
\ No newline at end of file
diff --git a/react/components/Row.tsx b/react/components/Row.tsx
index c5b9a614..9f8357f9 100644
--- a/react/components/Row.tsx
+++ b/react/components/Row.tsx
@@ -19,14 +19,14 @@ const Row: FunctionComponent<Props & BlockClass> = ({
   inverted,
   blockClass,
 }) => {
-  const content = <div className="w-100 flex items-center">{children}</div>
+  const content = <div className={`${styles.headerRowContainer} w-100 flex items-center`}>{children}</div>
 
   return (
     <StickyRow sticky={sticky}>
       <div className={generateBlockClass(styles.headerRow, blockClass)}>
         <div
           className={classNames(
-            'w-100',
+            `${generateBlockClass(styles.headerRowBackground, blockClass)} w-100`,
             inverted
               ? 'bg-base--inverted c-on-base--inverted'
               : 'bg-base c-on-base'
diff --git a/react/legacy/components/FixedContent.js b/react/legacy/components/FixedContent.js
index f6dd779d..750b0888 100644
--- a/react/legacy/components/FixedContent.js
+++ b/react/legacy/components/FixedContent.js
@@ -87,6 +87,8 @@ const FixedContent = ({
                   </div>
                 )}
 
+                <ExtensionPoint id="locale-switcher"/>
+
                 <Actions
                   iconClasses={iconClasses}
                   labelClasses={labelClasses}
diff --git a/react/legacy/components/TopMenu.js b/react/legacy/components/TopMenu.js
index 21e1b99a..9a1f404e 100644
--- a/react/legacy/components/TopMenu.js
+++ b/react/legacy/components/TopMenu.js
@@ -17,6 +17,7 @@ const TopMenu = ({
   logoTitle,
   logoSize,
   showLogin,
+  showLocaleSwitcher,
   showSearchBar,
   iconClasses,
   labelClasses,
@@ -44,6 +45,7 @@ const TopMenu = ({
         logoTitle={logoTitle}
         showSearchBar={showSearchBar}
         showLogin={showLogin}
+        showLocaleSwitcher={showLocaleSwitcher}
         iconClasses={iconClasses}
         labelClasses={labelClasses}
         mobile={mobile}
diff --git a/react/legacy/defaults.js b/react/legacy/defaults.js
index 95468523..5cb67785 100644
--- a/react/legacy/defaults.js
+++ b/react/legacy/defaults.js
@@ -81,6 +81,19 @@ export const icons = {
   },
 }
 
+export const localeSwitcher = {
+  propTypes: {
+    showLocaleSwitcher: PropTypes.bool,
+    color: PropTypes.string,
+    hoverColor: PropTypes.string,
+  },
+  defaultProps: {
+    showLocaleSwitcher: true,
+    color: 'near-black',
+    hoverColor: 'rebel-pink',
+  }
+}
+
 export const collapsible = {
   propTypes: {
     collapsibleAnimation: PropTypes.shape({
diff --git a/react/legacy/index.js b/react/legacy/index.js
index cadfbeff..83a119cc 100644
--- a/react/legacy/index.js
+++ b/react/legacy/index.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
 import { ExtensionPoint, useRuntime } from 'vtex.render-runtime'
 import TopMenu from './components/TopMenu'
 import Spacer from './components/Helpers/Spacer'
-import { logo, collapsible, icons, searchBar, login } from './defaults'
+import { logo, collapsible, icons, searchBar, login, localeSwitcher } from './defaults'
 
 import styles from './store-header.css'
 import useDevice from './hooks/useDevice'
@@ -20,6 +20,7 @@ const Header = ({
   logoSize,
   showSearchBar,
   showLogin,
+  showLocaleSwitcher,
   iconClasses,
   labelClasses,
   collapsibleAnimation,
@@ -46,6 +47,7 @@ const Header = ({
     logoSize,
     showSearchBar,
     showLogin,
+    showLocaleSwitcher,
     iconClasses,
     labelClasses,
     collapsibleAnimation,
@@ -95,6 +97,7 @@ Header.propTypes = {
   ...icons.propTypes,
   ...logo.propTypes,
   ...collapsible.propTypes,
+  ...localeSwitcher.propTypes,
 }
 
 Header.defaultProps = {
@@ -104,6 +107,7 @@ Header.defaultProps = {
   ...icons.defaultProps,
   ...logo.defaultProps,
   ...collapsible.defaultProps,
+  ...localeSwitcher.defaultProps,
 }
 
 Header.schema = {
@@ -134,6 +138,12 @@ Header.schema = {
       default: true,
       isLayout: true,
     },
+    showLocaleSwitcher: {
+      title: 'admin/editor.header.show.localeswitcher.title',
+      type: 'boolean',
+      default: true,
+      isLayout: true,
+    },
   },
 }
 
diff --git a/store/blocks.json b/store/blocks.json
index 682e13f8..f35d6167 100644
--- a/store/blocks.json
+++ b/store/blocks.json
@@ -12,7 +12,8 @@
       "minicart",
       "login",
       "category-menu",
-      "search-bar"
+      "search-bar",
+      "locale-switcher"
     ]
   },
   "header-layout.desktop": {
@@ -34,6 +35,7 @@
     "children": [
       "header-spacer",
       "search-bar",
+      "locale-switcher",
       "header-spacer",
       "login",
       "minicart"
@@ -66,6 +68,7 @@
     "children": [
       "logo",
       "search-bar",
+      "locale-switcher",
       "login",
       "minicart"
     ]
diff --git a/store/interfaces.json b/store/interfaces.json
index 4f5fd0d7..435d12b3 100644
--- a/store/interfaces.json
+++ b/store/interfaces.json
@@ -5,6 +5,7 @@
       "login",
       "category-menu",
       "search-bar",
+      "locale-switcher",
       "theme",
       "user-address",
       "menu",
@@ -47,6 +48,7 @@
       "minicart",
       "login",
       "search-bar",
+      "locale-switcher",
       "menu-link",
       "category-menu",
       "menu",
@@ -87,6 +89,7 @@
       "minicart",
       "login",
       "search-bar",
+      "locale-switcher",
       "menu-link",
       "category-menu",
       "menu",