diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index dc28c179d..604e34f78 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -210,7 +210,7 @@ class SurveyAdminSettings {
             // Ta del se v 2. fazi zamenja z gumbom "Večjezične ankete"
 			echo '<div class="setting_holder">';
 
-			echo '<p>'.$lang['srv_language_link2'].':';
+			echo '<p class="bottom8">'.$lang['srv_language_link2'].':';
 			// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
             $userAccess = UserAccess::getInstance($global_user_id);
             if($userAccess->checkUserAccess($what='prevajanje')){
@@ -219,7 +219,7 @@ class SurveyAdminSettings {
             else{            
                 echo '&nbsp;<a href="#" onClick=popupUserAccess(\'prevajanje\'); return false;" title="'.$lang['srv_language_link'].'" class="user_access_locked"><span class="bold">'.$lang['srv_language_link'].'</span></a></p>';
             }			
-			echo '<p>'.$lang['srv_language_mySurveys'].'</p>';
+			echo '<p>'.$lang['srv_language_mySurveys'].'.</p>';
 
 			echo '</div>';
 			
@@ -1575,7 +1575,7 @@ class SurveyAdminSettings {
 			$file = '../../lang/'.$lang_admin.'.php';
 			include($file);
 			
-			echo '<th>'.$lang['srv_std_translation'].'</th>';
+			echo '<th><div class="standardna-beseda-th">'.$lang['srv_std_translation'].'<div class="icon_holder"><a href="'.SurveyInfo::getSurveyLink().'&preview=on&language='.$lang_resp.'" target="_blank"><span class="faicon preview"></span></a></div></div></th>';
 			echo '</tr>';
 			
 			// jezik nastavimo na nastavitev za respondente, ker ta text dejansko nastavljamo
@@ -1642,8 +1642,21 @@ class SurveyAdminSettings {
 			echo '<button class="medium white-black" type="button" onclick="ponastavi_prevod(\''.$lang_id.'\')">'.$lang['reset_translation'].'</button>';
 			echo '</div>';
 			
-			//Link na zavihek Jezik
-			echo '<a class="noline" href="index.php?anketa='.$this->anketa.'&a=prevajanje"><span class="faicon link-right fa-globe"></span>'.$lang['srv_info_language'].'</a>';
+			// Ta del se v 2. fazi zamenja z gumbom "Večjezične ankete"
+			echo '<div class="setting_holder">';
+
+			echo '<p class="bottom8">'.$lang['srv_language_link2'].':';
+			// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
+            $userAccess = UserAccess::getInstance($global_user_id);
+            if($userAccess->checkUserAccess($what='prevajanje')){
+                echo '&nbsp;<a href="index.php?anketa='.$this->anketa.'&a=prevajanje" title="'.$lang['srv_language_link'].'"><span class="bold">'.$lang['srv_language_link'].'</span></a></p>';
+            }
+            else{            
+                echo '&nbsp;<a href="#" onClick=popupUserAccess(\'prevajanje\'); return false;" title="'.$lang['srv_language_link'].'" class="user_access_locked"><span class="bold">'.$lang['srv_language_link'].'</span></a></p>';
+            }			
+			echo '<p>'.$lang['srv_language_mySurveys'].'.</p>';
+
+			echo '</div>';
 
 			echo '</fieldset>';
 
@@ -2236,13 +2249,13 @@ class SurveyAdminSettings {
 		echo '<tr>';
 		echo '<td>'.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? ' ('.$next_uvod.')' : '').'</td> ';
 		echo '<td>'.$lang[$text].'</td>';
-		echo '<td class="standardna-beseda"><div contentEditable="true" class="standardna-beseda-urejanje" name="srvlang_'.$text.$lang_id.'" id="srvlang_'.$text.$lang_id.'">'.$value.'</div>';
+		echo '<td><div class="standardna-beseda"><div contentEditable="true" class="standardna-beseda-urejanje" name="srvlang_'.$text.$lang_id.'" id="srvlang_'.$text.$lang_id.'">'.$value.'</div>';
 
 		if($editor == 1) 
 			echo '<span class="faicon edit2 sb-edit blue"'.$onclick.' style="display:none;"></span>';
 
 		echo '<textarea name="srvlang_'.$text.$lang_id.'" id="polje_srvlang_'.$text.$lang_id.'"  style="display:none;">'.$value.'</textarea>';
-		echo '</td>';
+		echo '</div></td>';
         
 		echo '</tr>';
 	}
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 7566ec84a..1513a3b80 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -12000,30 +12000,39 @@ li.top16 {
   font-size: 20px;
 }
 
-.standardna-beseda {
+table#standard_words_table td {
+  font-size: 14px;
+}
+table#standard_words_table td div.standardna-beseda {
   display: flex;
   flex-direction: row;
   align-items: center;
   width: 300px;
 }
-.standardna-beseda .standardna-beseda-urejanje {
+table#standard_words_table td div.standardna-beseda div.standardna-beseda-urejanje {
   display: block;
   border: 1px solid #E5E5E5;
   box-sizing: border-box;
   border-radius: 2px;
   padding: 8px 20px 8px 8px;
   width: 92%;
+  min-height: 32px;
 }
-.standardna-beseda .standardna-beseda-urejanje:focus {
+table#standard_words_table td div.standardna-beseda div.standardna-beseda-urejanje:focus {
   outline-style: none;
   box-shadow: none;
   border-color: transparent;
   border-color: #1E88E5;
 }
-.standardna-beseda .faicon.sb-edit {
+table#standard_words_table td div.standardna-beseda span.faicon.sb-edit {
   margin-left: 8px;
   cursor: pointer;
 }
+table#standard_words_table th div.standardna-beseda-th {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
 
 /*
     Branching ikone, radio, checkboxi...
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 e75a51980..d37657464 100644
--- a/resources/sass/admin_new/pages/my_surveys/standardne_besede.scss
+++ b/resources/sass/admin_new/pages/my_surveys/standardne_besede.scss
@@ -1,29 +1,44 @@
-.standardna-beseda {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    width: 300px;
-	
-	.standardna-beseda-urejanje {
-		display: block;
-		border: 1px solid #E5E5E5;
-        box-sizing: border-box;
-        border-radius: 2px;
-
-        padding: 8px 20px 8px 8px;
-        width: 92%;
-
-        &:focus {
-            outline-style: none;
-            box-shadow: none;
-            border-color: transparent;
-            border-color: $blue;
+table#standard_words_table {
+    td {
+        font-size: 14px;
+        
+        div.standardna-beseda {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            width: 300px;
+            
+            div.standardna-beseda-urejanje {
+                display: block;
+                border: 1px solid #E5E5E5;
+                box-sizing: border-box;
+                border-radius: 2px;
+        
+                padding: 8px 20px 8px 8px;
+                width: 92%;
+                min-height: 32px;
+        
+                &:focus {
+                    outline-style: none;
+                    box-shadow: none;
+                    border-color: transparent;
+                    border-color: $blue;
+                }
+            }
+        
+            span.faicon.sb-edit {
+                margin-left: 8px;
+                cursor: pointer;
+            }
+        
         }
-	}
-
-    .faicon.sb-edit {
-        margin-left: 8px;
-        cursor: pointer;
     }
 
+    th {
+        div.standardna-beseda-th {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+        }
+    }
 }