diff --git a/apps/client/src/stylesheets/theme-next/shell.css b/apps/client/src/stylesheets/theme-next/shell.css
index d569dec91..1e2e54d40 100644
--- a/apps/client/src/stylesheets/theme-next/shell.css
+++ b/apps/client/src/stylesheets/theme-next/shell.css
@@ -1375,7 +1375,7 @@ div.floating-buttons-children .floating-button:active {
 }
 
 /* The first visible floating button */
-div.floating-buttons-children > *:nth-child(1 of .visible) {
+div.floating-buttons-children > *:first-child {
     --border-radius: var(--border-radius-size) 0 0 var(--border-radius-size);
     border-radius: var(--border-radius);
 }
diff --git a/apps/client/src/widgets/FloatingButtons.css b/apps/client/src/widgets/FloatingButtons.css
index 1bf4ff23f..41afefed9 100644
--- a/apps/client/src/widgets/FloatingButtons.css
+++ b/apps/client/src/widgets/FloatingButtons.css
@@ -81,7 +81,7 @@
     border: 1px solid transparent;
     color: var(--button-text-color);
     padding: 6px;
-    border-radius: 100px;
+    border-radius: 100px !important;
 }
 
 .show-floating-buttons-button:hover {
diff --git a/apps/client/src/widgets/FloatingButtons.tsx b/apps/client/src/widgets/FloatingButtons.tsx
index fd0aa14dd..4d8c7e46f 100644
--- a/apps/client/src/widgets/FloatingButtons.tsx
+++ b/apps/client/src/widgets/FloatingButtons.tsx
@@ -100,6 +100,7 @@ function ShowFloatingButton({ setVisible }: { setVisible(visible: boolean): void
                 icon="bx bx-chevrons-left"
                 text={t("show_floating_buttons_button.button_title")}
                 onClick={() => setVisible(true)}
+                noIconActionClass
             />
         </div>
     );
@@ -112,7 +113,8 @@ function CloseFloatingButton({ setVisible }: { setVisible(visible: boolean): voi
                 className="close-floating-buttons-button"
                 icon="bx bx-chevrons-right"
                 text={t("hide_floating_buttons_button.button_title")}
-                onClick={() => setVisible(false)}
+                onClick={() => setVisible(false)}                
+                noIconActionClass
             />
         </div>
     );
diff --git a/apps/client/src/widgets/react/ActionButton.tsx b/apps/client/src/widgets/react/ActionButton.tsx
index c97aa01ca..41c4abbed 100644
--- a/apps/client/src/widgets/react/ActionButton.tsx
+++ b/apps/client/src/widgets/react/ActionButton.tsx
@@ -31,7 +31,7 @@ export default function ActionButton({ text, icon, className, onClick, triggerCo
 
     return <button
         ref={buttonRef}
-        class={`${className ?? ""} ${!noIconActionClass ? "icon-action" : ""} ${icon}`}
+        class={`${className ?? ""} ${!noIconActionClass ? "icon-action" : "btn"} ${icon}`}
         onClick={onClick}        
         data-trigger-command={triggerCommand}
     />;