diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
index 0953a0adc..2651660bf 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -244,7 +244,7 @@ module.exports = {
                     )
                     themeContext.page.scripts = scriptFiles.concat(themeContext.page.scripts || [])
                     theme.page = theme.page || {_:{}}
-                    theme.page._.scripts = cssFiles.concat(theme.page._.scripts || [])
+                    theme.page._.scripts = scriptFiles.concat(theme.page._.scripts || [])
                 }
             }
             activeThemeInitialised = true;
diff --git a/packages/node_modules/@node-red/editor-client/src/images/grip-horizontal.png b/packages/node_modules/@node-red/editor-client/src/images/grip-horizontal.png
new file mode 100644
index 000000000..7bff7b4a2
Binary files /dev/null and b/packages/node_modules/@node-red/editor-client/src/images/grip-horizontal.png differ
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index dc8041d8d..afbf5f5f7 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -2369,6 +2369,7 @@ RED.view = (function() {
     var textDimensionPlaceholder = {};
     var textDimensionCache = {};
     function calculateTextDimensions(str,className) {
+        var cacheKey = "!"+str;
         if (!textDimensionPlaceholder[className]) {
             textDimensionPlaceholder[className] = document.createElement("span");
             textDimensionPlaceholder[className].className = className;
@@ -2377,15 +2378,15 @@ RED.view = (function() {
             document.getElementById("red-ui-editor").appendChild(textDimensionPlaceholder[className]);
             textDimensionCache[className] = {};
         } else {
-            if (textDimensionCache[className][str]) {
-                return textDimensionCache[className][str]
+            if (textDimensionCache[className][cacheKey]) {
+                return textDimensionCache[className][cacheKey]
             }
         }
         textDimensionPlaceholder[className].textContent = (str||"");
         var w = textDimensionPlaceholder[className].offsetWidth;
         var h = textDimensionPlaceholder[className].offsetHeight;
-        textDimensionCache[className][str] = [w,h];
-        return textDimensionCache[className][str];
+        textDimensionCache[className][cacheKey] = [w,h];
+        return textDimensionCache[className][cacheKey];
     }
 
     function convertLineBreakCharacter(str) {
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/panels.scss b/packages/node_modules/@node-red/editor-client/src/sass/panels.scss
index 455aab891..1a15d3c0d 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/panels.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/panels.scss
@@ -40,7 +40,7 @@
     height: 7px;
     box-sizing: border-box;
     cursor: ns-resize;
-    background: $primary-background url(images/grip.png) no-repeat 50% 50%;
+    background: $primary-background url(images/grip-horizontal.png) no-repeat 50% 50%;
 }
 
 
@@ -70,5 +70,6 @@
         width: 7px;
         display: inline-block;
         cursor: ew-resize;
+        background: $primary-background url(images/grip.png) no-repeat 50% 50%;
     }
 }