diff --git a/src/frontend/src/lib/components/analytics/NoAnalytics.svelte b/src/frontend/src/lib/components/analytics/NoAnalytics.svelte
index 7452a0110..f061cc7ab 100644
--- a/src/frontend/src/lib/components/analytics/NoAnalytics.svelte
+++ b/src/frontend/src/lib/components/analytics/NoAnalytics.svelte
@@ -1,12 +1,9 @@
 <script lang="ts">
 	import { i18n } from '$lib/stores/i18n.store';
-	import NoAnalyticsActions from '$lib/components/analytics/NoAnalyticsActions.svelte';
 </script>
 
 <div class="card-container">
 	<p>{$i18n.analytics.empty}</p>
-
-	<NoAnalyticsActions />
 </div>
 
 <style lang="scss">
diff --git a/src/frontend/src/lib/components/analytics/NoAnalyticsActions.svelte b/src/frontend/src/lib/components/analytics/NoAnalyticsActions.svelte
deleted file mode 100644
index 5a9926773..000000000
--- a/src/frontend/src/lib/components/analytics/NoAnalyticsActions.svelte
+++ /dev/null
@@ -1,10 +0,0 @@
-<script lang="ts">
-	import Actions from '$lib/components/core/Actions.svelte';
-	import NoAnalyticsAttach from '$lib/components/analytics/NoAnalyticsAttach.svelte';
-
-	let visible: boolean | undefined;
-</script>
-
-<Actions bind:visible>
-	<NoAnalyticsAttach on:junoAttach={() => (visible = false)} />
-</Actions>
diff --git a/src/frontend/src/lib/components/mission-control/MissionControlActions.svelte b/src/frontend/src/lib/components/mission-control/MissionControlActions.svelte
index 4b0f2fb00..e42c0697c 100644
--- a/src/frontend/src/lib/components/mission-control/MissionControlActions.svelte
+++ b/src/frontend/src/lib/components/mission-control/MissionControlActions.svelte
@@ -6,6 +6,7 @@
 	import type { CanisterIcStatus } from '$lib/types/canister';
 	import type { Principal } from '@dfinity/principal';
 	import MissionControlAttachSatellite from '$lib/components/mission-control/MissionControlAttachSatellite.svelte';
+	import MissionControlAttachOrbiter from '$lib/components/mission-control/MissionControlAttachOrbiter.svelte';
 
 	export let missionControlId: Principal;
 
@@ -44,5 +45,9 @@
 
 	<CanisterTransferCycles {canister} on:click={onTransferCycles} />
 
+	<hr />
+
 	<MissionControlAttachSatellite on:junoAttach={close} />
+
+	<MissionControlAttachOrbiter on:junoAttach={close} />
 </Actions>
diff --git a/src/frontend/src/lib/components/analytics/NoAnalyticsAttach.svelte b/src/frontend/src/lib/components/mission-control/MissionControlAttachOrbiter.svelte
similarity index 59%
rename from src/frontend/src/lib/components/analytics/NoAnalyticsAttach.svelte
rename to src/frontend/src/lib/components/mission-control/MissionControlAttachOrbiter.svelte
index e75b7e438..128d06284 100644
--- a/src/frontend/src/lib/components/analytics/NoAnalyticsAttach.svelte
+++ b/src/frontend/src/lib/components/mission-control/MissionControlAttachOrbiter.svelte
@@ -4,6 +4,9 @@
 	import IconLink from '$lib/components/icons/IconLink.svelte';
 	import { attachOrbiter } from '$lib/services/mission-control.services';
 	import CanisterAttach from '$lib/components/canister/CanisterAttach.svelte';
+	import { createEventDispatcher } from 'svelte';
+	import { toasts } from '$lib/stores/toasts.store';
+	import { i18nCapitalize, i18nFormat } from '$lib/utils/i18n.utils';
 
 	let visible: boolean | undefined;
 
@@ -19,11 +22,28 @@
 			orbiterId: canisterId
 		});
 	};
+	const dispatch = createEventDispatcher();
+
+	const onSuccess = () => {
+		toasts.success(
+			i18nCapitalize(
+				i18nFormat($i18n.canisters.attach_success, [
+					{
+						placeholder: '{0}',
+						value: 'orbiter'
+					}
+				])
+			)
+		);
+
+		dispatch('junoAttach');
+	};
 </script>
 
-<button on:click={() => (visible = true)} class="menu"><IconLink /> {$i18n.core.attach}</button>
+<button on:click={() => (visible = true)} class="menu"><IconLink /> {$i18n.analytics.attach}</button
+>
 
-<CanisterAttach on:junoAttach bind:visible setFn={setOrbiter}>
+<CanisterAttach on:junoAttach={onSuccess} bind:visible setFn={setOrbiter}>
 	<svelte:fragment slot="title">{$i18n.analytics.attach}</svelte:fragment>
 	<svelte:fragment slot="input">{$i18n.analytics.attach_id}</svelte:fragment>
 </CanisterAttach>
diff --git a/src/frontend/src/lib/components/orbiter/OrbiterActions.svelte b/src/frontend/src/lib/components/orbiter/OrbiterActions.svelte
index 5bf4359ba..811ad22c0 100644
--- a/src/frontend/src/lib/components/orbiter/OrbiterActions.svelte
+++ b/src/frontend/src/lib/components/orbiter/OrbiterActions.svelte
@@ -46,6 +46,8 @@
 
 	<CanisterTransferCycles {canister} on:click={() => onCanisterAction('transfer_cycles_orbiter')} />
 
+	<hr />
+
 	<CanisterStopStart {canister} segment="orbiter" on:junoStop={close} on:junoStart={close} />
 
 	<SegmentDetach segment="orbiter" segmentId={orbiter.orbiter_id} on:junoDetach={close} />
diff --git a/src/frontend/src/lib/components/satellites/SatelliteActions.svelte b/src/frontend/src/lib/components/satellites/SatelliteActions.svelte
index 7f4da4f4a..168b54c06 100644
--- a/src/frontend/src/lib/components/satellites/SatelliteActions.svelte
+++ b/src/frontend/src/lib/components/satellites/SatelliteActions.svelte
@@ -79,6 +79,8 @@
 
 	<CanisterTransferCycles {canister} on:click={onTransferCycles} />
 
+	<hr />
+
 	<CanisterStopStart {canister} segment="satellite" on:junoStop={close} on:junoStart={close} />
 
 	<SegmentDetach segment="satellite" segmentId={satellite.satellite_id} on:junoStop={close} />
diff --git a/src/frontend/src/lib/i18n/en.json b/src/frontend/src/lib/i18n/en.json
index 0533396ce..9f8c5512a 100644
--- a/src/frontend/src/lib/i18n/en.json
+++ b/src/frontend/src/lib/i18n/en.json
@@ -276,7 +276,7 @@
 		"desktop": "Desktop",
 		"others": "Others",
 		"browsers": "Browsers",
-		"attach": "Attach existing Analytics",
+		"attach": "Attach analytics",
 		"attach_id": "Enter Orbiter ID",
 		"score": "Score",
 		"rating": "Rating",
diff --git a/src/frontend/src/lib/i18n/zh-cn.json b/src/frontend/src/lib/i18n/zh-cn.json
index b51fb7872..fc6dd2b9d 100644
--- a/src/frontend/src/lib/i18n/zh-cn.json
+++ b/src/frontend/src/lib/i18n/zh-cn.json
@@ -276,7 +276,7 @@
 		"desktop": "桌面",
 		"others": "其他",
 		"browsers": "浏览器",
-		"attach": "附加已有的 Analytics",
+		"attach": "附加 Analytics",
 		"attach_id": "输入 Orbiter ID",
 		"score": "得分",
 		"rating": "打分",