diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html
index a4211ea9e..1508807c5 100644
--- a/modules/addon/tpl/addon_list.html
+++ b/modules/addon/tpl/addon_list.html
@@ -13,7 +13,7 @@
 	</div>
 	<table class="x_table x_table-striped x_table-hover dsTg">
 		<caption>
-			<strong>All({$addon_count})</strong>
+			<strong>{lang('all')} ({$addon_count})</strong>
 			<div class="x_pull-right x_btn-group">
 				<button type="button" class="x_btn x_active __simple">{$lang->simple_view}</button>
 				<button type="button" class="x_btn __detail">{$lang->detail_view}</button>
diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index bb4fe5c62..4001a2290 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -779,7 +779,7 @@ margin-bottom: 10px;
 .x>.body>.content {
 	box-sizing:border-box;
 	width: 100%;
-	padding: 10px 5px 0 5px;
+	padding: 10px 15px 0 15px;
 	float: right;
 	margin: 0 0 0 -100%;
 	outline: none;
diff --git a/modules/autoinstall/tpl/category.html b/modules/autoinstall/tpl/category.html
index 3acf517ab..d1cb9b7b5 100644
--- a/modules/autoinstall/tpl/category.html
+++ b/modules/autoinstall/tpl/category.html
@@ -1,5 +1,5 @@
 <ul class="x_nav x_nav-tabs">
-	<li class="x_active"|cond="$act == 'dispAutoinstallAdminIndex'"><a href="{getUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminIndex')}">All({$tCount})</a></li>
+	<li class="x_active"|cond="$act == 'dispAutoinstallAdminIndex'"><a href="{getUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminIndex')}">{lang('all')} ({$tCount})</a></li>
 	<li class="x_active"|cond="$act == 'dispAutoinstallAdminInstalledPackages'"><a href="{getUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminInstalledPackages')}">Installed({$iCount})</a></li>
 </ul>
 
diff --git a/modules/module/tpl/css/images/star-empty.svg b/modules/module/tpl/css/images/star-empty.svg
new file mode 100644
index 000000000..2a78f9f65
--- /dev/null
+++ b/modules/module/tpl/css/images/star-empty.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="1081.2933" height="1038.668">
+<path d="m 51.709635,406.864 c 4.672,-15.893 18.133,-27.648 34.496,-30.144 L 383.52863,331.301 501.90763,74.789 c 6.976,-15.104 22.101,-24.789 38.741,-24.789 16.64,0 31.765,9.685 38.741,24.789 l 118.379,256.491 297.323,45.419 c 16.38397,2.496 29.82397,14.251 34.49607,30.144 4.672,15.893 -0.299,33.045 -12.7151,44.011 l -216.23497,190.848 59.157,295.893 c 3.328,16.64 -3.52,33.685 -17.451,43.392 -13.931,9.707 -32.32,10.219 -46.72,1.323 l -254.976,-156.885 -254.976,156.907 c -6.848,4.245 -14.613,6.336 -22.357,6.336 -8.533,0 -17.067,-2.56 -24.384,-7.659 -13.931,-9.707 -20.8,-26.731 -17.451,-43.392 L 280.63663,641.724 64.401635,450.876 c -12.395,-10.965 -17.365,-28.117 -12.693,-44.011 z" style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:70;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/modules/module/tpl/css/images/star-fill.svg b/modules/module/tpl/css/images/star-fill.svg
new file mode 100644
index 000000000..758051e2f
--- /dev/null
+++ b/modules/module/tpl/css/images/star-fill.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="1081.2933" height="1038.668">
+<path d="m 51.709635,406.864 c 4.672,-15.893 18.133,-27.648 34.496,-30.144 L 383.52863,331.301 501.90763,74.789 c 6.976,-15.104 22.101,-24.789 38.741,-24.789 16.64,0 31.765,9.685 38.741,24.789 l 118.379,256.491 297.323,45.419 c 16.38397,2.496 29.82397,14.251 34.49607,30.144 4.672,15.893 -0.299,33.045 -12.7151,44.011 l -216.23497,190.848 59.157,295.893 c 3.328,16.64 -3.52,33.685 -17.451,43.392 -13.931,9.707 -32.32,10.219 -46.72,1.323 l -254.976,-156.885 -254.976,156.907 c -6.848,4.245 -14.613,6.336 -22.357,6.336 -8.533,0 -17.067,-2.56 -24.384,-7.659 -13.931,-9.707 -20.8,-26.731 -17.451,-43.392 L 280.63663,641.724 64.401635,450.876 c -12.395,-10.965 -17.365,-28.117 -12.693,-44.011 z" style="fill:#ffeb3b;fill-opacity:1;stroke:#000000;stroke-width:70;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/modules/module/tpl/css/module_admin.less b/modules/module/tpl/css/module_admin.less
new file mode 100644
index 000000000..e2e703d2d
--- /dev/null
+++ b/modules/module/tpl/css/module_admin.less
@@ -0,0 +1,21 @@
+.fvOff,.fvOn{
+	display:inline-block;
+	width:25px;
+	height:25px;
+	background-color:transparent;
+	background-size:25px 25px;
+	overflow:hidden;
+	text-indent:-1000px;
+	border:0
+}
+.fvOff{
+	background-image: data-uri('images/star-empty.svg');
+}
+.fvOn{
+	background-image: data-uri('images/star-fill.svg');
+}
+.x_table.x_table-striped.x_table-hover.dsTg tr {
+	th:first-child, td:first-child {
+		text-align: center;
+	}
+}
\ No newline at end of file
diff --git a/modules/module/tpl/header.html b/modules/module/tpl/header.html
index 0af15d777..783983e50 100644
--- a/modules/module/tpl/header.html
+++ b/modules/module/tpl/header.html
@@ -1,10 +1,11 @@
 <load target="js/module_admin.js" />
+<load target="css/module_admin.less" />
 <div class="x_page-header">
 	<h1>{$lang->installed_modules} <a class="x_icon-question-sign" href="./common/manual/admin/index.html#UMAN_advanced_installed_module" target="_blank">{$lang->help}</a></h1>
 </div>
 <script>
-	xe.lang.favorite_on = '{$lang->favorite}({$lang->on})';
-	xe.lang.favorite_off = '{$lang->favorite}({$lang->off})';
+	xe.lang.favorite_on = '{lang("favorite")} ({lang("on")})';
+	xe.lang.favorite_off = '{lang("favorite")} ({lang("off")})';
 </script>
 <ul class="x_nav x_nav-tabs">
 	<li class="x_active"|cond="$act=='dispModuleAdminContent'">
diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html
index 436d9aeee..c5bad8c0d 100644
--- a/modules/module/tpl/module_list.html
+++ b/modules/module/tpl/module_list.html
@@ -4,7 +4,7 @@
 </div>
 <table class="x_table x_table-striped x_table-hover dsTg">
 	<caption>
-		<strong>All({count($module_list)})</strong>
+		<strong>{lang('all')} ({count($module_list)})</strong>
 		<div class="x_pull-right x_btn-group">
 			<button class="x_btn x_active __simple">{$lang->simple_view}</button>
 			<button class="x_btn __detail">{$lang->detail_view}</button>
@@ -12,7 +12,7 @@
 	</caption>
 	<thead>
 		<tr>
-			<th class="nowr">{$lang->favorite}</th>
+			<th class="nowr">{lang('favorite')}</th>
 			<th class="title">{$lang->module_name}</th>
 			<th class="nowr">{$lang->version}</th>
 			<th class="nowr rx_detail_marks">{$lang->author}</th>
@@ -23,8 +23,8 @@
 	<tbody>
 		<tr loop="$module_list => $key,$val" data-type1="#"|cond="in_array($val->module,$favoriteModuleList)" data-type2="#"|cond="$val->need_install || $val->need_update || $val->need_autoinstall_update">
 			<td>
-				<button type="button" class="fvOn" onclick="doToggleFavoriteModule(this, '{$val->module}')" cond="in_array($val->module,$favoriteModuleList)">{$lang->favorite}({$lang->on})</button>
-				<button type="button" class="fvOff" onclick="doToggleFavoriteModule(this, '{$val->module}')" cond="!in_array($val->module,$favoriteModuleList)">{$lang->favorite}({$lang->off})</button>
+				<button type="button" class="fvOn" onclick="doToggleFavoriteModule(this, '{$val->module}')" cond="in_array($val->module,$favoriteModuleList)">{lang("favorite")} ({lang("on")})</button>
+				<button type="button" class="fvOff" onclick="doToggleFavoriteModule(this, '{$val->module}')" cond="!in_array($val->module,$favoriteModuleList)">{lang("favorite")} ({lang("off")})</button>
 			</td>
 			<td class="title">
 				<p>
@@ -57,11 +57,6 @@
 		</tr>
 	</tbody>
 </table>
-<style scoped>
-.fvOff,.fvOn{display:inline-block;width:30px;height:30px;background-color:transparent;background-size:30px 30px;overflow:hidden;text-indent:-1000px;border:0}
-.fvOff{background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSIxMDgxLjI5MzMiIGhlaWdodD0iMTAzOC42NjgiPgo8cGF0aCBkPSJtIDUxLjcwOTYzNSw0MDYuODY0IGMgNC42NzIsLTE1Ljg5MyAxOC4xMzMsLTI3LjY0OCAzNC40OTYsLTMwLjE0NCBMIDM4My41Mjg2MywzMzEuMzAxIDUwMS45MDc2Myw3NC43ODkgYyA2Ljk3NiwtMTUuMTA0IDIyLjEwMSwtMjQuNzg5IDM4Ljc0MSwtMjQuNzg5IDE2LjY0LDAgMzEuNzY1LDkuNjg1IDM4Ljc0MSwyNC43ODkgbCAxMTguMzc5LDI1Ni40OTEgMjk3LjMyMyw0NS40MTkgYyAxNi4zODM5NywyLjQ5NiAyOS44MjM5NywxNC4yNTEgMzQuNDk2MDcsMzAuMTQ0IDQuNjcyLDE1Ljg5MyAtMC4yOTksMzMuMDQ1IC0xMi43MTUxLDQ0LjAxMSBsIC0yMTYuMjM0OTcsMTkwLjg0OCA1OS4xNTcsMjk1Ljg5MyBjIDMuMzI4LDE2LjY0IC0zLjUyLDMzLjY4NSAtMTcuNDUxLDQzLjM5MiAtMTMuOTMxLDkuNzA3IC0zMi4zMiwxMC4yMTkgLTQ2LjcyLDEuMzIzIGwgLTI1NC45NzYsLTE1Ni44ODUgLTI1NC45NzYsMTU2LjkwNyBjIC02Ljg0OCw0LjI0NSAtMTQuNjEzLDYuMzM2IC0yMi4zNTcsNi4zMzYgLTguNTMzLDAgLTE3LjA2NywtMi41NiAtMjQuMzg0LC03LjY1OSAtMTMuOTMxLC05LjcwNyAtMjAuOCwtMjYuNzMxIC0xNy40NTEsLTQzLjM5MiBMIDI4MC42MzY2Myw2NDEuNzI0IDY0LjQwMTYzNSw0NTAuODc2IGMgLTEyLjM5NSwtMTAuOTY1IC0xNy4zNjUsLTI4LjExNyAtMTIuNjkzLC00NC4wMTEgeiIgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6IzAwMDAwMDtzdHJva2Utd2lkdGg6NzA7c3Ryb2tlLW1pdGVybGltaXQ6NDtzdHJva2UtZGFzaGFycmF5Om5vbmU7c3Ryb2tlLW9wYWNpdHk6MSIgLz4KPC9zdmc+');}
-.fvOn{background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSIxMDgxLjI5MzMiIGhlaWdodD0iMTAzOC42NjgiPgo8cGF0aCBkPSJtIDUxLjcwOTYzNSw0MDYuODY0IGMgNC42NzIsLTE1Ljg5MyAxOC4xMzMsLTI3LjY0OCAzNC40OTYsLTMwLjE0NCBMIDM4My41Mjg2MywzMzEuMzAxIDUwMS45MDc2Myw3NC43ODkgYyA2Ljk3NiwtMTUuMTA0IDIyLjEwMSwtMjQuNzg5IDM4Ljc0MSwtMjQuNzg5IDE2LjY0LDAgMzEuNzY1LDkuNjg1IDM4Ljc0MSwyNC43ODkgbCAxMTguMzc5LDI1Ni40OTEgMjk3LjMyMyw0NS40MTkgYyAxNi4zODM5NywyLjQ5NiAyOS44MjM5NywxNC4yNTEgMzQuNDk2MDcsMzAuMTQ0IDQuNjcyLDE1Ljg5MyAtMC4yOTksMzMuMDQ1IC0xMi43MTUxLDQ0LjAxMSBsIC0yMTYuMjM0OTcsMTkwLjg0OCA1OS4xNTcsMjk1Ljg5MyBjIDMuMzI4LDE2LjY0IC0zLjUyLDMzLjY4NSAtMTcuNDUxLDQzLjM5MiAtMTMuOTMxLDkuNzA3IC0zMi4zMiwxMC4yMTkgLTQ2LjcyLDEuMzIzIGwgLTI1NC45NzYsLTE1Ni44ODUgLTI1NC45NzYsMTU2LjkwNyBjIC02Ljg0OCw0LjI0NSAtMTQuNjEzLDYuMzM2IC0yMi4zNTcsNi4zMzYgLTguNTMzLDAgLTE3LjA2NywtMi41NiAtMjQuMzg0LC03LjY1OSAtMTMuOTMxLC05LjcwNyAtMjAuOCwtMjYuNzMxIC0xNy40NTEsLTQzLjM5MiBMIDI4MC42MzY2Myw2NDEuNzI0IDY0LjQwMTYzNSw0NTAuODc2IGMgLTEyLjM5NSwtMTAuOTY1IC0xNy4zNjUsLTI4LjExNyAtMTIuNjkzLC00NC4wMTEgeiIgc3R5bGU9ImZpbGw6I2ZmZWIzYjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6IzAwMDAwMDtzdHJva2Utd2lkdGg6NzA7c3Ryb2tlLW1pdGVybGltaXQ6NDtzdHJva2UtZGFzaGFycmF5Om5vbmU7c3Ryb2tlLW9wYWNpdHk6MSIgLz4KPC9zdmc+');}
-</style>
 <script>
 jQuery(function($){
 	$('.dsTg>tbody>tr[data-type1]').prependTo('tbody');
diff --git a/modules/widget/tpl/downloaded_widget_list.html b/modules/widget/tpl/downloaded_widget_list.html
index bec852467..5ecbf09f6 100644
--- a/modules/widget/tpl/downloaded_widget_list.html
+++ b/modules/widget/tpl/downloaded_widget_list.html
@@ -1,7 +1,7 @@
 <include target="header.html" />
 <table class="x_table x_table-striped x_table-hover dsTg">
 	<caption>
-		<strong>All({$tCount})</strong>
+		<strong>{lang('all')} ({$tCount})</strong>
 		<div class="x_pull-right x_btn-group">
 			<button class="x_btn x_active __simple">{$lang->simple_view}</button>
 			<button class="x_btn __detail">{$lang->detail_view}</button>