diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php
index 993997539..087a8c439 100644
--- a/admin/survey/classes/class.SurveyTheme.php
+++ b/admin/survey/classes/class.SurveyTheme.php
@@ -727,14 +727,48 @@ class SurveyTheme {
 				echo '<div class="theme_label_content">';
 				
 				// Preview slika
+				$css = urlencode($skin);
+				$gid = $groupId;
+
+
 				if ($groupId == -1) echo '<a href="#" class="theme_delete theme" gid="'.$groupId.'" css="'.urlencode($skin).'">'.$lang['srv_anketadelete_txt'].'</a>';
 				
 				if ($groupId == -1) {
-					echo '<img src="'.$site_url.'public/img/skins_previews/'.($groupId==-1?'usertheme':urlencode($simple_name)).'.png" gid="'.$groupId.'" css="'.urlencode($skin).'" alt="'.$simple_name.'" title="'.$lang['srv_changetheme'].'">';
+					echo '<button class="button wtext" onclick="changeTheme(\''.$gid.'\', \''.$css.'\');" title="'.$lang['srv_te_theme_activate2'].'"><img src="'.$site_url.'public/img/skins_previews/'.($groupId==-1?'usertheme':urlencode($simple_name)).'.png" gid="'.$groupId.'" css="'.urlencode($skin).'" alt="'.$simple_name.'" title="'.$lang['srv_changetheme'].'"></button>';
 				}
 				else
-					echo '<img src="'.$site_url.'public/img/skins_previews/'.urlencode($simple_name).'.png" class="theme" gid="'.$groupId.'" css="'.urlencode($skin).'" alt="'.$simple_name.'" title="'.$lang['srv_changetheme'].'">';
+					echo '<button class="button wtext" onclick="changeTheme(\''.$gid.'\', \''.$css.'\');" title="'.$lang['srv_te_theme_activate2'].'"><img src="'.$site_url.'public/img/skins_previews/'.urlencode($simple_name).'.png" class="theme" gid="'.$groupId.'" css="'.urlencode($skin).'" alt="'.$simple_name.'" title="'.$lang['srv_changetheme'].'"></button>';
 				
+				// // Ime teme
+				// echo '<span class="theme_name">';			
+				// echo self::strip_name($simple_name.($simple_name=='1kaBlue' || $simple_name=='MobileBlue' ? ' ('.$lang['default'].')' : ''));
+
+				// // Vprasajcki
+				// if( in_array($simple_name, array('Fdv', 'Cdi', 'Uni', 'MobileFdv', 'MobileCdi', 'MobileUni')) ){
+                //     echo ' '.Help::display('srv_skins_Fdv');
+                // }	
+                // elseif($simple_name == 'Embed' || $simple_name == 'Embed2' || $simple_name == 'Slideshow'){
+                //     echo ' '.Help::display('srv_skins_'.$simple_name);
+                // }
+
+				// if($groupId == -1)
+				// 	echo ' (CSS)';					
+				// echo '</span>';
+				
+				echo '</div>';
+
+				//Gumbi
+				echo '<div class="theme_label_options">';
+
+				$css = urlencode($skin);
+				$gid = $groupId;
+
+				// // Aktiviraj
+				// echo '<div class="button wtext" onclick="changeTheme(\''.$gid.'\', \''.$css.'\');" title="'.$lang['srv_te_theme_activate2'].'">';
+				// echo '  <span class="faicon fa-hand-pointer"></span>';
+				// echo    $lang['srv_te_theme_activate'];
+				// echo '</div>';
+
 				// Ime teme
 				echo '<span class="theme_name">';			
 				echo self::strip_name($simple_name.($simple_name=='1kaBlue' || $simple_name=='MobileBlue' ? ' ('.$lang['default'].')' : ''));
@@ -750,20 +784,6 @@ class SurveyTheme {
 				if($groupId == -1)
 					echo ' (CSS)';					
 				echo '</span>';
-				
-				echo '</div>';
-
-				//Gumbi
-				echo '<div class="theme_label_options">';
-
-				$css = urlencode($skin);
-				$gid = $groupId;
-
-				// Aktiviraj
-				echo '<div class="button wtext" onclick="changeTheme(\''.$gid.'\', \''.$css.'\');" title="'.$lang['srv_te_theme_activate2'].'">';
-				echo '  <span class="faicon fa-hand-pointer"></span>';
-				echo    $lang['srv_te_theme_activate'];
-				echo '</div>';
 
 				// Predogled
 				echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 09334dca1..20029345e 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10013,7 +10013,7 @@ textarea:focus {
 }
 .box-container .num_box {
   border: unset;
-  background-color: #FFFF;
+  background-color: white;
   margin: 0px;
   padding: 0px;
 }
@@ -20962,7 +20962,7 @@ div.page_tema div#theme_grid_holder {
 }
 div.page_tema div#theme_grid_holder div.div_theme_group {
   display: grid;
-  grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+  grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
   grid-gap: 16px;
   box-sizing: border-box;
 }
@@ -20992,8 +20992,8 @@ div.page_tema div#theme_grid_holder div.div_theme_group {
   }
 }
 div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label {
-  width: 204px;
-  height: 247px;
+  width: 259px;
+  height: 240px;
   box-sizing: border-box;
   background-color: #F8F8F8;
   border: 1px solid #F8F8F8;
@@ -21019,7 +21019,9 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l
   flex-direction: row;
   justify-content: space-between;
   box-sizing: border-box;
-  padding-top: 16px;
+}
+div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options span.theme_name {
+  font-weight: 500;
 }
 div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options div.button {
   background: #FFFFFF;
@@ -25370,7 +25372,6 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   .page_vabila #vabila .button_holder #nice_url_holder .buttons {
     margin: 9px 0px 0px 0px !important;
   }
-
   div#vabila div.more div.more_block {
     width: 89% !important;
   }
@@ -29764,15 +29765,15 @@ iframe#ifmcontentstoprint {
 }
 
 .rsdl_bck1 {
-  background-color: #fae2e2 !important;
+  background-color: rgb(250, 226, 226) !important;
 }
 
 .rsdl_bck2 {
-  background-color: #ff9d9d !important;
+  background-color: rgb(255, 157, 157) !important;
 }
 
 .rsdl_bck3 {
-  background-color: #f84242 !important;
+  background-color: rgb(248, 66, 66) !important;
 }
 
 .rsdl_bck4 {
@@ -33260,24 +33261,19 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   #quick_comments_link.newCss {
     display: none;
   }
-
   #firstNavigation ol.right-side {
     display: none;
   }
-
   div.status_advanced {
     flex-direction: column;
   }
-
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
-
   a.status_advanced_link {
     width: 95%;
   }
-
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -33371,7 +33367,6 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
-
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -33401,44 +33396,36 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
-
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
-
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
-
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
-
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
-
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
-
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
-
   .top_note {
     padding: 8px 16px;
   }
-
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -33694,7 +33681,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
-
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -33716,7 +33702,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
-
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -33727,7 +33712,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
-
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -33738,12 +33722,10 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
-
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
-
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -33818,7 +33800,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
-
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -33902,7 +33883,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
-
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -33915,19 +33895,16 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
-
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
-
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
-
   #branching {
     width: 100%;
     margin: 0;
@@ -34032,11 +34009,9 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
-
   .toolbox_holder {
     display: none;
   }
-
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -34056,7 +34031,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
-
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -34110,7 +34084,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
-
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -34163,7 +34136,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
-
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -34176,7 +34148,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
-
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -34192,18 +34163,15 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
-
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
-
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
-
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -34221,7 +34189,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
-
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -34248,7 +34215,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
-
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -34256,7 +34222,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
-
   #srv_diagnostic br {
     display: none;
   }
@@ -34277,7 +34242,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
-
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -34291,7 +34255,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
-
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -34299,7 +34262,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
-
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -34324,7 +34286,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
-
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -34392,7 +34353,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
-
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -34476,7 +34436,6 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
-
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -34484,7 +34443,6 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
-
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -34523,7 +34481,6 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
-
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -34544,7 +34501,6 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
-
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -34556,7 +34512,6 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
-
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -34571,11 +34526,9 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
-
   #inv_field_container ul li {
     width: 45%;
   }
-
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -34587,7 +34540,6 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
-
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -34658,11 +34610,9 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
-
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
-
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -34703,7 +34653,6 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
-
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -34723,7 +34672,6 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
-
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -34733,16 +34681,13 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
-
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
-
   .analysis_icons_holder {
     display: none;
   }
-
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -34765,7 +34710,6 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
-
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -34782,14 +34726,12 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
-
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
-
   .noSurvey_sequence {
     padding: 0;
   }
@@ -34811,13 +34753,11 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
-
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
-
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -34828,7 +34768,6 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
-
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,
diff --git a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
index 245ef712e..fbd0e3252 100644
--- a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
+++ b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
@@ -137,7 +137,7 @@ div.page_tema {
 
         div.div_theme_group {
             display: grid;
-            grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+            grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
             grid-gap: 16px;
 
             box-sizing: border-box;
@@ -159,8 +159,8 @@ div.page_tema {
             }
     
             div.theme_label {
-                width: 204px;
-                height: 247px;
+                width: 259px;
+                height: 240px;
                 box-sizing: border-box;
                 
                 background-color: $light-gray;
@@ -195,8 +195,11 @@ div.page_tema {
                     flex-direction: row;
                     justify-content: space-between;
                     box-sizing: border-box;
+
+                    span.theme_name {
+                        font-weight: 500;
+                    }
     
-                    padding-top: 16px;
     
                     div.button {
                         background: $white;