diff --git a/app/src/frontend/map/borough-switcher.tsx b/app/src/frontend/map/borough-switcher.tsx
index e348e910..56cfe415 100644
--- a/app/src/frontend/map/borough-switcher.tsx
+++ b/app/src/frontend/map/borough-switcher.tsx
@@ -9,7 +9,7 @@ export const BoroughSwitcher: React.FC<{}> = () => {
         <form className={`borough-switcher map-button ${darkLightTheme}`} onSubmit={boroughSwitch}>
             <button className="btn btn-outline btn-outline-dark"
                 type="submit">
-                {(borough === 'enabled')? 'Switch off Borough Boundaries' : 'Switch on Borough Boundaries'}
+                {(borough === 'enabled')? 'Borough Boundaries on' : 'Borough Boundaries off'}
             </button>
         </form>
     );
diff --git a/app/src/frontend/map/conservation-switcher.tsx b/app/src/frontend/map/conservation-switcher.tsx
index 177469fe..942360ab 100644
--- a/app/src/frontend/map/conservation-switcher.tsx
+++ b/app/src/frontend/map/conservation-switcher.tsx
@@ -9,7 +9,7 @@ export const ConservationAreaSwitcher: React.FC<{}> = (props) => {
         <form className={`conservation-switcher map-button ${darkLightTheme}`} onSubmit={conservationSwitch}>
             <button className="btn btn-outline btn-outline-dark"
                 type="submit">
-                {(conservation === 'enabled')? 'Switch off Conservation Areas' : 'Switch on Conservation Areas'}
+                {(conservation === 'enabled')? 'Conservation Areas on' : 'Conservation Areas off'}
             </button>
         </form>
     );
diff --git a/app/src/frontend/map/creative-switcher.tsx b/app/src/frontend/map/creative-switcher.tsx
index cf3d98d7..e32a8391 100644
--- a/app/src/frontend/map/creative-switcher.tsx
+++ b/app/src/frontend/map/creative-switcher.tsx
@@ -9,7 +9,7 @@ export const CreativeSwitcher: React.FC<{}> = () => {
         <form className={`creative-switcher map-button ${darkLightTheme}`} onSubmit={creativeSwitch}>
             <button className="btn btn-outline btn-outline-dark"
                 type="submit">
-                {(creative === 'enabled')? 'Switch off Creative Enterprise Zones' : 'Switch on Creative Enterprise Zones'}
+                {(creative === 'enabled')? 'Enterprise Zones on' : 'Creative Enterprise Zones off'}
             </button>
         </form>
     );
diff --git a/app/src/frontend/map/flood-switcher.tsx b/app/src/frontend/map/flood-switcher.tsx
index 72f602c8..45d729de 100644
--- a/app/src/frontend/map/flood-switcher.tsx
+++ b/app/src/frontend/map/flood-switcher.tsx
@@ -9,7 +9,7 @@ export const FloodSwitcher: React.FC<{}> = () => {
         <form className={`flood-switcher map-button ${darkLightTheme}`} onSubmit={floodSwitch}>
             <button className="btn btn-outline btn-outline-dark"
                 type="submit">
-                {(flood === 'enabled')? 'Switch off Flood Zones' : 'Switch on Flood Zones'}
+                {(flood === 'enabled')? 'Flood Zones on' : 'Flood Zones of'}
             </button>
         </form>
     );
diff --git a/app/src/frontend/map/historic-data-switcher.tsx b/app/src/frontend/map/historic-data-switcher.tsx
index 9488b288..e2e09893 100644
--- a/app/src/frontend/map/historic-data-switcher.tsx
+++ b/app/src/frontend/map/historic-data-switcher.tsx
@@ -9,7 +9,7 @@ export const HistoricDataSwitcher: React.FC<{}> = (props) => {
         <form className={`historic-data-switcher map-button ${darkLightTheme}`} onSubmit={historicDataSwitch}>
             <button className="btn btn-outline btn-outline-dark"
                 type="submit">
-                {(historicData === 'enabled')? 'Switch off the OS 1890s Historical Map' : 'Switch on the OS 1890s Historical Map'}
+                {(historicData === 'enabled')? 'The OS 1890s Historical Map on' : 'The OS 1890s Historical Map off'}
             </button>
         </form>
     );
diff --git a/app/src/frontend/map/housing-switcher.tsx b/app/src/frontend/map/housing-switcher.tsx
index 345696c7..a0c6769f 100644
--- a/app/src/frontend/map/housing-switcher.tsx
+++ b/app/src/frontend/map/housing-switcher.tsx
@@ -9,7 +9,7 @@ export const HousingSwitcher: React.FC<{}> = () => {
     <form className={`housing-switcher map-button ${darkLightTheme}`} onSubmit={housingSwitch}>
         <button className="btn btn-outline btn-outline-dark"
             type="submit">
-            {(housing === 'enabled')? 'Switch off Housing Zones' : 'Switch on Housing Zones'}
+            {(housing === 'enabled')? 'Housing Zones on' : 'Housing Zones off'}
         </button>
     </form>
     );
diff --git a/app/src/frontend/map/parcel-switcher.tsx b/app/src/frontend/map/parcel-switcher.tsx
index f933773c..e2e403a3 100644
--- a/app/src/frontend/map/parcel-switcher.tsx
+++ b/app/src/frontend/map/parcel-switcher.tsx
@@ -9,7 +9,7 @@ export const ParcelSwitcher: React.FC<{}> = () => {
         <form className={`parcel-switcher map-button ${darkLightTheme}`} onSubmit={parcelSwitch}>
             <button className="btn btn-outline btn-outline-dark"
                 type="submit">
-                {(parcel === 'enabled')? 'Switch off Parcel (sample) overlay' : 'Switch on Parcel (sample) overlay'}
+                {(parcel === 'enabled')? 'Parcel overlay (sample) on' : 'Parcel overlay (sample) off'}
             </button>
         </form>
     );
diff --git a/app/src/frontend/map/vista-switcher.tsx b/app/src/frontend/map/vista-switcher.tsx
index a26b6b51..b3a8cb38 100644
--- a/app/src/frontend/map/vista-switcher.tsx
+++ b/app/src/frontend/map/vista-switcher.tsx
@@ -9,7 +9,7 @@ export const VistaSwitcher: React.FC<{}> = () => {
     <form className={`vista-switcher map-button ${darkLightTheme}`} onSubmit={vistaSwitch}>
         <button className="btn btn-outline btn-outline-dark"
             type="submit">
-            {(vista === 'enabled')? 'Switch off Protected Vistas' : 'Switch on Protected Vistas'}
+            {(vista === 'enabled')? 'Protected Vistas on' : 'Protected Vistas off'}
         </button>
     </form>
     );