diff --git a/packages/raystack/components/calendar/calendar.tsx b/packages/raystack/components/calendar/calendar.tsx
index 1e4c92991..e21bf8664 100644
--- a/packages/raystack/components/calendar/calendar.tsx
+++ b/packages/raystack/components/calendar/calendar.tsx
@@ -149,23 +149,26 @@ export const Calendar = function ({
           const hasDateInfo = Boolean(dateComponent);
 
           return (
-            <Tooltip
-              side='top'
-              disabled={loadingData || !showTooltip || !message}
-              message={message}
-            >
-              <button
-                {...buttonProps}
-                className={cx(
-                  buttonProps.className,
-                  hasDateInfo && styles.dayButtonWithInfo
-                )}
-              >
-                {hasDateInfo && (
-                  <div className={styles.dayInfo}>{dateComponent}</div>
-                )}
-                <span className={styles.dayNumber}>{buttonProps.children}</span>
-              </button>
+            <Tooltip disabled={loadingData || !showTooltip || !message}>
+              <Tooltip.Trigger
+                render={
+                  <button
+                    {...buttonProps}
+                    className={cx(
+                      buttonProps.className,
+                      hasDateInfo && styles.dayButtonWithInfo
+                    )}
+                  >
+                    {hasDateInfo && (
+                      <div className={styles.dayInfo}>{dateComponent}</div>
+                    )}
+                    <span className={styles.dayNumber}>
+                      {buttonProps.children}
+                    </span>
+                  </button>
+                }
+              />
+              <Tooltip.Content side='top'>{message}</Tooltip.Content>
             </Tooltip>
           );
         },
diff --git a/packages/raystack/components/input-field/input-field.module.css b/packages/raystack/components/input-field/input-field.module.css
index 429f22809..52b5eac63 100644
--- a/packages/raystack/components/input-field/input-field.module.css
+++ b/packages/raystack/components/input-field/input-field.module.css
@@ -27,7 +27,7 @@
   width: 100%;
   position: relative;
   border-radius: var(--rs-radius-2);
-  border: 1px solid var(--rs-color-border-base-tertiary);
+  border: 0.5px solid var(--rs-color-border-base-tertiary);
   background: var(--rs-color-background-base-primary);
   transition: all 0.2s ease;
   box-sizing: border-box;
@@ -310,4 +310,4 @@
 .input-error-wrapper.variant-borderless:hover,
 .input-error-wrapper.variant-borderless:focus-within {
   border-color: transparent;
-}
\ No newline at end of file
+}
diff --git a/packages/raystack/components/select/select.module.css b/packages/raystack/components/select/select.module.css
index 7c4e3c729..3c0f72367 100644
--- a/packages/raystack/components/select/select.module.css
+++ b/packages/raystack/components/select/select.module.css
@@ -71,11 +71,10 @@
   user-select: none;
   -webkit-user-select: none;
   transition: all 0.2s ease;
-  box-shadow: var(--rs-shadow-feather);
 }
 
 .trigger-outline {
-  border: 0.5px solid var(--rs-color-border-base-secondary);
+  border: 0.5px solid var(--rs-color-border-base-tertiary);
 }
 
 .trigger-text {
diff --git a/packages/raystack/components/text-area/text-area.module.css b/packages/raystack/components/text-area/text-area.module.css
index 2c822f275..3b892532a 100644
--- a/packages/raystack/components/text-area/text-area.module.css
+++ b/packages/raystack/components/text-area/text-area.module.css
@@ -56,7 +56,7 @@
   width: 100%;
   min-height: 64px;
   background-color: var(--rs-color-background-base-primary);
-  border: 1px solid var(--rs-color-border-base-tertiary);
+  border: 0.5px solid var(--rs-color-border-base-tertiary);
   border-radius: var(--rs-radius-2);
   font-size: var(--rs-font-size-small);
   line-height: var(--rs-line-height-small);
diff --git a/packages/raystack/components/text-area/text-area.tsx b/packages/raystack/components/text-area/text-area.tsx
index 9adca43f6..25cc4976f 100644
--- a/packages/raystack/components/text-area/text-area.tsx
+++ b/packages/raystack/components/text-area/text-area.tsx
@@ -51,10 +51,15 @@ function TextArea({
             {!required && <span className={styles.optional}>(optional)</span>}
           </label>
           {infoTooltip && (
-            <Tooltip message={infoTooltip} side='right'>
-              <span className={styles.helpIcon}>
-                <InfoCircledIcon />
-              </span>
+            <Tooltip>
+              <Tooltip.Trigger
+                render={
+                  <span className={styles.helpIcon}>
+                    <InfoCircledIcon />
+                  </span>
+                }
+              />
+              <Tooltip.Content side='right'>{infoTooltip}</Tooltip.Content>
             </Tooltip>
           )}
         </div>
diff --git a/packages/raystack/figma/tooltip.figma.tsx b/packages/raystack/figma/tooltip.figma.tsx
index 2220d3abd..8b58cee8b 100644
--- a/packages/raystack/figma/tooltip.figma.tsx
+++ b/packages/raystack/figma/tooltip.figma.tsx
@@ -6,5 +6,10 @@ figma.connect(Tooltip, '<FIGMA_LINK>?node-id=3598-25261', {
   props: {
     message: figma.textContent('Tooltip text')
   },
-  example: props => <Tooltip {...props}>TOOLTIP_TRIGGER</Tooltip>
+  example: props => (
+    <Tooltip>
+      <Tooltip.Trigger render={<button />}>TOOLTIP_TRIGGER</Tooltip.Trigger>
+      <Tooltip.Content>{props.message}</Tooltip.Content>
+    </Tooltip>
+  )
 });