diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index a0442ccb0..ffd0e66a7 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -7688,16 +7688,13 @@ class Branching {
 			echo '</div>';
         } 
         // filter na vrednosti
-        else {						
-        	/*echo '<span class="buttonwrapper floatRight">';
-            echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="vrednost_condition_editing_close_save(\''.$vrednost.'\', \''.$if.'\'); return false;"><span>'.$lang['srv_potrdi'].'</span></a>';
-        	echo '</span>';
-        	echo '<span class="buttonwrapper spaceRight floatRight">';
-            echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="vrednost_condition_editing_close(\''.$vrednost.'\', \''.$if.'\'); return false;"><span>'.$lang['srv_zapri'].'</span></a>';
-        	echo '</span>';
-        	echo '<span class="buttonwrapper spaceRight floatRight">';
-            echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="vrednost_if_remove(\''.$if.'\', \''.$vrednost.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span>'.$lang['srv_if_rem'].'</span></a>'."\n\r";
-			echo '</span>';*/
+        else {
+			
+			echo '<div class="button_holder" id="if_popup_butons">';
+			echo '<button class="medium white-black" onClick="vrednost_condition_editing_close(\''.$vrednost.'\', \''.$if.'\'); return false;">'.$lang['srv_zapri'].'</button>';              
+			echo '<button class="medium white-blue" onClick="vrednost_if_remove(\''.$if.'\', \''.$vrednost.'\'); return false;">'.$lang['srv_if_rem'].'</button>';              
+        	echo '<button class="medium blue" onclick="vrednost_condition_editing_close_save(\''.$vrednost.'\', \''.$if.'\'); return false;">'.$lang['srv_potrdi'].'</button>';
+        	echo '</div>';
         }
 
 		echo '</div>';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index d61094a93..d0057b237 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8484,6 +8484,10 @@ div#div_condition_editing div#div_condition_editing_container div#div_condition_
   margin: 0;
 }
 
+div.popup_right #div_cp_preview_content #if_popup_butons {
+  display: none !important;
+}
+
 #rec_spremenljivka_naslov {
   margin-right: 4px;
 }
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index 7dea4f2d6..aead11345 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -450,6 +450,16 @@ div#div_condition_editing {
     }
 }
 
+//Skrijemo gumbe pri pogoju znotraj filtra (ima svoje gumbe)
+div.popup_right {
+    #div_cp_preview_content {
+        #if_popup_butons {
+            display: none !important;
+        }
+    }
+}
+
+
 //Izračuni
 
 #rec_spremenljivka_naslov {