diff --git a/src/app/pages/maps/gmaps/gmaps.component.scss b/src/app/pages/maps/gmaps/gmaps.component.scss
index 43cceb85..8826f1cf 100644
--- a/src/app/pages/maps/gmaps/gmaps.component.scss
+++ b/src/app/pages/maps/gmaps/gmaps.component.scss
@@ -1,21 +1,13 @@
 @import '../../../@theme/styles/variables';
 
 @include nga-install-component() {
-  nga-card-header {
-    border: none;
-  }
 
   nga-card-body {
     padding: 0;
   }
 
-  agm-map {
+  /deep/ agm-map {
     width: 100%;
     height: 100%;
-
-    /deep/ .agm-map-container-inner {
-      border-bottom-left-radius: nga-theme(card-border-radius);
-      border-bottom-right-radius: nga-theme(card-border-radius);
-    }
   }
 }
diff --git a/src/app/pages/maps/gmaps/gmaps.component.ts b/src/app/pages/maps/gmaps/gmaps.component.ts
index 25028a2d..4632de7a 100644
--- a/src/app/pages/maps/gmaps/gmaps.component.ts
+++ b/src/app/pages/maps/gmaps/gmaps.component.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
   selector: 'ngx-gmaps',
   styleUrls: ['./gmaps.component.scss'],
   template: `
-    <nga-card size="large">
+    <nga-card size="xlarge">
       <nga-card-header>Gmaps</nga-card-header>
       <nga-card-body>
         <agm-map [latitude]="lat" [longitude]="lng">
@@ -15,6 +15,7 @@ import { Component } from '@angular/core';
   `,
 })
 export class GmapsComponent {
+
   lat: number = 51.678418;
   lng: number = 7.809007;
 }
diff --git a/src/app/pages/maps/leaflet/leaflet.component.scss b/src/app/pages/maps/leaflet/leaflet.component.scss
index 54cbcfbf..c3b6af75 100644
--- a/src/app/pages/maps/leaflet/leaflet.component.scss
+++ b/src/app/pages/maps/leaflet/leaflet.component.scss
@@ -1,9 +1,8 @@
 @import '../../../@theme/styles/variables';
 
 @include nga-install-component() {
-  nga-card-header {
-    border: none;
-  }
+
+  $card-header-border: 1px;
 
   nga-card-body {
     padding: 0;
@@ -11,6 +10,7 @@
 
   /deep/ .leaflet-container {
     width: 100%;
-    height: 500px;
+    height: calc(#{nga-theme(card-height-xlarge)} - (#{nga-theme(card-padding) * 2}) -
+                (#{nga-theme(card-header-font-size)} * #{nga-theme(card-line-height)}) - #{$card-header-border});
   }
 }
diff --git a/src/app/pages/maps/leaflet/leaflet.component.ts b/src/app/pages/maps/leaflet/leaflet.component.ts
index e8ecbfc6..37d23bed 100644
--- a/src/app/pages/maps/leaflet/leaflet.component.ts
+++ b/src/app/pages/maps/leaflet/leaflet.component.ts
@@ -7,7 +7,7 @@ import 'style-loader!leaflet/dist/leaflet.css';
   selector: 'ngx-leaflet',
   styleUrls: ['./leaflet.component.scss'],
   template: `
-    <nga-card>
+    <nga-card size="xlarge">
       <nga-card-header>Leaflet</nga-card-header>
       <nga-card-body>
         <div leaflet [leafletOptions]="options"></div>