diff --git a/data/resources/style.css b/data/resources/style.css
index d9ef270a..51a8a1e8 100644
--- a/data/resources/style.css
+++ b/data/resources/style.css
@@ -163,7 +163,7 @@ entry .inline-pill {
 	margin-bottom: -0.5em;
 }
 
-.cutout-button {
+editable-avatar .cutout {
   background-color: @window_bg_color;
   border-radius: 9999px;
   padding: 2px;
diff --git a/src/components/editable_avatar.rs b/src/components/editable_avatar.rs
index 035d0451..237e3bfd 100644
--- a/src/components/editable_avatar.rs
+++ b/src/components/editable_avatar.rs
@@ -65,8 +65,6 @@ mod imp {
         #[template_child]
         pub stack: TemplateChild<gtk::Stack>,
         #[template_child]
-        pub button_remove_bin: TemplateChild<adw::Bin>,
-        #[template_child]
         pub button_remove: TemplateChild<ActionButton>,
         #[template_child]
         pub button_edit: TemplateChild<ActionButton>,
@@ -80,6 +78,7 @@ mod imp {
 
         fn class_init(klass: &mut Self::Class) {
             Self::bind_template(klass);
+            klass.set_css_name("editable-avatar");
 
             klass.install_action("editable-avatar.edit-avatar", None, |obj, _, _| {
                 spawn!(clone!(@weak obj => async move {
diff --git a/src/components/editable_avatar.ui b/src/components/editable_avatar.ui
index ed6ff7c4..13509f04 100644
--- a/src/components/editable_avatar.ui
+++ b/src/components/editable_avatar.ui
@@ -42,7 +42,7 @@
         <child type="overlay">
           <object class="AdwBin" id="button_remove_bin">
             <style>
-              <class name="cutout-button" />
+              <class name="cutout" />
             </style>
             <property name="halign">end</property>
             <property name="valign">start</property>
@@ -57,7 +57,7 @@
         <child type="overlay">
           <object class="AdwBin">
             <style>
-              <class name="cutout-button" />
+              <class name="cutout" />
             </style>
             <property name="visible" bind-source="ComponentsEditableAvatar" bind-property="editable" bind-flags="sync-create"/>
             <property name="halign">end</property>