diff --git a/app/Models/Themes.php b/app/Models/Themes.php
index d652ada5b..86125c5f5 100644
--- a/app/Models/Themes.php
+++ b/app/Models/Themes.php
@@ -79,7 +79,6 @@ class FreshRSS_Themes extends Minz_Model {
 		static $alts = array(
 			'add' => '➕',	//✚
 			'all' => '☰',
-			'bookmark' => '✨',	//★
 			'bookmark-add' => '➕',	//✚
 			'bookmark-tag' => '📑',
 			'category' => '🗂️',	//☷
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 3c4f1ec2e..bb9d678dc 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -37,7 +37,7 @@
 
 		<li class="tree-folder category favorites<?= FreshRSS_Context::isCurrentGet('s') ? ' active' : '' ?>">
 			<div class="tree-folder-title">
-				<?= _i('bookmark') ?>
+				<?= _i('starred') ?>
 				<a class="title" data-unread="<?= format_number(FreshRSS_Context::$total_starred['unread']) ?>" href="<?= _url('index', $actual_view, 'get', 's') . $state_filter_manual ?>">
 					<?= _t('index.menu.favorites', format_number(FreshRSS_Context::$total_starred['all'])) ?>
 				</a>
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index e3e18f5a0..d49986981 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -126,7 +126,7 @@
 						<tr>
 							<th> </th>
 							<th title="<?= _t('conf.shortcut.mark_read') ?>"><?= _i('read') ?></th>
-							<th title="<?= _t('conf.shortcut.mark_favorite') ?>"><?= _i('bookmark') ?></th>
+							<th title="<?= _t('conf.shortcut.mark_favorite') ?>"><?= _i('starred') ?></th>
 							<th><?= _t('conf.display.icon.related_tags') ?></th>
 							<th><?= _t('conf.display.icon.sharing') ?></th>
 							<th><?= _t('conf.display.icon.summary') ?></th>
diff --git a/p/themes/BlueLagoon/icons/bookmark.svg b/p/themes/BlueLagoon/icons/bookmark.svg
deleted file mode 100644
index 898488038..000000000
--- a/p/themes/BlueLagoon/icons/bookmark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14.031" height="12.989">
-  <path fill="#666" d="M69.003 398.01a1.03 1.03 0 0 0-.665.24c-.166.138-.277.32-.39.5-.224.357-.392.768-.565 1.203-.173.435-.347.888-.504 1.232a2.606 2.606 0 0 1-.36.588 2.621 2.621 0 0 1-.695.152c-.388.035-.881.05-1.363.07-.482.02-.97.036-1.393.128-.211.038-.415.11-.604.21a.987.987 0 0 0-.45.53.994.994 0 0 0 .036.7c.085.196.227.366.368.524.283.317.633.606 1.008.899.375.293.777.559 1.068.81.29.251.454.508.459.523.018.235 0 .472-.055.702-.085.367-.223.812-.352 1.26-.13.449-.252.902-.292 1.319-.02.208-.043.407.005.614a.987.987 0 0 0 1.067.752c.22-.018.436-.07.636-.152.4-.162.801-.428 1.206-.682.405-.254.808-.522 1.146-.711.337-.19.648-.269.664-.269.016 0 .303.095.639.288.336.192.725.465 1.128.722.402.257.82.497 1.218.663.199.082.389.15.607.17.219.02.48-.03.696-.18a.947.947 0 0 0 .389-.56c.05-.206.043-.435.025-.643-.037-.417-.16-.864-.284-1.314-.126-.45-.262-.887-.345-1.255a2.64 2.64 0 0 1-.066-.701c.005-.015.187-.253.48-.501.293-.249.676-.538 1.054-.827.378-.29.767-.572 1.053-.886a1.93 1.93 0 0 0 .329-.53.916.916 0 0 0 .055-.672c-.082-.245-.271-.413-.46-.523a1.965 1.965 0 0 0-.577-.23c-.422-.095-.914-.14-1.396-.164-.482-.024-.946-.039-1.334-.077a3.698 3.698 0 0 1-.729-.14 2.713 2.713 0 0 1-.338-.582 28.41 28.41 0 0 1-.496-1.224c-.168-.437-.334-.865-.556-1.224a2.01 2.01 0 0 0-.398-.494 1.061 1.061 0 0 0-.669-.258z" style="color:#000;text-indent:0;text-align:start;text-transform:none;direction:ltr;baseline-shift:baseline;enable-background:accumulate;fill:#0062bf;fill-opacity:1" transform="translate(-61.966 -398.01)"/>
-</svg>
diff --git a/p/themes/Pafat/icons/all.svg b/p/themes/Pafat/icons/all.svg
index 14fa80366..1c7ba3ffe 100644
--- a/p/themes/Pafat/icons/all.svg
+++ b/p/themes/Pafat/icons/all.svg
@@ -1,7 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<g transform="translate(-40.0002,-746)" fill="#FFF">
-<rect style="color:#FFF;" height="2.0002" width="9.9996" y="749" x="43"/>
-<rect style="color:#FFF;" height="2.0002" width="9.9996" y="753" x="43"/>
-<rect style="color:#FFF;" height="2.0002" width="9.9996" y="757" x="43"/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+  <g style="fill:#666;fill-opacity:1">
+    <path d="M43 749h10v2H43zM43 753h10v2H43zM43 757h10v2H43z" style="fill:#666;fill-opacity:1" transform="translate(-40 -746)"/>
+  </g>
+</svg>
diff --git a/p/themes/Pafat/icons/bookmark.svg b/p/themes/Pafat/icons/bookmark.svg
deleted file mode 100644
index 70d0c81fb..000000000
--- a/p/themes/Pafat/icons/bookmark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<g transform="translate(-41.000202,-397)">
-<path style="enable-background:accumulate;color:#000000;" d="m530.95,186.71c-0.77941,0.55189-3.1576-1.906-4.1125-1.9179-0.95532-0.0119-3.3949,2.3858-4.161,1.8149-0.76573-0.57072,0.83698-3.592,0.55319-4.5039-0.2839-0.91223-3.3182-2.4915-3.0119-3.3965,0.30617-0.90461,3.6749-0.31399,4.4544-0.86567,0.77986-0.5519,1.3442-3.9257,2.2995-3.914,0.95494,0.0116,1.4342,3.398,2.1998,3.9689,0.76588,0.57114,4.1489,0.0653,4.4331,0.97746,0.28402,0.9118-2.7885,2.414-3.0949,3.3186-0.30652,0.90489,1.22,3.966,0.44027,4.5182z" fill-rule="nonzero" transform="matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)" fill="#FFF"/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index d64521573..fe8770c88 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -476,6 +476,7 @@ a.btn {
 	line-height: 1;
 }
 
+.tree-folder-title > .icon,
 .tree-folder-title .title .icon {
 	filter: brightness(2.5);
 }
diff --git a/p/themes/Pafat/pafat.rtl.css b/p/themes/Pafat/pafat.rtl.css
index 55e255369..60877e1ad 100644
--- a/p/themes/Pafat/pafat.rtl.css
+++ b/p/themes/Pafat/pafat.rtl.css
@@ -476,6 +476,7 @@ a.btn {
 	line-height: 1;
 }
 
+.tree-folder-title > .icon,
 .tree-folder-title .title .icon {
 	filter: brightness(2.5);
 }
diff --git a/p/themes/Screwdriver/icons/bookmark.svg b/p/themes/Screwdriver/icons/bookmark.svg
deleted file mode 100644
index edf5a02db..000000000
--- a/p/themes/Screwdriver/icons/bookmark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<g transform="translate(-41.000202,-397)">
-<path style="color:#000000;enable-background:accumulate;" d="m530.95,186.71c-0.77941,0.55189-3.1576-1.906-4.1125-1.9179-0.95532-0.0119-3.3949,2.3858-4.161,1.8149-0.76573-0.57072,0.83698-3.592,0.55319-4.5039-0.2839-0.91223-3.3182-2.4915-3.0119-3.3965,0.30617-0.90461,3.6749-0.31399,4.4544-0.86567,0.77986-0.5519,1.3442-3.9257,2.2995-3.914,0.95494,0.0116,1.4342,3.398,2.1998,3.9689,0.76588,0.57114,4.1489,0.0653,4.4331,0.97746,0.28402,0.9118-2.7885,2.414-3.0949,3.3186-0.30652,0.90489,1.22,3.966,0.44027,4.5182z" fill-rule="nonzero" transform="matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)" fill="#d18104"/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/Swage/icons/bookmark.svg b/p/themes/Swage/icons/bookmark.svg
deleted file mode 100644
index 09bf263fd..000000000
--- a/p/themes/Swage/icons/bookmark.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 16 16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<style type="text/css">.st0{fill:#FFD255;}</style>
-<path class="st0" d="M8,12.6l4.9,3L11.6,10L16,6.2l-5.7-0.5L8,0.4L5.8,5.7L0,6.2L4.4,10l-1.3,5.6L8,12.6z"/>
-</svg>
-
diff --git a/p/themes/icons/bookmark.svg b/p/themes/icons/bookmark.svg
deleted file mode 100644
index 63a44908f..000000000
--- a/p/themes/icons/bookmark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<g transform="translate(-41.000202,-397)">
-<path style="enable-background:accumulate;color:#000000;" d="m530.95,186.71c-0.77941,0.55189-3.1576-1.906-4.1125-1.9179-0.95532-0.0119-3.3949,2.3858-4.161,1.8149-0.76573-0.57072,0.83698-3.592,0.55319-4.5039-0.2839-0.91223-3.3182-2.4915-3.0119-3.3965,0.30617-0.90461,3.6749-0.31399,4.4544-0.86567,0.77986-0.5519,1.3442-3.9257,2.2995-3.914,0.95494,0.0116,1.4342,3.398,2.1998,3.9689,0.76588,0.57114,4.1489,0.0653,4.4331,0.97746,0.28402,0.9118-2.7885,2.414-3.0949,3.3186-0.30652,0.90489,1.22,3.966,0.44027,4.5182z" fill-rule="nonzero" transform="matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)" fill="#f1c40f"/>
-</g>
-</svg>
\ No newline at end of file