diff --git a/apps/api/src/ipfs.ts b/apps/api/src/ipfs.ts
index 6c73c6f90..0d9aebd6d 100644
--- a/apps/api/src/ipfs.ts
+++ b/apps/api/src/ipfs.ts
@@ -22,6 +22,7 @@ export async function handleSpaceMetadata(space: string, metadataUri: string) {
   spaceMetadataItem.wallet = '';
   spaceMetadataItem.executors = [];
   spaceMetadataItem.executors_types = [];
+  spaceMetadataItem.treasuries = [];
   spaceMetadataItem.delegations = [];
 
   const metadata: any = metadataUri ? await getJSON(metadataUri) : {};
@@ -34,6 +35,11 @@ export async function handleSpaceMetadata(space: string, metadataUri: string) {
   if (metadata.properties) {
     if (metadata.properties.cover) spaceMetadataItem.cover = metadata.properties.cover;
 
+    if (metadata.properties.treasuries) {
+      spaceMetadataItem.treasuries = metadata.properties.treasuries.map((treasury: any) =>
+        JSON.stringify(treasury)
+      );
+    }
     if (metadata.properties.delegations) {
       spaceMetadataItem.delegations = metadata.properties.delegations.map((delegation: any) =>
         JSON.stringify(delegation)
@@ -45,9 +51,6 @@ export async function handleSpaceMetadata(space: string, metadataUri: string) {
     if (metadata.properties.voting_power_symbol) {
       spaceMetadataItem.voting_power_symbol = metadata.properties.voting_power_symbol;
     }
-    if (metadata.properties.wallets && metadata.properties.wallets.length > 0) {
-      spaceMetadataItem.wallet = metadata.properties.wallets[0];
-    }
     if (
       metadata.properties.execution_strategies &&
       metadata.properties.execution_strategies_types
diff --git a/apps/api/src/schema.gql b/apps/api/src/schema.gql
index dc1586f02..b51926148 100644
--- a/apps/api/src/schema.gql
+++ b/apps/api/src/schema.gql
@@ -39,6 +39,7 @@ type SpaceMetadataItem {
   avatar: String!
   cover: String!
   external_url: String!
+  treasuries: [String]!
   delegations: [String]!
   github: String!
   twitter: String!
@@ -47,6 +48,8 @@ type SpaceMetadataItem {
   wallet: String!
   executors: [String]!
   executors_types: [String]!
+  # this is dummy field, we should add support for many-to-many in the future
+  executors_strategies: [ExecutionStrategy]! @derivedFrom(field: "id")
 }
 
 type VotingPowerValidationStrategiesParsedMetadataItem {
@@ -73,6 +76,16 @@ type StrategiesParsedMetadataDataItem {
   payload: String
 }
 
+type ExecutionStrategy {
+  id: String!
+  type: String!
+  quorum: BigDecimalVP!
+  treasury: String
+  treasury_chain: String
+  timelock_veto_guardian: String
+  timelock_delay: BigInt!
+}
+
 type Proposal {
   id: String!
   proposal_id: Int!
diff --git a/apps/subgraph-api/schema.graphql b/apps/subgraph-api/schema.graphql
index 67d6a8e32..13d022228 100644
--- a/apps/subgraph-api/schema.graphql
+++ b/apps/subgraph-api/schema.graphql
@@ -34,6 +34,7 @@ type SpaceMetadata @entity {
   avatar: String!
   cover: String!
   external_url: String!
+  treasuries: [String!]!
   delegations: [String!]!
   github: String!
   twitter: String!
@@ -42,6 +43,7 @@ type SpaceMetadata @entity {
   wallet: String!
   executors: [Bytes!]!
   executors_types: [String!]!
+  executors_strategies: [ExecutionStrategy!]!
 }
 
 type StrategiesParsedMetadata @entity {
@@ -72,6 +74,8 @@ type ExecutionStrategy @entity {
   id: ID!
   type: String!
   quorum: BigDecimal!
+  treasury: Bytes
+  treasury_chain: Int
   timelock_veto_guardian: Bytes
   timelock_delay: BigInt!
 }
diff --git a/apps/subgraph-api/src/ipfs.ts b/apps/subgraph-api/src/ipfs.ts
index 51969e5b5..e7301dc72 100644
--- a/apps/subgraph-api/src/ipfs.ts
+++ b/apps/subgraph-api/src/ipfs.ts
@@ -18,21 +18,36 @@ export function handleSpaceMetadata(content: Bytes): void {
   spaceMetadata.about = description ? description.toString() : ''
   spaceMetadata.avatar = avatar ? avatar.toString() : ''
   spaceMetadata.external_url = externalUrl ? externalUrl.toString() : ''
+  spaceMetadata.wallet = ''
+  spaceMetadata.treasuries = []
   spaceMetadata.delegations = []
 
   if (properties) {
     const propertiesObj = properties.toObject()
 
+    let treasuries = propertiesObj.get('treasuries')
     let delegations = propertiesObj.get('delegations')
     let cover = propertiesObj.get('cover')
     let github = propertiesObj.get('github')
     let twitter = propertiesObj.get('twitter')
     let discord = propertiesObj.get('discord')
     let votingPowerSymbol = propertiesObj.get('voting_power_symbol')
-    let wallets = propertiesObj.get('wallets')
     let executionStrategies = propertiesObj.get('execution_strategies')
     let executionStrategiesTypes = propertiesObj.get('execution_strategies_types')
 
+    if (treasuries) {
+      let jsonObj: JSON.Obj = <JSON.Obj>JSON.parse(content)
+      let jsonPropertiesObj = jsonObj.getObj('properties')
+      if (jsonPropertiesObj) {
+        let jsonTreasuriesArr = jsonPropertiesObj.getArr('treasuries')
+        if (jsonTreasuriesArr) {
+          spaceMetadata.treasuries = jsonTreasuriesArr._arr.map<string>((treasury) =>
+            treasury.toString()
+          )
+        }
+      }
+    }
+
     if (delegations) {
       let jsonObj: JSON.Obj = <JSON.Obj>JSON.parse(content)
       let jsonPropertiesObj = jsonObj.getObj('properties')
@@ -51,8 +66,6 @@ export function handleSpaceMetadata(content: Bytes): void {
     spaceMetadata.twitter = twitter ? twitter.toString() : ''
     spaceMetadata.discord = discord ? discord.toString() : ''
     spaceMetadata.voting_power_symbol = votingPowerSymbol ? votingPowerSymbol.toString() : 'VP'
-    spaceMetadata.wallet =
-      wallets && wallets.toArray().length > 0 ? wallets.toArray()[0].toString() : ''
 
     if (executionStrategies && executionStrategiesTypes) {
       spaceMetadata.executors = executionStrategies
@@ -61,18 +74,22 @@ export function handleSpaceMetadata(content: Bytes): void {
       spaceMetadata.executors_types = executionStrategiesTypes
         .toArray()
         .map<string>((type) => type.toString())
+      spaceMetadata.executors_strategies = executionStrategies
+        .toArray()
+        .map<string>((strategy) => strategy.toString())
     } else {
       spaceMetadata.executors = []
       spaceMetadata.executors_types = []
+      spaceMetadata.executors_strategies = []
     }
   } else {
     spaceMetadata.cover = ''
     spaceMetadata.github = ''
     spaceMetadata.twitter = ''
     spaceMetadata.discord = ''
-    spaceMetadata.wallet = ''
     spaceMetadata.executors = []
     spaceMetadata.executors_types = []
+    spaceMetadata.executors_strategies = []
   }
 
   spaceMetadata.save()
diff --git a/apps/subgraph-api/src/mapping.ts b/apps/subgraph-api/src/mapping.ts
index 14f16f731..c9a08c142 100644
--- a/apps/subgraph-api/src/mapping.ts
+++ b/apps/subgraph-api/src/mapping.ts
@@ -1,4 +1,11 @@
-import { Address, BigDecimal, BigInt, Bytes, dataSource } from '@graphprotocol/graph-ts'
+import {
+  Address,
+  BigDecimal,
+  BigInt,
+  Bytes,
+  DataSourceContext,
+  dataSource,
+} from '@graphprotocol/graph-ts'
 import { ProxyDeployed } from '../generated/ProxyFactory/ProxyFactory'
 import { AvatarExecutionStrategy } from '../generated/ProxyFactory/AvatarExecutionStrategy'
 import { TimelockExecutionStrategy } from '../generated/ProxyFactory/TimelockExecutionStrategy'
@@ -39,18 +46,31 @@ const MASTER_SIMPLE_QUORUM_TIMELOCK = Address.fromString(
   '0xf2A1C2f2098161af98b2Cc7E382AB7F3ba86Ebc4'
 )
 
+const CHAIN_IDS = new Map<string, i32>()
+CHAIN_IDS.set('mainnet', 1)
+CHAIN_IDS.set('goerli', 5)
+CHAIN_IDS.set('sepolia', 11155111)
+CHAIN_IDS.set('matic', 137)
+CHAIN_IDS.set('arbitrum-one', 42161)
+CHAIN_IDS.set('linea-testnet', 59140)
+
 export function handleProxyDeployed(event: ProxyDeployed): void {
+  let network = dataSource.network()
+
   if (event.params.implementation.equals(MASTER_SPACE)) {
     SpaceTemplate.create(event.params.proxy)
   } else if (event.params.implementation.equals(MASTER_SIMPLE_QUORUM_AVATAR)) {
     let executionStrategyContract = AvatarExecutionStrategy.bind(event.params.proxy)
     let typeResult = executionStrategyContract.try_getStrategyType()
     let quorumResult = executionStrategyContract.try_quorum()
-    if (typeResult.reverted || quorumResult.reverted) return
+    let targetAddress = executionStrategyContract.try_target()
+    if (typeResult.reverted || quorumResult.reverted || targetAddress.reverted) return
 
     let executionStrategy = new ExecutionStrategy(event.params.proxy.toHexString())
     executionStrategy.type = typeResult.value
     executionStrategy.quorum = new BigDecimal(quorumResult.value)
+    if (CHAIN_IDS.has(network)) executionStrategy.treasury_chain = CHAIN_IDS.get(network)
+    executionStrategy.treasury = targetAddress.value
     executionStrategy.timelock_delay = new BigInt(0)
     executionStrategy.save()
   } else if (event.params.implementation.equals(MASTER_SIMPLE_QUORUM_TIMELOCK)) {
@@ -71,6 +91,8 @@ export function handleProxyDeployed(event: ProxyDeployed): void {
     let executionStrategy = new ExecutionStrategy(event.params.proxy.toHexString())
     executionStrategy.type = typeResult.value
     executionStrategy.quorum = new BigDecimal(quorumResult.value)
+    if (CHAIN_IDS.has(network)) executionStrategy.treasury_chain = CHAIN_IDS.get(network)
+    executionStrategy.treasury = event.params.proxy
     executionStrategy.timelock_veto_guardian = timelockVetoGuardianResult.value
     executionStrategy.timelock_delay = timelockDelayResult.value
     executionStrategy.save()
diff --git a/apps/ui/src/components/App/Nav.vue b/apps/ui/src/components/App/Nav.vue
index da1f5cc18..2aba00c48 100644
--- a/apps/ui/src/components/App/Nav.vue
+++ b/apps/ui/src/components/App/Nav.vue
@@ -24,8 +24,6 @@ const space = computed(() =>
     : null
 );
 
-const { treasury } = useTreasury(space);
-
 const isController = computed(() =>
   space.value ? compareAddresses(space.value.controller, web3.value.account) : false
 );
@@ -47,7 +45,7 @@ const navigationConfig = computed(() => ({
           }
         }
       : undefined),
-    ...(treasury.value
+    ...(space.value?.treasuries?.length
       ? {
           treasury: {
             name: 'Treasury',
diff --git a/apps/ui/src/components/EditorExecution.vue b/apps/ui/src/components/EditorExecution.vue
index f53ba144d..850032a35 100644
--- a/apps/ui/src/components/EditorExecution.vue
+++ b/apps/ui/src/components/EditorExecution.vue
@@ -2,19 +2,19 @@
 import Draggable from 'vuedraggable';
 import { getNetwork } from '@/networks';
 import { simulate } from '@/helpers/tenderly';
-import { Transaction as TransactionType, Space, SelectedStrategy } from '@/types';
+import { Transaction as TransactionType, Space, SpaceMetadataTreasury } from '@/types';
 
 const model = defineModel<TransactionType[]>({
   required: true
 });
 
 const props = defineProps<{
-  space?: Space;
-  selectedExecutionStrategy: SelectedStrategy;
+  space: Space;
+  treasuryData: SpaceMetadataTreasury;
 }>();
 
 const uiStore = useUiStore();
-const { treasury } = useTreasury(toRef(props, 'space'));
+const { treasury } = useTreasury(props.treasuryData);
 
 const editedTx: Ref<number | null> = ref(null);
 const modalState: Ref<{
@@ -31,15 +31,6 @@ const simulationState: Ref<'SIMULATING' | 'SIMULATION_SUCCEDED' | 'SIMULATION_FA
   ref(null);
 
 const network = computed(() => (props.space ? getNetwork(props.space.network) : null));
-const currentTreasury = computed(() =>
-  props.selectedExecutionStrategy.type === 'SimpleQuorumTimelock' && network.value
-    ? {
-        wallet: props.selectedExecutionStrategy.address,
-        network: network.value.baseChainId,
-        networkId: props.space?.network
-      }
-    : treasury.value
-);
 
 function addTx(tx: TransactionType) {
   const newValue = [...model.value];
@@ -72,15 +63,11 @@ function editTx(index: number) {
 }
 
 async function handleSimulateClick() {
-  if (simulationState.value !== null || !currentTreasury.value) return;
+  if (simulationState.value !== null || !treasury.value) return;
 
   simulationState.value = 'SIMULATING';
 
-  const valid = await simulate(
-    currentTreasury.value.network,
-    currentTreasury.value.wallet,
-    model.value
-  );
+  const valid = await simulate(treasury.value.network, treasury.value.wallet, model.value);
 
   if (valid) {
     simulationState.value = 'SIMULATION_SUCCEDED';
@@ -98,11 +85,11 @@ watch(model.value, () => {
 <template>
   <div class="space-y-3">
     <div class="overflow-hidden border rounded-lg">
-      <ExecutionButton :disabled="!currentTreasury" @click="openModal('sendToken')">
+      <ExecutionButton :disabled="!treasury" @click="openModal('sendToken')">
         <IH-cash class="inline-block" />
         <span>Send token</span>
       </ExecutionButton>
-      <ExecutionButton :disabled="!currentTreasury" @click="openModal('sendNft')">
+      <ExecutionButton :disabled="!treasury" @click="openModal('sendNft')">
         <IH-photograph class="inline-block" />
         <span>Send NFT</span>
       </ExecutionButton>
@@ -168,28 +155,28 @@ watch(model.value, () => {
     </div>
     <teleport to="#modal">
       <ModalSendToken
-        v-if="currentTreasury && currentTreasury.networkId"
+        v-if="treasury && treasury.networkId"
         :open="modalOpen.sendToken"
-        :address="currentTreasury.wallet"
-        :network="currentTreasury.network"
-        :network-id="currentTreasury.networkId"
+        :address="treasury.wallet"
+        :network="treasury.network"
+        :network-id="treasury.networkId"
         :initial-state="modalState.sendToken"
         @close="modalOpen.sendToken = false"
         @add="addTx"
       />
       <ModalSendNft
-        v-if="currentTreasury"
+        v-if="treasury"
         :open="modalOpen.sendNft"
-        :address="currentTreasury.wallet"
-        :network="currentTreasury.network"
+        :address="treasury.wallet"
+        :network="treasury.network"
         :initial-state="modalState.sendNft"
         @close="modalOpen.sendNft = false"
         @add="addTx"
       />
       <ModalTransaction
-        v-if="currentTreasury"
+        v-if="treasury"
         :open="modalOpen.contractCall"
-        :network="currentTreasury.network"
+        :network="treasury.network"
         :initial-state="modalState.contractCall"
         @close="modalOpen.contractCall = false"
         @add="addTx"
diff --git a/apps/ui/src/components/FormProfile.vue b/apps/ui/src/components/FormProfile.vue
index a3d913ac5..7f1efd2f3 100644
--- a/apps/ui/src/components/FormProfile.vue
+++ b/apps/ui/src/components/FormProfile.vue
@@ -1,13 +1,14 @@
 <script setup lang="ts">
 import { MAX_SYMBOL_LENGTH } from '@/helpers/constants';
 import { validateForm } from '@/helpers/validation';
-import { getNetwork, enabledNetworks } from '@/networks';
-import { SpaceMetadataDelegation } from '@/types';
+import { getNetwork } from '@/networks';
+import { SpaceMetadataTreasury, SpaceMetadataDelegation } from '@/types';
 
 const props = withDefaults(
   defineProps<{
     showTitle?: boolean;
     form: any;
+    treasuriesValue: SpaceMetadataTreasury[];
     delegationsValue: SpaceMetadataDelegation[];
     id?: string;
     space?: {
@@ -22,33 +23,28 @@ const props = withDefaults(
 
 const emit = defineEmits<{
   (e: 'errors', value: any);
+  (e: 'treasuries', value: SpaceMetadataTreasury[]);
   (e: 'delegations', value: SpaceMetadataDelegation[]);
   (e: 'pick', field: any);
-  (e: 'no-network');
 }>();
 
-const delegationsModalOpen = ref(false);
-const editedDelegation = ref<number | null>(null);
-const delegationInitialState = ref<SpaceMetadataDelegation | null>(null);
+const modalOpen = ref({
+  treasury: false,
+  delegation: false
+});
 
-const availableNetworks = enabledNetworks
-  .map(id => {
-    const { name, readOnly } = getNetwork(id);
+const editedTreasury = ref<number | null>(null);
+const treasuryInitialState = ref<any | null>(null);
 
-    return {
-      id,
-      name,
-      readOnly
-    };
-  })
-  .filter(network => !network.readOnly);
+const editedDelegation = ref<number | null>(null);
+const delegationInitialState = ref<SpaceMetadataDelegation | null>(null);
 
 const definition = computed(() => {
   return {
     type: 'object',
     title: 'Space',
     additionalProperties: true,
-    required: ['name', 'walletNetwork', 'walletAddress'],
+    required: ['name'],
     properties: {
       avatar: {
         type: 'string',
@@ -97,25 +93,7 @@ const definition = computed(() => {
         maxLength: MAX_SYMBOL_LENGTH,
         title: 'Voting power symbol',
         examples: ['e.g. VP']
-      },
-      walletNetwork: {
-        type: ['string', 'null'],
-        enum: [null, ...availableNetworks.map(network => network.id)],
-        options: [{ id: null, name: 'No treasury' }, ...availableNetworks],
-        title: 'Treasury network',
-        nullable: true
-      },
-      ...(props.form.walletNetwork !== null
-        ? {
-            walletAddress: {
-              type: 'string',
-              title: 'Treasury address',
-              examples: ['0x0000…'],
-              format: 'address',
-              minLength: 1
-            }
-          }
-        : {})
+      }
     }
   };
 });
@@ -124,6 +102,19 @@ const formErrors = computed(() =>
   validateForm(definition.value, props.form, { skipEmptyOptionalFields: true })
 );
 
+function addTreasuryConfig(config: SpaceMetadataTreasury) {
+  const newValue = [...props.treasuriesValue];
+
+  if (editedTreasury.value !== null) {
+    newValue[editedTreasury.value] = config;
+    editedTreasury.value = null;
+  } else {
+    newValue.push(config);
+  }
+
+  emit('treasuries', newValue);
+}
+
 function addDelegationConfig(config: SpaceMetadataDelegation) {
   const newValue = [...props.delegationsValue];
 
@@ -137,17 +128,40 @@ function addDelegationConfig(config: SpaceMetadataDelegation) {
   emit('delegations', newValue);
 }
 
+function addTreasury() {
+  editedTreasury.value = null;
+  treasuryInitialState.value = null;
+
+  modalOpen.value.treasury = true;
+}
+
 function addDelegation() {
   editedDelegation.value = null;
   delegationInitialState.value = null;
-  delegationsModalOpen.value = true;
+
+  modalOpen.value.delegation = true;
+}
+
+function editTreasury(index: number) {
+  editedTreasury.value = index;
+  treasuryInitialState.value = props.treasuriesValue[index];
+
+  modalOpen.value.treasury = true;
 }
 
 function editDelegation(index: number) {
   editedDelegation.value = index;
   delegationInitialState.value = props.delegationsValue[index];
 
-  delegationsModalOpen.value = true;
+  modalOpen.value.delegation = true;
+}
+
+function deleteTreasury(index: number) {
+  const newValue = [
+    ...props.treasuriesValue.slice(0, index),
+    ...props.treasuriesValue.slice(index + 1)
+  ];
+  emit('treasuries', newValue);
 }
 
 function deleteDelegation(index: number) {
@@ -160,13 +174,6 @@ function deleteDelegation(index: number) {
 
 watch(formErrors, value => emit('errors', value));
 
-watch(
-  () => props.form.walletNetwork,
-  to => {
-    if (to === null) emit('no-network');
-  }
-);
-
 onMounted(() => {
   emit('errors', formErrors.value);
 });
@@ -182,7 +189,26 @@ onMounted(() => {
       :definition="definition"
       @pick="field => emit('pick', field)"
     />
-    <h4 class="eyebrow mb-2">Delegations</h4>
+    <h4 class="eyebrow mb-2">Treasuries</h4>
+    <div
+      v-for="(treasury, i) in props.treasuriesValue"
+      :key="i"
+      class="flex justify-between items-center rounded-lg border px-4 py-3 mb-3 text-skin-link"
+    >
+      <div class="flex min-w-0">
+        <div class="whitespace-nowrap">{{ treasury.name }}</div>
+      </div>
+      <div class="flex gap-3">
+        <a @click="editTreasury(i)">
+          <IH-pencil />
+        </a>
+        <a @click="deleteTreasury(i)">
+          <IH-trash />
+        </a>
+      </div>
+    </div>
+    <UiButton class="w-full" @click="addTreasury">Add treasury</UiButton>
+    <h4 class="eyebrow my-2">Delegations</h4>
     <div
       v-for="(delegation, i) in props.delegationsValue"
       :key="i"
@@ -203,10 +229,16 @@ onMounted(() => {
     <UiButton class="w-full" @click="addDelegation">Add delegation</UiButton>
   </div>
   <teleport to="#modal">
+    <ModalTreasuryConfig
+      :open="modalOpen.treasury"
+      :initial-state="treasuryInitialState ?? undefined"
+      @close="modalOpen.treasury = false"
+      @add="addTreasuryConfig"
+    />
     <ModalDelegationConfig
-      :open="delegationsModalOpen"
+      :open="modalOpen.delegation"
       :initial-state="delegationInitialState ?? undefined"
-      @close="delegationsModalOpen = false"
+      @close="modalOpen.delegation = false"
       @add="addDelegationConfig"
     />
   </teleport>
diff --git a/apps/ui/src/components/Modal/DelegationConfig.vue b/apps/ui/src/components/Modal/DelegationConfig.vue
index d4505c007..b04bc3eb1 100644
--- a/apps/ui/src/components/Modal/DelegationConfig.vue
+++ b/apps/ui/src/components/Modal/DelegationConfig.vue
@@ -12,8 +12,6 @@ const DEFAULT_FORM_STATE = {
   contractAddress: null
 };
 
-const form: Ref<SpaceMetadataDelegation> = ref(clone(DEFAULT_FORM_STATE));
-
 const props = defineProps<{
   open: boolean;
   initialState?: SpaceMetadataDelegation;
@@ -23,6 +21,10 @@ const emit = defineEmits<{
   (e: 'close'): void;
 }>();
 
+const showPicker = ref(false);
+const searchValue = ref('');
+const form: Ref<SpaceMetadataDelegation> = ref(clone(DEFAULT_FORM_STATE));
+
 const availableNetworks = enabledNetworks
   .map(id => {
     const { name, readOnly } = getNetwork(id);
@@ -120,11 +122,37 @@ watch(
 </script>
 
 <template>
-  <UiModal :open="open" @close="$emit('close')">
+  <UiModal :open="open" @close="emit('close')">
     <template #header>
       <h3 v-text="'Add delegation'" />
+      <template v-if="showPicker">
+        <a class="absolute left-0 -top-1 p-4 text-color" @click="showPicker = false">
+          <IH-arrow-narrow-left class="mr-2" />
+        </a>
+        <div class="flex items-center border-t px-2 py-3 mt-3 -mb-3">
+          <IH-search class="mx-2" />
+          <input
+            ref="searchInput"
+            v-model="searchValue"
+            type="text"
+            placeholder="Search name or paste address"
+            class="flex-auto bg-transparent text-skin-link"
+          />
+        </div>
+      </template>
     </template>
-    <div class="s-box p-4">
+    <PickerContact
+      v-if="showPicker"
+      :loading="false"
+      :search-value="searchValue"
+      @pick="
+        value => {
+          form.contractAddress = value;
+          showPicker = false;
+        }
+      "
+    />
+    <div v-else class="s-box p-4">
       <UiForm :model-value="form" :error="formErrors" :definition="definition" />
     </div>
     <template #footer>
diff --git a/apps/ui/src/components/Modal/EditSpace.vue b/apps/ui/src/components/Modal/EditSpace.vue
index 1b7c340a1..9bdfc3022 100644
--- a/apps/ui/src/components/Modal/EditSpace.vue
+++ b/apps/ui/src/components/Modal/EditSpace.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { clone } from '@/helpers/utils';
-import type { Space, SpaceMetadata, NetworkID } from '@/types';
+import type { Space, SpaceMetadata } from '@/types';
 
 const DEFAULT_FORM_STATE: SpaceMetadata = {
   name: '',
@@ -12,8 +12,7 @@ const DEFAULT_FORM_STATE: SpaceMetadata = {
   github: '',
   discord: '',
   votingPowerSymbol: '',
-  walletNetwork: null,
-  walletAddress: null,
+  treasuries: [],
   delegations: []
 };
 
@@ -70,16 +69,8 @@ watch(
     form.discord = props.space.discord;
     form.twitter = props.space.twitter;
     form.votingPowerSymbol = props.space.voting_power_symbol;
+    form.treasuries = props.space.treasuries;
     form.delegations = props.space.delegations;
-
-    const [walletNetwork, walletAddress] = props.space.wallet.split(':');
-    if (walletNetwork && walletAddress) {
-      form.walletNetwork = walletNetwork as NetworkID;
-      form.walletAddress = walletAddress;
-    } else {
-      form.walletNetwork = null;
-      form.walletAddress = null;
-    }
   }
 );
 </script>
@@ -117,10 +108,11 @@ watch(
       :space="space"
       :show-title="false"
       :form="form"
+      :treasuries-value="form.treasuries"
       :delegations-value="form.delegations"
+      @treasuries="v => (form.treasuries = v)"
       @delegations="v => (form.delegations = v)"
       @pick="handlePick"
-      @no-network="form.walletAddress = null"
       @errors="v => (formErrors = v)"
     />
     <template v-if="!showPicker" #footer>
diff --git a/apps/ui/src/components/Modal/TreasuryConfig.vue b/apps/ui/src/components/Modal/TreasuryConfig.vue
new file mode 100644
index 000000000..39412376d
--- /dev/null
+++ b/apps/ui/src/components/Modal/TreasuryConfig.vue
@@ -0,0 +1,145 @@
+<script setup lang="ts">
+import { getNetwork, enabledNetworks } from '@/networks';
+import { validateForm } from '@/helpers/validation';
+import { SpaceMetadataTreasury } from '@/types';
+import { clone } from '@/helpers/utils';
+
+const DEFAULT_FORM_STATE = {
+  name: '',
+  network: null,
+  address: null
+};
+
+const props = defineProps<{
+  open: boolean;
+  initialState?: SpaceMetadataTreasury;
+}>();
+const emit = defineEmits<{
+  (e: 'add', config: SpaceMetadataTreasury);
+  (e: 'close'): void;
+}>();
+
+const showPicker = ref(false);
+const searchValue = ref('');
+const form: Ref<SpaceMetadataTreasury> = ref(clone(DEFAULT_FORM_STATE));
+
+const availableNetworks = enabledNetworks
+  .map(id => {
+    const { name, readOnly } = getNetwork(id);
+
+    return {
+      id,
+      name,
+      readOnly
+    };
+  })
+  .filter(network => !network.readOnly);
+
+const definition = computed(() => {
+  return {
+    type: 'object',
+    title: 'Space',
+    additionalProperties: true,
+    required: ['name', 'network', 'address'],
+    properties: {
+      name: {
+        type: 'string',
+        title: 'Name',
+        minLength: 1,
+        examples: ['Treasury name']
+      },
+      network: {
+        type: ['string', 'null'],
+        enum: [null, ...availableNetworks.map(network => network.id)],
+        options: [{ id: null, name: 'No treasury' }, ...availableNetworks],
+        title: 'Treasury network',
+        nullable: true
+      },
+      ...(form.value.network !== null
+        ? {
+            address: {
+              type: 'string',
+              title: 'Treasury address',
+              examples: ['0x0000…'],
+              format: 'address',
+              minLength: 1
+            }
+          }
+        : {})
+    }
+  };
+});
+
+const formErrors = computed(() =>
+  validateForm(definition.value, form.value, { skipEmptyOptionalFields: true })
+);
+
+const formValid = computed(() => {
+  return (
+    Object.keys(formErrors.value).length === 0 &&
+    form.value.network !== null &&
+    form.value.address !== ''
+  );
+});
+
+async function handleSubmit() {
+  emit('add', form.value);
+  emit('close');
+}
+
+watch(
+  () => props.open,
+  () => {
+    if (props.initialState) {
+      form.value = clone(props.initialState);
+    } else {
+      form.value = clone(DEFAULT_FORM_STATE);
+    }
+  }
+);
+</script>
+
+<template>
+  <UiModal :open="open" @close="emit('close')">
+    <template #header>
+      <h3 v-text="'Add treasury'" />
+      <template v-if="showPicker">
+        <a class="absolute left-0 -top-1 p-4 text-color" @click="showPicker = false">
+          <IH-arrow-narrow-left class="mr-2" />
+        </a>
+        <div class="flex items-center border-t px-2 py-3 mt-3 -mb-3">
+          <IH-search class="mx-2" />
+          <input
+            ref="searchInput"
+            v-model="searchValue"
+            type="text"
+            placeholder="Search name or paste address"
+            class="flex-auto bg-transparent text-skin-link"
+          />
+        </div>
+      </template>
+    </template>
+    <PickerContact
+      v-if="showPicker"
+      :loading="false"
+      :search-value="searchValue"
+      @pick="
+        value => {
+          form.address = value;
+          showPicker = false;
+        }
+      "
+    />
+    <div v-else class="s-box p-4">
+      <UiForm
+        :model-value="form"
+        :error="formErrors"
+        :definition="definition"
+        @pick="showPicker = true"
+      />
+    </div>
+    <template #footer>
+      <UiButton class="w-full" :disabled="!formValid" @click="handleSubmit">Confirm</UiButton>
+    </template>
+  </UiModal>
+</template>
diff --git a/apps/ui/src/components/SpaceTreasury.vue b/apps/ui/src/components/SpaceTreasury.vue
new file mode 100644
index 000000000..36018f81e
--- /dev/null
+++ b/apps/ui/src/components/SpaceTreasury.vue
@@ -0,0 +1,305 @@
+<script setup lang="ts">
+import { _n, _c, shorten, sanitizeUrl, compareAddresses } from '@/helpers/utils';
+import { getNetwork, evmNetworks } from '@/networks';
+import { ETH_CONTRACT } from '@/helpers/constants';
+import { Space, SpaceMetadataTreasury, Transaction } from '@/types';
+import type { Token } from '@/helpers/alchemy';
+
+const props = defineProps<{ space: Space; treasuryData: SpaceMetadataTreasury }>();
+
+const { setTitle } = useTitle();
+const router = useRouter();
+const { copy, copied } = useClipboard();
+const { loading, loaded, assets, loadBalances } = useBalances();
+const { loading: nftsLoading, loaded: nftsLoaded, nfts, loadNfts } = useNfts();
+const { treasury } = useTreasury(props.treasuryData);
+const { createDraft } = useEditor();
+
+const page: Ref<'tokens' | 'nfts'> = ref('tokens');
+const modalOpen = ref({
+  tokens: false,
+  nfts: false,
+  walletConnectLink: false
+});
+
+const currentNetworkId = computed(() => {
+  try {
+    return treasury.value?.networkId;
+  } catch (e) {
+    return null;
+  }
+});
+
+const currentNetwork = computed(() => {
+  if (!currentNetworkId.value) return null;
+
+  return getNetwork(currentNetworkId.value);
+});
+
+const spaceKey = computed(() => `${props.space.network}:${props.space.id}`);
+
+const isReadOnly = computed(() => {
+  return !props.space.executors_strategies.find(
+    strategy =>
+      strategy.treasury &&
+      strategy.treasury_chain &&
+      treasury.value &&
+      compareAddresses(strategy.treasury, treasury.value.wallet) &&
+      strategy.treasury_chain === treasury.value.network
+  );
+});
+
+const totalQuote = computed(() =>
+  assets.value.reduce((acc, asset) => {
+    return acc + asset.value;
+  }, 0)
+);
+
+const sortedAssets = computed(() =>
+  (assets || []).value.sort((a, b) => {
+    const isEth = (token: Token) => token.contractAddress === ETH_CONTRACT;
+    if (isEth(a)) return -1;
+    if (isEth(b)) return 1;
+    return 0;
+  })
+);
+
+const treasuryExplorerUrl = computed(() => {
+  if (!currentNetwork.value || !treasury.value) return '';
+
+  const url = currentNetwork.value.helpers.getExplorerUrl(treasury.value.wallet, 'address');
+  return sanitizeUrl(url);
+});
+
+const executionStrategy = computed(() => {
+  let executorIndex = props.space.executors.findIndex(
+    executorAddress => executorAddress === treasury.value?.wallet
+  );
+
+  if (executorIndex === -1) {
+    // If the treasury is not an executor, use the first avatar executor
+    executorIndex = props.space.executors_types.findIndex(e => e === 'SimpleQuorumAvatar');
+  }
+
+  if (executorIndex === -1) return null;
+
+  return {
+    address: props.space.executors[executorIndex],
+    type: props.space.executors_types[executorIndex]
+  };
+});
+
+function openModal(type: 'tokens' | 'nfts') {
+  modalOpen.value[type] = true;
+}
+
+function addTx(tx: Transaction) {
+  const draftId = createDraft(spaceKey.value, {
+    execution: [tx],
+    executionStrategy: executionStrategy.value
+  });
+  router.push(`create/${draftId}`);
+}
+
+onMounted(() => {
+  if (!treasury.value) return;
+
+  loadBalances(treasury.value.wallet, treasury.value.network);
+  loadNfts(treasury.value.wallet, treasury.value.network);
+});
+
+watchEffect(() => setTitle(`Treasury - ${props.space.name}`));
+</script>
+
+<template>
+  <div v-if="!treasury || !currentNetwork" class="p-4 flex items-center text-skin-link">
+    <IH-exclamation-circle class="inline-block mr-2" />
+    No treasury configured.
+  </div>
+  <template v-else>
+    <div class="p-4 space-x-2 flex">
+      <div class="flex-auto" />
+
+      <UiTooltip
+        v-if="currentNetworkId && evmNetworks.includes(currentNetworkId) && !isReadOnly"
+        title="Connect to apps"
+      >
+        <UiButton class="!px-0 w-[46px]" @click="modalOpen.walletConnectLink = true">
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            width="480"
+            height="332"
+            viewBox="0 0 480 332"
+            class="inline-block w-[26px] h-[26px]"
+          >
+            <path
+              fill="rgba(var(--link))"
+              d="m126.613 93.9842c62.622-61.3123 164.152-61.3123 226.775 0l7.536 7.3788c3.131 3.066 3.131 8.036 0 11.102l-25.781 25.242c-1.566 1.533-4.104 1.533-5.67 0l-10.371-10.154c-43.687-42.7734-114.517-42.7734-158.204 0l-11.107 10.874c-1.565 1.533-4.103 1.533-5.669 0l-25.781-25.242c-3.132-3.066-3.132-8.036 0-11.102zm280.093 52.2038 22.946 22.465c3.131 3.066 3.131 8.036 0 11.102l-103.463 101.301c-3.131 3.065-8.208 3.065-11.339 0l-73.432-71.896c-.783-.767-2.052-.767-2.835 0l-73.43 71.896c-3.131 3.065-8.208 3.065-11.339 0l-103.4657-101.302c-3.1311-3.066-3.1311-8.036 0-11.102l22.9456-22.466c3.1311-3.065 8.2077-3.065 11.3388 0l73.4333 71.897c.782.767 2.051.767 2.834 0l73.429-71.897c3.131-3.065 8.208-3.065 11.339 0l73.433 71.897c.783.767 2.052.767 2.835 0l73.431-71.895c3.132-3.066 8.208-3.066 11.339 0z"
+            />
+          </svg>
+        </UiButton>
+      </UiTooltip>
+      <UiTooltip title="Copy address">
+        <UiButton class="!px-0 w-[46px]" @click="copy(treasury.wallet)">
+          <IH-duplicate v-if="!copied" class="inline-block" />
+          <IH-check v-else class="inline-block" />
+        </UiButton>
+      </UiTooltip>
+      <UiTooltip v-if="!isReadOnly" :title="page === 'tokens' ? 'Send token' : 'Send NFT'">
+        <UiButton class="!px-0 w-[46px]" @click="openModal(page)">
+          <IH-arrow-sm-right class="inline-block -rotate-45" />
+        </UiButton>
+      </UiTooltip>
+    </div>
+    <div class="space-y-3">
+      <div>
+        <UiLabel label="Treasury" sticky />
+        <a
+          :href="treasuryExplorerUrl || '#'"
+          target="_blank"
+          class="flex justify-between items-center mx-4 py-3 border-b"
+          :class="{
+            'pointer-events-none': !treasuryExplorerUrl
+          }"
+        >
+          <UiStamp :id="treasury.wallet" type="avatar" :size="32" class="mr-3" />
+          <div class="flex-1 leading-[22px]">
+            <h4 class="text-skin-link" v-text="shorten(treasury.wallet)" />
+            <div class="text-skin-text text-[17px]" v-text="shorten(treasury.wallet)" />
+          </div>
+          <h3 v-text="`$${_n(totalQuote.toFixed())}`" />
+        </a>
+      </div>
+      <div>
+        <div class="flex pl-4 border-b space-x-3">
+          <button type="button" @click="page = 'tokens'">
+            <UiLink :is-active="page === 'tokens'" text="Tokens" />
+          </button>
+          <button type="button" @click="page = 'nfts'">
+            <UiLink :is-active="page === 'nfts'" text="NFTs" />
+          </button>
+        </div>
+        <div v-if="page === 'tokens'">
+          <UiLoading v-if="loading && !loaded" class="px-4 py-3 block" />
+          <div
+            v-if="loaded && sortedAssets.length === 0"
+            class="px-4 py-3 flex items-center text-skin-link"
+          >
+            <IH-exclamation-circle class="inline-block mr-2" />
+            There are no tokens in treasury.
+          </div>
+          <a
+            v-for="(asset, i) in sortedAssets"
+            :key="i"
+            :href="
+              (asset.contractAddress === ETH_CONTRACT
+                ? treasuryExplorerUrl
+                : sanitizeUrl(
+                    currentNetwork.helpers.getExplorerUrl(asset.contractAddress, 'token')
+                  )) || '#'
+            "
+            target="_blank"
+            class="mx-4 py-3 border-b flex"
+          >
+            <div class="flex-auto flex items-center min-w-0">
+              <UiStampToken
+                :id="`${treasury.networkId}:${asset.contractAddress}`"
+                type="token"
+                :size="32"
+              />
+              <div class="flex flex-col ml-3 leading-[22px] min-w-0 pr-2 md:pr-0">
+                <h4 class="truncate" v-text="asset.symbol" />
+                <div class="text-[17px] truncate text-skin-text" v-text="asset.name" />
+              </div>
+            </div>
+            <div
+              v-if="asset.price"
+              class="flex-col items-end text-right leading-[22px] w-[240px] hidden md:block"
+            >
+              <h4
+                class="text-skin-link"
+                v-text="`$${_n(asset.price, 'standard', { maximumFractionDigits: 2 })}`"
+              />
+              <div v-if="asset.change" class="text-[17px]">
+                <div
+                  v-if="asset.change > 0"
+                  class="text-skin-success"
+                  v-text="`+${_n(asset.change, 'standard', { maximumFractionDigits: 2 })}%`"
+                />
+                <div
+                  v-if="asset.change < 0"
+                  class="text-skin-danger"
+                  v-text="`${_n(asset.change, 'standard', { maximumFractionDigits: 2 })}%`"
+                />
+              </div>
+            </div>
+            <div class="flex-col items-end text-right leading-[22px] w-auto md:w-[240px]">
+              <h4
+                class="text-skin-link truncate"
+                v-text="
+                  `${_c(asset.tokenBalance || 0n, asset.decimals || 0)} ${shorten(
+                    asset.symbol,
+                    'symbol'
+                  )}`
+                "
+              />
+              <div
+                v-if="asset.value"
+                class="text-[17px] text-skin-text"
+                v-text="`$${_n(asset.value, 'standard', { maximumFractionDigits: 2 })}`"
+              />
+            </div>
+          </a>
+        </div>
+        <div v-else-if="page === 'nfts'">
+          <div
+            v-if="nftsLoaded && nfts.length === 0"
+            class="px-4 py-3 flex items-center text-skin-link"
+          >
+            <IH-exclamation-circle class="inline-block mr-2" />
+            There are no NFTs in treasury.
+          </div>
+          <UiLoading v-if="nftsLoading && !nftsLoaded" class="px-4 py-3 block" />
+          <div class="flex flex-row flex-wrap gap-4 p-4">
+            <a
+              v-for="(nft, i) in nfts"
+              :key="i"
+              :href="sanitizeUrl(nft.permalink) || '#'"
+              target="_blank"
+              class="block max-w-[120px]"
+            >
+              <UiNftImage :item="nft" class="w-full" />
+              <div class="mt-2 text-[17px] truncate">{{ nft.displayTitle }}</div>
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+    <teleport to="#modal">
+      <ModalSendToken
+        :open="modalOpen.tokens"
+        :address="treasury.wallet"
+        :network="treasury.network"
+        :network-id="treasury.networkId"
+        @close="modalOpen.tokens = false"
+        @add="addTx"
+      />
+      <ModalSendNft
+        :open="modalOpen.nfts"
+        :address="treasury.wallet"
+        :network="treasury.network"
+        @close="modalOpen.nfts = false"
+        @add="addTx"
+      />
+      <ModalLinkWalletConnect
+        :open="modalOpen.walletConnectLink"
+        :address="treasury.wallet"
+        :network="treasury.network"
+        :network-id="treasury.networkId"
+        :space-key="spaceKey"
+        :execution-strategy="executionStrategy"
+        @close="modalOpen.walletConnectLink = false"
+      />
+    </teleport>
+  </template>
+</template>
diff --git a/apps/ui/src/composables/useTreasury.ts b/apps/ui/src/composables/useTreasury.ts
index 727916209..60c6bc07c 100644
--- a/apps/ui/src/composables/useTreasury.ts
+++ b/apps/ui/src/composables/useTreasury.ts
@@ -1,20 +1,17 @@
 import { CHAIN_IDS } from '@/helpers/constants';
-import { Space } from '@/types';
+import { SpaceMetadataTreasury } from '@/types';
 
-type NullableSpace = Space | undefined | null;
-
-export function useTreasury(spaceRef: Ref<NullableSpace>) {
+export function useTreasury(treasuryData: SpaceMetadataTreasury) {
   const treasury = computed(() => {
-    if (!spaceRef.value || !spaceRef.value.wallet) return null;
+    if (!treasuryData || !treasuryData.network || !treasuryData.address) return null;
 
-    const [networkId, wallet] = spaceRef.value.wallet.split(':');
-    const chainId = CHAIN_IDS[networkId];
-    if (!chainId || !wallet) return null;
+    const chainId = CHAIN_IDS[treasuryData.network];
+    if (!chainId || !treasuryData) return null;
 
     return {
-      networkId,
+      networkId: treasuryData.network,
       network: chainId,
-      wallet
+      wallet: treasuryData.address
     };
   });
 
diff --git a/apps/ui/src/helpers/utils.test.ts b/apps/ui/src/helpers/utils.test.ts
index dd83f9bb1..1b5380acb 100644
--- a/apps/ui/src/helpers/utils.test.ts
+++ b/apps/ui/src/helpers/utils.test.ts
@@ -15,8 +15,13 @@ describe('utils', () => {
         twitter: 'SnapshotLabs',
         discord: 'snapshot',
         votingPowerSymbol: 'VOTE',
-        walletNetwork: 'gor',
-        walletAddress: '0x000000000000000000000000000000000000dead',
+        treasuries: [
+          {
+            name: 'treasury 1',
+            network: 'gor',
+            address: '0x000000000000000000000000000000000000dead'
+          }
+        ],
         delegations: [
           {
             name: 'sample',
@@ -39,7 +44,13 @@ describe('utils', () => {
           github: 'snapshot-labs',
           twitter: 'SnapshotLabs',
           discord: 'snapshot',
-          wallets: ['gor:0x000000000000000000000000000000000000dead'],
+          treasuries: [
+            {
+              name: 'treasury 1',
+              network: 'gor',
+              address: '0x000000000000000000000000000000000000dead'
+            }
+          ],
           delegations: [
             {
               name: 'sample',
diff --git a/apps/ui/src/helpers/utils.ts b/apps/ui/src/helpers/utils.ts
index 46c13ab41..5bd0d0ba2 100644
--- a/apps/ui/src/helpers/utils.ts
+++ b/apps/ui/src/helpers/utils.ts
@@ -301,11 +301,6 @@ export function createErc1155Metadata(
   metadata: SpaceMetadata,
   extraProperties?: Record<string, any>
 ) {
-  const wallets: string[] = [];
-  if (metadata.walletNetwork && metadata.walletAddress) {
-    wallets.push(`${metadata.walletNetwork}:${metadata.walletAddress}`);
-  }
-
   return {
     name: metadata.name,
     avatar: metadata.avatar,
@@ -317,7 +312,11 @@ export function createErc1155Metadata(
       github: metadata.github,
       twitter: metadata.twitter,
       discord: metadata.discord,
-      wallets,
+      treasuries: metadata.treasuries.map(treasury => ({
+        name: treasury.name,
+        network: treasury.network,
+        address: treasury.address
+      })),
       delegations: metadata.delegations.map(delegation => ({
         name: delegation.name,
         api_type: delegation.apiType,
diff --git a/apps/ui/src/networks/common/graphqlApi/index.ts b/apps/ui/src/networks/common/graphqlApi/index.ts
index 5705e438b..4426e5b3a 100644
--- a/apps/ui/src/networks/common/graphqlApi/index.ts
+++ b/apps/ui/src/networks/common/graphqlApi/index.ts
@@ -93,7 +93,15 @@ function formatSpace(space: ApiSpace, networkId: NetworkID): Space {
     twitter: space.metadata.twitter,
     discord: space.metadata.discord,
     voting_power_symbol: space.metadata.voting_power_symbol,
-    wallet: space.metadata.wallet,
+    treasuries: space.metadata.treasuries.map(treasury => {
+      const { name, network, address } = JSON.parse(treasury);
+
+      return {
+        name,
+        network,
+        address
+      };
+    }),
     delegations: space.metadata.delegations.map(delegation => {
       const { name, api_type, api_url, contract } = JSON.parse(delegation);
 
@@ -109,6 +117,7 @@ function formatSpace(space: ApiSpace, networkId: NetworkID): Space {
     }),
     executors: space.metadata.executors,
     executors_types: space.metadata.executors_types,
+    executors_strategies: space.metadata.executors_strategies,
     voting_power_validation_strategies_parsed_metadata: processStrategiesMetadata(
       space.voting_power_validation_strategies_parsed_metadata
     ),
diff --git a/apps/ui/src/networks/common/graphqlApi/queries.ts b/apps/ui/src/networks/common/graphqlApi/queries.ts
index 4956c6e73..5ef863325 100644
--- a/apps/ui/src/networks/common/graphqlApi/queries.ts
+++ b/apps/ui/src/networks/common/graphqlApi/queries.ts
@@ -13,10 +13,16 @@ const SPACE_FRAGMENT = gql`
       twitter
       discord
       voting_power_symbol
-      wallet
+      treasuries
       delegations
       executors
       executors_types
+      executors_strategies {
+        id
+        type
+        treasury_chain
+        treasury
+      }
     }
     controller
     voting_delay
diff --git a/apps/ui/src/networks/common/graphqlApi/types.ts b/apps/ui/src/networks/common/graphqlApi/types.ts
index c076b72b9..397828867 100644
--- a/apps/ui/src/networks/common/graphqlApi/types.ts
+++ b/apps/ui/src/networks/common/graphqlApi/types.ts
@@ -25,6 +25,13 @@ export type ApiSpace = {
     wallet: string;
     executors: string[];
     executors_types: string[];
+    executors_strategies: {
+      id: string;
+      type: string;
+      treasury: string | null;
+      treasury_chain: number | null;
+    }[];
+    treasuries: string[];
     delegations: string[];
   };
   controller: string;
diff --git a/apps/ui/src/networks/offchain/api/index.ts b/apps/ui/src/networks/offchain/api/index.ts
index d8a3d4d15..a1fabdba3 100644
--- a/apps/ui/src/networks/offchain/api/index.ts
+++ b/apps/ui/src/networks/offchain/api/index.ts
@@ -6,9 +6,18 @@ import {
   PROPOSAL_QUERY,
   VOTES_QUERY
 } from './queries';
+import { enabledNetworks } from '@/networks';
 import { PaginationOpts, SpacesFilter, NetworkApi } from '@/networks/types';
 import { getNames } from '@/helpers/stamp';
-import { Space, Proposal, Vote, User, NetworkID, ProposalState } from '@/types';
+import {
+  Space,
+  Proposal,
+  Vote,
+  User,
+  NetworkID,
+  ProposalState,
+  SpaceMetadataTreasury
+} from '@/types';
 import { ApiSpace, ApiProposal, ApiVote } from './types';
 import { DEFAULT_VOTING_DELAY } from '../constants';
 
@@ -28,7 +37,10 @@ function getProposalState(proposal: ApiProposal): ProposalState {
 function formatSpace(space: ApiSpace, networkId: NetworkID): Space {
   // TODO: convert ChainID to ShortName, we might need external mapping to handle
   // all of those - or just have simple map with limited support
-  const wallet = space.treasuries[0] ? `eth:${space.treasuries[0].address}` : '';
+  const treasuries = space.treasuries.filter(treasury =>
+    enabledNetworks.includes(treasury.network as NetworkID)
+  ) as SpaceMetadataTreasury[];
+
   let validationName = space.validation.name;
   const validationParams = space.validation.params || {};
   if (space.validation.name === 'basic') {
@@ -61,7 +73,7 @@ function formatSpace(space: ApiSpace, networkId: NetworkID): Space {
     min_voting_period: space.voting.period ?? DEFAULT_VOTING_DELAY,
     max_voting_period: space.voting.period ?? 0,
     proposal_threshold: '1',
-    wallet,
+    treasuries,
     delegations: space.delegationPortal
       ? [
           {
@@ -78,6 +90,7 @@ function formatSpace(space: ApiSpace, networkId: NetworkID): Space {
     authenticators: [DEFAULT_AUTHENTICATOR],
     executors: [],
     executors_types: [],
+    executors_strategies: [],
     strategies: space.strategies.map(strategy => strategy.name),
     strategies_indicies: [],
     strategies_params: space.strategies.map(strategy => strategy),
diff --git a/apps/ui/src/networks/offchain/api/queries.ts b/apps/ui/src/networks/offchain/api/queries.ts
index 8ba57afe5..04503657c 100644
--- a/apps/ui/src/networks/offchain/api/queries.ts
+++ b/apps/ui/src/networks/offchain/api/queries.ts
@@ -13,6 +13,7 @@ const SPACE_FRAGMENT = gql`
     github
     symbol
     treasuries {
+      name
       network
       address
     }
diff --git a/apps/ui/src/networks/offchain/api/types.ts b/apps/ui/src/networks/offchain/api/types.ts
index d455bab6a..508c2f88c 100644
--- a/apps/ui/src/networks/offchain/api/types.ts
+++ b/apps/ui/src/networks/offchain/api/types.ts
@@ -13,6 +13,7 @@ export type ApiSpace = {
   symbol: string;
   treasuries: [
     {
+      name: string;
       network: string;
       address: string;
     }
diff --git a/apps/ui/src/types.ts b/apps/ui/src/types.ts
index b9e97f0d8..c767f3992 100644
--- a/apps/ui/src/types.ts
+++ b/apps/ui/src/types.ts
@@ -32,6 +32,12 @@ export type SelectedStrategy = {
   type: string;
 };
 
+export type SpaceMetadataTreasury = {
+  name: string | null;
+  network: NetworkID | null;
+  address: string | null;
+};
+
 export type SpaceMetadataDelegation = {
   name: string | null;
   apiType: string | null;
@@ -50,8 +56,7 @@ export type SpaceMetadata = {
   github: string;
   discord: string;
   votingPowerSymbol: string;
-  walletNetwork: NetworkID | null;
-  walletAddress: string | null;
+  treasuries: SpaceMetadataTreasury[];
   delegations: SpaceMetadataDelegation[];
 };
 
@@ -79,12 +84,12 @@ export type Space = {
   cover: string;
   about?: string;
   external_url: string;
+  treasuries: SpaceMetadataTreasury[];
   delegations: SpaceMetadataDelegation[];
   twitter: string;
   github: string;
   discord: string;
   voting_power_symbol: string;
-  wallet: string;
   controller: string;
   voting_delay: number;
   min_voting_period: number;
@@ -102,6 +107,12 @@ export type Space = {
   authenticators: string[];
   executors: string[];
   executors_types: string[];
+  executors_strategies: {
+    id: string;
+    type: string;
+    treasury: string | null;
+    treasury_chain: number | null;
+  }[];
   proposal_count: number;
   vote_count: number;
   created: number;
@@ -257,3 +268,6 @@ export type ContractCallTransaction = BaseTransaction & {
 };
 
 export type Transaction = SendTokenTransaction | SendNftTransaction | ContractCallTransaction;
+
+// Utils
+export type RequiredProperty<T> = { [P in keyof T]: Required<NonNullable<T[P]>> };
diff --git a/apps/ui/src/views/Create.vue b/apps/ui/src/views/Create.vue
index a1e680df2..41db789ff 100644
--- a/apps/ui/src/views/Create.vue
+++ b/apps/ui/src/views/Create.vue
@@ -46,8 +46,6 @@ const { predictSpaceAddress } = useActions();
 const { web3 } = useWeb3();
 
 const pagesRefs = ref([] as HTMLElement[]);
-const showPicker = ref(false);
-const searchValue = ref('');
 const sending = ref(false);
 const currentPage: Ref<PageID> = ref('profile');
 const pagesErrors: Ref<Record<PageID, Record<string, string>>> = ref({
@@ -71,8 +69,7 @@ const metadataForm: SpaceMetadata = reactive(
     github: '',
     discord: '',
     votingPowerSymbol: '',
-    walletNetwork: null,
-    walletAddress: null,
+    treasuries: [],
     delegations: []
   })
 );
@@ -133,11 +130,6 @@ function handleNextClick() {
   pagesRefs.value[currentIndex + 1].scrollIntoView();
 }
 
-function handlePickerSelect(value: string) {
-  showPicker.value = false;
-  metadataForm.walletAddress = value;
-}
-
 async function handleSubmit() {
   salt.value = getSalt();
   predictedSpaceAddress.value = await predictSpaceAddress(selectedNetworkId.value, salt.value);
@@ -203,10 +195,10 @@ watchEffect(() => setTitle('Create space'));
           <FormProfile
             v-if="currentPage === 'profile'"
             :form="metadataForm"
+            :treasuries-value="metadataForm.treasuries"
             :delegations-value="metadataForm.delegations"
-            @pick="showPicker = true"
+            @treasuries="v => (metadataForm.treasuries = v)"
             @delegations="v => (metadataForm.delegations = v)"
-            @no-network="metadataForm.walletAddress = null"
             @errors="v => handleErrors('profile', v)"
           />
           <FormNetwork v-else-if="currentPage === 'network'" v-model="selectedNetworkId" />
@@ -270,26 +262,5 @@ watchEffect(() => setTitle('Create space'));
         </UiButton>
       </div>
     </div>
-    <teleport to="#modal">
-      <UiModal :open="showPicker" @close="showPicker = false">
-        <template #header>
-          <h3>Select contact</h3>
-          <a class="absolute left-0 -top-1 p-4 text-color" @click="showPicker = false">
-            <IH-arrow-narrow-left class="mr-2" />
-          </a>
-          <div class="flex items-center border-t px-2 py-3 mt-3 -mb-3">
-            <IH-search class="mx-2" />
-            <input
-              ref="searchInput"
-              v-model="searchValue"
-              type="text"
-              placeholder="Search"
-              class="flex-auto bg-transparent text-skin-link"
-            />
-          </div>
-        </template>
-        <PickerContact :loading="false" :search-value="searchValue" @pick="handlePickerSelect" />
-      </UiModal>
-    </teleport>
   </div>
 </template>
diff --git a/apps/ui/src/views/Editor.vue b/apps/ui/src/views/Editor.vue
index 2d885eebb..49b0cf2ce 100644
--- a/apps/ui/src/views/Editor.vue
+++ b/apps/ui/src/views/Editor.vue
@@ -1,8 +1,13 @@
 <script setup lang="ts">
 import { getNetwork, supportsNullCurrent } from '@/networks';
-import { omit, shortenAddress } from '@/helpers/utils';
+import { compareAddresses, omit } from '@/helpers/utils';
+import { CHAIN_IDS } from '@/helpers/constants';
 import { validateForm } from '@/helpers/validation';
-import { SelectedStrategy, VoteType } from '@/types';
+import { RequiredProperty, SelectedStrategy, VoteType, SpaceMetadataTreasury } from '@/types';
+
+type StrategyWithTreasury = SelectedStrategy & {
+  treasury: RequiredProperty<SpaceMetadataTreasury>;
+};
 
 const TITLE_DEFINITION = {
   type: 'string',
@@ -91,8 +96,36 @@ const supportedExecutionStrategies = computed(() => {
   const networkValue = network.value;
   if (!spaceValue || !networkValue) return null;
 
-  return spaceValue.executors.filter((_, i) =>
-    networkValue.helpers.isExecutorSupported(spaceValue.executors_types[i])
+  return spaceValue.treasuries
+    .map(treasury => {
+      const strategy = spaceValue.executors_strategies.find(strategy => {
+        return (
+          strategy.treasury &&
+          strategy.treasury_chain &&
+          treasury.address &&
+          treasury.network &&
+          compareAddresses(strategy.treasury, treasury.address) &&
+          CHAIN_IDS[treasury.network] === strategy.treasury_chain
+        );
+      });
+
+      if (!strategy) return null;
+
+      return {
+        address: strategy.id,
+        type: strategy.type,
+        treasury: treasury as RequiredProperty<SpaceMetadataTreasury>
+      };
+    })
+    .filter(
+      strategy => strategy && networkValue.helpers.isExecutorSupported(strategy.type)
+    ) as StrategyWithTreasury[];
+});
+const selectedExecutionWithTreasury = computed(() => {
+  if (!executionStrategy.value || !supportedExecutionStrategies.value) return null;
+
+  return supportedExecutionStrategies.value.find(
+    strategy => strategy.address === executionStrategy.value?.address
   );
 });
 const votingTypes = computed(() => {
@@ -351,30 +384,27 @@ export default defineComponent({
         <h4 class="eyebrow mb-2">Execution</h4>
         <div class="border rounded-lg mb-3">
           <ExecutionButton
-            v-for="(executor, i) in supportedExecutionStrategies"
-            :key="executor"
+            v-for="strategy in supportedExecutionStrategies"
+            :key="strategy.address"
             class="flex-auto flex items-center gap-2"
-            @click="
-              handleExecutionStrategySelected({
-                address: executor,
-                type: space.executors_types[i]
-              })
-            "
+            @click="handleExecutionStrategySelected(strategy)"
           >
             <IH-chip />
             <span class="flex-1">
-              {{ network.constants.EXECUTORS[space.executors_types[i]] }}
-              execution strategy
-              <span class="hidden sm:inline-block">({{ shortenAddress(executor) }})</span>
+              {{ strategy.treasury.name }}
+              <span class="hidden sm:inline-block">
+                ({{ network.constants.EXECUTORS[strategy.type] }} execution strategy)
+              </span>
             </span>
-            <IH-check v-if="executionStrategy?.address === executor" />
+            <IH-check v-if="executionStrategy?.address === strategy.address" />
           </ExecutionButton>
         </div>
         <EditorExecution
-          v-if="executionStrategy"
+          v-if="selectedExecutionWithTreasury"
+          :key="selectedExecutionWithTreasury.address"
           v-model="proposal.execution"
-          :selected-execution-strategy="executionStrategy"
           :space="space"
+          :treasury-data="selectedExecutionWithTreasury.treasury"
           class="mb-4"
         />
       </div>
diff --git a/apps/ui/src/views/Space/Treasury.vue b/apps/ui/src/views/Space/Treasury.vue
index cf46f6f1c..345ed3c33 100644
--- a/apps/ui/src/views/Space/Treasury.vue
+++ b/apps/ui/src/views/Space/Treasury.vue
@@ -1,295 +1,30 @@
 <script setup lang="ts">
-import { _n, _c, shorten, sanitizeUrl } from '@/helpers/utils';
-import { getNetwork, evmNetworks } from '@/networks';
-import { ETH_CONTRACT } from '@/helpers/constants';
-import { NetworkID, Space, Transaction } from '@/types';
-import type { Token } from '@/helpers/alchemy';
+import { Space, SpaceMetadataTreasury, RequiredProperty } from '@/types';
 
 const props = defineProps<{ space: Space }>();
 
 const { setTitle } = useTitle();
-const router = useRouter();
-const { copy, copied } = useClipboard();
-const { loading, loaded, assets, loadBalances } = useBalances();
-const { loading: nftsLoading, loaded: nftsLoaded, nfts, loadNfts } = useNfts();
-const { treasury } = useTreasury(toRef(props, 'space'));
-const { createDraft } = useEditor();
 
-const page: Ref<'tokens' | 'nfts'> = ref('tokens');
-const modalOpen = ref({
-  tokens: false,
-  nfts: false,
-  walletConnectLink: false
-});
-
-const currentNetworkId = computed(() => {
-  if (!props.space.wallet) return null;
-
-  try {
-    return props.space.wallet.split(':')[0] as NetworkID;
-  } catch (e) {
-    return null;
-  }
-});
-
-const currentNetwork = computed(() => {
-  if (!currentNetworkId.value) return null;
-
-  return getNetwork(currentNetworkId.value);
-});
-
-const spaceKey = computed(() => `${props.space.network}:${props.space.id}`);
-
-const totalQuote = computed(() =>
-  assets.value.reduce((acc, asset) => {
-    return acc + asset.value;
-  }, 0)
-);
-
-const sortedAssets = computed(() =>
-  (assets || []).value.sort((a, b) => {
-    const isEth = (token: Token) => token.contractAddress === ETH_CONTRACT;
-    if (isEth(a)) return -1;
-    if (isEth(b)) return 1;
-    return 0;
-  })
+const activeTreasuryId = ref(0);
+const filteredTreasuries = computed(
+  () =>
+    props.space.treasuries.filter(
+      t => t.address && t.network
+    ) as RequiredProperty<SpaceMetadataTreasury>[]
 );
-
-const treasuryExplorerUrl = computed(() => {
-  if (!currentNetwork.value || !treasury.value) return '';
-
-  const url = currentNetwork.value.helpers.getExplorerUrl(treasury.value.wallet, 'address');
-  return sanitizeUrl(url);
-});
-
-const executionStrategy = computed(() => {
-  let executorIndex = props.space.executors.findIndex(
-    executorAddress => executorAddress === treasury.value?.wallet
-  );
-
-  if (executorIndex === -1) {
-    // If the treasury is not an executor, use the first avatar executor
-    executorIndex = props.space.executors_types.findIndex(e => e === 'SimpleQuorumAvatar');
-  }
-
-  if (executorIndex === -1) return null;
-
-  return {
-    address: props.space.executors[executorIndex],
-    type: props.space.executors_types[executorIndex]
-  };
-});
-
-function openModal(type: 'tokens' | 'nfts') {
-  modalOpen.value[type] = true;
-}
-
-function addTx(tx: Transaction) {
-  const draftId = createDraft(spaceKey.value, {
-    execution: [tx],
-    executionStrategy: executionStrategy.value
-  });
-  router.push(`create/${draftId}`);
-}
-
-onMounted(() => {
-  if (!treasury.value) return;
-
-  loadBalances(treasury.value.wallet, treasury.value.network);
-  loadNfts(treasury.value.wallet, treasury.value.network);
-});
+const treasuryData = computed(() => filteredTreasuries.value[activeTreasuryId.value]);
 
 watchEffect(() => setTitle(`Treasury - ${props.space.name}`));
 </script>
 
 <template>
-  <div v-if="!treasury || !currentNetwork" class="p-4 flex items-center text-skin-link">
-    <IH-exclamation-circle class="inline-block mr-2" />
-    No treasury configured.
+  <div
+    v-if="filteredTreasuries.length !== 1"
+    class="flex px-4 bg-skin-bg border-b sticky top-[71px] lg:top-[72px] z-40 space-x-3"
+  >
+    <a v-for="(treasury, i) in filteredTreasuries" :key="i" @click="activeTreasuryId = i">
+      <UiLink :is-active="activeTreasuryId === i" :text="treasury.name || 'Unnamed treasury'" />
+    </a>
   </div>
-  <template v-else>
-    <div class="p-4 space-x-2 flex">
-      <div class="flex-auto" />
-      <UiTooltip
-        v-if="currentNetworkId && evmNetworks.includes(currentNetworkId)"
-        title="Connect to apps"
-      >
-        <UiButton class="!px-0 w-[46px]" @click="modalOpen.walletConnectLink = true">
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            width="480"
-            height="332"
-            viewBox="0 0 480 332"
-            class="inline-block w-[26px] h-[26px]"
-          >
-            <path
-              fill="rgba(var(--link))"
-              d="m126.613 93.9842c62.622-61.3123 164.152-61.3123 226.775 0l7.536 7.3788c3.131 3.066 3.131 8.036 0 11.102l-25.781 25.242c-1.566 1.533-4.104 1.533-5.67 0l-10.371-10.154c-43.687-42.7734-114.517-42.7734-158.204 0l-11.107 10.874c-1.565 1.533-4.103 1.533-5.669 0l-25.781-25.242c-3.132-3.066-3.132-8.036 0-11.102zm280.093 52.2038 22.946 22.465c3.131 3.066 3.131 8.036 0 11.102l-103.463 101.301c-3.131 3.065-8.208 3.065-11.339 0l-73.432-71.896c-.783-.767-2.052-.767-2.835 0l-73.43 71.896c-3.131 3.065-8.208 3.065-11.339 0l-103.4657-101.302c-3.1311-3.066-3.1311-8.036 0-11.102l22.9456-22.466c3.1311-3.065 8.2077-3.065 11.3388 0l73.4333 71.897c.782.767 2.051.767 2.834 0l73.429-71.897c3.131-3.065 8.208-3.065 11.339 0l73.433 71.897c.783.767 2.052.767 2.835 0l73.431-71.895c3.132-3.066 8.208-3.066 11.339 0z"
-            />
-          </svg>
-        </UiButton>
-      </UiTooltip>
-      <UiTooltip title="Copy address">
-        <UiButton class="!px-0 w-[46px]" @click="copy(treasury.wallet)">
-          <IH-duplicate v-if="!copied" class="inline-block" />
-          <IH-check v-else class="inline-block" />
-        </UiButton>
-      </UiTooltip>
-      <UiTooltip :title="page === 'tokens' ? 'Send token' : 'Send NFT'">
-        <UiButton class="!px-0 w-[46px]" @click="openModal(page)">
-          <IH-arrow-sm-right class="inline-block -rotate-45" />
-        </UiButton>
-      </UiTooltip>
-    </div>
-    <div class="space-y-3">
-      <div>
-        <UiLabel label="Treasury" sticky />
-        <a
-          :href="treasuryExplorerUrl || '#'"
-          target="_blank"
-          class="flex justify-between items-center mx-4 py-3 border-b"
-          :class="{
-            'pointer-events-none': !treasuryExplorerUrl
-          }"
-        >
-          <UiStamp :id="treasury.wallet" type="avatar" :size="32" class="mr-3" />
-          <div class="flex-1 leading-[22px]">
-            <h4 class="text-skin-link" v-text="shorten(treasury.wallet)" />
-            <div class="text-skin-text text-[17px]" v-text="shorten(treasury.wallet)" />
-          </div>
-          <h3 v-text="`$${_n(totalQuote.toFixed())}`" />
-        </a>
-      </div>
-      <div>
-        <div class="flex pl-4 border-b space-x-3">
-          <button type="button" @click="page = 'tokens'">
-            <UiLink :is-active="page === 'tokens'" text="Tokens" />
-          </button>
-          <button type="button" @click="page = 'nfts'">
-            <UiLink :is-active="page === 'nfts'" text="NFTs" />
-          </button>
-        </div>
-        <div v-if="page === 'tokens'">
-          <UiLoading v-if="loading && !loaded" class="px-4 py-3 block" />
-          <div
-            v-if="loaded && sortedAssets.length === 0"
-            class="px-4 py-3 flex items-center text-skin-link"
-          >
-            <IH-exclamation-circle class="inline-block mr-2" />
-            There are no tokens in treasury.
-          </div>
-          <a
-            v-for="(asset, i) in sortedAssets"
-            :key="i"
-            :href="
-              (asset.contractAddress === ETH_CONTRACT
-                ? treasuryExplorerUrl
-                : sanitizeUrl(
-                    currentNetwork.helpers.getExplorerUrl(asset.contractAddress, 'token')
-                  )) || '#'
-            "
-            target="_blank"
-            class="mx-4 py-3 border-b flex"
-          >
-            <div class="flex-auto flex items-center min-w-0">
-              <UiStampToken
-                :id="`${treasury.networkId}:${asset.contractAddress}`"
-                type="token"
-                :size="32"
-              />
-              <div class="flex flex-col ml-3 leading-[22px] min-w-0 pr-2 md:pr-0">
-                <h4 class="truncate" v-text="asset.symbol" />
-                <div class="text-[17px] truncate text-skin-text" v-text="asset.name" />
-              </div>
-            </div>
-            <div
-              v-if="asset.price"
-              class="flex-col items-end text-right leading-[22px] w-[240px] hidden md:block"
-            >
-              <h4
-                class="text-skin-link"
-                v-text="`$${_n(asset.price, 'standard', { maximumFractionDigits: 2 })}`"
-              />
-              <div v-if="asset.change" class="text-[17px]">
-                <div
-                  v-if="asset.change > 0"
-                  class="text-skin-success"
-                  v-text="`+${_n(asset.change, 'standard', { maximumFractionDigits: 2 })}%`"
-                />
-                <div
-                  v-if="asset.change < 0"
-                  class="text-skin-danger"
-                  v-text="`${_n(asset.change, 'standard', { maximumFractionDigits: 2 })}%`"
-                />
-              </div>
-            </div>
-            <div class="flex-col items-end text-right leading-[22px] w-auto md:w-[240px]">
-              <h4
-                class="text-skin-link truncate"
-                v-text="
-                  `${_c(asset.tokenBalance || 0n, asset.decimals || 0)} ${shorten(
-                    asset.symbol,
-                    'symbol'
-                  )}`
-                "
-              />
-              <div
-                v-if="asset.value"
-                class="text-[17px] text-skin-text"
-                v-text="`$${_n(asset.value, 'standard', { maximumFractionDigits: 2 })}`"
-              />
-            </div>
-          </a>
-        </div>
-        <div v-else-if="page === 'nfts'">
-          <div
-            v-if="nftsLoaded && nfts.length === 0"
-            class="px-4 py-3 flex items-center text-skin-link"
-          >
-            <IH-exclamation-circle class="inline-block mr-2" />
-            There are no NFTs in treasury.
-          </div>
-          <UiLoading v-if="nftsLoading && !nftsLoaded" class="px-4 py-3 block" />
-          <div class="flex flex-row flex-wrap gap-4 p-4">
-            <a
-              v-for="(nft, i) in nfts"
-              :key="i"
-              :href="sanitizeUrl(nft.permalink) || '#'"
-              target="_blank"
-              class="block max-w-[120px]"
-            >
-              <UiNftImage :item="nft" class="w-full" />
-              <div class="mt-2 text-[17px] truncate">{{ nft.displayTitle }}</div>
-            </a>
-          </div>
-        </div>
-      </div>
-    </div>
-    <teleport to="#modal">
-      <ModalSendToken
-        :open="modalOpen.tokens"
-        :address="treasury.wallet"
-        :network="treasury.network"
-        :network-id="treasury.networkId"
-        @close="modalOpen.tokens = false"
-        @add="addTx"
-      />
-      <ModalSendNft
-        :open="modalOpen.nfts"
-        :address="treasury.wallet"
-        :network="treasury.network"
-        @close="modalOpen.nfts = false"
-        @add="addTx"
-      />
-      <ModalLinkWalletConnect
-        :open="modalOpen.walletConnectLink"
-        :address="treasury.wallet"
-        :network="treasury.network"
-        :network-id="treasury.networkId"
-        :space-key="spaceKey"
-        :execution-strategy="executionStrategy"
-        @close="modalOpen.walletConnectLink = false"
-      />
-    </teleport>
-  </template>
+  <SpaceTreasury :key="activeTreasuryId" :space="space" :treasury-data="treasuryData" />
 </template>