diff --git a/src/components/settings/auth/AuthSettings.vue b/src/components/settings/auth/AuthSettings.vue
index 1819550671..1961c8a1f4 100644
--- a/src/components/settings/auth/AuthSettings.vue
+++ b/src/components/settings/auth/AuthSettings.vue
@@ -65,10 +65,11 @@
             text
             x-small
             color=""
+            class="ms-1"
             @click.stop="handleRemoveUser(user)"
           >
             <v-icon color="">
-              $close
+              $delete
             </v-icon>
           </app-btn>
         </app-setting>
diff --git a/src/components/settings/cameras/CameraSettings.vue b/src/components/settings/cameras/CameraSettings.vue
index c4524fc9ec..bba57326db 100644
--- a/src/components/settings/cameras/CameraSettings.vue
+++ b/src/components/settings/cameras/CameraSettings.vue
@@ -32,7 +32,6 @@
           :key="`camera-${camera.uid}`"
           :r-cols="2"
           :sub-title="camera.source === 'config' ? $t('app.general.tooltip.managed_by_moonraker') : undefined"
-          @click="handleEditDialog(camera)"
         >
           <template #title>
             {{ camera.name }} <v-icon
@@ -44,16 +43,31 @@
               $warning
             </v-icon>
           </template>
+
+          <app-btn
+            fab
+            text
+            x-small
+            color=""
+            class="ms-1"
+            @click.stop="handleEditDialog(camera)"
+          >
+            <v-icon color="">
+              $edit
+            </v-icon>
+          </app-btn>
+
           <app-btn
-            v-if="camera.source !== 'config'"
+            :disabled="camera.source === 'config'"
             fab
             text
             x-small
             color=""
+            class="ms-1"
             @click.stop="handleRemoveCamera(camera)"
           >
             <v-icon color="">
-              $close
+              $delete
             </v-icon>
           </app-btn>
         </app-setting>
diff --git a/src/components/settings/console/ConsoleSettings.vue b/src/components/settings/console/ConsoleSettings.vue
index b9b21dd33c..56845590ed 100644
--- a/src/components/settings/console/ConsoleSettings.vue
+++ b/src/components/settings/console/ConsoleSettings.vue
@@ -41,6 +41,7 @@
             text
             x-small
             color=""
+            class="ms-1"
             @click.stop="handleEditFilterDialog(filter)"
           >
             <v-icon color="">
@@ -53,10 +54,11 @@
             text
             x-small
             color=""
+            class="ms-1"
             @click.stop="handleRemoveFilter(filter)"
           >
             <v-icon color="">
-              $close
+              $delete
             </v-icon>
           </app-btn>
         </app-setting>
diff --git a/src/components/settings/macros/MacroSettings.vue b/src/components/settings/macros/MacroSettings.vue
index 5ed834d650..cc5cf97c74 100644
--- a/src/components/settings/macros/MacroSettings.vue
+++ b/src/components/settings/macros/MacroSettings.vue
@@ -48,6 +48,7 @@
             text
             x-small
             color=""
+            class="ms-1"
             @click.stop="handleEditCategoryDialog(category)"
           >
             <v-icon color="">
@@ -60,10 +61,11 @@
             text
             x-small
             color=""
+            class="ms-1"
             @click.stop="handleRemoveCategory(category)"
           >
             <v-icon color="">
-              $close
+              $delete
             </v-icon>
           </app-btn>
 
diff --git a/src/components/settings/presets/PresetSettings.vue b/src/components/settings/presets/PresetSettings.vue
index 0dd87b0ef3..c59126491b 100644
--- a/src/components/settings/presets/PresetSettings.vue
+++ b/src/components/settings/presets/PresetSettings.vue
@@ -44,15 +44,17 @@
               {{ k }}: {{ value.value }}<small>°C</small>
             </span>
           </template>
+
           <app-btn
             fab
             text
             x-small
             color=""
+            class="ms-1"
             @click.stop="handleRemovePreset(preset)"
           >
             <v-icon color="">
-              $close
+              $delete
             </v-icon>
           </app-btn>
         </app-setting>
diff --git a/src/components/widgets/bedmesh/BedMeshControls.vue b/src/components/widgets/bedmesh/BedMeshControls.vue
index 8e046dabdb..932a599ef9 100644
--- a/src/components/widgets/bedmesh/BedMeshControls.vue
+++ b/src/components/widgets/bedmesh/BedMeshControls.vue
@@ -89,7 +89,7 @@
                     v-on="on"
                   >
                     <v-icon color="">
-                      $close
+                      $delete
                     </v-icon>
                   </app-btn>
                 </template>