diff --git a/ui/admin/tests/acceptance/credential-store/credentials/update-test.js b/ui/admin/tests/acceptance/credential-store/credentials/update-test.js
index 4e25f2013..7c6a2d728 100644
--- a/ui/admin/tests/acceptance/credential-store/credentials/update-test.js
+++ b/ui/admin/tests/acceptance/credential-store/credentials/update-test.js
@@ -143,7 +143,7 @@ module(
         );
       await visit(urls.usernamePasswordCredential);
       assert
-        .dom('.rose-layout-page-actions .rose-button-secondary')
+        .dom('.rose-layout-page-actions .hds-button-secondary')
         .doesNotExist();
     });
 
@@ -154,7 +154,7 @@ module(
         );
       await visit(urls.usernameKeyPairCredential);
       assert
-        .dom('.rose-layout-page-actions .rose-button-secondary')
+        .dom('.rose-layout-page-actions .hds-button-secondary')
         .doesNotExist();
     });
 
@@ -165,7 +165,7 @@ module(
         );
       await visit(urls.jsonCredential);
       assert
-        .dom('.rose-layout-page-actions .rose-button-secondary')
+        .dom('.rose-layout-page-actions .hds-button-secondary')
         .doesNotExist();
     });
 
diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss
index 5333d59d1..0d18788f4 100644
--- a/ui/desktop/app/styles/app.scss
+++ b/ui/desktop/app/styles/app.scss
@@ -7,8 +7,8 @@
 @use 'rose/variables/media';
 @use 'rose/utilities/type';
 
-@use 'rose';
 @use 'notify';
+@use 'rose';
 
 .rose-layout-centered {
   > .rose-layout-page {
@@ -123,6 +123,20 @@
     margin: sizing.rems(xs);
   }
 
+  .button-window-close {
+    &:hover {
+      background: var(--failure);
+    }
+  }
+
+  .button-window-minimize,
+  .button-window-fullscreen {
+    &:hover {
+      background: var(--white);
+      color: var(--black);
+    }
+  }
+
   .logotype {
     display: none;
   }
@@ -482,4 +496,4 @@
       flex-basis: 100%;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs
index e9ab1b8d5..d5d525362 100644
--- a/ui/desktop/app/templates/application.hbs
+++ b/ui/desktop/app/templates/application.hbs
@@ -21,26 +21,31 @@
 
       <header.utilities as |utilities|>
         {{#if this.showWindowActions}}
-          <Rose::Button
-            @iconOnly='x'
-            @style='warning'
+          <Hds::Button
+            {{on 'click' this.close}}
             class='button-window-close'
             title={{t 'actions.close'}}
-            {{on 'click' this.close}}
+            @text={{t 'actions.close'}}
+            @icon='x'
+            @isIconOnly={{true}}
           />
-          <Rose::Button
-            @iconOnly='square'
-            @style='secondary'
+          <Hds::Button
+            {{on 'click' this.toggleFullScreen}}
             class='button-window-fullscreen'
             title={{t 'actions.fullscreen'}}
-            {{on 'click' this.toggleFullScreen}}
+            @text={{t 'actions.fullscreen'}}
+            @icon='square'
+            @isIconOnly={{true}}
+            @color='secondary'
           />
-          <Rose::Button
-            @iconOnly='minus'
-            @style='secondary'
+          <Hds::Button
+            {{on 'click' this.minimize}}
             class='button-window-minimize'
             title={{t 'actions.minimize'}}
-            {{on 'click' this.minimize}}
+            @text={{t 'actions.minimize'}}
+            @icon='minus'
+            @isIconOnly={{true}}
+            @color='secondary'
           />
         {{/if}}