diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 4a182acef..73414b4c5 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -7501,8 +7501,8 @@ class Branching {
             // Dodaj blok/if v knjiznico
             echo '<div class="condition_setting_holder">';
         
-            echo '  <div class="condition_setting_line">';
-            echo '      <button class="blue small" onClick="displayAddIntoLibraryPopup(\''.$if.'\', \'2_'.$row['tip'].'\');">'.$lang['srv_library_add_to_lib'].'</button>';
+            echo '  <div class="condition_setting_line with-icon">';
+            echo '      <span onClick="displayAddIntoLibraryPopup(\''.$if.'\', \'2_'.$row['tip'].'\');"><span class="faicon library"></span>'.$lang['srv_library_add_to_lib'].'</span>';
             echo '  </div>';
             
             echo '</div>';
@@ -7657,15 +7657,16 @@ class Branching {
             echo '</div>';
 			
 
-			echo '<div class="button_holder">';
+			echo '<div class="remove_condition_holder">';
 
-            echo '  <button id="if_remove_all" class="small black-white" onclick="if_remove(\''.$if.'\', \'1\', \'0\'); return false;" title="'.($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) ).'">';
+            echo '  <div id="if_remove_all" onclick="if_remove(\''.$if.'\', \'1\', \'0\'); return false;" title="'.($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) ).'">';
             echo        ($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) );
-            echo '  </button>';
+            echo '  </div>';
 
-            echo '  <button class="small white-blue"onclick="if_remove(\''.$if.'\'); return false;" title="'.($row['tip'] == 0 ? $lang['srv_if_rem'] : ($row['tip']==1?$lang['srv_block_rem']:$lang['srv_loop_rem']) ).'">';
-            echo        ($row['tip'] == 0 ? $lang['srv_if_rem'] : ($row['tip']==1?$lang['srv_block_rem']:$lang['srv_loop_rem']) );
-            echo '  </button>';
+            echo '  <div onclick="if_remove(\''.$if.'\'); return false;" title="'.($row['tip'] == 0 ? $lang['srv_if_rem_only'] : ($row['tip']==1?$lang['srv_block_rem_only']:$lang['srv_loop_rem_only']) ).'">';
+            echo '      <span class="faicon delete"></span>';
+            echo        ($row['tip'] == 0 ? $lang['srv_if_rem_only'] : ($row['tip']==1?$lang['srv_block_rem_only']:$lang['srv_loop_rem_only']) );
+            echo '  </div>';
 
             echo '</div>';
 
diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index bb213a4cf..333bfd446 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -1967,8 +1967,8 @@ class Vprasanje {
 		
         echo '<div class="vprasanje_setting_holder">';
         
-        echo '  <div class="vprasanje_setting_line">';
-		echo '      <button class="blue small" onClick="displayAddIntoLibraryPopup(\''.$this->spremenljivka.'\', \'1\');">'.$lang['srv_library_add_to_lib'].'</button>';
+        echo '  <div class="vprasanje_setting_line with-icon">';
+		echo '      <span onClick="displayAddIntoLibraryPopup(\''.$this->spremenljivka.'\', \'1\');"><span class="faicon library"></span>'.$lang['srv_library_add_to_lib'].'</span>';
 		echo '  </div>';
         
         echo '</div>';
@@ -2653,15 +2653,24 @@ class Vprasanje {
         // Hitro dodajanje kategorij
         echo '<div class="vprasanje_setting_holder" '.$displayNone.'>';
 
-        echo '  <div class="vprasanje_setting_line">';
-        echo '      <span onclick="vrednost_fastadd(\''.$this->spremenljivka.'\'); return false;" class="pointer"><span class="sprites paste_word"></span> ';
+        echo '  <div class="vprasanje_setting_line with-icon">';
+        
 
-        if ( in_array($row['tip'], array(6, 16, 19, 20)) )
-            echo $lang['srv_question_fastadd'].' '.Help::display('srv_question_fastadd');
-        else
-            echo $lang['srv_vrednost_fastadd'].' '.Help::display('srv_vrednost_fastadd');
+        if ( in_array($row['tip'], array(6, 16, 19, 20)) ){
+            echo '<span onclick="vrednost_fastadd(\''.$this->spremenljivka.'\'); return false;" class="pointer"><span class="faicon file-import"></span> ';
+            echo    $lang['srv_question_fastadd'].'&nbsp;';
+            echo '</span>';
+
+            echo Help::display('srv_question_fastadd');
+        }
+        else{
+            echo '<span onclick="vrednost_fastadd(\''.$this->spremenljivka.'\'); return false;" class="pointer"><span class="faicon file-import"></span> ';
+            echo    $lang['srv_vrednost_fastadd'].'&nbsp;';
+            echo '</span>';
+
+            echo Help::display('srv_vrednost_fastadd');
+        }
 
-        echo '      </span>';
         echo '  </div>';
 
 		echo '</div>';
diff --git a/lang/1.php b/lang/1.php
index 9453e717e..feac18a9d 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2190,11 +2190,14 @@ $lang = array (
     "srv_podif_edit"        =>	 "Uredi pogoj za prikaz kategorije",
     "srv_block_new"         =>	 "Dodaj blok",
     "srv_if_rem"            =>	 "Odstrani pogoj",
-    "srv_if_rem_all"        =>	 "Izbri&#353;i pogoj in celotno vsebino",
+    "srv_if_rem_only"       =>	 "Odstrani pogoj (obdrži vsebino)",
+    "srv_if_rem_all"        =>	 "Odstrani pogoj in celotno vsebino",
     "srv_block_rem"			=>	 "Odstrani blok",
+    "srv_block_rem_only"    =>	 "Odstrani blok (obdrži vsebino)",
+    "srv_block_rem_all"		=>	 "Odstrani blok in celotno vsebino",
     "srv_loop_rem"			=>	 "Odstrani zanko",
-    "srv_block_rem_all"		=>	 "Izbri&#353;i blok in celotno vsebino",
-    "srv_loop_rem_all"		=>	 "Izbri&#353;i zanko in celotno vsebino",
+    "srv_loop_rem_only"     =>	 "Odstrani zanko (obdrži vsebino)",
+    "srv_loop_rem_all"		=>	 "Odstrani zanko in celotno vsebino",
     "srv_if_edit"           =>	 "Uredi pogoj",
     "srv_block_edit"		=>	 "Uredi blok",
     "srv_loop_edit"			=>	 "Uredi zanko",
diff --git a/lang/2.php b/lang/2.php
index 49ba0f611..8461973ab 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -2177,10 +2177,13 @@ $lang = array (
     "srv_podif_edit"        =>  "Edit conditions *IF for category display",
     "srv_block_new"         =>  "Add block",
     "srv_if_rem"            =>  "Remove condition",
+    "srv_if_rem_only"       =>	"Remove condition (keep content)",
     "srv_if_rem_all"        =>  "Remove condition and all its content",
     "srv_block_rem"         =>  "Remove block",
-    "srv_loop_rem"        	=>  "Remove loop",
+    "srv_block_rem_only"    =>	"Remove block (keep content)",
     "srv_block_rem_all"     =>  "Remove block and all its content",
+    "srv_loop_rem"        	=>  "Remove loop",
+    "srv_loop_rem_only"     =>	"Remove loop (keep content)",
 	"srv_loop_rem_all"		=>	"Remove loop and all its content",
     "srv_if_edit"           =>  "Edit if",
     "srv_block_edit"        =>  "Edit block",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 4109375e6..f0bc4d83f 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5466,13 +5466,11 @@ span.faicon.export::before {
   content: "";
 }
 
-/*span.faicon.import::before{
-        font-size: 24px;
-        content: "\f56f";
-}*/
-/*span.faicon.import{
-        width: 32px;
-}*/
+span.faicon.file-import::before {
+  content: "";
+  transform: scaleX(-1);
+}
+
 span.faicon.import::before {
   font-size: 24px;
   font-weight: 400;
@@ -13863,6 +13861,25 @@ div#variabla_new span.correct {
 #vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.half-half .content textarea {
   width: 100%;
 }
+#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon span {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  color: #1E88E5;
+}
+#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon span:hover {
+  color: #0059ab;
+}
+#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon span:hover .faicon::before {
+  color: #0059ab;
+}
+#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon .faicon {
+  margin-right: 8px;
+}
+#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon .faicon:before {
+  color: #1E88E5;
+  font-size: 18px;
+}
 #vprasanje_float_editing .vprasanje_edit_holder p,
 #vprasanje_float_editing .vprasanje_edit_holder span,
 #vprasanje_float_editing .vprasanje_edit_holder label {
@@ -18186,6 +18203,25 @@ and open the template in the editor.
 #branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.half-half .content textarea {
   width: 100%;
 }
+#branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.with-icon span {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  color: #1E88E5;
+}
+#branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.with-icon span:hover {
+  color: #0059ab;
+}
+#branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.with-icon span:hover .faicon::before {
+  color: #0059ab;
+}
+#branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.with-icon .faicon {
+  margin-right: 8px;
+}
+#branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.with-icon .faicon:before {
+  color: #1E88E5;
+  font-size: 18px;
+}
 #branching #div_condition_editing_float .condition_edit p,
 #branching #div_condition_editing_float .condition_edit span,
 #branching #div_condition_editing_float .condition_edit label {
@@ -18239,6 +18275,33 @@ and open the template in the editor.
 #branching #div_condition_editing_float .button_holder button:last-of-type {
   margin-bottom: 0;
 }
+#branching #div_condition_editing_float .remove_condition_holder {
+  margin: 0 16px;
+  padding: 16px 0;
+  border-top: 1px #D3D3D3 solid;
+}
+#branching #div_condition_editing_float .remove_condition_holder div {
+  cursor: pointer;
+  margin-bottom: 16px;
+  color: #1E88E5;
+  font-size: 14px;
+  transition: 0.2s;
+}
+#branching #div_condition_editing_float .remove_condition_holder div .faicon {
+  margin-right: 8px;
+}
+#branching #div_condition_editing_float .remove_condition_holder div .faicon:before {
+  font-size: 14px;
+}
+#branching #div_condition_editing_float .remove_condition_holder div:last-child {
+  margin-bottom: 0;
+}
+#branching #div_condition_editing_float .remove_condition_holder div:hover {
+  color: #0059ab;
+}
+#branching #div_condition_editing_float .remove_condition_holder div:hover .faicon:before {
+  color: #0059ab;
+}
 #branching span.IF_title_start {
   font-weight: 900;
   color: #1E88E5;
diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss
index ca5c6658f..b95faf8e7 100644
--- a/resources/sass/admin_new/basic/icons/standard.scss
+++ b/resources/sass/admin_new/basic/icons/standard.scss
@@ -78,16 +78,11 @@ span.faicon.export::before{
         content: "\f56e";
 }
 
+span.faicon.file-import::before{    
+    content: "\f56f";
+    transform: scaleX(-1);
+}
 
-
-/*span.faicon.import::before{
-        font-size: 24px;
-        content: "\f56f";
-}*/
-
-/*span.faicon.import{
-        width: 32px;
-}*/
 span.faicon.import::before{
         font-size: 24px;
 		font-weight: 400;
@@ -711,4 +706,4 @@ span.faicon.fa-1::before{
 
 span.faicon.phone::before{
         content: "\f095";
-}
\ No newline at end of file
+}
diff --git a/resources/sass/admin_new/pages/survey_edit/conditions.scss b/resources/sass/admin_new/pages/survey_edit/conditions.scss
index c4cb3be69..520aa9a04 100644
--- a/resources/sass/admin_new/pages/survey_edit/conditions.scss
+++ b/resources/sass/admin_new/pages/survey_edit/conditions.scss
@@ -455,6 +455,34 @@ and open the template in the editor.
                             }
                         }
                     }
+
+                    &.with-icon{
+
+                        span{
+                            display: flex;
+                            align-items: center;
+
+                            cursor: pointer;
+                            color: $blue;
+    
+                            &:hover{
+                                color: $dark-blue;
+                                
+                                .faicon::before{
+                                    color: $dark-blue;
+                                }
+                            }
+                        }
+                        
+                        .faicon{
+                            margin-right: 8px;
+    
+                            &:before{
+                                color: $blue;
+                                font-size: 18px;
+                            }
+                        }
+                    }
                 }
             }
 
@@ -531,6 +559,43 @@ and open the template in the editor.
                 }
             }
         }
+
+        .remove_condition_holder{
+            margin: 0 16px;
+            padding: 16px 0;
+
+            border-top: 1px $dark-gray2 solid;
+
+            div{
+                cursor: pointer;
+                margin-bottom: 16px;
+
+                color: $blue;
+                font-size: 14px;
+
+                transition: 0.2s;
+
+                .faicon{
+                    margin-right: 8px;
+
+                    &:before{
+                        font-size: 14px;
+                    }
+                }
+
+                &:last-child{
+                    margin-bottom: 0;
+                }
+
+                &:hover{
+                    color: $dark-blue;
+
+                    .faicon:before{
+                        color: $dark-blue;
+                    }
+                }
+            }
+        }
     }
 
 
diff --git a/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss b/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
index e9ac8561a..8f41188a1 100644
--- a/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
+++ b/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
@@ -213,6 +213,34 @@
                         }
                     }
                 }
+
+                &.with-icon{
+
+                    span{
+                        display: flex;
+                        align-items: center;
+                        
+                        cursor: pointer;
+                        color: $blue;
+
+                        &:hover{
+                            color: $dark-blue;
+                            
+                            .faicon::before{
+                                color: $dark-blue;
+                            }
+                        }
+                    }
+                    
+                    .faicon{
+                        margin-right: 8px;
+
+                        &:before{
+                            color: $blue;
+                            font-size: 18px;
+                        }
+                    }
+                }
             }
         }