diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index b5a57087f..081b24952 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -7506,7 +7506,7 @@ class Branching {
 
                 if ($row['tip'] == 0){
                     echo '  <div class="condition_setting_line">';
-					echo '      <label for="if_edit_1"><input type="radio" value="1" name="if_edit" id="if_edit_1" class="enka-admin-custom" '.($row['enabled']==1?' checked="checked"':'').' onClick="if_edit_enabled(\''.$row['id'].'\', $(this).val())" /><label for="if_edit_1">'.$lang['srv_if_enabled_1'].'</label>';
+					echo '      <input type="radio" value="1" name="if_edit" id="if_edit_1" class="enka-admin-custom" '.($row['enabled']==1?' checked="checked"':'').' onClick="if_edit_enabled(\''.$row['id'].'\', $(this).val())" /><label for="if_edit_1">'.$lang['srv_if_enabled_1'].'<label for="if_edit_1"></label>';
                     echo '  </div>';
                 }
 
@@ -7530,7 +7530,7 @@ class Branching {
                 echo '<div class="condition_setting_holder">';
 
                 echo '  <div class="condition_setting_line">';
-				echo '      <input type="text" name="panel_status_'.$if.'" id="panel_status_'.$if.'" value="'.$panel_if.'" ></span>';
+				echo '      <input type="text" class="text medium" name="panel_status_'.$if.'" id="panel_status_'.$if.'" value="'.$panel_if.'" ></span>';
 			    echo '  </div>';
                 
                 echo '</div>';
@@ -7575,7 +7575,7 @@ class Branching {
 				echo '      <label>'.$lang['srv_block_random_cnt'].':</label>';
                 
                 echo '      <span class="content">';
-				echo '          <select onchange="if_blok_random_cnt(\''.$row['id'].'\', $(this).val());">';
+				echo '          <select class="dropdown medium" onchange="if_blok_random_cnt(\''.$row['id'].'\', $(this).val());">';
 				echo '	            <option value="0" '.($row['random']==0 ? 'selected' : '').'>'.$lang['srv_block_random_all'].'</option>';
 				$sqlB = sisplet_query("SELECT count(*) AS cnt_spr FROM srv_branching 
 										WHERE ank_id='".$this->anketa."' AND parent='".$row['id']."' AND element_spr>'0'
@@ -7600,7 +7600,7 @@ class Branching {
                 echo '  <div class="condition_setting_line half-half">';
 				echo '      <label>'.$lang['srv_orientacija_vprasanja'].':</label>';
                 echo '      <span class="content">';
-				echo '          <select name="if_blok_horizontal" onchange="if_blok_horizontal(\''.$row['id'].'\', $(this).val());">';
+				echo '          <select class=dropdown medium" name="if_blok_horizontal" onchange="if_blok_horizontal(\''.$row['id'].'\', $(this).val());">';
 				echo '	           <option value="0" '.($row['horizontal']==0?'selected':'').'>'.$lang['srv_orientacija_classic'].'</option>';
 				echo '	            <option value="2" '.($row['horizontal']==2?'selected':'').'>'.$lang['srv_orientacija_expand'].'</option>';
 				echo '	            <option value="1" '.($row['horizontal']==1?'selected':'').'>'.$lang['srv_orientacija_horizontalna_3'].'</option>';
@@ -7618,7 +7618,7 @@ class Branching {
                 echo '  <div class="condition_setting_line half-half">';
 				echo '      <label>'.$lang['srv_block_tab'].':</label>';
                 echo'       <span class="content">';
-				echo '          <select name="if_blok_tab" onchange="if_blok_tab(\''.$row['id'].'\', $(this).val());">';
+				echo '          <select class="dropdown medium" name="if_blok_tab" onchange="if_blok_tab(\''.$row['id'].'\', $(this).val());">';
 				echo '	            <option value="0" '.($row['tab']==0?'selected':'').'>'.$lang['no'].'</option>';
 				echo '	            <option value="1" '.($row['tab']==1?'selected':'').'>'.$lang['yes'].'</option>';
 				echo '          </select>';
@@ -7684,18 +7684,18 @@ class Branching {
         } 
         // filter na vrednosti
         else {						
-        	echo '<span class="buttonwrapper floatRight">';
+        	/*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 'aaa<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>';
+            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>';*/
         }
 
-		echo '<div class="clr"></div>';
+		echo '</div>';
 
 		?><script>
 		$('#div_condition_editing_inner').sortable({items: 'form', handle: 'span.move', stop: function () {
@@ -8287,7 +8287,7 @@ class Branching {
 						else
                             $selected = '';
 
-                        echo '<label for="vrednost_'.$condition.'_'.$row['id'].'"><input type="checkbox" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_'.$row['id'].'" value="'.$row['id'].'" class="enka-admin-custom" '.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span> ('.$row['variable'].') '.strip_tags($row['naslov']).'</label>';
+                        echo '<input type="checkbox" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_'.$row['id'].'" value="'.$row['id'].'" class="enka-admin-custom" '.$selected.' onclick="condition_edit(\''.$condition.'\');" /><label for="vrednost_'.$condition.'_'.$row['id'].'"><span class="enka-checkbox-radio"></span> ('.$row['variable'].') '.strip_tags($row['naslov']).'</label>';
 						if ($selected != '')
                         	$preview .= '<span>('.$row['variable'].') '.strip_tags($row['naslov']).'</span>';
                     }
@@ -8305,7 +8305,7 @@ class Branching {
 							$selected = ' checked="checked"';
 						else
 							$selected = '';
-						echo '<label for="vrednost_'.$condition.'_-1"><input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_-1" value="-1"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span>(-1) '.$lang['srv_mv_Ni odgovoril'].'</label>';
+						echo '<input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_-1" value="-1"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><label for="vrednost_'.$condition.'_-1"><span class="enka-checkbox-radio"></span>(-1) '.$lang['srv_mv_Ni odgovoril'].'</label>';
 						if ($selected != '')
 							$preview .= '<span>(-1) '.$lang['srv_mv_Ni odgovoril'].'</span>';
 					}
@@ -8346,7 +8346,7 @@ class Branching {
 		                        $sql2 = sisplet_query("SELECT naslov, variable FROM srv_grid WHERE id='$i' AND spr_id='$row[id]'");
 		                        $row2 = mysqli_fetch_array($sql2);
 
-		                        echo '<label for="vrednost_'.$condition.'_'.$i.'"><input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_'.$i.'" value="'.$i.'"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span> ('.$row2['variable'].') '.strip_tags($row2['naslov']).'</label>';
+		                        echo '<input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_'.$i.'" value="'.$i.'"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><label for="vrednost_'.$condition.'_'.$i.'"><span class="enka-checkbox-radio"></span> ('.$row2['variable'].') '.strip_tags($row2['naslov']).'</label>';
 								if ($selected != '')
 									$preview .= '<span>('.$row2['variable'].') '.strip_tags($row2['naslov']).'</span>';
 		                    }
@@ -8362,7 +8362,7 @@ class Branching {
 									$selected = ' checked="checked"';
 								else
 									$selected = '';
-								echo '<label for="vrednost_'.$condition.'_-1"><input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_-1" value="-1"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span>(-1) '.$lang['srv_mv_Ni odgovoril'].'</label>';
+								echo '<input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_-1" value="-1"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><label for="vrednost_'.$condition.'_-1"><span class="enka-checkbox-radio"></span>(-1) '.$lang['srv_mv_Ni odgovoril'].'</label>';
 								if ($selected != '')
 									$preview .= '<span>(-1) '.$lang['srv_mv_Ni odgovoril'].'</span>';
 							}
@@ -8383,7 +8383,7 @@ class Branching {
 		                        else
 		                            $selected = '';
 
-		                        echo '<label for="vrednost_'.$condition.'_'.$i.'"><input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_'.$i.'" value="'.$i.'"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span>('.$i.') '.$i.'. '.$lang['srv_position'].'</label>';
+		                        echo '<input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_'.$i.'" value="'.$i.'"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><label for="vrednost_'.$condition.'_'.$i.'"><span class="enka-checkbox-radio"></span>('.$i.') '.$i.'. '.$lang['srv_position'].'</label>';
 								if ($selected != '')
 									$preview .= '<span>('.$i.') '.$i.'. '.$lang['srv_position'].'</span>';
 
@@ -8625,8 +8625,8 @@ class Branching {
 					if (mysqli_num_rows($sql3) > 0)	$selected = ' checked'; else $selected = '';
 
 					echo '<input type="checkbox" class="enka-admin-custom" name="vrednost_'.$if.'" id="vrednost_'.$if.'_'.$row2['id'].'" value="'.$row2['id'].'" '.$selected.' onclick="loop_edit(\''.$if.'\');" />';
-                    echo '<span class="enka-checkbox-radio"></span>';
-					echo'<label for="vrednost_'.$if.'_'.$row2['id'].'"> ('.$row2['variable'].') '.strip_tags($row2['naslov']).'</label><br />';
+                    echo '<label for="vrednost_'.$if.'_'.$row2['id'].'"><span class="enka-checkbox-radio"></span>';
+					echo ' ('.$row2['variable'].') '.strip_tags($row2['naslov']).'</label>';
 				}
 			}
 
diff --git a/lang/1.php b/lang/1.php
index 6ce5bd82e..db09771d3 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4700,8 +4700,8 @@ $lang = array (
 	"srv_dsp_link"								=>	"Nastavitve",
 	"srv_position"								=>	"Mesto",
 	"srv_add_condition_question"				=>	"Dodajte pogoj za prikaz",
-	"srv_edit_condition_question"				=>	"Vprašanja v pogoju se bodo prikazala, če je pogoj izpolnjen. <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/pogoji?from1ka=1\" target=\"_blank\">Več >></a>",
-	"srv_edit_condition_question1"				=>	"Vprašanje %s se bo prikazalo, če je izpolnjen spodnji pogoj. <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/pogoji?from1ka=1\" target=\"_blank\">Več >></a>",
+	"srv_edit_condition_question"				=>	"Vprašanja v pogoju se bodo prikazala, če je pogoj izpolnjen. <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/pogoji?from1ka=1\" target=\"_blank\">Preberi več</a>.",
+	"srv_edit_condition_question1"				=>	"Vprašanje %s se bo prikazalo, če je izpolnjen spodnji pogoj. <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/pogoji?from1ka=1\" target=\"_blank\">Preberi več</a>.",
 	"srv_edit_condition_conjunction"			=>	"Klikni za spremembo operatorja",
 	"srv_random_groups"							=>	"Naključne skupine",
 	"srv_device"								=>	"Naprava",
diff --git a/lang/2.php b/lang/2.php
index 1519ffb24..092f5407b 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4670,8 +4670,8 @@ $lang = array (
 	"srv_dsp_link"								=>	"Settings",
 	"srv_position"								=>	"Position",
 	"srv_add_condition_question"				=>	"Add a condition for question display",
-	"srv_edit_condition_question"				=>	"Questions are displayed when the following condition is met",
-	"srv_edit_condition_question1"				=>	"Question is displayed when condition is met",
+	"srv_edit_condition_question"				=>	"Questions are displayed when the following condition is met.",
+	"srv_edit_condition_question1"				=>	"Question is displayed when condition is met.",
 	"srv_edit_condition_conjunction"			=>	"Click to change operator",
 	"srv_random_groups"							=>	"Random groups",
     "srv_device"								=>	"Device",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index b04431e44..296a7ca2f 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8460,6 +8460,24 @@ fieldset.statusProfileFieldset .setting_holder.disabled .setting_item label {
   border-bottom: none;
 }
 
+div.popup_right div#div_cp_preview_content div#div_condition_editing_container {
+  background-color: #F2F2F2;
+  padding: 16px;
+}
+div.popup_right div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.condition_editing_preview div.condition_editing_naslov_holder div#div_condition_editing_conditions .clr_if,
+div.popup_right div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.condition_editing_preview div.condition_editing_naslov_holder div#div_condition_editing_conditions .colorif {
+  color: #1E88E5;
+}
+div.popup_right div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.condition_editing_body {
+  margin-top: 16px !important;
+}
+div.popup_right div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.condition_editing_body div.condition_editing_row div.white_holder {
+  padding: 16px;
+}
+div.popup_right div#div_cp_preview_content div#div_condition_editing_container div#div_condition_editing_inner div.div_condition_editing_operators {
+  margin: 0;
+}
+
 #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 5a6a4d8e0..5738d4966 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -401,6 +401,44 @@ fieldset.statusProfileFieldset {
     }
 }
 
+//Pogoji
+div.popup_right {
+    div#div_cp_preview_content {
+        div#div_condition_editing_container{
+            background-color: $light-gray2;
+            padding: 16px;
+
+            div#div_condition_editing_inner {
+                
+                div.condition_editing_preview {
+                    div.condition_editing_naslov_holder {
+                        div#div_condition_editing_conditions {
+                            .clr_if,
+                            .colorif {
+                                color: $blue;
+                            }
+                        }
+                    }
+                }
+
+                div.condition_editing_body {
+                    margin-top: 16px !important;
+                    
+                    div.condition_editing_row {
+                        div.white_holder {
+                            padding: 16px;
+                        }
+                    }
+                }
+
+                div.div_condition_editing_operators {
+                    margin: 0;
+                }
+            }
+        }
+    }
+}
+
 //Izračuni
 
 #rec_spremenljivka_naslov {