diff --git a/routes/_components/AccountProfile.html b/routes/_components/AccountProfile.html
index 43332a3d..508cb8d9 100644
--- a/routes/_components/AccountProfile.html
+++ b/routes/_components/AccountProfile.html
@@ -182,7 +182,7 @@
 <script>
   import IconButton from './IconButton.html'
   import ExternalLink from './ExternalLink.html'
-  import Avatar from './Status/Avatar.html'
+  import Avatar from './Avatar.html'
   import { store } from '../_store/store'
 
   export default {
diff --git a/routes/_components/status/Avatar.html b/routes/_components/Avatar.html
similarity index 87%
rename from routes/_components/status/Avatar.html
rename to routes/_components/Avatar.html
index 6be1c640..81812174 100644
--- a/routes/_components/status/Avatar.html
+++ b/routes/_components/Avatar.html
@@ -35,9 +35,9 @@
   }
 </style>
 <script>
-  import { imgLoadError } from '../../_utils/events'
-  import { store } from '../../_store/store'
-  import NonAutoplayImg from '../NonAutoplayImg.html'
+  import { imgLoadError } from '../_utils/events'
+  import { store } from '../_store/store'
+  import NonAutoplayImg from './NonAutoplayImg.html'
 
   export default {
     events: {
diff --git a/routes/_components/search/AccountSearchResult.html b/routes/_components/search/AccountSearchResult.html
index 369bb1f9..7a802df7 100644
--- a/routes/_components/search/AccountSearchResult.html
+++ b/routes/_components/search/AccountSearchResult.html
@@ -43,7 +43,7 @@
   }
 </style>
 <script>
-  import Avatar from '../status/Avatar.html'
+  import Avatar from '../Avatar.html'
   import SearchResult from './SearchResult.html'
   export default {
     components: {
diff --git a/routes/_components/status/StatusSidebar.html b/routes/_components/status/StatusSidebar.html
index 245c2de8..be6e5756 100644
--- a/routes/_components/status/StatusSidebar.html
+++ b/routes/_components/status/StatusSidebar.html
@@ -8,7 +8,7 @@
   }
 </style>
 <script>
-  import Avatar from './Avatar.html'
+  import Avatar from '../Avatar.html'
   export default {
     components: {
       Avatar
diff --git a/routes/settings/instances/[instanceName].html b/routes/settings/instances/[instanceName].html
index 68d08f81..44ff8b37 100644
--- a/routes/settings/instances/[instanceName].html
+++ b/routes/settings/instances/[instanceName].html
@@ -9,8 +9,7 @@
     {{#if verifyCredentials}}
       <h2>Logged in as:</h2>
       <div class="acct-current-user">
-        <img alt="Profile picture for {{'@' + verifyCredentials.acct}}"
-             class="acct-avatar" src="{{verifyCredentials.avatar}}" />
+        <Avatar account="{{verifyCredentials}}" className="acct-avatar" size="big"/>
         <ExternalLink class="acct-handle"
                       href="{{verifyCredentials.url}}">
           {{'@' + verifyCredentials.acct}}
@@ -53,12 +52,11 @@
     grid-template-areas:
         "avatar handle"
         "avatar display-name";
-    grid-gap: 20px;
+    grid-template-columns: min-content 1fr;
+    grid-column-gap: 20px;
+    grid-row-gap: 10px;
   }
-  .acct-avatar {
-    width: 64px;
-    height: 64px;
-    border-radius: 4px;
+  :global(.acct-avatar) {
     grid-area: avatar;
   }
   :global(.acct-handle) {
@@ -100,6 +98,7 @@
   import Layout from '../../_components/Layout.html'
   import SettingsLayout from '../_components/SettingsLayout.html'
   import ExternalLink from '../../_components/ExternalLink.html'
+  import Avatar from '../../_components/Avatar.html'
   import { showConfirmationDialog } from '../../_components/dialog/showConfirmationDialog'
   import {
     changeTheme,
@@ -113,7 +112,8 @@
     components: {
       Layout,
       SettingsLayout,
-      ExternalLink
+      ExternalLink,
+      Avatar
     },
     store: () => store,
     data: () => ({