diff --git a/locales/ja.yml b/locales/ja.yml
index 026c2308c..8e04d0988 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -76,6 +76,18 @@ common:
     nav: "ナビゲーション"
     tips: "ヒント"
 
+  deck:
+    widgets: "ウィジェット"
+    home: "ホーム"
+    local: "ローカル"
+    global: "グローバル"
+    notifications: "通知"
+    list: "リスト"
+    swap-left: "左に移動"
+    swap-right: "右に移動"
+    remove: "カラムを削除"
+    add-column: "カラムを追加"
+
 common/views/components/connect-failed.vue:
   title: "サーバーに接続できません"
   description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
diff --git a/src/client/app/desktop/views/pages/deck/deck.column.vue b/src/client/app/desktop/views/pages/deck/deck.column.vue
index e9f013734..4dee0db91 100644
--- a/src/client/app/desktop/views/pages/deck/deck.column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.column.vue
@@ -75,17 +75,17 @@ export default Vue.extend({
 
 		showMenu() {
 			const items = [{
-				content: '%fa:arrow-left% %i18n:@swap-left%',
+				content: '%fa:arrow-left% %i18n:common.deck.swap-left%',
 				onClick: () => {
 					this.$store.dispatch('settings/swapLeftDeckColumn', this.id);
 				}
 			}, {
-				content: '%fa:arrow-right% %i18n:@swap-right%',
+				content: '%fa:arrow-right% %i18n:common.deck.swap-right%',
 				onClick: () => {
 					this.$store.dispatch('settings/swapRightDeckColumn', this.id);
 				}
 			}, {
-				content: '%fa:trash-alt R% %i18n:@remove%',
+				content: '%fa:trash-alt R% %i18n:common.deck.remove%',
 				onClick: () => {
 					this.$store.dispatch('settings/removeDeckColumn', this.id);
 				}
diff --git a/src/client/app/desktop/views/pages/deck/deck.notifications-column.vue b/src/client/app/desktop/views/pages/deck/deck.notifications-column.vue
index b92614314..f57c52d2e 100644
--- a/src/client/app/desktop/views/pages/deck/deck.notifications-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notifications-column.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 	<x-column :id="id">
-		<span slot="header">%fa:bell R%%i18n:@notifications%</span>
+		<span slot="header">%fa:bell R%%i18n:common.deck.notifications%</span>
 
 		<x-notifications/>
 	</x-column>
diff --git a/src/client/app/desktop/views/pages/deck/deck.tl-column.vue b/src/client/app/desktop/views/pages/deck/deck.tl-column.vue
index 278137776..54bc6bfc2 100644
--- a/src/client/app/desktop/views/pages/deck/deck.tl-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.tl-column.vue
@@ -2,9 +2,9 @@
 <div>
 	<x-column :id="column.id">
 		<span slot="header">
-			<template v-if="column.type == 'home'">%fa:home%%i18n:@home%</template>
-			<template v-if="column.type == 'local'">%fa:R comments%%i18n:@local%</template>
-			<template v-if="column.type == 'global'">%fa:globe%%i18n:@global%</template>
+			<template v-if="column.type == 'home'">%fa:home%%i18n:common.deck.home%</template>
+			<template v-if="column.type == 'local'">%fa:R comments%%i18n:common.deck.local%</template>
+			<template v-if="column.type == 'global'">%fa:globe%%i18n:common.deck.global%</template>
 			<template v-if="column.type == 'list'">%fa:list%{{ column.list.title }}</template>
 		</span>
 
diff --git a/src/client/app/desktop/views/pages/deck/deck.vue b/src/client/app/desktop/views/pages/deck/deck.vue
index b876dec10..d6cbf7396 100644
--- a/src/client/app/desktop/views/pages/deck/deck.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.vue
@@ -9,7 +9,7 @@
 			<x-tl-column v-if="column.type == 'global'" :key="column.id" :column="column"/>
 			<x-tl-column v-if="column.type == 'list'" :key="column.id" :column="column"/>
 		</template>
-		<button ref="add" @click="add">%fa:plus%</button>
+		<button ref="add" @click="add" title="%i18n:common.deck.add-column%">%fa:plus%</button>
 	</div>
 </mk-ui>
 </template>
@@ -79,7 +79,7 @@ export default Vue.extend({
 				source: this.$refs.add,
 				compact: true,
 				items: [{
-					content: '%i18n:@home%',
+					content: '%i18n:common.deck.home%',
 					onClick: () => {
 						this.$store.dispatch('settings/addDeckColumn', {
 							id: uuid(),
@@ -87,7 +87,7 @@ export default Vue.extend({
 						});
 					}
 				}, {
-					content: '%i18n:@local%',
+					content: '%i18n:common.deck.local%',
 					onClick: () => {
 						this.$store.dispatch('settings/addDeckColumn', {
 							id: uuid(),
@@ -95,7 +95,7 @@ export default Vue.extend({
 						});
 					}
 				}, {
-					content: '%i18n:@global%',
+					content: '%i18n:common.deck.global%',
 					onClick: () => {
 						this.$store.dispatch('settings/addDeckColumn', {
 							id: uuid(),
@@ -103,7 +103,7 @@ export default Vue.extend({
 						});
 					}
 				}, {
-					content: '%i18n:@list%',
+					content: '%i18n:common.deck.list%',
 					onClick: () => {
 						const w = (this as any).os.new(MkUserListsWindow);
 						w.$once('choosen', list => {
@@ -116,7 +116,7 @@ export default Vue.extend({
 						});
 					}
 				}, {
-					content: '%i18n:@notifications%',
+					content: '%i18n:common.deck.notifications%',
 					onClick: () => {
 						this.$store.dispatch('settings/addDeckColumn', {
 							id: uuid(),
@@ -124,7 +124,7 @@ export default Vue.extend({
 						});
 					}
 				}, {
-					content: '%i18n:@widgets%',
+					content: '%i18n:common.deck.widgets%',
 					onClick: () => {
 						this.$store.dispatch('settings/addDeckColumn', {
 							id: uuid(),
@@ -155,7 +155,7 @@ root(isDark)
 	overflow auto
 
 	> div
-		margin-right 16px
+		margin-right 8px
 
 		&:last-of-type
 			margin-right 0
diff --git a/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue b/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue
index 0b2cc305f..34073160c 100644
--- a/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="wtdtxvecapixsepjtcupubtsmometobz">
 	<x-column :id="column.id" :menu="menu" :naked="true" :narrow="true">
-		<span slot="header">%fa:calculator%%i18n:@widgets%</span>
+		<span slot="header">%fa:calculator%%i18n:common.deck.widgets%</span>
 
 		<div class="gqpwvtwtprsbmnssnbicggtwqhmylhnq">
 			<template v-if="edit">
@@ -29,7 +29,7 @@
 						<option value="nav">%i18n:common.widgets.nav%</option>
 						<option value="tips">%i18n:common.widgets.tips%</option>
 					</select>
-					<button @click="addWidget">追加</button>
+					<button @click="addWidget">%i18n:@add%</button>
 				</header>
 				<x-draggable
 					:list="column.widgets"