diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 49bf05c21..27808fdcc 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1015,8 +1015,8 @@ class SurveyAdminSettings {
 				echo '<table id="passwords_table" '.(($spr_id == 0) ? 'class="displayNone"' : '').'>';
 
 					echo '<tr>';
-					echo '<th></th>';
 					echo '<th>'.$lang['password'].'</th>';
+					echo '<th></th>';
 					echo '</tr>';
 
 					if($spr_id > 0){
@@ -1024,8 +1024,8 @@ class SurveyAdminSettings {
 						if($vrednosti != 0){
 							foreach($vrednosti as $vrednost){
 								echo '<tr>';
-								echo '<td><a><span class="faicon trash empty" onclick="delete_skupina(\'2\', \''.$vrednost['id'].'\');"></span></a></td>';
 								echo '<td>'.$vrednost['naslov'].'</td>';
+								echo '<td class="right"><button class="table-inline blue" type="button" onclick="delete_skupina(\'2\', \''.$vrednost['id'].'\');">'.strtoupper($lang['srv_password_remove']).'</button></td>';
 								echo '</tr>';
 							}
 						}
diff --git a/admin/survey/classes/class.SurveySkupine.php b/admin/survey/classes/class.SurveySkupine.php
index f9747e8e3..26597c4b9 100644
--- a/admin/survey/classes/class.SurveySkupine.php
+++ b/admin/survey/classes/class.SurveySkupine.php
@@ -318,14 +318,23 @@ class SurveySkupine {
                 }
 
 
-                // Vrnemo novo geslo, ki ga vstavimo v html - POPRAVIT ZA INSERT V TABELO
+                // Vstavljanje v html tabelo
                 echo '<tr>';
-				echo '<td><a><span class="faicon trash empty" onclick="delete_skupina(\''.$skupine.'\', \''.$vre_id.'\');"></span></a></td>';
-				echo '<td>'.stripslashes($naslov_vrednost).'</td>';
+				
+				//Skupine
                 if($skupine == 1){
+					echo '<td><a><span class="faicon trash empty" onclick="delete_skupina(\''.$skupine.'\', \''.$vre_id.'\');"></span></a></td>';
+					echo '<td>'.stripslashes($naslov_vrednost).'</td>';
                     $link = $this->getUrl($spr_id, $vre_id);
 					echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.stripslashes($naslov_vrednost).'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
                 }
+
+				//Gesla
+				if($skupine == 2){
+					echo '<td>'.stripslashes($naslov_vrednost).'</td>';
+					echo '<td class="right"><button class="table-inline blue" type="button" onclick="delete_skupina(\''.$skupine.'\', \''.$vre_id.'\');">'.strtoupper($lang['srv_password_remove']).'</button></td>';
+                }
+
                 echo '</tr>';
             }
 		}
diff --git a/lang/1.php b/lang/1.php
index dc27bca74..e2d563619 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5040,7 +5040,8 @@ $lang = array (
 	'srv_footer_drupal_version'					=>	"Drupal",
 	'srv_footer_copyright'					    =>	"UL FDV, CDI",
 	'srv_password'								=>	"Geslo za dostop do izpolnjevanja ankete",
-	'srv_password_add_mass'						=>	"Masoven vnos gesel",
+	'srv_password_remove'						=>	"Odstrani",
+	'srv_password_add_mass'						=>	"Masovni vnos gesel",
     'srv_password_add_mass_instructions'		=>	"Vnesite seznam gesel kjer je vsako geslo v svoji vrstici:",
     'srv_password_add_mass_sample'		        =>  "(npr. Geslo1,Geslo2,Geslo3...)",
 	'srv_password_add_mass_execute'				=>	"Dodaj gesla",
diff --git a/lang/2.php b/lang/2.php
index 4dd15913d..88d65936d 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5011,6 +5011,7 @@ $lang = array (
 	'srv_footer_drupal_version'					=>	"Drupal",
 	'srv_footer_copyright'					    =>	"UL FDV, CDI",
     'srv_password'								=>	"Survey password",
+	'srv_password_remove'						=>	"Remove",
     'srv_password_add_mass'						=>	"Passwords mass insert",
 	'srv_password_add_mass_instructions'		=>	"Input each password in separate line:",
 	'srv_password_add_mass_sample'		        =>  "(Password1,Password2,Password3...)",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 7ace5f5de..25c382c70 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -7030,21 +7030,30 @@ submit {
   box-shadow: none;
   border: 0;
   transition: 0.3s;
-  min-width: 160px;
+}
+button.table-inline,
+submit.table-inline {
+  padding: 4px 20px;
+  width: fit-content;
+  font-size: 14px;
+  border-radius: 2px;
 }
 button.small,
 submit.small {
   padding: 5px 32px;
+  min-width: 160px;
   font-size: 14px;
 }
 button.medium,
 submit.medium {
   padding: 10px 32px;
+  min-width: 160px;
   font-size: 16px;
 }
 button.large,
 submit.large {
   padding: 12px 32px;
+  min-width: 160px;
   font-size: 20px;
 }
 button.blue,
diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss
index 5dd65e319..651abe41f 100644
--- a/resources/sass/admin_new/components/form/button.scss
+++ b/resources/sass/admin_new/components/form/button.scss
@@ -11,22 +11,28 @@ submit{
 
     transition: 0.3s;
 
-    min-width: 160px;
-    
     // Button sizes
+
+    &.table-inline{
+        padding: 4px 20px;
+        width: fit-content;
+        font-size: 14px;
+        border-radius: 2px;
+    }
+    
     &.small{
         padding: 5px 32px;
-
+        min-width: 160px;
         font-size: 14px;
     }
     &.medium{
         padding: 10px 32px;
-
+        min-width: 160px;
         font-size: 16px;
     }
     &.large{
         padding: 12px 32px;
-
+        min-width: 160px;
         font-size: 20px;
     }