diff --git a/web/modals/keyserver-selection/keyserver-selection-modal.css b/web/modals/keyserver-selection/keyserver-selection-modal.css
--- a/web/modals/keyserver-selection/keyserver-selection-modal.css
+++ b/web/modals/keyserver-selection/keyserver-selection-modal.css
@@ -1,7 +1,3 @@
-.container {
-  padding: 0 32px;
-}
-
 .keyserverDetailsContainer {
   background-color: var(--modal-background-secondary-default);
   display: flex;
@@ -10,7 +6,6 @@
   row-gap: 8px;
   padding: 16px 0;
   border-radius: 8px;
-  margin-top: 16px;
 }
 
 .keyserverDetailsHeaderContainer {
@@ -25,17 +20,12 @@
 
 .keyserverRemoveTextContainer {
   color: var(--text-background-primary-default);
-  margin: 16px 0 24px;
+  margin-top: 16px;
   display: flex;
   flex-direction: column;
   row-gap: 24px;
 }
 
-.buttonContainer {
-  background-color: var(--modal-background-secondary-default);
-  padding: 16px 32px;
-}
-
 .button {
   width: 100%;
 }
diff --git a/web/modals/keyserver-selection/keyserver-selection-modal.react.js b/web/modals/keyserver-selection/keyserver-selection-modal.react.js
--- a/web/modals/keyserver-selection/keyserver-selection-modal.react.js
+++ b/web/modals/keyserver-selection/keyserver-selection-modal.react.js
@@ -158,8 +158,13 @@
     ]);
 
   return (
-    <Modal size="large" onClose={popModal} name="Keyserver details">
-      <div className={css.container}>
+    <Modal
+      size="large"
+      onClose={popModal}
+      name="Keyserver details"
+      primaryButton={keyserverRemoveButton}
+    >
+      <>
         <div className={css.keyserverDetailsContainer}>
           <div className={css.keyserverDetailsHeaderContainer}>
             <KeyserverPill
@@ -172,8 +177,7 @@
         <div className={css.keyserverRemoveTextContainer}>
           {keyerverRemoveInfoText}
         </div>
-      </div>
-      <div className={css.buttonContainer}>{keyserverRemoveButton}</div>
+      </>
     </Modal>
   );
 }