diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 96a2b323a..df050b191 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -98,8 +98,7 @@
           "number": "Nr.",
           "role": "Rolle",
           "slug": "Alias"
-        },
-        "edit": "Bearbeiten"
+        }
       }
     }
   },
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 760937b06..ecd0ec18d 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -98,8 +98,7 @@
           "number": "No.",
           "role": "Role",
           "slug": "Slug"
-        },
-        "edit": "Edit"
+        }
       }
     }
   },
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index 5bc6b1b6d..15096b9d8 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -98,8 +98,7 @@
           "number": "No.",
           "role": "Rol",
           "slug": "Alias"
-        },
-        "edit": null
+        }
       }
     }
   },
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index 90164c47a..2da2a9801 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -98,8 +98,7 @@
           "number": "Num.",
           "role": "Rôle",
           "slug": "Slug"
-        },
-        "edit": null
+        }
       }
     }
   },
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index 1674a9cb3..485abff3a 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -98,8 +98,7 @@
           "number": null,
           "role": null,
           "slug": null
-        },
-        "edit": null
+        }
       }
     }
   },
diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index 0944dc472..40f9aca2e 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -98,8 +98,7 @@
           "number": null,
           "role": null,
           "slug": null
-        },
-        "edit": null
+        }
       }
     }
   },
diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index ba5a61bca..ee332b84b 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -98,8 +98,7 @@
           "number": null,
           "role": null,
           "slug": null
-        },
-        "edit": null
+        }
       }
     }
   },
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 6b6f07132..54f9b5d99 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -98,8 +98,7 @@
           "number": "N.º",
           "role": "Função",
           "slug": "Slug"
-        },
-        "edit": null
+        }
       }
     }
   },
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index 7bc33e628..4d2e2a357 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -98,8 +98,7 @@
           "number": "№",
           "role": "Роль",
           "slug": "Алиас"
-        },
-        "edit": null
+        }
       }
     }
   },
diff --git a/webapp/pages/admin/users/__snapshots__/index.spec.js.snap b/webapp/pages/admin/users/__snapshots__/index.spec.js.snap
index b72a2617f..0fff4016b 100644
--- a/webapp/pages/admin/users/__snapshots__/index.spec.js.snap
+++ b/webapp/pages/admin/users/__snapshots__/index.spec.js.snap
@@ -709,9 +709,19 @@ exports[`Users given badges are enabled renders 1`] = `
               <nuxt-link-stub
                 to="[object Object]"
               >
-                
-          admin.users.table.edit
-        
+                <button
+                  class="base-button --icon-only --circle --filled"
+                  type="button"
+                >
+                  <span
+                    class="base-icon"
+                  >
+                    <!---->
+                  </span>
+                   
+                  <!---->
+                   
+                </button>
               </nuxt-link-stub>
             </td>
           </tr>
@@ -793,9 +803,19 @@ exports[`Users given badges are enabled renders 1`] = `
               <nuxt-link-stub
                 to="[object Object]"
               >
-                
-          admin.users.table.edit
-        
+                <button
+                  class="base-button --icon-only --circle --filled"
+                  type="button"
+                >
+                  <span
+                    class="base-icon"
+                  >
+                    <!---->
+                  </span>
+                   
+                  <!---->
+                   
+                </button>
               </nuxt-link-stub>
             </td>
           </tr>
diff --git a/webapp/pages/admin/users/index.vue b/webapp/pages/admin/users/index.vue
index fd08f1e0c..0bd592bad 100644
--- a/webapp/pages/admin/users/index.vue
+++ b/webapp/pages/admin/users/index.vue
@@ -70,7 +70,7 @@
               params: { id: scope.row.id },
             }"
           >
-            {{ $t('admin.users.table.edit') }}
+            <base-button icon="pencil" filled circle />
           </nuxt-link>
         </template>
       </ds-table>
@@ -224,4 +224,8 @@ export default {
 .admin-users > .base-card:first-child {
   margin-bottom: $space-small;
 }
+
+.ds-table-col {
+  vertical-align: middle;
+}
 </style>