diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss
index a7aadd25b..5b4c200ff 100644
--- a/app/assets/stylesheets/my_modules/protocols/index.scss
+++ b/app/assets/stylesheets/my_modules/protocols/index.scss
@@ -602,78 +602,11 @@
       min-width: 115px;
     }
   }
-
-  .task-sharing-and-flows {
-    #dropdownTaskFlowList {
-      min-width: 230px;
-    }
-
-    .status-label {
-      @include font-button;
-      flex-basis: 50%;
-      margin-right: .5em;
-      text-align: right;
-
-      .status-title {
-        @include font-small;
-        color: var(--sn-grey);
-        margin-right: .2em;
-      }
-
-      .status-note {
-        font-weight: normal;
-      }
-
-      .pull-right {
-        font-weight: 400;
-      }
-    }
-
-    .status-flow-dropdown {
-      &:last-child {
-        margin-right: 0;
-      }
-    }
-
-    .status-buttons {
-      display: flex;
-
-      > :not(:first-child):not(.dropdown-menu) {
-        margin-left: .5em;
-      }
-    }
-
-    .status-transition-error {
-      @include font-small;
-      color: $brand-danger;
-      margin-top: .5em;
-
-      .fas {
-        margin-right: .5em;
-      }
-    }
-  }
 }
 
 @media (max-width: 810px) {
   .task-information .task-section-header {
     display: block;
-
-    .status-label,
-    .status-buttons {
-      display: block;
-      max-width: 230px;
-    }
-
-    .status-label {
-      margin: 0;
-      text-align: left;
-    }
-
-    .status-buttons > :not(:first-child):not(.dropdown-menu) {
-      margin-left: 0;
-      margin-top: .5em;
-    }
   }
 
   .task-information .expanded {
diff --git a/app/assets/stylesheets/my_modules/status_flow.scss b/app/assets/stylesheets/my_modules/status_flow.scss
index 5001883ce..0823e9294 100644
--- a/app/assets/stylesheets/my_modules/status_flow.scss
+++ b/app/assets/stylesheets/my_modules/status_flow.scss
@@ -3,6 +3,67 @@
 // scss-lint:disable SelectorFormat
 // scss-lint:disable ImportantRule
 
+.task-sharing-and-flows {
+  #dropdownTaskFlowList {
+    min-width: 230px;
+  }
+
+  .status-flow-dropdown {
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+
+  .status-buttons {
+    display: flex;
+
+    > :not(:first-child):not(.dropdown-menu) {
+      margin-left: .5em;
+    }
+
+    .status-flow-dropdown[data-status-changing=true] {
+      .caret.pull-right {
+        display: none;
+      }
+    }
+
+    > div > .btn {
+      min-width: 115px;
+    }
+  }
+
+  .status-transition-error {
+    @include font-small;
+    color: $brand-danger;
+    margin-top: .5em;
+
+    .fas {
+      margin-right: .5em;
+    }
+  }
+
+  .status-label {
+    @include font-button;
+    flex-basis: 50%;
+    margin-right: .5em;
+    text-align: right;
+
+    .status-title {
+      @include font-small;
+      color: var(--sn-grey);
+      margin-right: .2em;
+    }
+
+    .status-note {
+      font-weight: normal;
+    }
+
+    .pull-right {
+      font-weight: 400;
+    }
+  }
+}
+
 .status-flow-dropdown {
   .dropdown-toggle {
     color: $color-white;