diff --git a/app/coffee/modules/backlog/sprints.coffee b/app/coffee/modules/backlog/sprints.coffee
index 4c32e641..21e720ee 100644
--- a/app/coffee/modules/backlog/sprints.coffee
+++ b/app/coffee/modules/backlog/sprints.coffee
@@ -138,12 +138,17 @@ ToggleExcludeClosedSprintsVisualization = ($rootscope, $loading) ->
     excludeClosedSprints = true
 
     link = ($scope, $el, $attrs) ->
+        # insert loading wrapper
+        loadingElm = $("<div>")
+        $el.after(loadingElm)
+
         # Event Handlers
         $el.on "click", (event) ->
             event.preventDefault()
             excludeClosedSprints  = not excludeClosedSprints
 
-            $loading.start($el.parent().siblings('.loading-spinner'))
+            $loading.start(loadingElm)
+
             if excludeClosedSprints
                 $rootscope.$broadcast("backlog:unload-closed-sprints")
             else
@@ -153,7 +158,7 @@ ToggleExcludeClosedSprintsVisualization = ($rootscope, $loading) ->
             $el.off()
 
         $scope.$on "closed-sprints:reloaded", (ctx, sprints) =>
-            $loading.finish($el.siblings('.loading-spinner'))
+            $loading.finish(loadingElm)
 
             #TODO: i18n
             if sprints.length > 0
diff --git a/app/coffee/modules/user-settings/main.coffee b/app/coffee/modules/user-settings/main.coffee
index 8a10d312..3b221008 100644
--- a/app/coffee/modules/user-settings/main.coffee
+++ b/app/coffee/modules/user-settings/main.coffee
@@ -129,12 +129,12 @@ UserAvatarDirective = ($auth, $model, $rs, $confirm) ->
             $auth.setUser(user)
             $scope.user = user
 
-            $el.find('.overlay').hide()
+            $el.find('.overlay').addClass('hidden')
             $confirm.notify('success')
 
         onError = (response) ->
             showSizeInfo() if response.status == 413
-            $el.find('.overlay').hide()
+            $el.find('.overlay').addClass('hidden')
             $confirm.notify('error', response.data._error_message)
 
         # Change photo
@@ -143,12 +143,12 @@ UserAvatarDirective = ($auth, $model, $rs, $confirm) ->
 
         $el.on "change", "#avatar-field", (event) ->
             if $scope.avatarAttachment
-                $el.find('.overlay').css('display', 'flex')
+                $el.find('.overlay').removeClass('hidden')
                 $rs.userSettings.changeAvatar($scope.avatarAttachment).then(onSuccess, onError)
 
         # Use gravatar photo
         $el.on "click", "a.use-gravatar", (event) ->
-            $el.find('.overlay').show()
+            $el.find('.overlay').removeClass('hidden')
             $rs.userSettings.removeAvatar().then(onSuccess, onError)
 
         $scope.$on "$destroy", ->
diff --git a/app/partials/includes/modules/sprints.jade b/app/partials/includes/modules/sprints.jade
index 836b3b34..f5b147bc 100644
--- a/app/partials/includes/modules/sprints.jade
+++ b/app/partials/includes/modules/sprints.jade
@@ -18,7 +18,6 @@ section.sprints
     a.filter-closed-sprints(tg-backlog-toggle-closed-sprints-visualization, href="", ng-show="totalClosedMilestones")
         span.icon.icon-archive
         span.text Show closed sprints
-    div.loading-spinner
 
     div.sprint.sprint-closed(ng-repeat="sprint in closedSprints track by sprint.id" tg-backlog-sprint="sprint", tg-sprint-sortable)
         include sprint
diff --git a/app/partials/user/user-profile.jade b/app/partials/user/user-profile.jade
index 9819c23e..2d6989e6 100644
--- a/app/partials/user/user-profile.jade
+++ b/app/partials/user/user-profile.jade
@@ -14,7 +14,7 @@ div.wrapper(tg-user-profile, ng-controller="UserSettingsController as ctrl",
                     fieldset(tg-user-avatar)
                         .image-container
                             img.avatar(ng-src="{{user.big_photo}}" alt="avatar")
-                            .overlay
+                            .overlay.hidden
                                 img.loading-spinner(src="/svg/spinner-circle.svg", alt="loading...")
                         input(type="file", id="avatar-field", class="hidden",
                             tg-avatar-model="avatarAttachment")
diff --git a/app/styles/modules/backlog/sprints.scss b/app/styles/modules/backlog/sprints.scss
index 759b6a1d..cecbd7f0 100644
--- a/app/styles/modules/backlog/sprints.scss
+++ b/app/styles/modules/backlog/sprints.scss
@@ -26,8 +26,10 @@
             margin-right: .3rem;
         }
     }
+    .loading {
+        text-align: center;
+    }
     .loading-spinner {
-        @extend %loading-spinner;
         border: 0;
         flex-grow: 0;
         margin-bottom: 1rem;
diff --git a/app/styles/modules/user-settings/user-profile.scss b/app/styles/modules/user-settings/user-profile.scss
index 62f39807..2deea46a 100644
--- a/app/styles/modules/user-settings/user-profile.scss
+++ b/app/styles/modules/user-settings/user-profile.scss
@@ -21,7 +21,7 @@
                 align-items: center;
                 background: rgba($blackish, .8);
                 bottom: 0;
-                display: none;
+                display: flex;
                 justify-content: center;
                 left: 0;
                 position: absolute;