diff --git a/lang/1.php b/lang/1.php
index a8f003e9c..7e0ee1682 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -6099,6 +6099,7 @@ $lang = array (
 	'srv_recoded_advancetNote_recoded2'			=>	' je že rekodirana v drugo spremenljivko: ',
 	'srv_recoded_advancetNote_recoded3'			=>	'Spremenljivka: ',
 	'srv_recoded_advancetNote_recoded4'			=>	' je že rekodirana iz druge spremenljivke, zato nadalnje rekodiranje ni mogoče.',
+	'srv_auto_coding_end_title'					=>	'Uspešno kodiranje',
 	'srv_auto_coding_end'						=>	'Uspešno ste kodirali <b>%s</b> vrednosti.<br><br>Za ogled rezultatov in  nadaljnje popravke kliknite na %s',
 	'srv_hand_coding_text'						=>	'Kliknite za izbrano vrednost v tabeli in jo spremenite (kodirajte) v oknu, ki se odpre <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kaksna-razlika-med-kodiranjem-rekodiranjem?from1ka=1" target="_blank">Več >></a>',
 	'srv_popup_title'							=>	'Vključitev ankete v pop-up oknu (znotraj istega okna brskalnika)',
diff --git a/lang/2.php b/lang/2.php
index b6fb58c4e..64afe4310 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5997,6 +5997,7 @@ $lang = array (
 	'srv_recoded_advancetNote_recoded2'			=>	' has already been recoded in another variable: ',
 	'srv_recoded_advancetNote_recoded3'			=>	'Variable: ',
 	'srv_recoded_advancetNote_recoded4'			=>	' has been recoded from another variables, so further recoding is not allowed.',
+	'srv_auto_coding_end_title'					=>	'Coding successful',
 	'srv_auto_coding_end'						=>	'You have coded <b>%s</b> values.<br><br>To view the results go to %s',
 	'srv_hand_coding_text'						=>	'Click on a value in the table and code it in the pop-up window <a href="https://www.1ka.si/d/en/help/faq/what-is-the-difference-between-coding-and-recoding?from1ka=1" target="_blank">More >></a>',
 	'srv_popup_title'							=>	'Embed survey in pop-up',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index efaa7b1f7..fd24ef63b 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -6850,6 +6850,10 @@ a.help {
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+.divPopUp h2 span.faicon,
+.divPopUp .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 .divPopUp p {
   line-height: 20px;
 }
@@ -7299,6 +7303,10 @@ body.waitlong #loading {
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+#check_pogoji h2 span.faicon,
+#check_pogoji .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 #check_pogoji p {
   line-height: 20px;
 }
@@ -7446,6 +7454,10 @@ body.waitlong #loading {
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+#dropped_alert h2 span.faicon,
+#dropped_alert .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 #dropped_alert p {
   line-height: 20px;
 }
@@ -7602,6 +7614,10 @@ body.waitlong #loading {
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+#popup_user_access h2 span.faicon,
+#popup_user_access .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 #popup_user_access p {
   line-height: 20px;
 }
@@ -13597,6 +13613,10 @@ textarea#addusers, textarea#addusers_note {
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+#vrednost_edit h2 span.faicon,
+#vrednost_edit .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 #vrednost_edit p {
   line-height: 20px;
 }
@@ -13759,6 +13779,10 @@ textarea#addusers, textarea#addusers_note {
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+#calculation h2 span.faicon,
+#calculation .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 #calculation p {
   line-height: 20px;
 }
@@ -13968,6 +13992,10 @@ and open the template in the editor.
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+#preview_spremenljivka h2 span.faicon,
+#preview_spremenljivka .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 #preview_spremenljivka p {
   line-height: 20px;
 }
@@ -14898,6 +14926,10 @@ dl.arch_email dd {
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+#inv_view_arch_recipients h2 span.faicon,
+#inv_view_arch_recipients .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 #inv_view_arch_recipients p {
   line-height: 20px;
 }
@@ -15503,6 +15535,10 @@ and open the template in the editor.
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+#div_export_setting_show h2 span.faicon,
+#div_export_setting_show .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 #div_export_setting_show p {
   line-height: 20px;
 }
@@ -18785,6 +18821,10 @@ input#endDate {
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+.mc_table_settings h2 span.faicon,
+.mc_table_settings .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 .mc_table_settings p {
   line-height: 20px;
 }
@@ -18961,6 +19001,10 @@ input#endDate {
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+#newMCTable h2 span.faicon,
+#newMCTable .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 #newMCTable p {
   line-height: 20px;
 }
@@ -19113,6 +19157,10 @@ input#endDate {
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+#renameMCTable h2 span.faicon,
+#renameMCTable .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 #renameMCTable p {
   line-height: 20px;
 }
@@ -19265,6 +19313,10 @@ input#endDate {
   border-bottom: 1px #E5E5E5 solid;
   margin-block-start: 0;
 }
+#deleteMCTable h2 span.faicon,
+#deleteMCTable .divPopUp_top span.faicon {
+  margin-right: 6px;
+}
 #deleteMCTable p {
   line-height: 20px;
 }
diff --git a/resources/sass/admin_new/components/popup/basic.scss b/resources/sass/admin_new/components/popup/basic.scss
index ad7a1c187..7a24b6da6 100644
--- a/resources/sass/admin_new/components/popup/basic.scss
+++ b/resources/sass/admin_new/components/popup/basic.scss
@@ -101,6 +101,10 @@
         border-bottom: 1px $gray solid;
 
         margin-block-start: 0;
+
+        span.faicon {
+            margin-right: 6px;
+        }
     }
 
     p{