diff --git a/scm-ui/ui-layout/src/card/Card.tsx b/scm-ui/ui-layout/src/card/Card.tsx
index 50d0c886db..5eab439539 100644
--- a/scm-ui/ui-layout/src/card/Card.tsx
+++ b/scm-ui/ui-layout/src/card/Card.tsx
@@ -23,14 +23,9 @@
  */
 
 import React, { ComponentType, HTMLAttributes, ReactHTML, Ref } from "react";
-import styled from "styled-components";
 import classNames from "classnames";
 import CSS from "csstype";
 
-const CardRowsContainer = styled.div`
-  overflow: hidden;
-`;
-
 type Props = HTMLAttributes<HTMLElement> & {
   action?: React.ReactElement;
   /**
@@ -61,12 +56,12 @@ const Card = React.forwardRef<HTMLElement, Props>(
         ref,
         ...props,
       },
-      <CardRowsContainer
+      <div
         className="is-flex is-flex-direction-column is-justify-content-center is-flex-grow-1"
         style={{ gap: rowGap }}
       >
         {children}
-      </CardRowsContainer>,
+      </div>,
       action ? <span className="ml-2">{action}</span> : null
     )
 );
diff --git a/scm-ui/ui-layout/src/card/CardTitle.tsx b/scm-ui/ui-layout/src/card/CardTitle.tsx
index a9a627738b..b5e2a28d22 100644
--- a/scm-ui/ui-layout/src/card/CardTitle.tsx
+++ b/scm-ui/ui-layout/src/card/CardTitle.tsx
@@ -23,7 +23,6 @@
  */
 
 import React, { HTMLAttributes } from "react";
-import classNames from "classnames";
 
 type Props = HTMLAttributes<HTMLHeadingElement> & {
   /**
@@ -46,11 +45,10 @@ type Props = HTMLAttributes<HTMLHeadingElement> & {
  * @beta
  * @since 2.44.0
  */
-const CardTitle = React.forwardRef<HTMLHeadingElement, Props>(({ children, level = 3, className, ...props }, ref) =>
+const CardTitle = React.forwardRef<HTMLHeadingElement, Props>(({ children, level = 3, ...props }, ref) =>
   React.createElement(
     `h${level}`,
     {
-      className: classNames(className, "is-ellipsis-overflow"),
       ref,
       ...props,
     },
diff --git a/scm-ui/ui-overlays/src/popover/Popover.stories.tsx b/scm-ui/ui-overlays/src/popover/Popover.stories.tsx
index 20bf91ce15..2438e11a7c 100644
--- a/scm-ui/ui-overlays/src/popover/Popover.stories.tsx
+++ b/scm-ui/ui-overlays/src/popover/Popover.stories.tsx
@@ -33,6 +33,13 @@ export default {
 
 const Template: ComponentStory<typeof Popover> = (args) => <Popover {...args} />;
 
+export const WithShortBody = Template.bind({});
+WithShortBody.args = {
+  trigger: <button>a button</button>,
+  title: <h1>A title longer than the body</h1>,
+  children: <div>very short body</div>,
+};
+
 export const CiStatus = Template.bind({});
 CiStatus.args = {
   trigger: (
diff --git a/scm-ui/ui-overlays/src/popover/Popover.tsx b/scm-ui/ui-overlays/src/popover/Popover.tsx
index 3aa2546851..cc6ad909e7 100644
--- a/scm-ui/ui-overlays/src/popover/Popover.tsx
+++ b/scm-ui/ui-overlays/src/popover/Popover.tsx
@@ -78,8 +78,8 @@ const Popover = React.forwardRef<HTMLDivElement, Props>(({ title, className, tri
           ref={ref}
           className={classNames("has-rounded-border", "p-2", "popover-content", "box", "popover", className)}
         >
-          <div className="is-flex">
-            <TitleContainer>{title}</TitleContainer>
+          <div className="is-flex is-align-items-center">
+            <TitleContainer className="mr-4">{title}</TitleContainer>
             <RadixPopover.Close asChild>
               <button className="delete popover-close" aria-label={t("popover.closeButton.ariaLabel")} />
             </RadixPopover.Close>
diff --git a/scm-ui/ui-styles/src/dark.scss b/scm-ui/ui-styles/src/dark.scss
index 9ff207aabd..3d2b32d9e1 100644
--- a/scm-ui/ui-styles/src/dark.scss
+++ b/scm-ui/ui-styles/src/dark.scss
@@ -308,3 +308,11 @@ input[type="date"].input::-webkit-calendar-picker-indicator {
 .popover-close {
   background: $background;
 }
+
+.popover-close:hover {
+  background: $grey-darker !important;
+}
+
+.popover-close:focus {
+  background: $grey-darker !important;
+}
diff --git a/scm-ui/ui-styles/src/highcontrast.scss b/scm-ui/ui-styles/src/highcontrast.scss
index 071f4754f6..333e96b602 100644
--- a/scm-ui/ui-styles/src/highcontrast.scss
+++ b/scm-ui/ui-styles/src/highcontrast.scss
@@ -380,3 +380,11 @@ input[type="date"].input::-webkit-calendar-picker-indicator {
 .popover-close {
   background: $white-ter;
 }
+
+.popover-close:hover {
+  background: $grey-light !important;
+}
+
+.popover-close:focus {
+  background: $grey-light !important;
+}