diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 61e34997c..a39b8ae09 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1485,7 +1485,8 @@ class SurveyAdminSettings {
 				
 				echo '<fieldset><legend>' . $lang['srv_dostop_users'] . '' . Help :: display('srv_dostop_users'). '</legend>';
 
-                /**if($admin_type == 0 || $admin_type == 1){
+                //Dodajanje dostopa - prikaži vse za admine - potrebuje prenovo
+				/**if($admin_type == 0 || $admin_type == 1){
 					echo '<div class="setting_holder">';
 				    echo '<span id="dostop_active_show_1"><a href="#" onClick="dostopActiveShowAll(\'true\'); return false;">'.$lang['srv_dostop_show_all'].'</a></span>';
 				    echo '<span id="dostop_active_show_2" class="displayNone"><a href="#" onClick="dostopActiveShowAll(\'false\'); return false;">'.$lang['srv_dostop_hide_all'].'</a></span>';
@@ -1496,9 +1497,9 @@ class SurveyAdminSettings {
 				$this->display_dostop_users(0);
 				echo '</div>';
 
-				echo '<div class="button_holder below">';
+				/**echo '<div class="button_holder below">';
 				echo '<button class="medium blue" onclick="document.settingsanketa_' . $row['id'] . '.submit(); return false;">'.$lang['edit1337'].'</button>';
-				echo '</div>';
+				echo '</div>';**/
 				
 				echo '</fieldset>';
 							
@@ -4814,11 +4815,9 @@ class SurveyAdminSettings {
 
 			echo '<table>';
 			echo '<tr>';
-			echo '<th><input type="checkbox" id="user_access_check_all" name="user_access_check_all"></input><label for="user_access_check_all"></label></th>';
-			echo '<th></th>';
-			echo '<th></th>';
-			echo '<th>' . $lang['srv_dostop_users_username'] . '</th>';
+			echo '<th><input type="checkbox" id="user_access_check_all" name="user_access_check_all"></input><label for="user_access_check_all">' . $lang['srv_dostop_users_username'] . '</label></th>';
 			echo '<th>' . $lang['srv_dostop_users_email'] . '</th>';
+			echo '<th></th>';
 			echo '</tr>';
 			
 			$sql1 = sisplet_query("SELECT u.name, u.surname, u.id, u.email FROM users u, srv_dostop d WHERE d.ank_id='$this->anketa' AND d.uid=u.id");
@@ -4829,18 +4828,16 @@ class SurveyAdminSettings {
 					echo '	<input type="hidden" name="uid[]" value="' . $row1['id'] . '" />' . "\n";
 
 				echo '<tr id="div_for_uid_' . $row1['id'] . '" name="dostop_active_uid">';
-				echo '<td><input type="checkbox" name="uid[]" value="' . $row1['id'] . '" id="uid_' . $row1['id'] . '" checked="checked" '.($avtorRow['insert_uid'] == $row1['id'] || $global_user_id == $row1['id'] ? ' disabled="disabled"' : '').' autocomplete="off"/><label for="uid_' . $row1['id'] . '" title="' . $row1['email'] . '"></label></td>';
-				echo '<td><a><span class="faicon edit" onclick="javascript:anketa_user_dostop(\''.$row1['id'].'\');"></span></a></td>';
-				echo '<td><a><span class="faicon trash empty" onclick="_______IZBRIS DOSTOPA______"></span></a></td>';
-				echo '<td><label for="uid_' . $row1['id'] . '" title="' . $row1['email'] . '">'.$row1['name'] . ($avtorRow['insert_uid'] == $row1['id'] ? ' (' . $lang['author'] . ')' : '') . '</label></td>';
+				echo '<td><input type="checkbox" name="uid[]" value="' . $row1['id'] . '" id="uid_' . $row1['id'] . '" checked="checked" '.($avtorRow['insert_uid'] == $row1['id'] || $global_user_id == $row1['id'] ? ' disabled="disabled"' : '').' autocomplete="off"/><label for="uid_' . $row1['id'] . '" title="' . $row1['email'] . '">'.$row1['name'] . ($avtorRow['insert_uid'] == $row1['id'] ? ' (' . $lang['author'] . ')' : '') . '</label></td>';
 				echo '<td>'.$row1['email'].'</td>';
-				echo '<td>mstupar</td>';
+				echo '<td><div class="icon_holder multiple"><a><span class="faicon edit" onclick="javascript:anketa_user_dostop(\''.$row1['id'].'\');"></span></a>';
+				echo '<a><span class="faicon trash empty" onclick="_______IZBRIS DOSTOPA______"></span></a></div></td>';
 				echo '</tr>';
 			}
 
 			echo '</table>';
 
-			echo '<a class="noline" href="#" onClick="________IZBRIS DOSTOPA ZA OZNAČENE____________"><span class="faicon trash empty link-right"></span>'.$lang['srv_dostop_users_removeselected'].'</a>';
+			echo '<a class="noline undertable" href="#" onClick="________IZBRIS DOSTOPA ZA OZNAČENE____________"><span class="faicon trash empty link-right"></span>'.$lang['srv_dostop_users_removeselected'].'</a>';
 
 		}
 
@@ -4914,7 +4911,7 @@ class SurveyAdminSettings {
         echo '<label for="addusers_note_checkbox">'.$lang['srv_dostop_adduserstxt_note'].'</label>';
         echo '</div>';
 		echo '<div class="setting_item">';
-        echo '<textarea name="addusers_note" id="addusers_note">'.$lang['srv_dostop_adduserstxt_note_text'].'</textarea>';
+        echo '<textarea class="displayNone" name="addusers_note" id="addusers_note">'.$lang['srv_dostop_adduserstxt_note_text'].'</textarea>';
         echo '</div>';
         echo '</div>';
 
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index a78677273..867cf78ef 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -4031,10 +4031,10 @@ function dostopPassiveShowAll(show_hide) {
 function dostopNoteToggle () {
 
     if($('#addusers_note_checkbox').is(':checked')){
-        $('#addusers_note').show();
+        $('#addusers_note').removeClass('displayNone');
     }
     else{
-        $('#addusers_note').hide();
+        $('#addusers_note').addClass('displayNone');
     }
 }
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index d93ed9fec..4a364f133 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5177,6 +5177,14 @@ div.icon_holder a.faicon,
 div.icon_holder button.ui-datepicker-trigger {
   margin-left: 12px;
 }
+div.icon_holder.multiple span.faicon,
+div.icon_holder.multiple a.faicon {
+  margin-right: 16px;
+}
+div.icon_holder.multiple span.faicon:last-of-type,
+div.icon_holder.multiple a.faicon:last-of-type {
+  margin-right: 0px;
+}
 
 /*
 To change this license header, choose License Headers in Project Properties.
@@ -6512,6 +6520,9 @@ a:hover {
 a.noline {
   text-decoration: none;
 }
+a.noline.undertable {
+  margin-left: 17px;
+}
 a.help {
   text-decoration: none;
   font-weight: 800;
@@ -7413,7 +7424,7 @@ textarea:focus {
   border-color: transparent;
   border-color: #1E88E5;
 }
-textarea#anketa_note, textarea#addusers {
+textarea#anketa_note, textarea#addusers, textarea#addusers_note {
   width: 800px;
   height: 120px;
 }
diff --git a/resources/sass/admin_new/basic/icons/icons.scss b/resources/sass/admin_new/basic/icons/icons.scss
index 7135c336a..f0e81c4d8 100644
--- a/resources/sass/admin_new/basic/icons/icons.scss
+++ b/resources/sass/admin_new/basic/icons/icons.scss
@@ -51,7 +51,7 @@ a.faicon{
     }
 }
 
-//Wrapper (za ikone desno ob elementih)
+//Wrapperji za ikone
 div.icon_holder {
     display: flex;
     flex-direction: row;
@@ -59,11 +59,23 @@ div.icon_holder {
 
     align-items: center;
 
+    //Ikone desno ob elementih
     span.faicon,
     a.faicon,
     button.ui-datepicker-trigger{
         margin-left: 12px;
     }
+
+    //Samo ikone - več ikon skupaj
+    &.multiple {
+        span.faicon,
+        a.faicon{
+            margin-right: 16px;
+            &:last-of-type {
+            margin-right: 0px;
+            }
+        }
+    }
 }
 
 
diff --git a/resources/sass/admin_new/basic/links.scss b/resources/sass/admin_new/basic/links.scss
index 210fbe3b1..5061bb574 100644
--- a/resources/sass/admin_new/basic/links.scss
+++ b/resources/sass/admin_new/basic/links.scss
@@ -9,6 +9,10 @@ a {
 
     &.noline {
         text-decoration: none;
+
+        &.undertable {
+            margin-left: 17px;
+        }
     }
 
     &.help {
diff --git a/resources/sass/admin_new/components/form/textarea.scss b/resources/sass/admin_new/components/form/textarea.scss
index ebfd0a067..99673ad16 100644
--- a/resources/sass/admin_new/components/form/textarea.scss
+++ b/resources/sass/admin_new/components/form/textarea.scss
@@ -29,7 +29,8 @@ textarea {
     }
 
     &#anketa_note,
-    &#addusers{
+    &#addusers,
+    &#addusers_note{
         width: 800px;
         height: 120px;
     }