diff --git a/app/styles/app/components/sync-button.sass b/app/styles/app/components/sync-button.sass
index 900a2bb7..1e43cc0e 100644
--- a/app/styles/app/components/sync-button.sass
+++ b/app/styles/app/components/sync-button.sass
@@ -1,4 +1,3 @@
-
 .sync-button
   padding: 0.8em 0
   button
@@ -76,4 +75,4 @@
 
 .spinner-container
   text-align: center
-  padding: 1.5em 1em
\ No newline at end of file
+  padding: 1.5em 1em
diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass
index 2c0e5a54..6f526d65 100644
--- a/app/styles/app/layouts/profile.sass
+++ b/app/styles/app/layouts/profile.sass
@@ -146,6 +146,12 @@ p.profile-user-last
       width: 14px
       height: 14px
 
+.profile-hooklist .sync-spinner
+  display: inline !important
+
+.profile-settings span
+  display: inline-block !important
+
 .profile-repo
   @extend %border-radius-4px
   position: relative
diff --git a/app/templates/account.hbs b/app/templates/account.hbs
index 82b7c163..4098d42d 100644
--- a/app/templates/account.hbs
+++ b/app/templates/account.hbs
@@ -77,12 +77,13 @@
           <div class="columns">
             {{travis-switch action="toggle" target=hook toggleAutomatically="false"}}
             {{!-- <button class="switch is-on"></button> --}}
-            {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}<span class="icon icon--cog"></span>{{/link-to}}
-          </div>
-          <a {{bind-attr href="hook.urlGithub"}} rel="nofollow" class="profile-repo columns">
             {{#if hook.isSaving}}
               <span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
+            {{else}}
+              {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}<span class="icon icon--cog"></span>{{/link-to}}
             {{/if}}
+          </div>
+          <a {{bind-attr href="hook.urlGithub"}} rel="nofollow" class="profile-repo columns">
             {{hook.slug}}
             <span>{{hook.description}}</span></a>
         </li>