diff --git a/public/app/features/org/partials/apikeyModal.html b/public/app/features/org/partials/apikeyModal.html
index 7edb5d6e0af..2af81e57ac8 100644
--- a/public/app/features/org/partials/apikeyModal.html
+++ b/public/app/features/org/partials/apikeyModal.html
@@ -1,16 +1,16 @@
-<div class="modal-body gf-box gf-box-no-margin">
-	<div class="gf-box-header">
-		<div class="gf-box-title">
+<div class="modal-body">
+	<div class="modal-header">
+		<h2 class="modal-header-title">
 			<i class="fa fa-key"></i>
-			API Key Created
-		</div>
+			<span class="p-l-1">API Key Created</span>
+		</h2>
 
-		<button class="gf-box-header-close-btn" ng-click="dismiss();">
+		<a class="modal-header-close" ng-click="dismiss();">
 			<i class="fa fa-remove"></i>
-		</button>
+		</a>
 	</div>
 
-	<div class="gf-box-body">
+	<div class="modal-content">
 
 		<div class="gf-form-group">
 			<div class="gf-form">