diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php
index 087a8c439..716787e03 100644
--- a/admin/survey/classes/class.SurveyTheme.php
+++ b/admin/survey/classes/class.SurveyTheme.php
@@ -383,7 +383,7 @@ class SurveyTheme {
 				echo '</div>';
 
 				//Prilagodi		
-				echo '<div class="button" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
+				echo '<div class="button palette" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
 				echo '<span class="faicon palette"></span>';
 				echo $lang['srv_te_theme_edit'];
 				echo '</div>';
@@ -435,7 +435,7 @@ class SurveyTheme {
 				echo '</div>';
 
 				//Prilagodi		
-				echo '<div class="button" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
+				echo '<div class="button palette" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
 				echo '<span class="faicon palette"></span>';
 				echo $lang['srv_te_theme_edit'];
 				echo '</div>';
@@ -607,7 +607,9 @@ class SurveyTheme {
 					//Aktiviraj
 					echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
 					echo '<span class="faicon fa-hand-pointer"></span>';
-					echo $lang['srv_te_theme_activate'];
+						echo '<div class="aktiviraj">';
+						echo $lang['srv_te_theme_activate'] ;
+						echo '</div>';
 					echo '</div>';
 
 					//Predogled
@@ -617,7 +619,7 @@ class SurveyTheme {
 					echo '</div>';
 
 					//Prilagodi		
-					echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'\'" title="'.$lang['srv_te_theme_edit'].'">';
+					echo '<div class="button palette" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'\'" title="'.$lang['srv_te_theme_edit'].'">';
 					echo '<span class="faicon palette"></span>';
 					echo $lang['srv_te_theme_edit'];
 					echo '</div>';
@@ -665,7 +667,9 @@ class SurveyTheme {
 					//Aktiviraj
 					echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true, true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
 					echo '<span class="faicon fa-hand-pointer"></span>';
-					echo $lang['srv_te_theme_activate'];
+						echo '<div class="aktiviraj">';
+							echo $lang['srv_te_theme_activate'];
+						echo '</div>';
 					echo '</div>';
 
 					//Predogled
@@ -675,7 +679,7 @@ class SurveyTheme {
 					echo '</div>';
 
 					//Prilagodi		
-					echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'&mobile=1\'" title="'.$lang['srv_te_theme_edit'].'">';
+					echo '<div class="button palette" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'&mobile=1\'" title="'.$lang['srv_te_theme_edit'].'">';
 					echo '<span class="faicon palette"></span>';
 					echo $lang['srv_te_theme_edit'];
 					echo '</div>';
@@ -798,7 +802,7 @@ class SurveyTheme {
                     else
                         $link = 'index.php?anketa='.$this->sid.'&a=theme-editor&profile_new='.$rowa['skin'];
 
-                    echo '<div class="button" onclick="window.location.href=\''.$link.'\'" title="'.$lang['srv_te_theme_edit'].'">';
+                    echo '<div class="button palette" onclick="window.location.href=\''.$link.'\'" title="'.$lang['srv_te_theme_edit'].'">';
                     echo '  <span class="faicon palette"></span>';
                     echo '</div>';
                 }	
diff --git a/lang/1.php b/lang/1.php
index c2da044e3..4255c830f 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1929,7 +1929,7 @@ $lang = array (
 	"srv_anketarename"				=>	"Preimenuj anketo",
 	"srv_anketadelete"				=>	"Izbri&#353;i anketo",
 	"srv_anketarename_txt"			=>	"Preimenuj",
-	"srv_anketadelete_txt"			=>	"Izbri&#353;i",
+	"srv_anketadelete_txt"			=>	"Odstrani",
     "srv_anketadeleteconfirm"		=>	"Ali ste prepri&#269;ani, da &#382;elite izbrisati anketo?",
 	"srv_anketadeletelibrary"		=>	"Ali ste prepri&#269;ani, da &#382;elite odstraniti anketo iz knji&#382;nice?",
 	"srv_anketadeletelibrary_3"		=>	"Ali ste prepri&#269;ani, da &#382;elite odstraniti anketo iz uporabni&#154;ke knji&#382;nice?",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 8a3e48b0d..69ff086bc 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -20935,6 +20935,27 @@ div.page_tema div.theme_list div.options div.buttons-window {
   bottom: 20px;
   max-width: 113px;
   margin-right: 5px;
+  background-color: white;
+}
+div.page_tema div.theme_list div.options div.buttons-window .button.palette {
+  padding-top: 20px;
+  padding-bottom: 4px;
+}
+div.page_tema div.theme_list div.options div.buttons-window .button {
+  border: none;
+  padding: 19px 16px 0px 16px;
+}
+div.page_tema div.theme_list div.options div.buttons-window .button .fa-hand-pointer {
+  margin-right: 12px;
+}
+div.page_tema div.theme_list div.options div.buttons-window .button .trash {
+  margin-right: 12px;
+}
+div.page_tema div.theme_list div.options div.buttons-window .button:last-of-type {
+  padding-bottom: 19px;
+}
+div.page_tema div.theme_list div.options div.buttons-window .theme_delete {
+  padding-top: 22px;
 }
 div.page_tema div.theme_list div.options div.buttons-window.active {
   display: block;
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 fbd0e3252..e2a91ca89 100644
--- a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
+++ b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
@@ -78,6 +78,34 @@ div.page_tema {
                 // display: none;
 
                 margin-right: 5px;
+                background-color: #FFFF;
+
+                .button.palette{
+                    padding-top: 20px;
+                    padding-bottom: 4px;
+                }
+
+                .button{
+                    border: none;
+
+                    padding: 19px 16px 0px 16px;
+
+                    // margin: 5px 0px;
+
+                    .fa-hand-pointer{
+                        margin-right: 12px;
+                    }
+                    .trash{
+                        margin-right: 12px;
+                    }
+                }
+                .button:last-of-type{
+                    padding-bottom: 19px;
+                }
+                .theme_delete{
+                    padding-top: 22px;
+                }
+
             }
             div.buttons-window.active {
                 display: block;