diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
index 3f043682e..c9d103c85 100644
--- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
+++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
@@ -5563,8 +5563,11 @@ class SurveyInvitationsNew {
 		
 		echo '<div id="inv_recipient_edit">';
 
-        echo '<h2>Urejanje respondenta</h2>';
-                
+        echo '<h2>'.$lang['srv_inv_recipient_edit'].'</h2>';
+		echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;">✕</a></div>';
+        
+		$button_check = 0;
+		
 		if ((int)$_POST['inv_rid'] > 0) {
 			# polovimo podatke respondenta
 			$sql_string = "SELECT * FROM srv_invitations_recipients WHERE id = '".(int)$_POST['inv_rid']."'";
@@ -5577,49 +5580,49 @@ class SurveyInvitationsNew {
 			echo '<table id="inv_edit_recipient">';
 			#email
 			echo '<tr><th>'.$lang['srv_inv_field_email'].'</th><td>';
-			echo '<input type="text" id="rec_email" value="'.$sql_row['email'].'" autocomplete="off" maxlength="100">';
+			echo '<input type="text" class="text medium" id="rec_email" value="'.$sql_row['email'].'" autocomplete="off" maxlength="100">';
 			echo '</td></tr>';
 			#geslo
 			echo '<tr><th>'.$lang['srv_inv_field_password'].'</th><td>';
-			echo '<input type="text" id="rec_password" value="'.$sql_row['password'].'" autocomplete="off" maxlength="45">';
+			echo '<input type="text" class="text medium" id="rec_password" value="'.$sql_row['password'].'" autocomplete="off" maxlength="45">';
 			echo '</td></tr>';
 			#ime
 			echo '<tr><th>'.$lang['srv_inv_field_firstname'].'</th><td>';
-			echo '<input type="text" id="rec_firstname" value="'.$sql_row['firstname'].'" autocomplete="off" maxlength="45">';
+			echo '<input type="text" class="text medium" id="rec_firstname" value="'.$sql_row['firstname'].'" autocomplete="off" maxlength="45">';
 			echo '</td></tr>';
 			#priimek
 			echo '<tr><th>'.$lang['srv_inv_field_lastname'].'</th><td>';
-			echo '<input type="text" id="rec_lastname" value="'.$sql_row['lastname'].'" autocomplete="off" maxlength="45">';
+			echo '<input type="text" class="text medium" id="rec_lastname" value="'.$sql_row['lastname'].'" autocomplete="off" maxlength="45">';
 			echo '</td></tr>';
 			#naziv
 			echo '<tr><th>'.$lang['srv_inv_field_salutation'].'</th><td>';
-			echo '<input type="text" id="rec_salutation" value="'.$sql_row['salutation'].'" autocomplete="off" maxlength="45">';
+			echo '<input type="text" class="text medium" id="rec_salutation" value="'.$sql_row['salutation'].'" autocomplete="off" maxlength="45">';
 			echo '</td></tr>';
 			#telefon
 			echo '<tr><th>'.$lang['srv_inv_field_phone'].'</th><td>';
-			echo '<input type="text" id="rec_phone" value="'.$sql_row['phone'].'" autocomplete="off" maxlength="45">';
+			echo '<input type="text" class="text medium" id="rec_phone" value="'.$sql_row['phone'].'" autocomplete="off" maxlength="45">';
 			echo '</td></tr>';
 			#drugo
 			echo '<tr><th>'.$lang['srv_inv_field_custom'].'</th><td>';
-			echo '<input type="text" id="rec_custom" value="'.$sql_row['custom'].'" autocomplete="off" maxlength="100">';
+			echo '<input type="text" class="text medium" id="rec_custom" value="'.$sql_row['custom'].'" autocomplete="off" maxlength="100">';
 			echo '</td></tr>';
 			#odnos
 			if(SurveyInfo::getInstance()->checkSurveyModule('360_stopinj')){
 				echo '<tr><th>'.$lang['srv_inv_field_relation'].'</th><td>';
-				echo '<input type="text" id="rec_relation" value="'.$sql_row['relation'].'" autocomplete="off" maxlength="100">';
+				echo '<input type="text" class="text medium" id="rec_relation" value="'.$sql_row['relation'].'" autocomplete="off" maxlength="100">';
 				echo '</td></tr>';
 			}
 				
 			echo '</table>';
-				
-			echo '<br class="clr"/>';
-			echo '<br class="clr"/>';
-			echo '<span id="save_recipients" class="buttonwrapper floatRight" ><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_save_recipient();return false;" ><span>'.$lang['srv_inv_recipient_save'].'</span></a></span>';
 
+			$button_check = 1;
 		}
-		echo '<span class="buttonwrapper floatRight spaceRight"  title="'.$lang['srv_cancel'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;" ><span>'.$lang['srv_cancel'].'</span></a></span>';
-		echo '<br class="clr"/>';
-		echo '</div>';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" title="'.$lang['srv_cancel'].'" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;">'.$lang['edit1338'].'</button>';              
+        if($button_check)
+			echo '<button class="medium blue" onclick="inv_save_recipient(); return false;">'.$lang['srv_inv_recipient_save'].'</button>';
+        echo '</div>';
 	}
 
 	function saveRecipient() {
diff --git a/lang/1.php b/lang/1.php
index b63231fa6..8e2eec659 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5005,6 +5005,7 @@ $lang = array (
 	'srv_inv_recipient_list_recipients' 		=> "Prejemniki: ",
 	'srv_inv_recipient_list_new' 				=> "Seznam respondentov",
 	'srv_inv_recipient_delete' 			=> "Izbris respondenta",
+	'srv_inv_recipient_edit' 			=> "Urejanje respondenta",
 	'srv_inv_recipient_delete_text' 			=> "Ali ste prepričani da želite izbrisati respondenta?",
 	'srv_inv_recipient_delete_error' 			=> "Ne morem izbrisati respondenta!",
 	'srv_inv_recipient_show_only_duplicates' 	=> "Prikaži samo podvojene",
diff --git a/lang/2.php b/lang/2.php
index 01fbfe79f..9d8fe17de 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4974,7 +4974,8 @@ $lang = array (
 	'srv_inv_recipient_list_comment' 			=> "List comment: ",
 	'srv_inv_recipient_list_recipients' 		=> "Recipients: ",
 	'srv_inv_recipient_list_new' 				=> "New list",
-	'srv_inv_recipient_delete' 			=> "Delete respondents",
+	'srv_inv_recipient_edit' 			=> "Edit respondent",
+	'srv_inv_recipient_delete' 			=> "Delete respondent",
 	'srv_inv_recipient_delete_text' 			=> "Are you sure you want to delete the respondent?",
 	'srv_inv_recipient_delete_error' 			=> "Can't delete the respondent!",
 	'srv_inv_recipient_show_only_duplicates' 	=> "Show only duplicated",