diff --git a/editor.planx.uk/src/pages/FlowEditor/floweditor.scss b/editor.planx.uk/src/pages/FlowEditor/floweditor.scss
index 561d37248a..429c293660 100644
--- a/editor.planx.uk/src/pages/FlowEditor/floweditor.scss
+++ b/editor.planx.uk/src/pages/FlowEditor/floweditor.scss
@@ -138,6 +138,11 @@ $fontMonospace: "Source Code Pro", monospace;
     border: $nodeBorderWidth dashed red;
   }
 
+  // Allow nodes to expand to width of data when toggled
+  &:not(.type-Section):not(.portal) > a {
+    width: 100%;
+  }
+
   & a {
     position: relative;
     display: flex;
@@ -150,6 +155,8 @@ $fontMonospace: "Source Code Pro", monospace;
     background: white;
     user-select: none;
     padding: 6px 12px;
+    overflow-wrap: break-word;
+    word-break: break-word;
 
     * {
       pointer-events: none;
@@ -161,16 +168,14 @@ $fontMonospace: "Source Code Pro", monospace;
       overflow-wrap: break-word;
     }
 
-    > svg {
+    // Component icon
+    & svg {
       margin-left: -6px;
-      margin-top: 0.5px;
-      width: 16px;
-      height: 16px;
-      opacity: 0.6;
-    }
-
-    > span:not(:first-child) {
-      margin-left: 6px;
+      margin-top: -1px;
+      margin-right: 6px;
+      width: 19px;
+      height: 19px;
+      opacity: 0.75;
     }
   }