diff --git a/umap/static/umap/css/panel.css b/umap/static/umap/css/panel.css
index 967f5d60..d3bed4bc 100644
--- a/umap/static/umap/css/panel.css
+++ b/umap/static/umap/css/panel.css
@@ -58,14 +58,12 @@
     gap: 5px;
     line-height: 2.2em;
     background-color: #fff;
-    position: fixed;
+    position: sticky;
+    top: 0;
 }
 .panel.dark .toolbox {
     background-color: var(--color-darkGray);
 }
-.panel.full .toolbox {
-    width: calc(100% - 112px);
-}
 .panel .toolbox li {
     cursor: pointer;
     display: inline;
@@ -93,10 +91,6 @@
         margin-top: 10px;
         width: 400px;
     }
-    .panel .toolbox {
-        /* It overflows otherwise, dunno why */
-        width: 398px;
-    }
     .panel.condensed {
         max-height: 500px;
         bottom: initial;
@@ -131,9 +125,6 @@
     .panel.left {
         left: -100%;
     }
-    .panel .toolbox {
-        width: 100%;
-    }
     .panel.on {
         right: 0;
         left: 0;
diff --git a/umap/static/umap/js/umap.core.js b/umap/static/umap/js/umap.core.js
index dac89bba..c4c2c5e4 100644
--- a/umap/static/umap/js/umap.core.js
+++ b/umap/static/umap/js/umap.core.js
@@ -120,7 +120,7 @@ L.DomUtil.createLink = (className, container, content, url, target, title) => {
 L.DomUtil.createIcon = (parent, className, title, size = 16) => {
   return L.DomUtil.element(
     'i',
-    { className: `icon icon-${size} ${className}`, title: title },
+    { className: `icon icon-${size} ${className}`, title: title || '' },
     parent
   )
 }
diff --git a/umap/static/umap/js/umap.tableeditor.js b/umap/static/umap/js/umap.tableeditor.js
index d84e55ea..c5bbaa6c 100644
--- a/umap/static/umap/js/umap.tableeditor.js
+++ b/umap/static/umap/js/umap.tableeditor.js
@@ -99,7 +99,7 @@ U.TableEditor = L.Class.extend({
     this.body.innerHTML = ''
     this.datalayer.eachLayer(this.renderRow, this)
     const addButton = L.DomUtil.create('li', 'add-property')
-    L.DomUtil.create('i', 'icon icon-16 icon-add', addButton)
+    L.DomUtil.createIcon(addButton, 'icon-add')
     const label = L.DomUtil.create('span', '', addButton)
     label.textContent = label.title = L._('Add a new property')
     const addProperty = function () {