diff --git a/www/form/app-form.less b/www/form/app-form.less
index d3f2239a8..6e986da78 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -903,7 +903,7 @@
                             border-right: 0px;
                         }
                         button {
-                            i { margin: 0 !important; }
+                            svg { margin: 0 !important; }
                         }
 
                     }
diff --git a/www/form/inner.js b/www/form/inner.js
index 6615b2e40..c8d1fbdce 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -123,7 +123,7 @@ define([
                             Icons.get('preview'),
                             Messages.form_preview_button
                         ]);
-        $(cancelBlock).click(function () { cb(undefined, true); });
+        $(cancelBlock).click(function () { cb(undefined, true); Lucide.createIcons(); });
 
         return cancelBlock;
     };
@@ -4259,6 +4259,7 @@ define([
 
                         $(edit).hide();
                         $(copy).hide();
+                        Lucide.createIcons();
                     };
                     $(edit).click(function () {
                         onEdit();