diff --git a/src/theme.scss b/src/theme.scss
index 20b3f9f69..7228dc070 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -346,6 +346,7 @@ textarea {
             position: relative;
             padding: 10px 15px;
             height: 100%;
+            padding-top: 30px; // offset for non-admins
 
             .grid-item-top-title {
                 white-space: nowrap;
@@ -356,7 +357,7 @@ textarea {
 
             .usermanagement-indicator {
                 position: absolute;
-                bottom: 10px;
+                top: 10px;
                 color: #03a9f49e;
                 right: 10px;
             }
diff --git a/src/views/apps.html b/src/views/apps.html
index 474efa309..b2c55a2cb 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -97,9 +97,9 @@
                 </div>
 
                 <div class="usermanagement-indicator" ng-hide="user.isAtLeastAdmin">
-                  <i class="fas fa-user" ng-show="app.ssoAuth && !app.manifest.addons.email" uib-tooltip="Log in with Cloudron username and password"></i>
-                  <i class="far fa-user" ng-show="!app.ssoAuth && !app.manifest.addons.email" uib-tooltip="Not using Cloudron's usermanagement"></i>
-                  <i class="fas fa-envelope" ng-show="app.manifest.addons.email" uib-tooltip="Log in with Cloudron mailbox email and password"></i>
+                  <i class="fas fa-user" ng-show="app.ssoAuth && !app.manifest.addons.email" uib-tooltip="Log in with Cloudron username and password" tooltip-placement="right"></i>
+                  <i class="far fa-user" ng-show="!app.ssoAuth && !app.manifest.addons.email" uib-tooltip="Not using Cloudron's usermanagement" tooltip-placement="right"></i>
+                  <i class="fas fa-envelope" ng-show="app.manifest.addons.email" uib-tooltip="Log in with Cloudron mailbox email and password" tooltip-placement="right"></i>
                 </div>
               </div>