diff --git a/src/components/dialogs/ProviderDialog.tsx b/src/components/dialogs/ProviderDialog.tsx
index 79b1197..adc7f08 100644
--- a/src/components/dialogs/ProviderDialog.tsx
+++ b/src/components/dialogs/ProviderDialog.tsx
@@ -2,14 +2,14 @@ import * as React from 'react';
 import { PROVIDERS, replaceProviderUrl } from '$constants/providers';
 import { Icon } from '$components/panels/Icon';
 import classnames from 'classnames';
-import { changeProvider as changeProviderAction } from "$redux/user/actions";
+import * as MAP_ACTIONS from "$redux/map/actions";
 import { IRootState } from "$redux/user";
 
 interface Props extends IRootState {
-  changeProvider: typeof changeProviderAction,
+  mapSetProvider: typeof MAP_ACTIONS.mapSetProvider,
 }
 
-export const ProviderDialog = ({ provider, changeProvider }: Props) => (
+export const ProviderDialog = ({ provider, mapSetProvider }: Props) => (
   <div className="control-dialog top right control-dialog-provider">
     <div className="helper provider-helper">
       {
@@ -19,7 +19,7 @@ export const ProviderDialog = ({ provider, changeProvider }: Props) => (
             style={{
               backgroundImage: `url(${replaceProviderUrl(item, { x: 5980, y: 2589, zoom: 13 })})`,
             }}
-            onMouseDown={() => changeProvider(item)}
+            onMouseDown={() => mapSetProvider(item)}
             key={PROVIDERS[item].name}
           >
             {
diff --git a/src/containers/map/Sticker/index.tsx b/src/containers/map/Sticker/index.tsx
index c91fb5d..2633e2b 100644
--- a/src/containers/map/Sticker/index.tsx
+++ b/src/containers/map/Sticker/index.tsx
@@ -199,4 +199,4 @@ const Sticker: React.FC<IProps> = ({
   );
 };
 
-export { Sticker };
+export { Sticker };
\ No newline at end of file
diff --git a/src/modules/Editor.ts b/src/modules/Editor.ts
index 13492f0..c207ad3 100644
--- a/src/modules/Editor.ts
+++ b/src/modules/Editor.ts
@@ -8,21 +8,23 @@ import { DEFAULT_LOGO, ILogos, LOGOS } from '$constants/logos';
 import { getUrlData } from '$utils/history';
 import { store } from '$redux/store';
 import {
-  changeProvider,
   resetSaveDialog,
   setActiveSticker,
-  setAddress,
   setChanged, 
-  setDescription,
   setDistance,
   setIsEmpty, setIsRouting,
-  setLogo,
   setMarkersShown,
   setMode,
-  setPublic,
   setRouterPoints, setStarred,
-  setTitle,
 } from '$redux/user/actions';
+import {
+  mapSetAddress,
+  mapSetDescription,
+  mapSetLogo,
+  mapSetPublic,
+  mapSetTitle,
+  mapSetProvider,
+} from '$redux/map/actions';
 import { DEFAULT_PROVIDER, IProvider, PROVIDERS } from '$constants/providers';
 import { STICKERS } from '$constants/stickers';
 import { IRootState } from "$redux/user";
@@ -184,14 +186,14 @@ export class Editor {
   getDistance = () => this.getState().distance;
   getIsEmpty = () => this.getState().is_empty;
 
-  setLogo: typeof setLogo = logo => store.dispatch(setLogo(logo));
+  mapSetLogo: typeof mapSetLogo = logo => store.dispatch(mapSetLogo(logo));
   setMode: typeof setMode = value => store.dispatch(setMode(value));
   setRouterPoints: typeof setRouterPoints = value => store.dispatch(setRouterPoints(value));
   setActiveSticker: typeof setActiveSticker = value => store.dispatch(setActiveSticker(value));
-  setTitle: typeof setTitle = value => store.dispatch(setTitle(value));
-  setDescription: typeof setDescription = value => store.dispatch(setDescription(value));
-  setAddress: typeof setAddress = value => store.dispatch(setAddress(value));
-  setPublic: typeof setPublic = value => store.dispatch(setPublic(value));
+  mapSetTitle: typeof mapSetTitle = value => store.dispatch(mapSetTitle(value));
+  mapSetDescription: typeof mapSetDescription = value => store.dispatch(mapSetDescription(value));
+  mapSetAddress: typeof mapSetAddress = value => store.dispatch(mapSetAddress(value));
+  mapSetPublic: typeof mapSetPublic = value => store.dispatch(mapSetPublic(value));
   setStarred: typeof setStarred = value => store.dispatch(setStarred(value));
   setIsEmpty: typeof setIsEmpty = value => store.dispatch(setIsEmpty(value));
   setIsRouting: typeof setIsRouting = value => store.dispatch(setIsRouting(value));
@@ -324,11 +326,11 @@ export class Editor {
     is_published,
     description,
   }: Partial<IEditor['initialData']>): void => {
-    this.setTitle(title || '');
+    this.mapSetTitle(title || '');
     const { id } = this.getUser();
 
     if (address && id && owner && id === owner) {
-      this.setAddress(address);
+      this.mapSetAddress(address);
     }
 
     if (route) this.poly.setPoints(route);
@@ -348,11 +350,11 @@ export class Editor {
       );
     }
 
-    this.setPublic(is_public);
+    this.mapSetPublic(is_public);
     this.setStarred(is_published);
-    this.setDescription(description);
+    this.mapSetDescription(description);
 
-    this.setLogo((logo && LOGOS[DEFAULT_LOGO] && logo) || DEFAULT_LOGO);
+    this.mapSetLogo((logo && LOGOS[DEFAULT_LOGO] && logo) || DEFAULT_LOGO);
     this.setProvider((provider && PROVIDERS[provider] && provider) || DEFAULT_PROVIDER);
 
     if (owner) this.owner = owner;
@@ -438,7 +440,7 @@ export class Editor {
     provider: this.getProvider(),
   });
 
-  setProvider: typeof changeProvider = provider => store.dispatch(changeProvider(provider));
+  setProvider: typeof mapSetProvider = provider => store.dispatch(mapSetProvider(provider));
 
   get isEmpty(): boolean {
     const { route, stickers } = this.dumpData();
diff --git a/src/redux/user/actions.ts b/src/redux/user/actions.ts
index 25c72f2..f19e18a 100644
--- a/src/redux/user/actions.ts
+++ b/src/redux/user/actions.ts
@@ -63,8 +63,8 @@ export const setRenderer = payload => ({ type: USER_ACTIONS.SET_RENDERER, payloa
 export const takeAShot = () => ({ type: USER_ACTIONS.TAKE_A_SHOT });
 export const cropAShot = payload => ({ type: USER_ACTIONS.CROP_A_SHOT, ...payload });
 
-export const setProvider = provider => ({ type: USER_ACTIONS.SET_PROVIDER, provider });
-export const changeProvider = provider => ({ type: USER_ACTIONS.CHANGE_PROVIDER, provider });
+// export const setProvider = provider => ({ type: USER_ACTIONS.SET_PROVIDER, provider });
+// export const changeProvider = provider => ({ type: USER_ACTIONS.CHANGE_PROVIDER, provider });
 
 export const setDialog = dialog => ({ type: USER_ACTIONS.SET_DIALOG, dialog });
 export const setDialogActive = dialog_active => ({ type: USER_ACTIONS.SET_DIALOG_ACTIVE, dialog_active });
diff --git a/src/redux/user/handlers.ts b/src/redux/user/handlers.ts
index 1354c55..271687d 100644
--- a/src/redux/user/handlers.ts
+++ b/src/redux/user/handlers.ts
@@ -121,7 +121,7 @@ const setRenderer: ActionHandler<typeof ActionCreators.setRenderer> = (state, {
   renderer: { ...state.renderer, ...payload }
 });
 
-const setProvider: ActionHandler<typeof ActionCreators.setProvider> = (state, { provider }) => ({ ...state, provider });
+// const setProvider: ActionHandler<typeof ActionCreators.setProvider> = (state, { provider }) => ({ ...state, provider });
 
 const setDialog: ActionHandler<typeof ActionCreators.setDialog> = (state, { dialog }) => ({
   ...state,
@@ -270,7 +270,7 @@ export const USER_HANDLERS = ({
   [USER_ACTIONS.HIDE_RENDERER]: hideRenderer,
   [USER_ACTIONS.SET_RENDERER]: setRenderer,
 
-  [USER_ACTIONS.SET_PROVIDER]: setProvider,
+  // [USER_ACTIONS.SET_PROVIDER]: setProvider,
 
   [USER_ACTIONS.SET_DIALOG]: setDialog,
   [USER_ACTIONS.SET_DIALOG_ACTIVE]: setDialogActive,