diff --git a/packages/main/src/components/MessageViewButton/MessageViewButton.module.css b/packages/main/src/components/MessageViewButton/MessageViewButton.module.css
index 1b13c757152..ea0c3980675 100644
--- a/packages/main/src/components/MessageViewButton/MessageViewButton.module.css
+++ b/packages/main/src/components/MessageViewButton/MessageViewButton.module.css
@@ -26,6 +26,7 @@
   }
 
   &[data-type='Negative'] {
+    font-weight: var(--sapButton_Emphasized_FontWeight);
     text-shadow: var(--sapContent_ContrastTextShadow);
     color: var(--sapButton_Negative_TextColor);
     background: var(--sapButton_Negative_Background);
@@ -36,12 +37,14 @@
     }
 
     &:hover {
+      text-shadow: none;
       color: var(--sapButton_Negative_Hover_TextColor);
       background: var(--sapButton_Negative_Hover_Background);
       border-color: var(--sapButton_Negative_Hover_BorderColor);
     }
 
     &:active {
+      text-shadow: none;
       color: var(--sapButton_Negative_Active_TextColor);
       background: var(--sapButton_Negative_Active_Background);
       border-color: var(--sapButton_Negative_Active_BorderColor);
@@ -53,6 +56,7 @@
   }
 
   &[data-type='Critical'] {
+    font-weight: var(--sapButton_Emphasized_FontWeight);
     text-shadow: var(--sapContent_ContrastTextShadow);
     color: var(--sapButton_Critical_TextColor);
     background: var(--sapButton_Critical_Background);
@@ -63,12 +67,14 @@
     }
 
     &:hover {
+      text-shadow: none;
       color: var(--sapButton_Critical_Hover_TextColor);
       background: var(--sapButton_Critical_Hover_Background);
       border-color: var(--sapButton_Critical_Hover_BorderColor);
     }
 
     &:active {
+      text-shadow: none;
       color: var(--sapButton_Critical_Active_TextColor);
       background: var(--sapButton_Critical_Active_Background);
       border-color: var(--sapButton_Critical_Active_BorderColor);
@@ -80,6 +86,7 @@
   }
 
   &[data-type='Positive'] {
+    font-weight: var(--sapButton_Emphasized_FontWeight);
     text-shadow: var(--sapContent_ContrastTextShadow);
     color: var(--sapButton_Success_TextColor);
     background: var(--sapButton_Success_Background);
@@ -90,12 +97,14 @@
     }
 
     &:hover {
+      text-shadow: none;
       color: var(--sapButton_Success_Hover_TextColor);
       background: var(--sapButton_Success_Hover_Background);
       border-color: var(--sapButton_Success_Hover_BorderColor);
     }
 
     &:active {
+      text-shadow: none;
       color: var(--sapButton_Success_Active_TextColor);
       background: var(--sapButton_Success_Active_Background);
       border-color: var(--sapButton_Success_Active_BorderColor);
diff --git a/packages/main/src/components/MessageViewButton/MessageViewButton.stories.tsx b/packages/main/src/components/MessageViewButton/MessageViewButton.stories.tsx
index c2802951f31..1d92ae70ea3 100644
--- a/packages/main/src/components/MessageViewButton/MessageViewButton.stories.tsx
+++ b/packages/main/src/components/MessageViewButton/MessageViewButton.stories.tsx
@@ -18,15 +18,15 @@ type Story = StoryObj<typeof meta>;
 export const Default: Story = {};
 
 export const Severities: Story = {
-  render() {
+  render(args) {
     return (
       <>
         <Text>These buttons are ordered by severity, from high to low.</Text>
         <FlexBox style={{ gap: '1rem' }}>
-          <MessageViewButton type={ValueState.Negative} />
-          <MessageViewButton type={ValueState.Critical} />
-          <MessageViewButton type={ValueState.Positive} />
-          <MessageViewButton type={ValueState.Information} />
+          <MessageViewButton {...args} type={ValueState.Negative} />
+          <MessageViewButton {...args} type={ValueState.Critical} />
+          <MessageViewButton {...args} type={ValueState.Positive} />
+          <MessageViewButton {...args} type={ValueState.Information} />
         </FlexBox>
       </>
     );