4 files changed, 22 insertions, 4 deletions
diff --git a/webapp/sass/components/_module.scss b/webapp/sass/components/_module.scss
index 2cf310a48..f2180d525 100644
--- a/webapp/sass/components/_module.scss
+++ b/webapp/sass/components/_module.scss
@@ -17,6 +17,7 @@
 @import 'scrollbar';
 @import 'search';
 @import 'status-icon';
+@import 'status-dropdown';
 @import 'suggestion-list';
 @import 'tooltip';
 @import 'tutorial';
diff --git a/webapp/sass/components/_status-dropdown.scss b/webapp/sass/components/_status-dropdown.scss
new file mode 100644
index 000000000..3a6b89835
--- /dev/null
+++ b/webapp/sass/components/_status-dropdown.scss
@@ -0,0 +1,5 @@
+@charset 'UTF-8';
+
+#status-dropdown {
+    cursor: pointer;
+}
diff --git a/webapp/sass/components/_status-icon.scss b/webapp/sass/components/_status-icon.scss
index c2f8bca5b..ea87461c0 100644
--- a/webapp/sass/components/_status-icon.scss
+++ b/webapp/sass/components/_status-icon.scss
@@ -20,6 +20,17 @@
             bottom: -6px;
         }
 
+        &.status-edit {
+            text-align: center;
+
+            i {
+                @include opacity(1);
+                font-size: 10px;
+                position: relative;
+                top: 2px;
+            }
+        }
+
 
         svg {
             max-height: 11px;
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index cb4512ac1..e31452c9b 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -259,6 +259,8 @@
 
     .team__header {
         @include legacy-pie-clearfix;
+        @include display-flex();
+        @include flex-direction(row-reverse);
         padding: 9px 10px;
         position: relative;
 
@@ -297,6 +299,7 @@
 
         a {
             text-decoration: none;
+            @include flex-grow(1);
         }
 
         .sidebar-header-dropdown,
@@ -307,7 +310,6 @@
             position: absolute;
             right: 22px;
             top: 10px;
-            z-index: 5;
 
             li {
                 width: 100%;
@@ -351,16 +353,15 @@
             @include border-radius(36px);
             float: left;
             height: 36px;
-            margin-right: 6px;
             width: 36px;
         }
 
         .header__info {
             @include clearfix;
+            @include flex-grow(1);
             color: $white;
-            padding-left: 2px;
+            padding-left: 8px;
             position: relative;
-            z-index: 1;
         }
 
         .team__name,