diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 02c1a2cf0..6c7a4c2a3 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -4808,8 +4808,8 @@ function inline_jezik_edit(id_value){
     // Gumb shrani / zapri
 
 		'<div class="button_holder popup">'+
-		'<button class="white-blue popup_button" onclick="inline_jezik_reset(\''+id_value+'\');">'+lang['srv_zapri']+'</button>'+			
-		'<button class="blue popup_button" onclick="inline_jezik_save(\''+id_value+'\');">'+lang['save']+'</button>'+
+		'<button class="white-blue medium" onclick="inline_jezik_reset(\''+id_value+'\');">'+lang['srv_zapri']+'</button>'+			
+		'<button class="blue medium" onclick="inline_jezik_save(\''+id_value+'\');">'+lang['save']+'</button>'+
 		'</div>'+
 	
 	'</div></div>');
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 1d0fd9d2b..630594ede 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -6828,13 +6828,13 @@ a.help {
 .divPopUp h2,
 .divPopUp .divPopUp_top {
   width: 100%;
-  margin-top: 3px;
   margin-bottom: 16px;
   padding-bottom: 8px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
   border-bottom: 1px #E5E5E5 solid;
+  margin-block-start: 0;
 }
 .divPopUp p {
   line-height: 20px;
@@ -7381,13 +7381,13 @@ body.waitlong #loading {
 #check_pogoji h2,
 #check_pogoji .divPopUp_top {
   width: 100%;
-  margin-top: 3px;
   margin-bottom: 16px;
   padding-bottom: 8px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
   border-bottom: 1px #E5E5E5 solid;
+  margin-block-start: 0;
 }
 #check_pogoji p {
   line-height: 20px;
@@ -7440,13 +7440,13 @@ body.waitlong #loading {
 #dropped_alert h2,
 #dropped_alert .divPopUp_top {
   width: 100%;
-  margin-top: 3px;
   margin-bottom: 16px;
   padding-bottom: 8px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
   border-bottom: 1px #E5E5E5 solid;
+  margin-block-start: 0;
 }
 #dropped_alert p {
   line-height: 20px;
@@ -7508,13 +7508,13 @@ body.waitlong #loading {
 #popup_user_access h2,
 #popup_user_access .divPopUp_top {
   width: 100%;
-  margin-top: 3px;
   margin-bottom: 16px;
   padding-bottom: 8px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
   border-bottom: 1px #E5E5E5 solid;
+  margin-block-start: 0;
 }
 #popup_user_access p {
   line-height: 20px;
@@ -7693,13 +7693,13 @@ and open the template in the editor.
 #div_export_setting_show h2,
 #div_export_setting_show .divPopUp_top {
   width: 100%;
-  margin-top: 3px;
   margin-bottom: 16px;
   padding-bottom: 8px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
   border-bottom: 1px #E5E5E5 solid;
+  margin-block-start: 0;
 }
 #div_export_setting_show p {
   line-height: 20px;
@@ -8743,13 +8743,13 @@ dl.arch_email dd {
 #inv_view_arch_recipients h2,
 #inv_view_arch_recipients .divPopUp_top {
   width: 100%;
-  margin-top: 3px;
   margin-bottom: 16px;
   padding-bottom: 8px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
   border-bottom: 1px #E5E5E5 solid;
+  margin-block-start: 0;
 }
 #inv_view_arch_recipients p {
   line-height: 20px;
@@ -8824,13 +8824,13 @@ and open the template in the editor.
 #preview_spremenljivka h2,
 #preview_spremenljivka .divPopUp_top {
   width: 100%;
-  margin-top: 3px;
   margin-bottom: 16px;
   padding-bottom: 8px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
   border-bottom: 1px #E5E5E5 solid;
+  margin-block-start: 0;
 }
 #preview_spremenljivka p {
   line-height: 20px;
@@ -9532,13 +9532,13 @@ and open the template in the editor.
 .mc_table_settings h2,
 .mc_table_settings .divPopUp_top {
   width: 100%;
-  margin-top: 3px;
   margin-bottom: 16px;
   padding-bottom: 8px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
   border-bottom: 1px #E5E5E5 solid;
+  margin-block-start: 0;
 }
 .mc_table_settings p {
   line-height: 20px;
@@ -9620,13 +9620,13 @@ and open the template in the editor.
 #newMCTable h2,
 #newMCTable .divPopUp_top {
   width: 100%;
-  margin-top: 3px;
   margin-bottom: 16px;
   padding-bottom: 8px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
   border-bottom: 1px #E5E5E5 solid;
+  margin-block-start: 0;
 }
 #newMCTable p {
   line-height: 20px;
@@ -9684,13 +9684,13 @@ and open the template in the editor.
 #renameMCTable h2,
 #renameMCTable .divPopUp_top {
   width: 100%;
-  margin-top: 3px;
   margin-bottom: 16px;
   padding-bottom: 8px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
   border-bottom: 1px #E5E5E5 solid;
+  margin-block-start: 0;
 }
 #renameMCTable p {
   line-height: 20px;
@@ -9748,13 +9748,13 @@ and open the template in the editor.
 #deleteMCTable h2,
 #deleteMCTable .divPopUp_top {
   width: 100%;
-  margin-top: 3px;
   margin-bottom: 16px;
   padding-bottom: 8px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
   border-bottom: 1px #E5E5E5 solid;
+  margin-block-start: 0;
 }
 #deleteMCTable p {
   line-height: 20px;
@@ -9849,13 +9849,13 @@ and open the template in the editor.
 #vrednost_edit h2,
 #vrednost_edit .divPopUp_top {
   width: 100%;
-  margin-top: 3px;
   margin-bottom: 16px;
   padding-bottom: 8px;
   font-weight: 600;
   font-size: 16px;
   text-transform: uppercase;
   border-bottom: 1px #E5E5E5 solid;
+  margin-block-start: 0;
 }
 #vrednost_edit p {
   line-height: 20px;
@@ -9895,6 +9895,7 @@ and open the template in the editor.
   display: block;
   margin-top: -200px;
   margin-left: -300px;
+  position: relative;
 }
 .fixed-position #vrednost_edit span.buttonwrapper a.ovalbutton_gray {
   color: #1E88E5;
@@ -10814,12 +10815,6 @@ submit.table-inline {
   border-radius: 2px;
   margin-left: 16px;
 }
-button.popup_button,
-submit.popup_button {
-  padding: 4px 8px;
-  min-width: 128px;
-  font-size: 16px;
-}
 button.blue,
 submit.blue {
   color: #FFFFFF;
@@ -12050,6 +12045,7 @@ table#standard_words_table th div.standardna-beseda-th {
 
 span.faicon.st-besede-popup {
   margin-right: 6px;
+  margin-left: 0 !important;
   pointer-events: none;
 }
 
diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss
index 8eb886c7a..88c34b4e9 100644
--- a/resources/sass/admin_new/components/form/button.scss
+++ b/resources/sass/admin_new/components/form/button.scss
@@ -35,11 +35,6 @@ submit{
         border-radius: 2px;
         margin-left: 16px;
     }
-    &.popup_button{
-        padding: 4px 8px;
-        min-width: 128px;
-        font-size: 16px;
-    }
 
 
     // Button colors
diff --git a/resources/sass/admin_new/components/popup/basic.scss b/resources/sass/admin_new/components/popup/basic.scss
index f4cbb4837..716e394d1 100644
--- a/resources/sass/admin_new/components/popup/basic.scss
+++ b/resources/sass/admin_new/components/popup/basic.scss
@@ -91,7 +91,6 @@
     h2,
     .divPopUp_top{
         width: 100%;
-        margin-top: 3px;
         margin-bottom: 16px;
         padding-bottom: 8px;
 
@@ -100,6 +99,8 @@
         text-transform: uppercase;
 
         border-bottom: 1px $gray solid;
+
+        margin-block-start: 0;
     }
 
     p{
diff --git a/resources/sass/admin_new/components/popup/page_specific/standardne_besede.scss b/resources/sass/admin_new/components/popup/page_specific/standardne_besede.scss
index b3a96d1dd..0bb10abc7 100644
--- a/resources/sass/admin_new/components/popup/page_specific/standardne_besede.scss
+++ b/resources/sass/admin_new/components/popup/page_specific/standardne_besede.scss
@@ -8,6 +8,7 @@
 		display: block;
 		margin-top: -200px;
 		margin-left: -300px;
+		position: relative;
 		
 		span.buttonwrapper a.ovalbutton_gray{
 			color: $blue;
diff --git a/resources/sass/admin_new/pages/my_surveys/standardne_besede.scss b/resources/sass/admin_new/pages/my_surveys/standardne_besede.scss
index a68680dce..deb4e7fd4 100644
--- a/resources/sass/admin_new/pages/my_surveys/standardne_besede.scss
+++ b/resources/sass/admin_new/pages/my_surveys/standardne_besede.scss
@@ -50,5 +50,6 @@ table#standard_words_table {
 
 span.faicon.st-besede-popup {
     margin-right: 6px;
+    margin-left: 0 !important;
     pointer-events: none;
 }
\ No newline at end of file