diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 0f584c408..03411301b 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -156,6 +156,8 @@
 
 .popup-footer {
   justify-content: end;
+  background-color: var(--color-primary-light);
+  min-height: 41px;
   button {
     padding: 10px $-m;
   }
@@ -316,12 +318,6 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   }
 }
 
-.image-manager .corner-button {
-  margin: 0;
-  border-radius: 0;
-  padding: $-m;
-}
-
 // Dropzone
 /*
  * The MIT License
diff --git a/resources/views/common/confirm-dialog.blade.php b/resources/views/common/confirm-dialog.blade.php
index 28587d4e8..8e4148b88 100644
--- a/resources/views/common/confirm-dialog.blade.php
+++ b/resources/views/common/confirm-dialog.blade.php
@@ -5,7 +5,7 @@
 
         <div class="popup-header primary-background">
             <div class="popup-title">{{ $title }}</div>
-            <button refs="popup@hide" type="button" class="popup-header-close">x</button>
+            <button refs="popup@hide" type="button" class="popup-header-close">@icon('close')</button>
         </div>
 
         <div class="px-m py-m">
diff --git a/resources/views/entities/selector-popup.blade.php b/resources/views/entities/selector-popup.blade.php
index ab73a014f..c896b50b5 100644
--- a/resources/views/entities/selector-popup.blade.php
+++ b/resources/views/entities/selector-popup.blade.php
@@ -3,11 +3,11 @@
         <div class="popup-body small" tabindex="-1">
             <div class="popup-header primary-background">
                 <div class="popup-title">{{ trans('entities.entity_select') }}</div>
-                <button refs="popup@hide" type="button" class="popup-header-close">x</button>
+                <button refs="popup@hide" type="button" class="popup-header-close">@icon('close')</button>
             </div>
             @include('entities.selector', ['name' => 'entity-selector'])
             <div class="popup-footer">
-                <button refs="entity-selector-popup@select" type="button" disabled="true" class="button corner-button">{{ trans('common.select') }}</button>
+                <button refs="entity-selector-popup@select" type="button" disabled="true" class="button">{{ trans('common.select') }}</button>
             </div>
         </div>
     </div>
diff --git a/resources/views/pages/parts/code-editor.blade.php b/resources/views/pages/parts/code-editor.blade.php
index 7c3a7b9ec..9c10456ce 100644
--- a/resources/views/pages/parts/code-editor.blade.php
+++ b/resources/views/pages/parts/code-editor.blade.php
@@ -63,8 +63,8 @@
 
             </div>
 
-            <div class="popup-footer primary-background-light">
-                <button refs="code-editor@saveButton" type="button" class="button corner-button">{{ trans('components.code_save') }}</button>
+            <div class="popup-footer">
+                <button refs="code-editor@saveButton" type="button" class="button">{{ trans('components.code_save') }}</button>
             </div>
 
         </div>
diff --git a/resources/views/pages/parts/image-manager.blade.php b/resources/views/pages/parts/image-manager.blade.php
index c15c31b86..50a0cd8c3 100644
--- a/resources/views/pages/parts/image-manager.blade.php
+++ b/resources/views/pages/parts/image-manager.blade.php
@@ -9,7 +9,7 @@
 
             <div class="popup-header primary-background">
                 <div class="popup-title">{{ trans('components.image_select') }}</div>
-                <button refs="popup@hide" type="button" class="popup-header-close">x</button>
+                <button refs="popup@hide" type="button" class="popup-header-close">@icon('close')</button>
             </div>
 
             <div class="flex-fill image-manager-body">
@@ -53,14 +53,16 @@
                     </div>
 
                     <div refs="image-manager@formContainer" class="inner flex"></div>
-
-                    <button refs="image-manager@selectButton" type="button" class="hidden button corner-button">
-                        {{ trans('components.image_select_image') }}
-                    </button>
                 </div>
 
             </div>
 
+            <div class="popup-footer">
+                <button refs="image-manager@selectButton" type="button" class="hidden button">
+                    {{ trans('components.image_select_image') }}
+                </button>
+            </div>
+
         </div>
     </div>
 </div>
\ No newline at end of file