diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 48693e4d3..57ca7034d 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -10623,24 +10623,22 @@ class Branching {
 
 			// Vprasalnik se shranjuje avt.
 			echo '<div class="forma_bottom_inner changes">';
-			echo '<table><tr><td><span class="faicon bottom_saving icon-blue" style="float:left; display:inline;"></span></td>';
-			echo '<td>'.$lang['srv_vprasalnik_autosave'].'</td></tr></table>';
+			echo '  <span class="faicon bottom_saving icon-blue"></span>';
+			echo '  <span>'.$lang['srv_vprasalnik_autosave'].'</span>';
 			echo '</div>';
 
 			echo '<div class="forma_bottom_inner links">';
 
 			// Preview
 			echo '<a href="' . SurveyInfo::getSurveyLink() . '?preview=on" title="'.$lang['srv_poglejanketo'].'" target="_blank">';
-			echo '<span class="faicon bottom_preview"></span> ';
-			echo $lang['srv_poglejanketo2'];
+			echo '<span class="faicon bottom_preview"></span> '.$lang['srv_poglejanketo2'];
 			echo '</a>';
 
 			// Testiranje
 			if($this->survey_type != 0 && $this->survey_type != 1){
 				if ($d->checkDostopSub('test')){
 					echo '<a href="index.php?anketa='.$this->anketa.'&a=testiranje" title="'.$lang['srv_testiranje'].'">';
-					echo '<span class="faicon bottom_test"></span> ';
-					echo $lang['srv_testiranje'];
+					echo '<span class="faicon bottom_test"></span> '.$lang['srv_testiranje'];
 					echo '</a>';
 				}
 			}
@@ -10648,8 +10646,7 @@ class Branching {
 			// Objava
 			if ($d->checkDostopSub('publish')){
 				echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=vabila" '.$lang['srv_vabila'].' title="'.$lang['srv_vabila'].'">';
-				echo '<span class="faicon bottom_publish"></span> ';
-				echo $lang['srv_vabila'];
+				echo '<span class="faicon bottom_publish"></span> '.$lang['srv_vabila'];
 				echo '</a>';
 			}
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index ed8be718f..6883dd3cc 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10734,8 +10734,6 @@ and open the template in the editor.
   width: calc(100% - 401px - 304px);
   margin: 0 0 0 304px;
   background-color: white;
-  /* font awesom za admin */
-  /* select, checked */
   /* Okno za drop vprasanja, ko je anketa prazna */
 }
 #branching ul {
@@ -10839,53 +10837,6 @@ and open the template in the editor.
   cursor: move;
   margin-top: -2px;
 }
-#branching #variable_holder input[type=checkbox].enka-admin-custom,
-#branching #variable_holder input[type=radio].enka-admin-custom {
-  display: none !important;
-}
-#branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before,
-#branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  font-family: "Font Awesome 5 Free";
-  display: inline-block;
-  font-size: 16px;
-  color: #D3D3D3;
-  font-weight: 400;
-}
-#branching #variable_holder input[type=checkbox].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before,
-#branching #variable_holder input[type=radio].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before {
-  display: inline-block;
-  float: left;
-  padding-top: 4px;
-  padding-left: 4px;
-  font-weight: 400;
-}
-#branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
-  /*content: "\f096";*/
-  content: "";
-  letter-spacing: 10px;
-}
-#branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  /*content: "\f10c";*/
-  content: "";
-  letter-spacing: 8px;
-}
-#branching #variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  /*content: "\f046";*/
-  content: "";
-  color: #D3D3D3;
-  letter-spacing: 8px;
-}
-#branching #variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  /*content: "\f192";*/
-  content: "";
-  color: #D3D3D3;
-}
-#branching span.faicon.delete_circle::before {
-  font-size: 14px;
-}
-#branching span.faicon.add::before {
-  font-size: 14px;
-}
 #branching .empty_vrivanje {
   display: flex;
   flex-direction: column;
@@ -10915,12 +10866,38 @@ and open the template in the editor.
   background: 0 !important;
   background-color: #E5E5E5;
 }
-#branching #bottom_icons_holder {
-  /*display: none;*/
+#branching #bottom_icons_holder .forma_bottom {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  height: auto;
+  padding: 64px 0 0 0;
 }
-
-.branchinghover {
-  background: url("../../../admin/survey/img_0/hover_background.png") repeat-x top left !important;
+#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner {
+  display: flex;
+  align-items: baseline;
+  padding: 0;
+  margin: 0;
+}
+#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner > span {
+  font-size: 14px;
+  color: #333333;
+}
+#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner a {
+  display: flex;
+  align-items: baseline;
+  margin: 0 16px 0 0;
+  padding: 0;
+  font-size: 14px;
+  text-decoration: none;
+}
+#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner a:hover {
+  text-decoration: none;
+}
+#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner .faicon {
+  margin-right: 8px;
 }
 
 .blockSwitch {
diff --git a/resources/sass/admin_new/pages/survey_edit/branching.scss b/resources/sass/admin_new/pages/survey_edit/branching.scss
index 1daa6ded3..008a90959 100644
--- a/resources/sass/admin_new/pages/survey_edit/branching.scss
+++ b/resources/sass/admin_new/pages/survey_edit/branching.scss
@@ -162,61 +162,6 @@ $branching_main_size_small: calc(100% - #{$branching_settings_size} - #{$branchi
 	}
 
 
-    /* font awesom za admin */
-    #variable_holder input[type="checkbox"].enka-admin-custom,
-    #variable_holder input[type="radio"].enka-admin-custom  {
-        display: none !important;
-    }
-    #variable_holder input[type="checkbox"].enka-admin-custom+ span.enka-checkbox-radio:before,
-    #variable_holder input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before {
-        font-family: $fontawesome;
-        display: inline-block;
-        font-size: 16px;
-        color: $dark-gray2;
-
-        font-weight: 400;
-    }
-    #variable_holder input[type="checkbox"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before,
-    #variable_holder input[type="radio"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before {
-        display: inline-block;
-        float: left;
-        padding-top: 4px;
-        padding-left: 4px;
-        
-        font-weight: 400;
-    }
-
-    #variable_holder input[type="checkbox"].enka-admin-custom + span.enka-checkbox-radio:before{
-        /*content: "\f096";*/
-        content: "\f0c8";
-        letter-spacing: 10px;
-    }
-    #variable_holder input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before{
-        /*content: "\f10c";*/
-        content: "\f111";
-        letter-spacing: 8px;
-    }
-    /* select, checked */
-    #variable_holder input[type="checkbox"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
-        /*content: "\f046";*/
-        content: "\f14a";
-        color: $dark-gray2;
-        letter-spacing: 8px;
-    }
-    #variable_holder input[type="radio"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
-        /*content: "\f192";*/
-        content: "\f192";
-        color: $dark-gray2;
-    }
-
-    span.faicon.delete_circle::before {
-        font-size: 14px;
-    }
-    span.faicon.add::before {
-        font-size: 14px;
-    }
-
-
     /* Okno za drop vprasanja, ko je anketa prazna */
     .empty_vrivanje {
         display: flex;
@@ -257,15 +202,53 @@ $branching_main_size_small: calc(100% - #{$branching_settings_size} - #{$branchi
 
 
     #bottom_icons_holder{
-        /*display: none;*/
+
+        .forma_bottom{
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
+            align-items: center;
+
+            width: 100%;
+            height: auto;
+            padding: 64px 0 0 0;
+
+            .forma_bottom_inner{
+                display: flex;
+                align-items: baseline;
+
+                padding: 0;
+                margin: 0;
+
+                > span{
+                    font-size: 14px;
+                    color: $black;
+                }
+
+                a{
+                    display: flex;
+                    align-items: baseline;
+
+                    margin: 0 16px 0 0;
+                    padding: 0;
+
+                    font-size: 14px;
+                    text-decoration: none;
+                    
+                    &:hover{
+                        text-decoration: none;
+                    }
+                }
+
+                .faicon{
+                    margin-right: 8px;
+                }
+            }
+        }
     }
 }
 
 
-
-.branchinghover {
-	background: url('../../../admin/survey/img_0/hover_background.png') repeat-x top left !important;
-}
 .blockSwitch {
 	position: relative;
 	margin: 10px auto 0;
diff --git a/resources/sass/admin_new/pages/survey_edit/icons.scss b/resources/sass/admin_new/pages/survey_edit/icons.scss
new file mode 100644
index 000000000..68ddd3b67
--- /dev/null
+++ b/resources/sass/admin_new/pages/survey_edit/icons.scss
@@ -0,0 +1,62 @@
+/*
+    Branching ikone, radio, checkboxi...
+*/
+
+
+#branching {
+
+    /* font awesom za admin */
+    #variable_holder input[type="checkbox"].enka-admin-custom,
+    #variable_holder input[type="radio"].enka-admin-custom  {
+        display: none !important;
+    }
+    #variable_holder input[type="checkbox"].enka-admin-custom+ span.enka-checkbox-radio:before,
+    #variable_holder input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before {
+        font-family: $fontawesome;
+        display: inline-block;
+        font-size: 16px;
+        color: $dark-gray2;
+
+        font-weight: 400;
+    }
+    #variable_holder input[type="checkbox"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before,
+    #variable_holder input[type="radio"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before {
+        display: inline-block;
+        float: left;
+        padding-top: 4px;
+        padding-left: 4px;
+        
+        font-weight: 400;
+    }
+
+    #variable_holder input[type="checkbox"].enka-admin-custom + span.enka-checkbox-radio:before{
+        /*content: "\f096";*/
+        content: "\f0c8";
+        letter-spacing: 10px;
+    }
+    #variable_holder input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before{
+        /*content: "\f10c";*/
+        content: "\f111";
+        letter-spacing: 8px;
+    }
+    /* select, checked */
+    #variable_holder input[type="checkbox"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
+        /*content: "\f046";*/
+        content: "\f14a";
+        color: $dark-gray2;
+        letter-spacing: 8px;
+    }
+    #variable_holder input[type="radio"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
+        /*content: "\f192";*/
+        content: "\f192";
+        color: $dark-gray2;
+    }
+
+    span.faicon.delete_circle::before {
+        font-size: 14px;
+    }
+    span.faicon.add::before {
+        font-size: 14px;
+    }
+
+}