diff --git a/www/webapp/src/views/CrudList.vue b/www/webapp/src/views/CrudList.vue
index 591f2da4b..388cbac96 100644
--- a/www/webapp/src/views/CrudList.vue
+++ b/www/webapp/src/views/CrudList.vue
@@ -223,6 +223,7 @@
                               v-bind="attrs"
                               v-on="on"
                               :disabled="user.working || itemIsReadOnly(itemFieldProps.item)"
+                              :class="'button-' + key"
                               color="grey"
                               icon
                               @click.stop="action.go(itemFieldProps.item, $event)"
@@ -446,7 +447,7 @@ export default {
       if (e.keyCode === 13) {
         // Submit
         document.activeElement.blur();
-        e.target.closest('tr').querySelector('.mdi-content-save-edit').closest('button').click();
+        e.target.closest('tr').querySelector('.button-save').click();
       }
     },
     handleRowClick: () => {},
@@ -710,7 +711,7 @@ export default {
   @keyframes successFade {
     from { background-color: forestgreen; }
   }
-  >>> tr.orange .mdi-content-save-edit, >>> tr.red .mdi-content-save-edit {
+  >>> tr.orange .button-save .v-icon, >>> tr.red .button-save .v-icon {
     color: forestgreen;
   }
   >>> tr:focus-within :focus {
diff --git a/www/webapp/src/views/CrudListRecord.vue b/www/webapp/src/views/CrudListRecord.vue
index 1d58ef3bd..6a5f14980 100644
--- a/www/webapp/src/views/CrudListRecord.vue
+++ b/www/webapp/src/views/CrudListRecord.vue
@@ -143,7 +143,7 @@ export default {
     @keyframes successFade {
         from { background-color: forestgreen; }
     }
-    >>> tr:focus-within .mdi-content-save-edit {
+    >>> tr:focus-within .button-save .v-icon {
         color: forestgreen;
     }
     >>> tr:focus-within :focus {