diff --git a/admin/survey/classes/class.SurveyConditionProfiles.php b/admin/survey/classes/class.SurveyConditionProfiles.php
index 7da33b028..de6cb2c1c 100644
--- a/admin/survey/classes/class.SurveyConditionProfiles.php
+++ b/admin/survey/classes/class.SurveyConditionProfiles.php
@@ -273,25 +273,50 @@ class SurveyConditionProfiles
         echo '<div id="conditionProfileCoverDiv"></div>';
         
         // div za shranjevanje novega profila
-        echo '<div id="newProfile">'.$lang['srv_missing_profile_name'].': ';
-        echo '<input id="newProfileName" name="newProfileName" type="text" size="45"  />';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="conditionProfileAction(\'newCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="conditionProfileAction(\'newCreate\'); return false;"><span>'.$lang['srv_save_profile'].'</span></a></span></span>';            
+        echo '<div id="newProfile">';
+		
+		echo '<div class="setting_holder">';
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="newProfileName" name="newProfileName" type="text" class="text large"  />';
+		echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="conditionProfileAction(\'newCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="conditionProfileAction(\'newCreate\'); return false;">'.$lang['srv_save_profile'].'</button>';
+        echo '</div>';
+
         echo '</div>';
 
         // div za preimenovanje
-        echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': ';
-        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . self :: $profiles[$_currMPID]['name'] . '" size="45"  />';
-        echo '<input id="renameProfileId" type="hidden" value="' . self :: $profiles[$_currMPID]['id'] . '"  />';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="conditionProfileAction(\'renameCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="conditionProfileAction(\'renameConfirm\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>';            
+        echo '<div id="renameProfileDiv">';
+		
+		echo '<div class="setting_holder">';
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+		echo '<input id="renameProfileName" name="renameProfileName" type="text" class="text large" value="' . self :: $profiles[$_currMPID]['name'] . '"/>';
+        echo '<input id="renameProfileId" type="hidden" value="' . self :: $profiles[$_currMPID]['id'] . '"  />';echo '</div>';
         echo '</div>';
 
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="conditionProfileAction(\'renameCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="conditionProfileAction(\'renameConfirm\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
+        echo '</div>';
+
+        echo '</div>';
+		
         // div za brisanje
-        echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . self :: $profiles[$_currMPID]['name'] . '</b>?';
+        echo '<div id="deleteProfileDiv">';
+		
+		echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . self :: $profiles[$_currMPID]['name'] . '</span>?';
         echo '<input id="deleteProfileId" type="hidden" value="' . self :: $profiles[$_currMPID]['id'] . '"  />';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="conditionProfileAction(\'deleteCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="conditionProfileAction(\'deleteConfirm\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>';            
+        
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="conditionProfileAction(\'deleteCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="conditionProfileAction(\'deleteConfirm\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
+        echo '</div>';
+
         echo '</div>';
 	}
 	
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 3694b39f4..3cda1be24 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8158,25 +8158,35 @@ div#div_time_profiles div#renameProfileDiv .setting_holder .setting_item input.t
 }
 
 div#div_variable_profiles div#newProfile .setting_holder,
-div#div_variable_profiles div#renameProfileDiv .setting_holder {
+div#div_variable_profiles div#renameProfileDiv .setting_holder,
+div#div_condition_profiles div#newProfile .setting_holder,
+div#div_condition_profiles div#renameProfileDiv .setting_holder {
   margin-bottom: 16px;
   display: flex;
   flex-direction: column;
 }
 div#div_variable_profiles div#newProfile .setting_holder:first-of-type,
-div#div_variable_profiles div#renameProfileDiv .setting_holder:first-of-type {
+div#div_variable_profiles div#renameProfileDiv .setting_holder:first-of-type,
+div#div_condition_profiles div#newProfile .setting_holder:first-of-type,
+div#div_condition_profiles div#renameProfileDiv .setting_holder:first-of-type {
   margin-top: 0;
 }
 div#div_variable_profiles div#newProfile .setting_holder .setting_item,
-div#div_variable_profiles div#renameProfileDiv .setting_holder .setting_item {
+div#div_variable_profiles div#renameProfileDiv .setting_holder .setting_item,
+div#div_condition_profiles div#newProfile .setting_holder .setting_item,
+div#div_condition_profiles div#renameProfileDiv .setting_holder .setting_item {
   margin-top: 8px;
 }
 div#div_variable_profiles div#newProfile .setting_holder .setting_item label,
-div#div_variable_profiles div#renameProfileDiv .setting_holder .setting_item label {
+div#div_variable_profiles div#renameProfileDiv .setting_holder .setting_item label,
+div#div_condition_profiles div#newProfile .setting_holder .setting_item label,
+div#div_condition_profiles div#renameProfileDiv .setting_holder .setting_item label {
   margin-right: 0;
 }
 div#div_variable_profiles div#newProfile .setting_holder .setting_item input.text,
-div#div_variable_profiles div#renameProfileDiv .setting_holder .setting_item input.text {
+div#div_variable_profiles div#renameProfileDiv .setting_holder .setting_item input.text,
+div#div_condition_profiles div#newProfile .setting_holder .setting_item input.text,
+div#div_condition_profiles div#renameProfileDiv .setting_holder .setting_item input.text {
   margin-left: 4px;
   width: 469px;
 }
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index fd435b5af..076b9fd02 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -68,8 +68,9 @@ div#div_time_profiles {
     }
 }
 
-//Neodgovor spremenljivke >Filtri zgoraj desno
-div#div_variable_profiles {
+//Neodgovor spremenljivke > Filtri zgoraj desno
+div#div_variable_profiles,
+div#div_condition_profiles {
     div#newProfile,
     div#renameProfileDiv {