diff --git a/library/src/skins/default/src/sass/base/_extendables.scss b/library/src/skins/default/src/sass/base/_extendables.scss
index ddef85a540f4..33f61830340c 100644
--- a/library/src/skins/default/src/sass/base/_extendables.scss
+++ b/library/src/skins/default/src/sass/base/_extendables.scss
@@ -671,9 +671,7 @@ label.panelGridLabel{
 
 div.wicket-modal div.w_blue a.w_close {
 	background-image: none;
-	right: 0;
-	margin: 0 $standard-space-4x 0 0;
-	padding: $standard-space-4x;
+	right: 16px;
 	font-size: 1.5em;
 	overflow: visible;
 	color: var(--sakai-modal-header-color-1);
diff --git a/library/src/skins/default/src/sass/modules/tool/gradebook/_gradebook.scss b/library/src/skins/default/src/sass/modules/tool/gradebook/_gradebook.scss
index f000e814fe71..0f77a5d4c7f1 100644
--- a/library/src/skins/default/src/sass/modules/tool/gradebook/_gradebook.scss
+++ b/library/src/skins/default/src/sass/modules/tool/gradebook/_gradebook.scss
@@ -1447,8 +1447,8 @@ div.wicket-modal div.w_right {
   background-image: none !important;
 }
 div.wicket-modal a.w_close {
-  margin: 6px;
   color: var(--sakai-active-color-1);
+  transform: translateY(-15%);
 }
 div.wicket-modal div.w_caption {
   cursor: move;
@@ -1464,6 +1464,8 @@ div.wicket-modal .w_blue div.w_content
 {
   background: var(--sakai-background-color-1);
   color: var(--sakai-text-color-1);
+  display: flex;
+  align-items: center;
 }
 
 div.wicket-modal {