diff --git a/include/functions.php b/include/functions.php
index d6836bf3..c91314f6 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2214,15 +2214,14 @@ function get_cat_folder($cat = 101)
 	static $catPath = array();
 	if (!isset($catPath[$cat])) {
 		global $CURUSER, $CURLANGDIR;
-		$catrow = get_category_row($cat);
+        $catrow = get_category_row($cat);
 		$catmode = $catrow['catmodename'];
-		$caticonrow = get_category_icon_row($CURUSER['caticon']);
+//		$caticonrow = get_category_icon_row($CURUSER['caticon']);
         /**
          * @since v1.6
          * use setting, not user's caticon, that filed make no sense!
          */
-//		$caticonrow = get_category_icon_row(get_setting('main.browsecat'));
-//		dd($caticonrow);
+		$caticonrow = get_category_icon_row($catrow['icon_id'] ?: 1);
 		$catPath[$cat] = "category/".$catmode."/".$caticonrow['folder'] . ($caticonrow['multilang'] == 'yes' ? $CURLANGDIR."/" : "");
 	}
 	return trim($catPath[$cat] ?? '', '/');
diff --git a/public/catmanage.php b/public/catmanage.php
index a41f3ff3..d865b9d6 100644
--- a/public/catmanage.php
+++ b/public/catmanage.php
@@ -58,6 +58,17 @@ function return_category_mode_selection($selname, $selectedid)
 	$selection .= "</select>";
 	return $selection;
 }
+
+function category_icon_selection($iconId = 0)
+{
+    $res = sql_query("SELECT * FROM caticons ORDER BY id ASC");
+    $selection = "<select name=\"icon_id\">";
+    while ($row = mysql_fetch_array($res))
+        $selection .= "<option value=\"" . $row["id"] . "\"". ($row["id"]==$iconId ? " selected=\"selected\"" : "").">" . htmlspecialchars($row["name"]) . "</option>\n";
+    $selection .= "</select>";
+    return $selection;
+}
+
 function return_type_name($type)
 {
 	global $lang_catmanage;
@@ -313,6 +324,7 @@ function print_category_editor($type, $row='')
 			tr($lang_catmanage['col_image']."<font color=\"red\">*</font>", "<input type=\"text\" name=\"image\" value=\"".htmlspecialchars($image)."\" style=\"width: 300px\" /><br />" . $lang_catmanage['text_image_note'], 1);
 			tr($lang_catmanage['text_class_name'], "<input type=\"text\" name=\"class_name\" value=\"".htmlspecialchars($class_name)."\" style=\"width: 300px\" /><br />" . $lang_catmanage['text_class_name_note'], 1);
 			tr($lang_catmanage['row_mode']."<font color=\"red\">*</font>", return_category_mode_selection('mode', $mode), 1);
+			tr($lang_catmanage['text_category_icons']."<font color=\"red\">*</font>", category_icon_selection($row['icon_id'] ?? 0), 1);
 			tr($lang_catmanage['col_order'], "<input type=\"text\" name=\"sort_index\" value=\"".$sort_index."\" style=\"width: 100px\" /> " . $lang_catmanage['text_order_note'], 1);
 		}
 ?>
@@ -534,12 +546,14 @@ print($pagerbottom);
 		print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>");
 	else{
 		list($pagertop, $pagerbottom, $limit) = pager($perpage, $num, "?");
-		$res = sql_query("SELECT ".$dbtablename.".*, searchbox.name AS catmodename FROM ".$dbtablename." LEFT JOIN searchbox ON ".$dbtablename.".mode=searchbox.id ORDER BY ".$dbtablename.".mode ASC, ".$dbtablename.".id ASC ".$limit) or sqlerr(__FILE__, __LINE__);
+        $res = sql_query("SELECT ".$dbtablename.".*, searchbox.name AS catmodename, caticons.name as icon_name FROM ".$dbtablename." LEFT JOIN searchbox ON ".$dbtablename.".mode=searchbox.id left join caticons on caticons.id = $dbtablename.icon_id ORDER BY ".$dbtablename.".mode ASC, ".$dbtablename.".id ASC ".$limit) or sqlerr(__FILE__, __LINE__);
+
 ?>
 <table border="1" cellspacing="0" cellpadding="5" width="940">
 <tr>
 <td class="colhead"><?php echo $lang_catmanage['col_id']?></td>
 <td class="colhead"><?php echo $lang_catmanage['col_mode']?></td>
+<td class="colhead"><?php echo $lang_catmanage['text_category_icons']?></td>
 <td class="colhead"><?php echo $lang_catmanage['col_name']?></td>
 <td class="colhead"><?php echo $lang_catmanage['col_image']?></td>
 <td class="colhead"><?php echo $lang_catmanage['text_class_name']?></td>
@@ -553,6 +567,7 @@ print($pagerbottom);
 <tr>
 <td class="colfollow"><?php echo $row['id']?></td>
 <td class="colfollow"><?php echo htmlspecialchars($row['catmodename'])?></td>
+<td class="colfollow"><?php echo htmlspecialchars($row['icon_name'] ?? '')?></td>
 <td class="colfollow"><?php echo htmlspecialchars($row['name'])?></td>
 <td class="colfollow"><?php echo htmlspecialchars($row['image'])?></td>
 <td class="colfollow"><?php echo $row['class_name'] ? htmlspecialchars($row['class_name']) : $lang_catmanage['text_none']?></td>
@@ -772,6 +787,7 @@ elseif($action == 'submit')
 		$updateset[] = "mode=".sqlesc($mode);
 		$updateset[] = "class_name=".sqlesc($class_name);
 		$updateset[] = "sort_index=".sqlesc($sort_index);
+		$updateset[] = "icon_id=".sqlesc(intval($_POST['icon_id'] ?? 0));
 		if($_POST['isedit']){
 			$Cache->delete_value('category_content');
 		}
diff --git a/public/torrents.php b/public/torrents.php
index ef16692e..7ef49fbc 100644
--- a/public/torrents.php
+++ b/public/torrents.php
@@ -101,6 +101,7 @@ if ($allsec == 1)		//show torrents from all sections
 }
 // ----------------- end whether ignoring section ---------------------//
 // ----------------- start bookmarked ---------------------//
+$inclbookmarked = 0;
 if ($_GET)
 	$inclbookmarked = intval($_GET["inclbookmarked"] ?? 0);
 elseif ($CURUSER['notifs']){
@@ -111,7 +112,6 @@ elseif ($CURUSER['notifs']){
 	elseif (strpos($CURUSER['notifs'], "[inclbookmarked=2]") !== false)
 		$inclbookmarked = 2;
 }
-else $inclbookmarked = 0;
 
 if (!in_array($inclbookmarked,array(0,1,2)))
 {
@@ -172,6 +172,7 @@ elseif ($include_dead == 2)		//dead
 	$wherea[] = "visible = 'no'";
 }
 // ----------------- end include dead ---------------------//
+$special_state = 0;
 if ($_GET)
 	$special_state = intval($_GET["spstate"] ?? 0);
 elseif ($CURUSER['notifs']){
@@ -192,7 +193,6 @@ elseif ($CURUSER['notifs']){
 	elseif (strpos($CURUSER['notifs'], "[spstate=6]") !== false)
 		$special_state = 7;
 }
-else $special_state = 0;
 
 if (!in_array($special_state,array(0,1,2,3,4,5,6,7)))
 {
diff --git a/public/userdetails.php b/public/userdetails.php
index 0d03b4b7..2b4b9dd9 100644
--- a/public/userdetails.php
+++ b/public/userdetails.php
@@ -332,7 +332,7 @@ if (get_user_class() >= $prfmanage_class && $user["class"] < get_user_class())
 	if (get_user_class() == UC_STAFFLEADER)
 	{
 		tr($lang_userdetails['row_donor_status'], "<input type=\"radio\" name=\"donor\" value=\"yes\"" .($user["donor"] == "yes" ? " checked=\"checked\"" : "")." />".$lang_userdetails['radio_yes']." <input type=\"radio\" name=\"donor\" value=\"no\"" .($user["donor"] == "no" ? " checked=\"checked\"" : "").">".$lang_userdetails['radio_no'], 1);
-		tr($lang_userdetails['row_donated'], "USD: <input type=\"text\" size=\"5\" name=\"donated\" value=\"" . htmlspecialchars($user['donated']) . "\" />&nbsp;&nbsp;&nbsp;&nbsp;CNY: <input type=\"text\" size=\"5\" name=\"donated_cny\" value=\"" . htmlspecialchars($user[donated_cny]) . "\" />" . $lang_userdetails['text_transaction_memo'] . "<input type=\"text\" size=\"50\" name=\"donation_memo\" />", 1);
+		tr($lang_userdetails['row_donated'], "USD: <input type=\"text\" size=\"5\" name=\"donated\" value=\"" . htmlspecialchars($user['donated']) . "\" />&nbsp;&nbsp;&nbsp;&nbsp;CNY: <input type=\"text\" size=\"5\" name=\"donated_cny\" value=\"" . htmlspecialchars($user['donated_cny']) . "\" />" . $lang_userdetails['text_transaction_memo'] . "<input type=\"text\" size=\"50\" name=\"donation_memo\" />", 1);
 	}
 	if (get_user_class() == $prfmanage_class)
 		$maxclass = UC_VIP;