diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-menu-item/styles.js b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-menu-item/styles.js
index d060de3d78..37f53135ef 100644
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-menu-item/styles.js
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-menu-item/styles.js
@@ -81,14 +81,6 @@ const ToolbarButton = styled(Button)`
     & > i {
       color: ${toolbarListColor};
     }
-
-    border-top-left-radius: 0;
-    border-top-right-radius: ${toolbarButtonBorderRadius};
-
-    [dir="rtl"] & {
-      border-top-left-radius: ${toolbarButtonBorderRadius};
-      border-top-right-radius: 0;
-    }
   `}
 `;
 
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-submenu-item/styles.js b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-submenu-item/styles.js
index 8c1d7d8b32..469b378a26 100644
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-submenu-item/styles.js
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-submenu-item/styles.js
@@ -32,6 +32,13 @@ const ButtonWrapper = styled.div`
   &:first-child > button {
     border-top-left-radius: ${toolbarButtonBorderRadius};
     border-bottom-left-radius: ${toolbarButtonBorderRadius};
+
+    [dir="rtl"] & {
+      border-top-right-radius: ${toolbarButtonBorderRadius};
+      border-bottom-right-radius: ${toolbarButtonBorderRadius};
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+    }
   }
 `;