diff --git a/packages/components/package.json b/packages/components/package.json
index 9b503b5..86b201e 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -31,7 +31,7 @@
     "@types/react-responsive": "^8.0.2",
     "react-aspect-ratio": "^1.0.50",
     "react-responsive": "^8.2.0",
-    "react-tiny-popover": "^6.0.5"
+    "react-tiny-popover": "^7.1.0"
   },
   "peerDependencies": {
     "livekit-client": "^1.3.2",
diff --git a/packages/components/src/components/ControlsView.tsx b/packages/components/src/components/ControlsView.tsx
index f0cf6da..e78da55 100644
--- a/packages/components/src/components/ControlsView.tsx
+++ b/packages/components/src/components/ControlsView.tsx
@@ -67,6 +67,7 @@ export const ControlsView = ({
     const enabled = !(camPub?.isMuted ?? true);
     videoButton = (
       <VideoSelectButton
+        className={styles.controlButton}
         isEnabled={enabled}
         isButtonDisabled={videoButtonDisabled}
         onClick={() => {
@@ -91,6 +92,7 @@ export const ControlsView = ({
     const enabled = room.localParticipant.isScreenShareEnabled;
     screenButton = (
       <ControlButton
+        className={styles.controlButton}
         label={enabled ? 'Stop sharing' : 'Share screen'}
         icon={enabled ? faStop : faDesktop}
         disabled={screenButtonDisabled}
diff --git a/packages/components/src/components/styles.module.css b/packages/components/src/components/styles.module.css
index 08afced..36073be 100644
--- a/packages/components/src/components/styles.module.css
+++ b/packages/components/src/components/styles.module.css
@@ -68,12 +68,15 @@ video.video {
   color: #981010;
 }
 
+.controlButton {
+
+}
+
 .controlsWrapper {
 }
 
 .buttonWrapper {
   display: inline-block;
-  margin: 4px;
   white-space: nowrap;
 }
 
@@ -88,6 +91,7 @@ video.video {
   font-weight: normal;
   font-size: 14px;
   white-space: nowrap;
+  margin: 4px;
 }
 
 .button:active {
diff --git a/yarn.lock b/yarn.lock
index 1c7beb3..4892d77 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9448,10 +9448,10 @@ react-scripts@^5.0.1:
   optionalDependencies:
     fsevents "^2.3.2"
 
-react-tiny-popover@^6.0.5:
-  version "6.0.10"
-  resolved "https://registry.yarnpkg.com/react-tiny-popover/-/react-tiny-popover-6.0.10.tgz#6167a1b4a1ae6cf847d2909057defd00d95d726c"
-  integrity sha512-ECMucd701SxWHGa+2YuVvccCxxTjmhomcD0ZYTF+Qmi5qNAj8pdlExFN+k+p1G78QTYIGPGNLocxRb9f6cZ0Mw==
+react-tiny-popover@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/react-tiny-popover/-/react-tiny-popover-7.1.0.tgz#809bffefd54c7921eba96991f964953858e3388f"
+  integrity sha512-vlZFs8/uFWwLY+JwXL4Fwjvz+c5rqKUlg5b9UOgc/gJiRdp1lk+FachCdZlDIQwk8UOADMu8YxYp0VV3rXLU9g==
 
 react@^18.1.0:
   version "18.1.0"