diff --git a/css-map.json b/css-map.json
index 7dbde34802..691a681947 100644
--- a/css-map.json
+++ b/css-map.json
@@ -176,6 +176,7 @@
 	"KdxlBanhDJjzmHfqhP0X": "main-avatar-placeholderWrapper",
 	"BzunmwrVMyWGpopPJRt2": "main-avatar-withBadge",
 	"YEaaNScT6lyJCVBeQoxd": "main-buddyFeed-actions",
+	"EaZyLTjK9Rd_s6A8aYVw": "main-buddyFeed-actions",
 	"_Xe25F2aC59Kljgqyw3G": "main-buddyFeed-activityMetadata",
 	"j7K7_Zly3G1HS9MlKoao": "main-buddyFeed-addFriendPlaceholder",
 	"gY0qK1gmEdhq5idwQc8C": "main-buddyFeed-addFriendPlaceholderBtn",
@@ -184,14 +185,19 @@
 	"dLg5WMgjh1kfYtZ_MnZz": "main-buddyFeed-avatarContainer",
 	"ythYrlFSBm1P_ltHc8e1": "main-buddyFeed-buddyFeed",
 	"t345U9kQY1pF704d79oY": "main-buddyFeed-closeButton",
+	"fjCfUvlYgfexObyYQqFM": "main-buddyFeed-closeButton",
 	"eZCD3dqbvZaABVAhIniT": "main-buddyFeed-closeContainer",
+	"Uoc48ia3df_vZxWCLFDB": "main-buddyFeed-closeContainer",
 	"AzO2ondhaHJntbGy_3_S": "main-buddyFeed-container",
+	"NmPFqFYcYmtFfPShmtj3": "main-buddyFeed-container",
 	"zuwPpHAEtIqahnB2u9NR": "main-buddyFeed-content",
+	"dRp9nXvINyo7LOvJtuUC": "main-buddyFeed-content",
 	"MObmOrMxbQpO10ebAtZA": "main-buddyFeed-emptyBuddyFeed",
 	"gj9SOnCIzruGWAM5m3XO": "main-buddyFeed-friendActivity",
 	"oWQvtc5QZlmB60A9ejJx": "main-buddyFeed-friendsFeedContainer",
 	"nGInMrf62TCFD9MBnEzz": "main-buddyFeed-friendsList",
 	"NdQkQZhcYIEcJnRdAYcQ": "main-buddyFeed-header",
+	"vJNLkecIsGhwDaslvslX": "main-buddyFeed-header",
 	"BeABJha8PrxMcJmlBzcH": "main-buddyFeed-headerTitle",
 	"tli6RLZf7DdPtClCKK6_": "main-buddyFeed-link",
 	"n6rSk6R7nfmSGSgTRR5_": "main-buddyFeed-loadingFriends",
@@ -203,6 +209,7 @@
 	"Irsd58UNEmDPxdhXKXCs": "main-buddyFeed-playIcon",
 	"AWUxW13rbpNdQkvJJg13": "main-buddyFeed-scrollableArea",
 	"v_YrAYQP6fHG_z0hyg7C": "main-buddyFeed-scrollBarContainer",
+	"scnRZypJsyXH1tjPg6uM": "main-buddyFeed-scrollBarContainer",
 	"gWUxbU2cIHAajHxsVLMZ": "main-buddyFeed-section",
 	"WjW1oRtpaNrY37daDP6Y": "main-buddyFeed-sectionFadeEnter",
 	"C3bqciZSM7rPG_L3ohdC": "main-buddyFeed-sectionFadeEnterActive",
@@ -781,13 +788,16 @@
 	"Ty1q4GZz5EJ7Yl2jHs5I": "main-trackInfo-xsmallBadges",
 	"Ry7zokVNFKXaDxKp1Qf1": "main-trackList-actionsHeader",
 	"iSbqnFdjb1SuyJ3uWydl": "main-trackList-active",
+	"ZgAJecvDDVREPXktThbA": "main-trackList-active",
 	"eWNJl03RSvGa9VsxkJ_7": "main-trackList-addedBy",
 	"zxSdNpIMNoVh8g3F9fqt": "main-trackList-arrow",
 	"wE9dp6W8uInhrlbWPMsR": "main-trackList-chartTrackList",
 	"ASYv4mEu1lXEHVa04HqY": "main-trackList-column",
+	"rGujAXjCLKEd_N6yTwds": "main-trackList-column",
 	"r53kBgGOdrCYj2Jux0iN": "main-trackList-columnResizing",
 	"Wn5NpEuR1Qw99DelnfxX": "main-trackList-concertTrackList",
 	"KJeaWI3jCZemsmu4eYL3": "main-trackList-curationButton",
+	"otqy2yIt_BVXLjoundpp": "main-trackList-curationButton",
 	"SzsIJoBzlexhelPsHXnn": "main-trackList-delayedVisibility",
 	"Ar1CZ7qjPHuIJY0cI56W": "main-trackList-disabled",
 	"UuAaE00MS64uibJyxXxK": "main-trackList-discRow",
@@ -795,6 +805,7 @@
 	"WTbn2dLWM9fMMb3O4uKZ": "main-trackList-dropTargetAfter",
 	"xhgesf8qPsbyZY2NaYdH": "main-trackList-dropTargetBefore",
 	"AgiCqnZUliKs_dafpdyi": "main-trackList-durationHeader",
+	"kxxyFjKz2levImEvxq48": "main-trackList-durationHeader",
 	"m6Bvw7PNXw2WXqruLOLE": "main-trackList-enhanced",
 	"vr04lRmH66LzICUXnwCq": "main-trackList-eventDate",
 	"OINF2mTM4cu2JjtkmPiz": "main-trackList-eventTicketIcon",
@@ -802,15 +813,20 @@
 	"dZiDwJihz32GwQunXhnB": "main-trackList-facepile",
 	"uWYVhrrTnV2V_VYhThDl": "main-trackList-facepileAvatar",
 	"FCzIz5e0Lpt4xa5zz2F1": "main-trackList-icon",
+	"xEtoX9iOYS58uDtKLmzR": "main-trackList-icon",
 	"vBFTtFW3Co9F_yJ_HjF4": "main-trackList-icon",
 	"Ss6hr6HYpN4wjHJ9GHmi": "main-trackList-indexable",
+	"oYS_3GP9pvVjqbFlh9tq": "main-trackList-indexable",
 	"Kb365Ykr7fUEvnvOH0vl": "main-trackList-isNextRowSelected",
 	"dXWJ1DecZeg_dpXZUbHL": "main-trackList-isPreviousRowSelected",
 	"vDk3w0iWhhczk8PS_K3B": "main-trackList-isRecommendedTrackListRow",
+	"jDgf8MzZRbApYE6BW1qL": "main-trackList-isRecommendedTrackListRow",
 	"HOP1JqKm27djuzPVbaRl": "main-trackList-nineteen",
 	"w304euOUWkI5A8qAqFj8": "main-trackList-notificationDot",
 	"VrRwdIZO0sRX1lsWxJBe": "main-trackList-number",
+	"xNyTkXEncSjszLNI65Nq": "main-trackList-number",
 	"nEZjuVeUuGSmYaQWgXTd": "main-trackList-ownedBySelf",
+	"z0zJ798TVq97lZgdRT2_": "main-trackList-ownedBySelf",
 	"Iy7vi9cVsy6pS6wF8Dud": "main-trackList-placeholder",
 	"Dj9_CzXA7IbUFIz4wOsA": "main-trackList-placeholderEnd",
 	"cF8vKdBGYRZs_SpaG0Yz": "main-trackList-placeholderIndex",
@@ -819,50 +835,82 @@
 	"noANc1fQSmaQNKYVDEDQ": "main-trackList-placeholderVariable",
 	"n5XwsUqagSoVk8oMiw1x": "main-trackList-playingIcon",
 	"TYVy_QqiFWgzw0WkUiHb": "main-trackList-playsHeader",
+	"s6jK2TtsvpysB_LjjS7g": "main-trackList-playsHeader",
 	"B2Dwok3Y07k2ttjGDssH": "main-trackList-queuePanelTracklist",
 	"Bob5Qz4qd2ApsH6o1loA": "main-trackList-resizeHandle",
 	"sQcIERaiZKFhOM1LrSmX": "main-trackList-rowBadges",
+	"_7_yPy5jfb9kzk3gijq6A": "main-trackList-rowBadges",
 	"UeRAfdSphrPaohh2HWmB": "main-trackList-rowCompactMode",
+	"N7GZp8IuWPJvCPz_7dOg": "main-trackList-rowCompactMode",
 	"Btg2qHSuepFGBG6X0yEN": "main-trackList-rowDuration",
+	"l5CmSxiQaap8rWOOpEpk": "main-trackList-rowDuration",
 	"bnolo3jJ8KBxI6jyN7bD": "main-trackList-rowFeedback",
 	"U_mTGq4vzVyOrPrB3mx4": "main-trackList-rowFeedbackButton",
 	"tGKwoPuvNBNK3TzCS5OH": "main-trackList-rowHeartButton",
 	"rkw8BWQi3miXqtlJhKg0": "main-trackList-rowImage",
+	"IqDKYprOtD_EJR1WClPv": "main-trackList-rowImage",
 	"EfStVlHpnUDOJF3pM93I": "main-trackList-rowImageFallback",
+	"tgCyNnKttOMQXfuqVuhI": "main-trackList-rowImageFallback",
 	"RfidWIoz8FON2WhFoItU": "main-trackList-rowImagePlayButton",
+	"j2s64Lz8y6VzBLB_V9Gm": "main-trackList-rowImagePlayButton",
 	"Qs11Fsr_XqTVFDFWWRkQ": "main-trackList-rowImagePlayPauseButton",
+	"OXMPsUBpIQoIbOPIv7Bh": "main-trackList-rowImagePlayPauseButton",
 	"DoIH4Mjt4sJFHkmAGs03": "main-trackList-rowImagePlayPauseButtonPlaying",
 	"cxYjUh_DjUkRijOXGrOT": "main-trackList-rowImageVideo",
 	"byLkljnIRd_DJeSMD3LM": "main-trackList-rowImageWithPlay",
+	"gmuBAqsC6pcufUyP1VQW": "main-trackList-rowImageWithPlay",
 	"iCQtmPqY0QvkumAOuCjr": "main-trackList-rowMainContent",
+	"_iQpvk1c9OgRAc8KRTlH": "main-trackList-rowMainContent",
 	"gQnx5tArze5q1wfG6AWJ": "main-trackList-rowMainContentCompact",
+	"ft6dUifK4i03829TBAqC": "main-trackList-rowMainContentCompact",
 	"VpYFchIiPg3tPhBGyynT": "main-trackList-rowMarker",
+	"ucB9avGYvzsmzXUOw0S7": "main-trackList-rowMarker",
 	"JxZLQbpnH3fFGJHB4XQG": "main-trackList-rowMarkerChartStatus",
+	"t4yFt9Ch_ZCPxEEEoImE": "main-trackList-rowMarkerChartStatus",
 	"mYN_ST1TsDdC6q1k1_xs": "main-trackList-rowMoreButton",
+	"ObVor_8sQq5whKbtWs8a": "main-trackList-rowMoreButton",
 	"nYg_xsOVmrVE_8qk1GCW": "main-trackList-rowPlayCount",
+	"HxDMwNr5oCxTOyqt85gi": "main-trackList-rowPlayCount",
 	"UIBT7E6ZYMcSDl1KL62g": "main-trackList-rowPlayPauseIcon",
+	"zOsKPnD_9x3KJqQCSmAq": "main-trackList-rowPlayPauseIcon",
 	"HcMOFLaukKJdK5LfdHh0": "main-trackList-rowSectionEnd",
+	"PAqIqZXvse_3h6sDVxU0": "main-trackList-rowSectionEnd",
 	"NZAU7CsuZsMeMQB8zYUu": "main-trackList-rowSectionIndex",
+	"fS0C4IgbHviZxIVGC736": "main-trackList-rowSectionIndex",
 	"gvLrgQXBFVW6m9MscfFA": "main-trackList-rowSectionStart",
+	"w46g_LQVSLE9xK399VYf": "main-trackList-rowSectionStart",
 	"bfQ2S9bMXr_kJjqEfcwA": "main-trackList-rowSectionVariable",
+	"_TH6YAXEzJtzSxhkGSqu": "main-trackList-rowSectionVariable",
 	"rq2VQ5mb9SDAFWbBIUIn": "main-trackList-rowSubTitle",
 	"t_yrXoUO3qGsJS4Y6iXX": "main-trackList-rowTitle",
+	"btE2c3IKaOXZ4VNAb8WQ": "main-trackList-rowTitle",
 	"eRuZMo_HNLjb1IalIeRb": "main-trackList-selected",
+	"JgERXNoqNav5zOHiZGfG": "main-trackList-selected",
 	"FCqh1RprhBCx2nZeC2Xi": "main-trackList-showDisabledAsEnabled",
 	"ZdBognHQ3X610bLWE3e3": "main-trackList-sortable",
+	"Bh8ehD8at2hrINB7YMOg": "main-trackList-sortable",
 	"vY_4na7XFQWMFH8phXCQ": "main-trackList-statusChangeDown",
+	"NJMsWXHYQgISlxnPODAD": "main-trackList-statusChangeDown",
 	"YAINlTb90ZejTPv7k1dH": "main-trackList-statusChangeNew",
+	"OqarR9DPk9OgwzSAwR05": "main-trackList-statusChangeNew",
 	"zbBdn49lgTKVccLVZBqE": "main-trackList-statusChangeUp",
+	"VrcWCORvyjWWMoz4Mbpd": "main-trackList-statusChangeUp",
 	"_3IwXr7oR_KZlfPfwMh7": "main-trackList-talkIcon",
 	"y8YIxGr73OXUGacKKsWb": "main-trackList-talkSegmentDuration",
 	"jsV182e49Puwz9SIYt2J": "main-trackList-text",
 	"ShMHCGsT93epRGdxJp2w": "main-trackList-trackList",
+	"oIeuP60w1eYpFaXESRSg": "main-trackList-trackList",
 	"ixZyJJ3SHxsSb3NHkhWn": "main-trackList-trackListCompactMode",
+	"iHiqmESWdGRBwk5cS7ZZ": "main-trackList-trackListCompactMode",
 	"koyeY6AgGRPmyPITi7yO": "main-trackList-trackListHeader",
+	"IpXjqI9ouS_N5zi0WM88": "main-trackList-trackListHeader",
 	"dZPmmYYhskhqHJCAruvI": "main-trackList-trackListHeaderRow",
+	"ePPpO_NuGDUxVRTw7y6W": "main-trackList-trackListHeaderRow",
 	"qJOhHoRcFhHJpEQ2CwFT": "main-trackList-trackListHeaderStuck",
 	"h4HgbO_Uu1JYg5UGANeQ": "main-trackList-trackListRow",
+	"IjYxRc5luMiDPhKhZVUH": "main-trackList-trackListRow",
 	"wTUruPetkKdWAR1dd6w4": "main-trackList-trackListRowGrid",
+	"UpiE7J6vPrJIa59qxts4": "main-trackList-trackListRowGrid",
 	"vOp2HlcPkxOHebo3If32": "main-useDropTarget-album",
 	"O0AN8Ty_Cxd4iLwyKATB": "main-useDropTarget-album",
 	"VNdHKKznHkpJ0VHoDmai": "main-useDropTarget-artist",
@@ -972,6 +1020,7 @@
 	"XZRX_ea9eNn4rOLpNGLp": "main-yourLibraryX-librarySortWrapper",
 	"GG5skerNjHXAO6tXyyY0": "main-yourLibraryX-librarySortWrapper",
 	"qEiVyQ28VnOKb0LeijqL": "main-yourLibraryX-listItem",
+	"vSC5QuwmzUhqUNWdMTJ5": "main-yourLibraryX-listItem",
 	"ojrThQm1wxR2gZ6GntJB": "main-yourLibraryX-listItemGroup",
 	"Dtr130mQSR0j8k7bu5KS": "main-yourLibraryX-listItemGroupCompact",
 	"nZSNG58XEPTX69mkNi9n": "main-yourLibraryX-listRowEntityImage",
@@ -982,10 +1031,14 @@
 	"HdTF8gsRm5MgWvEYlokG": "main-yourLibraryX-listRowSubtitleLeadingWrapper",
 	"gj1L_SVM_H8GteWMdEF_": "main-yourLibraryX-listRowTitleLink",
 	"LU0q0itTx2613uiATSig": "main-yourLibraryX-navItem",
+	"KAcp7QFuEYSouAsuC5i_": "main-yourLibraryX-navItem",
 	"AlqlOMBoMUPbFmLmkhhg": "main-yourLibraryX-navItemOffline",
+	"fFvRIGtMIgsOLVSq_JNS": "main-yourLibraryX-navItems",
 	"QuHe04rU4bj0Z5U9E2Tk": "main-yourLibraryX-navItems",
 	"UYeKN11KAw61rZoyjcgZ": "main-yourLibraryX-navLink",
+	"hNvCMxbfz7HwgzLjt3IZ": "main-yourLibraryX-navLink",
 	"DzWw3g4E_66wu9ktqn36": "main-yourLibraryX-navLinkActive",
+	"Bh3b80dIrbc0keQ9kdso": "main-yourLibraryX-navLinkActive",
 	"ep0_ry7CLwf91E1rN6Cv": "main-yourLibraryX-pulse",
 	"B_HdWVSEWPHaOf9LQAtC": "main-yourLibraryX-rowCover",
 	"Gw7E7MkWci1ttQhb4EK0": "npv-exitFullScreenButton-button",
diff --git a/jsHelper/spicetifyWrapper.js b/jsHelper/spicetifyWrapper.js
index f89a6021e9..7d56e115e3 100644
--- a/jsHelper/spicetifyWrapper.js
+++ b/jsHelper/spicetifyWrapper.js
@@ -1026,7 +1026,7 @@ Spicetify._getStyledClassName = (args, component) => {
 	const excludedKeys = ["children", "className", "style", "dir", "key", "ref", "as", "$autoMirror", "$hasFocus", ""];
 	const excludedPrefix = ["aria-"];
 
-	const childrenProps = ["iconLeading", "iconTrailing", "iconOnly"];
+	const childrenProps = ["iconLeading", "iconTrailing", "iconOnly", "$iconOnly", "$iconLeading", "$iconTrailing"];
 
 	for (const key of childrenProps) {
 		if (element[key]) className += `-${key}`;
@@ -1043,9 +1043,7 @@ Spicetify._getStyledClassName = (args, component) => {
 
 	const customEntries = Object.entries(element).filter(
 		([key, value]) =>
-			(customKeys.some(k => key.toLowerCase().includes(k)) || customExactKeys.some(k => key.toLowerCase().includes(k))) &&
-			typeof value === "string" &&
-			value.length
+			(customKeys.some(k => key.toLowerCase().includes(k)) || customExactKeys.some(k => key === k)) && typeof value === "string" && value.length
 	);
 
 	for (const [key, value] of customEntries) {