diff --git a/css/leptonContent.css b/css/leptonContent.css
index b38e88f..f5a5684 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2958,6 +2958,9 @@
 }
 /** Rounding ******************************************************************/
 @supports -moz-bool-pref("userChrome.rounding.square_button") {
+  .all-buttons-container,
+  .highlight-buttons > button,
+  .cancel-shot,
   #pictureInPictureToggle > .pip-small {
     border-radius: 0 !important;
   }
diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css
index bf6197c..6ca6479 100644
--- a/css/leptonContentESR.css
+++ b/css/leptonContentESR.css
@@ -2961,6 +2961,9 @@
 }
 /** Rounding ******************************************************************/
 @supports -moz-bool-pref("userChrome.rounding.square_button") {
+  .all-buttons-container,
+  .highlight-buttons > button,
+  .cancel-shot,
   #pictureInPictureToggle > .pip-small {
     border-radius: 0 !important;
   }
diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss
index 7074c3c..c22ac81 100644
--- a/src/contents/_rounding.scss
+++ b/src/contents/_rounding.scss
@@ -1,4 +1,10 @@
 @include Option("userChrome.rounding.square_button") {
+  // #firefox-screenshots-selection-iframe
+  .all-buttons-container,
+  .highlight-buttons > button,
+  .cancel-shot,
+
+  // Video player
   #pictureInPictureToggle > .pip-small {
     border-radius: 0 !important;
   }