diff --git a/admin/survey/classes/class.Library.php b/admin/survey/classes/class.Library.php
index 1257648cd..1871a6b8f 100644
--- a/admin/survey/classes/class.Library.php
+++ b/admin/survey/classes/class.Library.php
@@ -5,8 +5,6 @@ class Library {
     var $Branching;
 	
     var $tab = 2;           // tab pove kater tab je odprt (od 4ih)
-    var $tip = 1;          	// tip pove v bazi srv_library_folder za kater tip gre (0-vpra�anja, 1-ankete)
-    var $prva = 0;      	// prva pove, ce je to library na prvi strani (1) ali v urejanju ankete (0)
 	
     // v odvisnosti od mode prilagajamu UI. (Mode je odvisen od tipa ankete - survey_type)
     var $mode = -1; 		// mode: -1 -> library pri datotekah, 0 -> glasovanje, 1 -> forma, 2 -> ankata na več straneh, 3 -> ifi
@@ -32,28 +30,12 @@ class Library {
 
         if (isset($_options['tab'])) {
 			$this->tab = $_options['tab'];
-            if ($this->tab <= 1)
-                $this->tip = 0;
-            else
-                $this->tip = 1;
         } 
         else if (isset($_POST['tab'])) {
             $this->tab = ($_POST['tab'] == 0 || $_POST['tab'] == 'undefined') ? 0 : $_POST['tab'];
-            if ($this->tab <= 1)
-                $this->tip = 0;
-            else
-                $this->tip = 1;
         } 
         else {
             $this->tab = 0;
-            $this->tip = 0;
-        }
-
-        if (isset($_options['prva'])) {
-        	$this->prva = $_options['prva'];
-        } 
-        else {
-        	$this->prva = 0;
         }
 
         if (isset($_GET['tab'])) $this->tab = (int)$_GET['tab'];
@@ -78,93 +60,28 @@ class Library {
 		}
 	}
 	
-
-    /**
-    * @desc prikaze knjiznico znotraj ankete na desni
-    */
-    function display () {
-        global $admin_type;
-		global $global_user_id;
-		global $lang;
-
-		echo '<div id="library_title">';
-		echo '<span class="faicon library"></span> '.$lang['srv_library'];
-		echo '<a href="#" title="'.$lang['srv_zapri'].'" onclick="change_mode(\'toolboxback\', \'1\'); return false;"><span class="faicon close" style="float:right;"></span></a>';
-		echo '</div>';
-
-        $this->display_tabs();
-
-        echo '<div id="library">';
-
-        echo '<div id="libraryInner">';
-        $this->display_folders();
-        echo '</div><!-- id="libraryInner" -->';
-
-        echo '</div><!-- id="library" -->';
-    }
-
-    /**
-    * @desc prikaze tabe za izbiro
-    */
-    function display_tabs () {
-        global $lang;
-
-		echo '<p class="display_tabs">';
-	    echo '<span' . ($this->tab==0 || $this->tab==1 ? ' class="highlightTabBlackLeft"' : ' class="nohighlight"') . ' >';
-		echo '<a href="/" onclick="display_knjiznica(\'0\'); return false;" title="'.$lang['srv_vprasanja'].'"><span>' . $lang['srv_vprasanja'] . '</span></a></span>';
-		echo '<span' . ($this->tab==2 || $this->tab==3 ? ' class="highlightTabBlackRight"' : ' class="nohighlight"') . ' >';
-		echo '<a href="/" onclick="display_knjiznica(\'2\'); return false;" title="'.$lang['srv_ankete'].'"><span>' . $lang['srv_ankete'] . '</span></a></span>';
-		echo '</p>';
-    }
-
+    
     function display_folders () {
 		global $global_user_id;
 		global $lang;
 
-		// Knjiznica znotraj posamezne ankete
-		if ($this->prva == 0) {
-			$this->display_contentfolders(0, 0);
-	        $this->display_contentfolders(0, $global_user_id);
-
-	        if ($this->tip == 1) {
-	        	echo '<p class="bold"><a href="index.php?a=knjiznica">'.$lang['srv_library_edit'].'</a><br>';
-
-	        	$sql = sisplet_query("SELECT * FROM srv_library_anketa WHERE uid='".$global_user_id."' AND ank_id='".$this->SurveyAdmin->anketa."'");
-	        	if (mysqli_num_rows($sql) == 0) {
-		        	echo '<div class="buttonwrapper" style="float:left;">
-					<a class="ovalbutton ovalbutton_orange btn_savesettings" onclick="add_to_my_library(); return false;" href="#"><span>'.$lang['srv_library_edit_add'].'</span></a>
-					</div></p>';
-	    		}
-
-	    	} else {
-				echo '<p>'.$lang['srv_library_q_txt'].'</p>';
-			}
-
-			//echo '<a style="padding:5px; background-color: white; bottom: 1px; position: absolute; right: 18px;" onclick="change_mode(\'toolboxback\', \'1\'); return false;" href="#">'.$lang['srv_zapri'].'</a>';
-		} 
-		// Knjiznica na prvi strani zraven mojih anket
-		else {
-			// Na prvi strani imamo search	
-			if($this->isSearch == 1){
-				echo '<div id="searchLibrarySettings">';
-				$this->displaySearchSettings();
-				echo '</div>';
-				
-				echo '<div class="clr"></div>';
-				
-				$this->display_contentfolders_searchList();
-			}				
-			else{
-				echo '<div id="searchLibrarySurveys">';
-				$this->displaySearch();
-				echo '</div>';
-				
-				echo '<div class="clr"></div>';
-				
-				$this->display_contentfolders();
-			}
-		}
+        // Na prvi strani imamo search	
+        if($this->isSearch == 1){
+            echo '<div id="searchLibrarySettings">';
+            $this->displaySearchSettings();
+            echo '</div>';
+            
+            $this->display_contentfolders_searchList();
+        }				
+        else{
+            echo '<div id="searchLibrarySurveys">';
+            $this->displaySearch();
+            echo '</div>';
+                            
+            $this->display_contentfolders();
+        }
     }
+    
 
     /**
     * @desc prikaze folderje v knjiznici
@@ -194,34 +111,30 @@ class Library {
 		if (isset($_GET['libfolder'])) $cookie .= '-'.$_GET['libfolder'].'-';
 
         if ($parent == 0) {
-	        // v skrite html elemente shranimo tab, in prva
+	        // v skrite html elemente shranimo tab
 			echo '<input type="hidden" name="lib_tab" id="lib_tab" value="'.($this->tab == 0 || $this->tab == "" ? "0" : "$this->tab").'">';
-			echo '<input type="hidden" name="lib_tip" id="lib_tip" value="'.($this->tip == 0 || $this->tip== "" ? "0" : "$this->tip").'">';
-			echo '<input type="hidden" name="lib_prva" id="lib_prva" value="'.($this->prva == 0 || $this->prva== "" ? "0" : "$this->prva").'">';
 
 			echo '<ul title="'.($uid==0?$lang['srv_library_left']:$lang['srv_library_left_right']).'" style="padding-left:0;" class="'.($admin_type==0 || $uid == $global_user_id?'can_edit':'').'">'."\n";
         }
 
-        $sql = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE uid='$uid' AND parent = '$parent' AND tip='$this->tip' $language ORDER BY naslov");
+        $sql = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE uid='$uid' AND parent = '$parent' AND tip='1' $language ORDER BY naslov");
         if (!$sql) 
             echo mysqli_error($GLOBALS['connect_db']);
 
         if (mysqli_num_rows($sql) == 0 && $uid > 0 && $parent == 0) {
             
             // za prvic ko pride user, da mu dodamo folder
-            if ($this->tip == 0)
-            	$naslov = $lang['srv_moja_vprasanja'];
-            else
-            	$naslov = $lang['srv_moje_ankete'];
+            $naslov = $lang['srv_moje_ankete'];
             
-            sisplet_query("INSERT INTO srv_library_folder (uid, tip, naslov, parent, lang) VALUES ('$uid', '$this->tip', '$naslov', '0', '$lang[id]')");
+            sisplet_query("INSERT INTO srv_library_folder (uid, tip, naslov, parent, lang) VALUES ('$uid', '1', '$naslov', '0', '$lang[id]')");
             
-            $sql = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE uid='$uid' AND parent = '$parent' AND tip='$this->tip' ORDER BY naslov");
+            $sql = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE uid='$uid' AND parent = '$parent' AND tip='1' ORDER BY naslov");
             if (!$sql) 
                 echo mysqli_error($GLOBALS['connect_db']);
         }
 
         while ($row = mysqli_fetch_array($sql)) {
+
             if (strpos($cookie, '-'.$row['id'].'-')=== false && $parent!=0)
                 $hidden = true;
             else
@@ -230,164 +143,134 @@ class Library {
 
             echo '  <li id="li'.$row['id'].'" eid="'.$row['id'].'" class="folder" name="folder">';
 
-            if ($parent != 0)
-                echo '  <a href="/" onclick="javascript:library_folders_plusminus(\''.$row['id'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" id="f_pm_'.$row['id'].'"><span class="faicon icon-blue '.($hidden?'plus':'minus').'"></span></a>';
-            else
-                echo '  <span class="sprites spacer12"></span>';
 
-            echo '  <span class="'.($parent!=0 || $uid>0 || $admin_type==0 ? ' folderdrop' : '').'" id="sp'.$row['id'].'" eid="'.$row['id'].'"><span class="faicon folder icon-blue'.($parent!=0?' movable':'').'"></span>'.
-                 '  <span '.($admin_type==0||$uid>0? 'title="'.$lang['srv_rename_profile'].'" onclick="folder_rename(\''.$row['id'].'\'); return false;"':'').'>'.$row['naslov'].'</span>';
+            // Okvircek folderja
+            echo '<div class="folder_box '.($hidden ? '' : 'open').'">';
+
+            if ($parent != 0){
+                echo '<span onclick="javascript:library_folders_plusminus(\''.$row['id'].'\',\''.$this->tab.'\'); return false;" class="faicon folder_arrow_icon"></span>';
+            }
+
+            echo '<div class="'.($parent!=0 || $uid>0 || $admin_type==0 ? ' folderdrop' : '').'" id="sp'.$row['id'].'" eid="'.$row['id'].'"><span class="faicon folder '.($parent!=0?' movable':'').'"></span>';
+            echo '<span '.($admin_type==0||$uid>0? 'title="'.$lang['srv_rename_profile'].'" onclick="folder_rename(\''.$row['id'].'\'); return false;"':'').'>'.$row['naslov'].'</span>';
+            
             if ($admin_type==0 || $uid>0)
-            	echo '  <a href="/" onclick="javascript:library_new_folder(\''.$row['id'].'\',\''.$uid.'\'); return false;"><span class="faicon add icon-blue-hover-orange small new_folder" id="new_folder_'.$row['id'].'" title="'.$lang['srv_newfolder'].'"></span></a>';
+            	echo '<span class="faicon add new_folder" id="new_folder_'.$row['id'].'" title="'.$lang['srv_newfolder'].'" onclick="javascript:library_new_folder(\''.$row['id'].'\',\''.$uid.'\'); return false;"></span>';
 
             if ($parent != 0 && ($admin_type==0||$uid>0) )
-                echo '  <a href="/" onclick="javascript:library_delete_folder(\''.$row['id'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;"><span class="faicon remove icon-orange small delete_folder" id="delete_folder_'.$row['id'].'" title="'.$lang['srv_deletefolder'].'"></span></a>';
+                echo '<span class="faicon remove delete_folder" id="delete_folder_'.$row['id'].'" title="'.$lang['srv_deletefolder'].'" onclick="javascript:library_delete_folder(\''.$row['id'].'\',\''.$this->tab.'\'); return false;"></span>';
 
-            echo '  </span>'."\n";
+            echo '</div>'."\n";
 
-            echo '<ul id="folder_'.$row['id'].'"'.($hidden?' style="display:none"':'').'>'."\n";
+            echo '</div>';
 
+
+            // Vsebina folderja
+            echo '      <ul id="folder_'.$row['id'].'"'.($hidden?' style="display:none"':'').'>'."\n";
             $this->display_contentfolders($row['id'], $uid);
 
-            $this->display_ifs($row['id']);
+            // Izpis anket v folderju
+            $sql1 = sisplet_query("SELECT * FROM srv_anketa a, srv_library_anketa l WHERE a.id=l.ank_id AND l.folder='$row[id]' AND l.uid='$uid' ORDER BY naslov ASC");
+            if (!$sql1) echo mysqli_error($GLOBALS['connect_db']);
 
-			// Izpis spremenljivk v folderju - v root folderju ne izpisujemo vprasanj (ker jih itak ne sme bit)
-			if(!($this->tip == 0 && $parent == 0 && $uid == 0)){
+            if (mysqli_num_rows($sql1) > 0) {
 
-				if ($this->tip == 0)
-					$sql1 = sisplet_query("SELECT * FROM srv_spremenljivka WHERE folder = '$row[id]' AND gru_id='-1' ORDER BY naslov ASC");
-				else
-					$sql1 = sisplet_query("SELECT * FROM srv_anketa a, srv_library_anketa l WHERE a.id=l.ank_id AND l.folder='$row[id]' AND l.uid='$uid' ORDER BY naslov ASC");
-				if (!$sql1) echo mysqli_error($GLOBALS['connect_db']);
+                while ($row1 = mysqli_fetch_array($sql1)) {
 
-				if (mysqli_num_rows($sql1) > 0) {
+                    echo '<li class="anketa tip1">';
 
-					while ($row1 = mysqli_fetch_array($sql1)) {
+                    // Okvircek ankete
+                    echo '  <div copy="'.$row1['id'].'" eid="'.$row1['id'].'" class="folder_container" name="library">';
 
-                        echo '<li class="anketa tip'.$this->tip.'">';
-                        echo '        <div copy="'.$row1['id'].'" eid="'.$row1['id'].'" class="folder_container '.($this->tip==0?'new_spr':'').'" name="library">';
 
-                        echo '          <div class="folder_right">';
+                    // Levo ime
+                    echo '<div class="folder_left">';
 
-                        if ($this->tip == 0) {
-                            //echo '<a href="/" onclick="javascript:copy_spremenljivka(\''.$row1['id'].'\'); return false;"><img src="img_'.$this->skin.'/copy.png" title="'.$lang['srv_copy_spr'].'" /></a>';
-                            if ($admin_type==0 or $uid==$global_user_id)
-                                echo ' <a href="/" onclick="library_brisi_spremenljivko(\''.$row1['id'].'\', \''.$lang['srv_brisispremenljivkoconfirm'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;"><span class="faicon delete_circle icon-orange" title="'.$lang['srv_brisispremenljivko'].'"></span></a>';
+                    echo '<span class="faicon clipboard"></span> ';
+                    echo skrajsaj(strip_tags($row1['naslov']), 40);
+
+                    echo '</div>';
+
+
+                    // Desne nastavitve
+                    echo '<div class="folder_right">';
+
+                    SurveyInfo::getInstance()->SurveyInit($row1['id']);
+                        
+                    // Dodaj anketo v javno knjiznico
+                    if ($admin_type == 0 && $this->tab == 3) {
+
+                        $sqlPublic = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='".$row1['id']."' AND uid='0'");
+                        if (!$sqlPublic) echo mysqli_error($GLOBALS['connect_db']);
+
+                        // Anketa ze obstaja v javni knjiznici - jo pobrisemo
+                        if (mysqli_num_rows($sqlPublic) > 0) {
+                            echo '<button class="medium-rounded white-gray" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_off'].'">';
+                            echo '  <span class="faicon anketa_delete"></span> <span class="library_item_setting_text">'.$lang['srv_ank_lib_off'].'</span>';
+                            echo '</button>';
                         }
-                        else {
-                            SurveyInfo::getInstance()->SurveyInit($row1['id']);
-
-                            if ($this->prva == "1") {
-                                
-                                // Dodaj anketo v javno knjiznico
-                                if ($admin_type == 0 && $this->tab == 3) {
-
-                                    $sqlPublic = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='".$row1['id']."' AND uid='0'");
-                                    if (!$sqlPublic) echo mysqli_error($GLOBALS['connect_db']);
-
-                                    // Anketa ze obstaja v javni knjiznici - jo pobrisemo
-                                    if (mysqli_num_rows($sqlPublic) > 0) {
-                                        echo '  <a href="/" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_off'].'">';
-                                        echo '      <span class="sprites faicon remove icon-orange small"></span> <span class="library_item_setting_text">'.$lang['srv_ank_lib_off'].'</span>';
-                                        echo '  </a>';
-                                    }
-                                    // Anketo dodamo v javno knjiznico
-                                    else{
-                                        echo '  <a href="/" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_on'].'">';
-                                        echo '      <span class="sprites faicon library"></span> <span class="library_item_setting_text">'.$lang['srv_ank_lib_on'].'</span>';
-                                        echo '  </a>';
-                                    }
-                                }
-
-                                // nova anketa kot template iz knjiznice
-                                echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'"><span class="faicon copy"></span> <span class="library_item_setting_text">'.$lang['srv_anketacopy'].'</span></a> ';
-                                if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))                                
-                                    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span></a> ';
-                                else
-                                    echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span></a> ';
-                                
-                                // brisi iz knjiznice
-                                if ($admin_type == 0) {
-                                    echo ' <a href="index.php?anketa='.$row1['id'].'" title="'.$lang['srv_editirajanketo'].'"><span class="faicon edit"></span> <span class="library_item_setting_text">'.$lang['edit3'].'</span></a>';
-                                }
-                                
-                                if ($admin_type==0 && $this->tab==2) {// sistemska
-                                    echo ' <a href="/" onclick="library_del_anketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_4'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_lib_off'].'"><span class="sprites faicon remove icon-orange small"></span> <span class="library_item_setting_text">'.$lang['hour_remove'].'</span></a>';
-                                }
-                                
-                                if($this->tab==3){// moja knjiznica
-                                    echo ' <a href="/" onclick="library_del_myanketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_3'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_mylib_off'].'"><span class="faicon remove icon-orange small"></span> <span class="library_item_setting_text">'.$lang['hour_remove'].'</span></a>';
-                                }
-                            }
-                            else {
-                                if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))                                
-                                    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
-                                else
-                                    echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
-                                
-                                // moznost da povozi anketo z anketo iz knjiznice
-                                //TEGA NE DOVOLIMO KER NI OK DA SE KAR PREPISE OBSTOJECO ANKETO - anketo iz knjiznice se lahko po novem dodaja samo iz mojih anket oz. pri ustvarjanju
-                                echo ' <a href="/" onclick="alert_copy_anketa(\''.$row1['id'].'\'); return false;"><span class="sprites copy_small" title="'.$lang['srv_copy_srv'].'"></span></a>';
-                            }
+                        // Anketo dodamo v javno knjiznico
+                        else{
+                            echo '<button class="medium-rounded white-gray" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_on'].'">';
+                            echo '  <span class="faicon library"></span> <span class="library_item_setting_text">'.$lang['srv_ank_lib_on'].'</span>';
+                            echo '</button>';
                         }
-                        echo '</div>';
+                    }
 
-                        echo '          <div class="folder_left'.($this->tip==1?' indent"':'" onclick="library_spremenljivka_new(\''.$row1['id'].'\'); return false;"').'>';
-                        if ($this->tip == 1 && $this->prva == "0") {
-                            echo '<a href="/" onclick="javascript:library_anketa_plusminus(\''.$row1['id'].'\', this); return false;"><span class="faicon icon-blue plus" style="opacity: 0.3"></span></a> ';
-                        } else {
-                            if ($this->tip != 0)
-                                echo '  <span class="sprites spacer12"></span>';
-                        }
+                    // Predogled
+                    if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost')){
+                        echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" class="noline" title="'.$lang['srv_poglejanketo'].'">';
+                        echo '  <button class="medium-rounded white-gray">';
+                        echo '      <span class="faicon monitor"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span></a> ';
+                        echo '  </button>';
+                        echo '</a>';
+                    }
+                    else{
+                        echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" class="noline" title="'.$lang['srv_poglejanketo'].'">';
+                        echo '  <button class="medium-rounded white-gray">';
+                        echo '      <span class="faicon monitor"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span>';
+                        echo '  </button>';
+                        echo '</a>';
+                    }
 
+                    // nova anketa kot template iz knjiznice
+                    echo '<button class="medium-rounded white-gray" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'">';
+                    echo '  <span class="faicon copy"></span><span class="library_item_setting_text">'.$lang['srv_copy'].'</span>';
+                    echo '</button>';  
+                    
+                    // Uredi anketo
+                    if ($admin_type == 0 || $this->tab==3) {
+                        echo '<a href="index.php?anketa='.$row1['id'].'" class="noline" title="'.$lang['srv_editirajanketo'].'">';
+                        echo '  <button class="medium-rounded white-gray">';
+                        echo '      <span class="faicon edit"></span> <span class="library_item_setting_text">'.$lang['edit3'].'</span>';
+                        echo '  </button>';
+                        echo '</a>';
+                    }
+                    
+                    // sistemska
+                    if ($admin_type==0 && $this->tab==2) {
+                        echo '<button class="medium-rounded white-gray" onclick="library_del_anketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_4'].'\',\''.$this->tab.'\'); return false;" title="'.$lang['srv_ank_lib_off'].'">';
+                        echo '  <span class="sprites faicon anketa_delete"></span> <span class="library_item_setting_text">'.$lang['hour_remove'].'</span>';
+                        echo '</button>';
+                    }
+                    
+                    // moja knjiznica
+                    if($this->tab==3){
+                        echo '<button class="medium-rounded white-gray" onclick="library_del_myanketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_3'].'\',\''.$this->tab.'\'); return false;" title="'.$lang['srv_ank_mylib_off'].'">';
+                        echo '  <span class="faicon anketa_delete"></span> <span class="library_item_setting_text">'.$lang['hour_remove'].'</span>';
+                        echo '</button>';
+                    }
 
-                        if ($this->tip == 0) {
-                            if ($row1['tip']==1 || $row1['tip']==2 || $row1['tip']==3 || $row1['tip']==21 || $row1['tip']==7)
-                                $ikonca = 'osnovna_vprasanja';
-                            elseif ($row1['tip']==6 || $row1['tip']==16 || $row1['tip']==19 || $row1['tip']==20)
-                                $ikonca = 'table';
-                            else
-                                $ikonca = 'other_vprasanja';
-                        } else {
-                            $ikonca = 'anketa';
-                        }
+                    echo '</div>';
+                    
 
-                        echo '<span class="faicon '.$ikonca.' mapca icon-blue" style="display:inline-block"></span> ';
-                        echo skrajsaj(strip_tags($row1['naslov']), 40).'</a>'."\n";
+                    echo '  </div>';
 
-                        echo '          </div>';
+                    echo '</li>';
+                }
+            }
 
-
-                        if ($this->prva == "0") {
-
-                            echo '<div id="anketa_vprasanja_'.$row1['id'].'" class="anketa_vprasanja">';
-                            if ($this->tip == 1) {
-                                $sql2 = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$row1[id]'");
-                                while ($row2 = mysqli_fetch_array($sql2)) {
-
-                                    if ($row2['tip']==1 || $row2['tip']==2 || $row2['tip']==3 || $row2['tip']==21 || $row2['tip']==7)
-                                        $ikonca = 'osnovna_vprasanja';
-                                    elseif ($row2['tip']==6 || $row2['tip']==16 || $row2['tip']==19 || $row2['tip']==20)
-                                        $ikonca = 'table';
-                                    else
-                                        $ikonca = 'other_vprasanja';
-
-                                    echo '<span class="new_spr" copy="'.$row2['id'].'" onclick="library_spremenljivka_new(\''.$row2['id'].'\'); return false;"><span class="faicon '.$ikonca.' icon-blue" title="'.$lang['srv_copy_spr'].'" style="display:inline-block"></span>';
-                                    echo ' '.skrajsaj(strip_tags($row2['naslov']), 40).'</span>';
-
-                                }
-                            }
-
-                            echo '</div>';
-                        }
-
-                        echo '</div></li>';
-					}
-
-				}
-			}
-
-            echo '    </ul>'."\n";
+            echo '      </ul>'."\n";
 
             echo '  </li>'."\n";
         }
@@ -406,36 +289,6 @@ class Library {
             <?php
         }
     }
-
-    /**
-    * @desc prikaze ife / bloke v knjiznici
-    */
-    function display_ifs ($folder) {
-        global $lang, $admin_type;
-
-        $sql = sisplet_query("SELECT * FROM srv_if WHERE folder = '$folder' ORDER BY label ASC, id ASC");
-        while ($row = mysqli_fetch_array($sql)) {
-
-            echo '<li class="anketa tip0">';
-            echo '        <div eid="'.$row['id'].'" copy="'.$row['id'].'" class="folder_container new_if" name="library_if">';
-
-            echo '          <div class="folder_right">';
-            if ($admin_type==0 or $this->tab==1)
-        		echo ' <a href="/" onclick="library_if_remove(\''.$row['id'].'\', \''.$lang['srv_brisispremenljivkoconfirm'].'\'); return false;"><span class="faicon delete_circle icon-orange" title="'.($row['tip']==0?$lang['srv_if_rem']:$lang['srv_block_rem']).'"></span></a>';
-            echo '          </div>';
-
-            echo '          <div class="folder_left'.($this->tip==1?' indent':'').'" onclick="library_if_new(\''.$row['id'].'\'); return false;">';
-
-            echo '<span class="faicon '.($row['tip']==0?'if':'b').' mapca icon-blue"></span> ';
-
-            echo skrajsaj(strip_tags(($row['label']!=''?$row['label']:($row['tip']==0?$lang['srv_pogoj']:$lang['srv_blok']))), 40).'</a>'."\n";
-
-            echo '          </div>';
-
-            echo '</div></li>';
-        }
-
-    }
   
   
 	/**
@@ -457,10 +310,8 @@ class Library {
   		if ($uid == 0)
   			$language = " AND lang='$lang[id]' ";
 
-		// v skrite html elemente shranimo tab, in prva
+		// v skrite html elemente shranimo tab
 		echo '<input type="hidden" name="lib_tab" id="lib_tab" value="'.$this->tab.'">';
-		echo '<input type="hidden" name="lib_tip" id="lib_tip" value="1">';
-		echo '<input type="hidden" name="lib_prva" id="lib_prva" value="1">';
 
 		echo '<ul title="'.($uid == 0 ? $lang['srv_library_left'] : $lang['srv_library_left_right']).'" style="padding-left:0; margin-left:-12px; margin-top:10px;" class="'.($admin_type == 0 || $uid == $global_user_id ? 'can_edit' : '').'">'."\n";
 
@@ -481,43 +332,13 @@ class Library {
 			while ($row1 = mysqli_fetch_array($sql1)) {
 				
 				echo '<li class="anketa tip1">';
-				echo '        <div copy="'.$row1['id'].'" eid="'.$row1['id'].'" class="folder_container" name="library">';
-
-				echo '          <div class="folder_right">';
-				
-				SurveyInfo::getInstance()->SurveyInit($row1['id']);
-				
-				// nova anketa kot template iz knjiznice
-				echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'"><span class="faicon copy"></span> '.$lang['srv_anketacopy'].'</a> ';
-				
-				// Preview
-                
-                if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
-				    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';
-                else
-				    echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';
-				
-				// Urejanje - admin
-				if ($admin_type == 0)
-					echo ' <a href="index.php?anketa='.$row1['id'].'" title="'.$lang['srv_editirajanketo'].'"><span class="faicon edit"></span> '.$lang['edit3'].'</a>';
-				
-				// Brisanje - admin iz javne knjiznice
-				if ($admin_type == 0 && $this->tab == 2)
-					echo ' <a href="/" onclick="library_del_anketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_4'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_lib_off'].'"><span class="faicon remove icon-orange small"></span> '.$lang['hour_remove'].'</a>';
-				
-				// Brisanje - uporabnik iz moje knjiznice
-				if($this->tab == 3)
-					echo ' <a href="/" onclick="library_del_myanketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_3'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_mylib_off'].'"><span class="faicon remove icon-orange small"></span> '.$lang['hour_remove'].'</a>';
-				
-				echo '</div>';
+				echo '  <div copy="'.$row1['id'].'" eid="'.$row1['id'].'" class="folder_container" name="library">';
 
 
-				echo '          <div class="folder_left'.($this->tip==1?' indent"':'" onclick="library_spremenljivka_new(\''.$row1['id'].'\'); return false;"').'>';	
-				echo '  <span class="sprites spacer12"></span>';
+                // Leva stran - ime
+                echo '<div class="folder_left">';	
 
-				$ikonca = 'anketa';
-
-				echo '<span class="faicon '.$ikonca.' mapca icon-blue" style="display:inline-block"></span> ';
+				echo '<span class="faicon clipboard"></span>';
 				
 				// Ce gre za search moramo ustrezno pobarvati najden del besede
 				$text_searched = $row1['naslov'];
@@ -534,10 +355,65 @@ class Library {
 					}					
 				}
 				
-				echo skrajsaj($text_searched, 40).'</a>'."\n";
+				echo skrajsaj($text_searched, 40);
 
-				echo '          </div>';
-				echo '</div></li>';
+				echo '</div>';
+
+
+                // Desne nastavitve
+				echo '<div class="folder_right">';
+				
+				SurveyInfo::getInstance()->SurveyInit($row1['id']);
+				
+                // Preview
+                if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost')){
+				    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'">';
+                    echo '  <button class="medium-rounded white-gray">';
+                    echo '      <span class="faicon monitor"></span>'.$lang['srv_poglejanketo2'];
+                    echo '  </button>';
+                    echo '</a>';
+                }
+                else{
+				    echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'">';
+                    echo '  <button class="medium-rounded white-gray">';
+				    echo '      <span class="faicon monitor"></span>'.$lang['srv_poglejanketo2'];
+                    echo '  </button>';
+                    echo '</a>';
+                }
+
+				// nova anketa kot template iz knjiznice
+                echo '<button class="medium-rounded white-gray" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'">';
+				echo '  <span class="faicon copy"></span>'.$lang['srv_copy'];
+                echo '</button>';			
+				
+				// Urejanje - admin
+				if ($admin_type == 0){
+					echo ' <a href="index.php?anketa='.$row1['id'].'" title="'.$lang['srv_editirajanketo'].'">';
+                    echo '  <button class="medium-rounded white-gray">';
+					echo '      <span class="faicon edit"></span> '.$lang['edit3'];
+                    echo '  </button>';
+                    echo '</a>';
+                }
+				
+				// Brisanje - admin iz javne knjiznice
+				if ($admin_type == 0 && $this->tab == 2){
+                    echo '<button class="medium-rounded white-gray" onclick="library_del_anketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_4'].'\',\''.$this->tab.'\'); return false;" title="'.$lang['srv_ank_lib_off'].'">';
+					echo '  <span class="faicon anketa_delete"></span> '.$lang['hour_remove'];
+                    echo '</button>';
+                }
+				
+				// Brisanje - uporabnik iz moje knjiznice
+				if($this->tab == 3){
+                    echo '<button class="medium-rounded white-gray" onclick="library_del_myanketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_3'].'\',\''.$this->tab.'\'); return false;" title="'.$lang['srv_ank_mylib_off'].'">';
+					echo '  <span class="faicon anketa_delete"></span> '.$lang['hour_remove'];
+                    echo '</button>';
+                }
+				
+				echo '</div>';
+
+
+				echo '  </div>';
+                echo '</li>';
 			}
 		}
 
@@ -677,17 +553,6 @@ class Library {
     		$this->tab = (int)$_GET['tab'];
     	if ($this->tab == 'undefined')
     		$this->tab = 0;
-    	if (isset($_POST['prva']))
-    		$this->prva = $_POST['prva'];
-    	else if (isset($_GET['prva']))
-    		$this->prva = $_GET['prva'];
-    	if ($this->prva == 'undefined')
-    		$this->prva = 0;
-
-    	if ($this->tab <= 1)
-            $this->tip = 0;
-        else
-            $this->tip = 1;
 
     	if ($_GET['a'] == 'display_knjiznica') {
             $this->ajax_display_knjiznica();
@@ -757,36 +622,11 @@ class Library {
 
         $data = array();
 
-        if ($this->tip == 0) {
-            $spremenljivka = substr($_POST['spremenljivka'], 10);	// odrezemo branching_
-            $folder = $_POST['folder'];
-
-            // v knjiznico dodamo spremenljivko
-            if ($spremenljivka > 0) {
-                $id = $this->Branching->nova_spremenljivka(-1, 0, 0, $spremenljivka);
-                sisplet_query("UPDATE srv_spremenljivka SET folder = '$folder' WHERE id = '$id'");
-
-            	$data['response'] = $lang['srv_library_q_added'];
-
-            // v knjiznico dodamo if/blok
-            } else {
-                $if = substr($_POST['spremenljivka'], 12);			// odrezemo branching_if
-
-                if ($if > 0) {
-	                $id = $this->Branching->if_copy(0, $if, true);
-	                sisplet_query("UPDATE srv_if SET folder = '$folder' WHERE id = '$id'");
-
-	                $data['response'] = $lang['srv_library_b_added'];
-				}
-            }
-        }
-
         ob_start();
 		$this->display_folders();
 		$data['folders'] = ob_get_clean();
 
 		echo json_encode($data);
-
     }
 
 
@@ -801,12 +641,8 @@ class Library {
         elseif ($this->tab == 1 or $this->tab == 3)
             $uid = $global_user_id;
 
-        if ($this->tip == 0) {
-            sisplet_query("UPDATE srv_spremenljivka SET folder = '$folder' WHERE id = '$spremenljivka'");
-        } else {
-            sisplet_query("UPDATE srv_library_anketa SET folder = '$folder' WHERE ank_id = '$spremenljivka' AND uid='$uid'");
-        }
-        //$this->display();
+        sisplet_query("UPDATE srv_library_anketa SET folder = '$folder' WHERE ank_id = '$spremenljivka' AND uid='$uid'");
+
         $this->display_folders();
     }
 
@@ -828,9 +664,8 @@ class Library {
         $folder = $_POST['folder'];
 
         if ($drop != $folder)
-            sisplet_query("UPDATE srv_library_folder SET parent = '$folder' WHERE id = '$drop' AND tip='$this->tip'");
+            sisplet_query("UPDATE srv_library_folder SET parent = '$folder' WHERE id = '$drop' AND tip='1'");
 
-        //$this->display();
         $this->display_folders();
     }
 
@@ -841,9 +676,9 @@ class Library {
        $sql = sisplet_query("SELECT naslov FROM srv_library_folder WHERE id = '$folder'");
        $row = mysqli_fetch_array($sql);
 
-       echo '<form method="post" onsubmit="javascript:library_folder_newname(\''.$folder.'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" style="display:inline">';
+       echo '<form method="post" onsubmit="javascript:library_folder_newname(\''.$folder.'\',\''.$this->tab.'\'); return false;" style="display:inline">';
        echo '<span class="faicon folder icon-blue"></span> '.
-            '<input type="text" name="naslov" id="naslov_'.$folder.'" value="'.$row['naslov'].'" onblur="javascript:library_folder_newname(\''.$folder.'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" />';
+            '<input type="text" name="naslov" id="naslov_'.$folder.'" value="'.$row['naslov'].'" onblur="javascript:library_folder_newname(\''.$folder.'\',\''.$this->tab.'\'); return false;" />';
        echo '</form>';
 
     }
@@ -870,16 +705,14 @@ class Library {
 
         $uid = $_POST['uid'];
 
-        $s = sisplet_query("INSERT INTO srv_library_folder (uid, tip, naslov, parent) VALUES ('$uid', '$this->tip', '$lang[srv_newfolder]', '$folder')");
+        $s = sisplet_query("INSERT INTO srv_library_folder (uid, tip, naslov, parent) VALUES ('$uid', '1', '$lang[srv_newfolder]', '$folder')");
         if (!$s) echo mysqli_error($GLOBALS['connect_db']);
         $insert_id = mysqli_insert_id($GLOBALS['connect_db']);
 
         $_COOKIE['library_folders'] .= '-'.$insert_id.'-';  // $_COOKIE popravimo, da bo sprememba vidna tudi v display_folders()
         setcookie('library_folders', $_COOKIE['library_folders'], time()+2500000);
 
-		//        $this->display();
 		$this->display_folders();
-
     }
 
     function ajax_delete_folder () {
@@ -890,12 +723,7 @@ class Library {
         $sql = sisplet_query("SELECT parent FROM srv_library_folder WHERE id = '$folder'");
         $row = mysqli_fetch_array($sql);
 
-        if ($this->tip == 0) {
-            sisplet_query("UPDATE srv_spremenljivka SET folder = '$row[parent]' WHERE folder = '$folder'");
-            sisplet_query("UPDATE srv_if SET folder = '$row[parent]' WHERE folder = '$folder'");
-        } else {
-            sisplet_query("UPDATE srv_library_anketa SET folder = '$row[parent]' WHERE folder = '$folder'");
-        }
+        sisplet_query("UPDATE srv_library_anketa SET folder = '$row[parent]' WHERE folder = '$folder'");
 
         sisplet_query("UPDATE srv_library_folder SET parent = '$row[parent]' WHERE parent = '$folder'");
 
@@ -913,13 +741,12 @@ class Library {
 
         if ($collapsed == 0) {
             $cookie .= '-'.$folder.'-';
-        } else {
+        } 
+        else {
             $cookie = str_replace('-'.$folder.'-', '', $cookie);
         }
 
         setcookie('library_folders', $cookie, time()+2500000);
-
-        echo '<span class="faicon icon-blue '.($collapsed==1?'plus':'minus').'"></span>';
     }
 
     function ajax_library_del_anketa () {
@@ -1223,16 +1050,12 @@ class Library {
     }
 
 	function repareTabs() {
-        if ($this->tab >= 2)
-            $this->tip = 1;
-        else
-            $this->tip = 0;
 
         // popravimo tabe če smo v glasovanju ali formi
         if ($this->mode < 2) {
-           	// uredimo tabe
+           	
+            // uredimo tabe
         	if ($this->tab==0 || $this->tab==1) {
-        		$this->tip = 1;
         		$this->tab=2;
         	}
         }
diff --git a/admin/survey/script/library.js b/admin/survey/script/library.js
index 43378e45b..cd7ce053e 100644
--- a/admin/survey/script/library.js
+++ b/admin/survey/script/library.js
@@ -62,11 +62,6 @@ function library () {
     
 }
 
-function library_spremenljivka_new (spremenljivka) {
-	$('html, body').animate({scrollTop: $('body').height()+$('#branching').height()});
-	spremenljivka_new(0, 0, 1, spremenljivka);
-}
-
 function library_if_new (copy) {
 	$('html, body').animate({scrollTop: $('body').height()+$('#branching').height()});
 	if_new(0, 0, 1, '0', copy);
@@ -102,36 +97,32 @@ function folder_rename (folder) {
 }
 function library_folder_newname (folder) {
 	var lib_tab = $("input#lib_tab").val();
-	var lib_prva = $("input#lib_prva").val();
-    $('#libraryInner').load('ajax.php?t=library&a=folder_newname', {folder: folder, naslov: $('#naslov_'+folder).attr('value'), tab: lib_tab, prva: lib_prva});
+    $('#libraryInner').load('ajax.php?t=library&a=folder_newname', {folder: folder, naslov: $('#naslov_'+folder).attr('value'), tab: lib_tab});
 }
 
 function library_new_folder (folder, uid) {
 	var lib_tab = $("input#lib_tab").val();
-	var lib_prva = $("input#lib_prva").val();
-    $('#libraryInner').load('ajax.php?t=library&a=new_folder', {folder: folder, uid: uid, tab: lib_tab, prva: lib_prva});
+    $('#libraryInner').load('ajax.php?t=library&a=new_folder', {folder: folder, uid: uid, tab: lib_tab});
 }
 
 function library_delete_folder (folder) {
 	var lib_tab = $("input#lib_tab").val();
-	var lib_prva = $("input#lib_prva").val();
-    $('#libraryInner').load('ajax.php?t=library&a=delete_folder', {folder: folder, tab: lib_tab, prva: lib_prva});
+
+    $('#libraryInner').load('ajax.php?t=library&a=delete_folder', {folder: folder, tab: lib_tab});
 }
 
 
 function library_del_anketa (anketa, text) {
     if (confirm(text)) {
     	var lib_tab = $("input#lib_tab").val();
-    	var lib_prva = $("input#lib_prva").val();
-        $('#libraryInner').load('ajax.php?t=library&a=library_del_anketa', {anketa: anketa, tab: lib_tab, prva: lib_prva});
+        $('#libraryInner').load('ajax.php?t=library&a=library_del_anketa', {anketa: anketa, tab: lib_tab});
     }
 }
 
 function library_del_myanketa (anketa, text) {
     if (confirm(text)) {
     	var lib_tab = $("input#lib_tab").val();
-    	var lib_prva = $("input#lib_prva").val();
-        $('#libraryInner').load('ajax.php?t=library&a=library_del_myanketa', {anketa: anketa, tab: lib_tab, prva: lib_prva});
+        $('#libraryInner').load('ajax.php?t=library&a=library_del_myanketa', {anketa: anketa, tab: lib_tab});
     }
 }
 
@@ -162,25 +153,21 @@ function anketa_copy_top (ank_id, hierarhija) {
 }
 
 function library_folders_plusminus (folder) {
+    
 	var lib_tab = $("input#lib_tab").val();
-	var lib_prva = $("input#lib_prva").val();
     var sortable_if = document.getElementById('folder_'+folder).style;
     
     if (sortable_if.display != "none") {
-    
-        $('#folder_'+folder).slideUp();
-            
-        //$('#f_pm_'+folder).html('<img src="img/plus.png" class="folder_plusminus" style="width:12px; height:12px">');
-        
-        $('#f_pm_'+folder).load('ajax.php?t=library&a=folder_collapsed', {collapsed: 1, folder: folder, tab: lib_tab, prva:lib_prva});
-        
-    } else {
-            
-        $('#folder_'+folder).slideDown();
-        
-        //$('#f_pm_'+folder).html('<img src="img/minus.png" class="folder_plusminus" style="width:12px; height:12px">');
-        
-        $('#f_pm_'+folder).load('ajax.php?t=library&a=folder_collapsed', {collapsed: 0, folder: folder, tab:lib_tab, prva:lib_prva});
+        $('#folder_'+folder).slideUp(); 
+        $('#li'+folder).find('> .folder_box').removeClass('open');  
+
+        $.post('ajax.php?t=library&a=folder_collapsed', {collapsed: 1, folder: folder, tab: lib_tab});  
+    } 
+    else {        
+        $('#folder_'+folder).slideDown();    
+        $('#li'+folder).find('> .folder_box').addClass('open');  
+
+        $.post('ajax.php?t=library&a=folder_collapsed', {collapsed: 0, folder: folder, tab:lib_tab});
     }
 }
 
@@ -211,10 +198,9 @@ function library_if_remove (_if) {
 // izbrise spremenljivko iz knjiznice
 function library_brisi_spremenljivko (spremenljivka, text) {
 	var lib_tab = $("input#lib_tab").val();
-	var lib_prva = $("input#lib_prva").val();
 
     if (confirm(text)) {
-        $('#libraryInner').load('ajax.php?t=library&a=brisi_spremenljivko', {spremenljivka: spremenljivka, grupa: srv_meta_grupa, anketa: srv_meta_anketa_id, branching: srv_meta_branching, tab:lib_tab, prva: lib_prva});
+        $('#libraryInner').load('ajax.php?t=library&a=brisi_spremenljivko', {spremenljivka: spremenljivka, grupa: srv_meta_grupa, anketa: srv_meta_anketa_id, branching: srv_meta_branching, tab:lib_tab});
     }
 }
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index f860cb2c3..46f10256b 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -22625,6 +22625,106 @@ div.page_obvestila #unread_notifications .gdpr_popup_radio input {
   margin-top: 2px;
 }
 
+#anketa_knjiznica #libraryInner {
+  display: flex;
+  flex-direction: column;
+}
+#anketa_knjiznica #libraryInner ul {
+  list-style-type: none;
+  margin: 0;
+}
+#anketa_knjiznica #libraryInner ul li {
+  list-style-type: none;
+}
+#anketa_knjiznica #libraryInner ul li .folder_box {
+  display: flex;
+  align-items: center;
+  height: 41px;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 0 16px;
+  margin-bottom: 16px;
+  border: 1px #E5E5E5 solid;
+  border-radius: 4px;
+  transition: 0.2s;
+}
+#anketa_knjiznica #libraryInner ul li .folder_box .faicon.new_folder,
+#anketa_knjiznica #libraryInner ul li .folder_box .faicon.delete_folder {
+  display: none;
+  cursor: pointer;
+  margin-left: 8px;
+  transition: 0.2s;
+}
+#anketa_knjiznica #libraryInner ul li .folder_box .faicon.new_folder:before,
+#anketa_knjiznica #libraryInner ul li .folder_box .faicon.delete_folder:before {
+  color: #1E88E5;
+  font-size: 15px;
+}
+#anketa_knjiznica #libraryInner ul li .folder_box .folder_arrow_icon {
+  cursor: pointer;
+}
+#anketa_knjiznica #libraryInner ul li .folder_box .folder_arrow_icon::before {
+  content: "";
+  font-size: 14px;
+  color: #333333;
+  margin-right: 8px;
+}
+#anketa_knjiznica #libraryInner ul li .folder_box .folder::before {
+  content: "";
+  font-size: 16px;
+  font-weight: 400;
+  color: #1E88E5;
+  margin-right: 8px;
+}
+#anketa_knjiznica #libraryInner ul li .folder_box:hover {
+  background-color: #F8F8F8;
+}
+#anketa_knjiznica #libraryInner ul li .folder_box:hover .faicon.new_folder,
+#anketa_knjiznica #libraryInner ul li .folder_box:hover .faicon.delete_folder {
+  display: inline-block;
+}
+#anketa_knjiznica #libraryInner ul li .folder_box.open {
+  background-color: #F8F8F8;
+}
+#anketa_knjiznica #libraryInner ul li .folder_box.open .faicon.new_folder,
+#anketa_knjiznica #libraryInner ul li .folder_box.open .faicon.delete_folder {
+  display: inline-block;
+}
+#anketa_knjiznica #libraryInner ul li .folder_box.open .folder_arrow_icon::before {
+  content: "";
+}
+#anketa_knjiznica #libraryInner ul li .folder_box.open .folder::before {
+  font-weight: 600;
+}
+#anketa_knjiznica #libraryInner ul li .folder_container {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 41px;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 0 16px;
+  margin-bottom: 16px;
+  border: 1px #E5E5E5 solid;
+  border-radius: 4px;
+}
+#anketa_knjiznica #libraryInner ul li .folder_container .folder_left .faicon {
+  margin-right: 8px;
+}
+#anketa_knjiznica #libraryInner ul li .folder_container .folder_left .faicon:before {
+  color: #1E88E5;
+}
+#anketa_knjiznica #libraryInner ul li .folder_container .folder_right {
+  display: flex;
+  align-items: center;
+}
+#anketa_knjiznica #libraryInner ul li .folder_container .folder_right button {
+  margin-left: 8px;
+}
+#anketa_knjiznica #libraryInner ul li ul {
+  padding-left: 36px;
+}
+
 @media (max-width: 1100px) {
   #quick_comments_link.newCss {
     display: none;
diff --git a/resources/sass/admin_new/pages/library/library.scss b/resources/sass/admin_new/pages/library/library.scss
new file mode 100644
index 000000000..5338c305c
--- /dev/null
+++ b/resources/sass/admin_new/pages/library/library.scss
@@ -0,0 +1,144 @@
+#anketa_knjiznica{
+
+    #libraryInner{
+        display: flex;
+        flex-direction: column;
+
+
+        #searchLibrarySurveys{
+
+
+        }
+
+
+        ul{
+            list-style-type: none;
+
+            margin: 0;
+
+            li{
+                list-style-type: none;
+
+                .folder_box{
+                    display: flex;
+                    align-items: center;
+
+                    height: 41px;
+                    width: 100%;
+
+                    box-sizing: border-box;
+                    padding: 0 16px;
+                    margin-bottom: 16px;
+                    
+                    border: 1px $gray solid;
+                    border-radius: 4px;
+
+                    transition: 0.2s;
+
+                    .faicon.new_folder,
+                    .faicon.delete_folder{
+                        display: none;
+                        cursor: pointer;
+
+                        margin-left: 8px;
+
+                        transition: 0.2s;
+
+                        &:before{
+                            color: $blue;
+                            font-size: 15px;
+                        }
+                    }
+
+                    .folder_arrow_icon{
+                        cursor: pointer;
+                    }
+                    .folder_arrow_icon::before{
+                        content: "\f078";
+                        font-size: 14px;
+                        color: $black;
+        
+                        margin-right: 8px;
+                    }
+                    .folder::before{
+                        content: "\f07b";
+                        font-size: 16px;
+                        font-weight: 400;
+                        color: $blue;
+        
+                        margin-right: 8px;
+                    }
+        
+                    &:hover{
+                        background-color: $light-gray;
+        
+                        .faicon.new_folder,
+                        .faicon.delete_folder{
+                            display: inline-block;
+                        }
+                    }
+
+                    &.open{
+                        background-color: $light-gray;
+        
+                        .faicon.new_folder,
+                        .faicon.delete_folder{
+                            display: inline-block;
+                        }
+                        
+                        .folder_arrow_icon::before{
+                            content: "\f077";
+                        }
+                        .folder::before{
+                            font-weight: 600;
+                        }
+                    }
+                }
+
+                .folder_container{
+                    display: flex;
+                    align-items: center;
+                    justify-content: space-between;
+
+                    height: 41px;
+                    width: 100%;
+
+                    box-sizing: border-box;
+                    padding: 0 16px;
+                    margin-bottom: 16px;
+                    
+
+                    border: 1px $gray solid;
+                    border-radius: 4px;
+
+                    .folder_left{
+                        
+                        .faicon{
+                            margin-right: 8px;
+
+                            &:before{
+                                color: $blue;
+                            }
+                        }
+                    }
+
+                    .folder_right{
+                        display: flex;
+                        align-items: center;
+
+                        button{
+                            margin-left: 8px;
+                        }
+                    }
+                }
+
+                ul{
+                    padding-left: 36px;
+                }
+            }
+        }
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/pages.scss b/resources/sass/admin_new/pages/pages.scss
index a57d256f1..4776c5aa0 100644
--- a/resources/sass/admin_new/pages/pages.scss
+++ b/resources/sass/admin_new/pages/pages.scss
@@ -21,3 +21,4 @@
 
 @import "aktivnost/aktivnost";
 @import "sporocila/sporocila";
+@import "library/library";