diff --git a/app/css/material-dark.php b/app/css/material-dark.php
index fef671e8e..524d5e4d8 100644
--- a/app/css/material-dark.php
+++ b/app/css/material-dark.php
@@ -206,6 +206,7 @@ function lightenColor($color, $percent)
 
 .modal-body {
   background-color: <?php echo $backgroundColor; ?>;
+  min-height: 8rem;
 }
 
 .card-header {
@@ -228,8 +229,6 @@ function lightenColor($color, $percent)
   border-color: transparent;
   border-radius: 18px;
   background-color: <?php echo $cardsColor; ?>;
-  box-shadow: 0px -5px 5px rgba(0, 0, 0, 0.1),
-              0px 4px 6px rgba(0, 0, 0, 0.1);
 }
 
 .card-body {
@@ -288,11 +287,13 @@ function lightenColor($color, $percent)
   border-bottom-right-radius: 18px!important;
   border-bottom-left-radius: 18px!important;
   position: relative;
-  margin-top: -18px;
+  box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.1),
+              0px 4px 6px rgba(0, 0, 0, 0.1);
 }
 
 .modal-footer {
-  border-radius: 18px;
+  margin-top: 0px;
+  height: 3.5rem;
 }
 
 .card>.card-header::before, .navbar-default::before {
@@ -548,6 +549,7 @@ function lightenColor($color, $percent)
   border-radius: 18px!important;
   background-color: <?php echo $backgroundColor; ?>;
   border: 1px solid <?php echo $primaryColor; ?>!important;
+  padding: 0.5rem;
 }
 
 .btn-sm {
diff --git a/app/css/material-light.php b/app/css/material-light.php
index f2ad68154..0a87f825a 100644
--- a/app/css/material-light.php
+++ b/app/css/material-light.php
@@ -204,6 +204,7 @@ function lightenColor($color, $percent)
 
 .modal-body {
   background-color: <?php echo $backgroundColor; ?>;
+  min-height: 8rem;
 }
 
 .card-header {
@@ -226,8 +227,6 @@ function lightenColor($color, $percent)
   border-color: transparent;
   border-radius: 18px;
   background-color: <?php echo $cardsColor; ?>;
-  box-shadow: 0px -5px 5px rgba(0, 0, 0, 0.1),
-              0px 4px 6px rgba(0, 0, 0, 0.1);
 }
 
 .card-body {
@@ -286,11 +285,13 @@ function lightenColor($color, $percent)
   border-bottom-right-radius: 18px!important;
   border-bottom-left-radius: 18px!important;
   position: relative;
-  margin-top: -18px;
+  box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.1),
+              0px 4px 6px rgba(0, 0, 0, 0.1);
 }
 
 .modal-footer {
-  border-radius: 18px;
+  margin-top: 0px;
+  height: 3.5rem;
 }
 
 .card>.card-header::before, .navbar-default::before {
@@ -554,6 +555,7 @@ function lightenColor($color, $percent)
   border-radius: 18px!important;
   background-color: <?php echo $backgroundColor; ?>;
   border: 1px solid <?php echo $primaryColor; ?>!important;
+  padding: 0.5rem;
 }
 
 .btn-sm {