diff --git a/src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp b/src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp
index 25353e801..9f3b806a6 100644
--- a/src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp
+++ b/src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp
@@ -14,28 +14,7 @@ Adw.AlertDialog clipboard_confirmation_window {
   default-response: "cancel";
   close-response: "cancel";
 
-  extra-child: Box {
-    orientation: vertical;
-    spacing: 12;
-
-    Button reveal_button {
-      visible: false;
-
-      styles [
-        "destructive-action"
-      ]
-
-      Adw.ButtonContent {
-        label: _("Reveal Potentially Sensitive Content");
-        icon-name: "dialog-warning-symbolic";
-      }
-    }
-
-    Button hide_button {
-      visible: false;
-      label: _("Hide Potentially Sensitive Content");
-    }
-
+  extra-child: Overlay {
     ScrolledWindow text_view_scroll {
       width-request: 500;
       height-request: 250;
@@ -54,5 +33,39 @@ Adw.AlertDialog clipboard_confirmation_window {
         ]
       }
     }
+
+    [overlay]
+    Button reveal_button {
+      visible: false;
+      halign: end;
+      valign: start;
+      margin-end: 12;
+      margin-top: 12;
+
+      styles [
+        "destructive-action",
+      ]
+
+      Image {
+        icon-name: "view-reveal-symbolic";
+      }
+    }
+
+    [overlay]
+    Button hide_button {
+      visible: false;
+      halign: end;
+      valign: start;
+      margin-end: 12;
+      margin-top: 12;
+
+      styles [
+        "suggested-action",
+      ]
+
+      Image {
+        icon-name: "view-conceal-symbolic";
+      }
+    }
   };
 }
diff --git a/src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp b/src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp
index 1c4e740e4..a745de597 100644
--- a/src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp
+++ b/src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp
@@ -14,28 +14,7 @@ Adw.AlertDialog clipboard_confirmation_window {
   default-response: "cancel";
   close-response: "cancel";
 
-  extra-child: Box {
-    orientation: vertical;
-    spacing: 12;
-
-    Button reveal_button {
-      visible: false;
-
-      styles [
-        "destructive-action"
-      ]
-
-      Adw.ButtonContent {
-        label: _("Reveal Potentially Sensitive Content");
-        icon-name: "dialog-warning-symbolic";
-      }
-    }
-
-    Button hide_button {
-      visible: false;
-      label: _("Hide Potentially Sensitive Content");
-    }
-
+  extra-child: Overlay {
     ScrolledWindow text_view_scroll {
       width-request: 500;
       height-request: 250;
@@ -54,5 +33,39 @@ Adw.AlertDialog clipboard_confirmation_window {
         ]
       }
     }
+
+    [overlay]
+    Button reveal_button {
+      visible: false;
+      halign: end;
+      valign: start;
+      margin-end: 12;
+      margin-top: 12;
+
+      styles [
+        "destructive-action",
+      ]
+
+      Image {
+        icon-name: "view-reveal-symbolic";
+      }
+    }
+
+    [overlay]
+    Button hide_button {
+      visible: false;
+      halign: end;
+      valign: start;
+      margin-end: 12;
+      margin-top: 12;
+
+      styles [
+        "suggested-action",
+      ]
+
+      Image {
+        icon-name: "view-conceal-symbolic";
+      }
+    }
   };
 }
diff --git a/src/apprt/gtk/ui/1.5/ccw-paste.blp b/src/apprt/gtk/ui/1.5/ccw-paste.blp
index 395556f3d..1066ecae7 100644
--- a/src/apprt/gtk/ui/1.5/ccw-paste.blp
+++ b/src/apprt/gtk/ui/1.5/ccw-paste.blp
@@ -14,28 +14,7 @@ Adw.AlertDialog clipboard_confirmation_window {
   default-response: "cancel";
   close-response: "cancel";
 
-  extra-child: Box {
-    orientation: vertical;
-    spacing: 12;
-
-    Button reveal_button {
-      visible: false;
-
-      styles [
-        "destructive-action"
-      ]
-
-      Adw.ButtonContent {
-        label: _("Reveal Potentially Sensitive Content");
-        icon-name: "dialog-warning-symbolic";
-      }
-    }
-
-    Button hide_button {
-      visible: false;
-      label: _("Hide Potentially Sensitive Content");
-    }
-
+  extra-child: Overlay {
     ScrolledWindow text_view_scroll {
       width-request: 500;
       height-request: 250;
@@ -54,5 +33,39 @@ Adw.AlertDialog clipboard_confirmation_window {
         ]
       }
     }
+
+    [overlay]
+    Button reveal_button {
+      visible: false;
+      halign: end;
+      valign: start;
+      margin-end: 12;
+      margin-top: 12;
+
+      styles [
+        "destructive-action",
+      ]
+
+      Image {
+        icon-name: "view-reveal-symbolic";
+      }
+    }
+
+    [overlay]
+    Button hide_button {
+      visible: false;
+      halign: end;
+      valign: start;
+      margin-end: 12;
+      margin-top: 12;
+
+      styles [
+        "suggested-action",
+      ]
+
+      Image {
+        icon-name: "view-conceal-symbolic";
+      }
+    }
   };
 }