diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
index dff8dec7..45f593cd 100644
--- a/src/components/Modal.tsx
+++ b/src/components/Modal.tsx
@@ -79,14 +79,13 @@ const sizeToWidth = {
 const ModalSC = styled(Card)<{
   $width: number
   $maxWidth: number
-}>(({ theme, $width, $maxWidth }) => ({
+}>(({ $width, $maxWidth }) => ({
   position: 'relative',
   display: 'flex',
   flexDirection: 'column',
   height: '100%',
   width: $width,
   maxWidth: $maxWidth,
-  backgroundColor: theme.colors['fill-one'],
 }))
 
 const ModalContentSC = styled.div<{
@@ -186,6 +185,7 @@ function ModalRef(
       {...props}
     >
       <ModalSC
+        fillLevel={1}
         forwardedAs={asForm ? 'form' : undefined}
         $width={sizeToWidth[size]}
         $maxWidth={maxWidth}
diff --git a/src/components/Table.tsx b/src/components/Table.tsx
index a50f48a0..2e051065 100644
--- a/src/components/Table.tsx
+++ b/src/components/Table.tsx
@@ -172,7 +172,8 @@ const Tr = styled.tr<{
     ...(clickable && {
       cursor: 'pointer',
 
-      '&:hover': {
+      // highlight when hovered, but don't highlight if a child button is hovered
+      '&:not(:has(button:hover)):hover': {
         backgroundColor: selectable
           ? selected
             ? theme.colors['fill-zero-hover']