diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts
index 071c31a0d..fa497cc60 100644
--- a/src/client/app/common/views/components/index.ts
+++ b/src/client/app/common/views/components/index.ts
@@ -5,7 +5,6 @@ import muteAndBlock from './mute-and-block.vue';
 import error from './error.vue';
 import apiSettings from './api-settings.vue';
 import passwordSettings from './password-settings.vue';
-import driveSettings from './drive-settings.vue';
 import profileEditor from './profile-editor.vue';
 import noteSkeleton from './note-skeleton.vue';
 import theme from './theme.vue';
@@ -57,7 +56,6 @@ Vue.component('mk-mute-and-block', muteAndBlock);
 Vue.component('mk-error', error);
 Vue.component('mk-api-settings', apiSettings);
 Vue.component('mk-password-settings', passwordSettings);
-Vue.component('mk-drive-settings', driveSettings);
 Vue.component('mk-profile-editor', profileEditor);
 Vue.component('mk-note-skeleton', noteSkeleton);
 Vue.component('mk-theme', theme);
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index 7e9e900c6..833de3f25 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -194,7 +194,7 @@
 		</ui-card>
 
 		<div class="drive" v-if="page == 'drive'">
-			<mk-drive-settings/>
+			<x-drive-settings/>
 		</div>
 
 		<ui-card class="hashtags" v-show="page == 'hashtags'">
@@ -301,7 +301,8 @@ export default Vue.extend({
 		X2fa,
 		XApps,
 		XSignins,
-		XTags
+		XTags,
+		XDriveSettings: () => import('../../../common/views/components/drive-settings.vue')
 	},
 	props: {
 		initialPage: {
diff --git a/src/client/app/mobile/script.ts b/src/client/app/mobile/script.ts
index 56b6d9d0c..5622e233d 100644
--- a/src/client/app/mobile/script.ts
+++ b/src/client/app/mobile/script.ts
@@ -153,7 +153,7 @@ init((launch) => {
 			{ path: '/tags/:tag', component: MkTag },
 			{ path: '/share', component: MkShare },
 			{ path: '/reversi/:game?', name: 'reversi', component: MkReversi },
-			{ path: '/@:user', component: MkUser },
+			{ path: '/@:user', component: () => import('./views/pages/user.vue').then(m => m.default) },
 			{ path: '/@:user/followers', component: MkFollowers },
 			{ path: '/@:user/following', component: MkFollowing },
 			{ path: '/notes/:note', component: MkNote },
diff --git a/src/client/app/mobile/views/components/index.ts b/src/client/app/mobile/views/components/index.ts
index e6cc2c997..9a410e827 100644
--- a/src/client/app/mobile/views/components/index.ts
+++ b/src/client/app/mobile/views/components/index.ts
@@ -18,7 +18,6 @@ import usersList from './users-list.vue';
 import userPreview from './user-preview.vue';
 import userTimeline from './user-timeline.vue';
 import userListTimeline from './user-list-timeline.vue';
-import activity from './activity.vue';
 import widgetContainer from './widget-container.vue';
 import postForm from './post-form.vue';
 
@@ -40,6 +39,5 @@ Vue.component('mk-users-list', usersList);
 Vue.component('mk-user-preview', userPreview);
 Vue.component('mk-user-timeline', userTimeline);
 Vue.component('mk-user-list-timeline', userListTimeline);
-Vue.component('mk-activity', activity);
 Vue.component('mk-widget-container', widgetContainer);
 Vue.component('mk-post-form', postForm);
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index 836046129..3006ae7db 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -85,7 +85,7 @@
 				</section>
 			</ui-card>
 
-			<mk-drive-settings/>
+			<x-drive-settings/>
 
 			<mk-mute-and-block/>
 
@@ -182,6 +182,11 @@ import checkForUpdate from '../../../common/scripts/check-for-update';
 
 export default Vue.extend({
 	i18n: i18n('mobile/views/pages/settings.vue'),
+
+	components: {
+		XDriveSettings: () => import('../../../common/views/components/drive-settings.vue')
+	},
+
 	data() {
 		return {
 			apiUrl,
diff --git a/src/client/app/mobile/views/pages/user/home.vue b/src/client/app/mobile/views/pages/user/home.vue
index f89b04ae9..ff6b2d4c2 100644
--- a/src/client/app/mobile/views/pages/user/home.vue
+++ b/src/client/app/mobile/views/pages/user/home.vue
@@ -16,7 +16,7 @@
 	<section class="activity">
 		<h2><fa icon="chart-bar"/>{{ $t('activity') }}</h2>
 		<div>
-			<mk-activity :user="user"/>
+			<x-activity :user="user"/>
 		</div>
 	</section>
 	<section class="frequently-replied-users">
@@ -49,7 +49,8 @@ export default Vue.extend({
 		XNotes,
 		XPhotos,
 		XFriends,
-		XFollowersYouKnow
+		XFollowersYouKnow,
+		XActivity: () => import('../../components/activity.vue').then(m => m.default)
 	},
 	props: ['user']
 });
diff --git a/src/client/app/mobile/views/widgets/activity.vue b/src/client/app/mobile/views/widgets/activity.vue
index c67d84667..4dcab8e3b 100644
--- a/src/client/app/mobile/views/widgets/activity.vue
+++ b/src/client/app/mobile/views/widgets/activity.vue
@@ -3,7 +3,7 @@
 	<mk-widget-container :show-header="!props.compact">
 		<template slot="header"><fa icon="chart-bar"/>{{ $t('activity') }}</template>
 		<div :class="$style.body">
-			<mk-activity :user="$store.state.i"/>
+			<x-activity :user="$store.state.i"/>
 		</div>
 	</mk-widget-container>
 </div>
@@ -20,6 +20,9 @@ export default define({
 	})
 }).extend({
 	i18n: i18n(),
+	components: {
+		XActivity: () => import('../components/activity.vue').then(m => m.default)
+	},
 	methods: {
 		func() {
 			this.props.compact = !this.props.compact;