diff --git a/src/renderer/components/Authorize.vue b/src/renderer/components/Authorize.vue
index d6c30ebf..e6f78679 100644
--- a/src/renderer/components/Authorize.vue
+++ b/src/renderer/components/Authorize.vue
@@ -1,22 +1,27 @@
 <template>
 <div id="authorize">
-  <div class="close">
-    <el-button type="text" @click="close">
-      <i class="el-icon-close"></i>
-    </el-button>
-  </div>
-  <el-form ref="form" :model="authorizeForm" label-width="120px" label-position="top" class="authorize-form" v-on:submit.prevent="authorizeSubmit">
-    <el-form-item label="Please paste authorization code from your browser:">
-      <el-input v-model="authorizeForm.code"></el-input>
-    </el-form-item>
-    <!-- Dummy form to guard submitting with enter -->
-    <el-form-item class="hidden">
-      <el-input></el-input>
-    </el-form-item>
-    <el-form-item class="submit">
-      <el-button type="primary" @click="authorizeSubmit">Submit</el-button>
-    </el-form-item>
-  </el-form>
+  <el-header>
+    <el-row>
+      <el-col :span="24" class="close">
+        <el-button type="text" icon="el-icon-close" @click="close" class="close-button">
+        </el-button>
+      </el-col>
+    </el-row>
+  </el-header>
+  <el-container>
+    <el-form ref="form" :model="authorizeForm" label-width="120px" label-position="top" class="authorize-form" v-on:submit.prevent="authorizeSubmit">
+      <el-form-item label="Please paste authorization code from your browser:">
+        <el-input v-model="authorizeForm.code"></el-input>
+      </el-form-item>
+      <!-- Dummy form to guard submitting with enter -->
+      <el-form-item class="hidden">
+        <el-input></el-input>
+      </el-form-item>
+      <el-form-item class="submit">
+        <el-button type="primary" @click="authorizeSubmit">Submit</el-button>
+      </el-form-item>
+    </el-form>
+  </el-container>
 </div>
 </template>
 
@@ -59,6 +64,10 @@ export default {
 
   .close {
     text-align: right;
+
+    .close-button {
+      font-size: 24px;
+    }
   }
 
   .authorize-form {
diff --git a/src/renderer/components/Login.vue b/src/renderer/components/Login.vue
index 5ef9dc8e..21fa9c99 100644
--- a/src/renderer/components/Login.vue
+++ b/src/renderer/components/Login.vue
@@ -1,12 +1,17 @@
 <template>
-<div id="login">
-  <div class="close">
-    <el-button type="text" @click="close">
-      <i class="el-icon-close"></i>
-    </el-button>
-  </div>
-  <login-form></login-form>
-</div>
+<el-container id="login">
+  <el-header>
+    <el-row>
+      <el-col :span="24" class="close">
+        <el-button type="text" icon="el-icon-close" @click="close" class="close-button">
+        </el-button>
+      </el-col>
+    </el-row>
+  </el-header>
+  <el-container>
+    <login-form></login-form>
+  </el-container>
+</el-container>
 </template>
 
 <script>
@@ -39,6 +44,10 @@ export default {
 
   .close {
     text-align: right;
+
+    .close-button {
+      font-size: 24px;
+    }
   }
 
   .el-form-item__label {
diff --git a/src/renderer/components/Login/LoginForm.vue b/src/renderer/components/Login/LoginForm.vue
index c6df3cbe..87789ba3 100644
--- a/src/renderer/components/Login/LoginForm.vue
+++ b/src/renderer/components/Login/LoginForm.vue
@@ -1,5 +1,4 @@
 <template>
-<div id="login_form">
   <el-form ref="loginForm" label-width="120px" label-position="top" v-on:submit.prevent="confirm" class="login-form">
     <el-form-item label="At first, let's login a mastodon instance. Please write host name which you want to login.">
       <el-input v-model="domainName" placeholder="mastodon.social"></el-input>
@@ -13,7 +12,6 @@
       <el-button type="primary" class="login" @click="login" v-if="selectedInstance !== null">Login</el-button>
     </el-form-item>
   </el-form>
-</div>
 </template>
 
 <script>
diff --git a/src/renderer/components/TimelineSpace/Modals/ImageViewer.vue b/src/renderer/components/TimelineSpace/Modals/ImageViewer.vue
index 65575a56..a31a041d 100644
--- a/src/renderer/components/TimelineSpace/Modals/ImageViewer.vue
+++ b/src/renderer/components/TimelineSpace/Modals/ImageViewer.vue
@@ -2,7 +2,7 @@
 <div id="image" v-if="modalOpen">
   <div class="image-wrapper" @keyup.esc.exact="close" tabindex="-1" ref="wrapper">
     <div class="image-header">
-      <i class="el-icon-close" @click="close"></i>
+      <el-button type="text" icon="el-icon-close" @click="close" class="close-button"></el-button>
     </div>
     <div class="image-content">
       <img :src="imageURL">
@@ -51,11 +51,9 @@ export default {
     padding: 8px 8px 0 0 ;
     color: #409eff;
     box-sizing: border-box;
-    font-size: 18px;
 
-    i {
-      font-weight: 800;
-      cursor: pointer;
+    .close-button {
+      font-size: 24px;
     }
   }