diff --git a/modules/addon/tpl/addon_info.html b/modules/addon/tpl/addon_info.html
index 604afe696..5e56d7343 100644
--- a/modules/addon/tpl/addon_info.html
+++ b/modules/addon/tpl/addon_info.html
@@ -2,7 +2,7 @@
 <table class="x_table x_table-striped x_table-hover">
 	<tr>
 		<th scope="row">{$lang->title}</th>
-		<td>{$addon_info->title} ver. {$addon->version === 'RX_VERSION' ? 'CORE' : $addon->version}</td>
+		<td>{$addon_info->title} ver. {($addon->version === 'RX_VERSION' && Context::isDefaultPlugin($addon_info->addon_name, 'addon')) ? 'CORE' : $addon->version}</td>
 	</tr>
 	<tr>
 		<th scope="row">{$lang->author}</th>
diff --git a/modules/addon/tpl/setup_addon.html b/modules/addon/tpl/setup_addon.html
index 019a4ea06..f34799497 100644
--- a/modules/addon/tpl/setup_addon.html
+++ b/modules/addon/tpl/setup_addon.html
@@ -8,8 +8,14 @@
 		<tr>
 			<th class="nowr">{$lang->version}</th>
 			<td>
-				{$addon_info->version === 'RX_VERSION' ? 'CORE' : $addon_info->version}
-				<!--@if($addon_info->date)-->({zdate($addon_info->date, 'Y-m-d')})<!--@endif-->
+				<!--@if($addon_info->version === 'RX_VERSION' && Context::isDefaultPlugin($addon_info->addon_name, 'addon'))-->
+					CORE
+				<!--@else-->
+					{$addon_info->version}
+					<!--@if($addon_info->date)-->
+						({zdate($addon_info->date, 'Y-m-d')})
+					<!--@endif-->
+				<!--@endif-->
 			</td>
 		</tr>
 		<tr>
diff --git a/modules/layout/tpl/installed_layout_list.html b/modules/layout/tpl/installed_layout_list.html
index 8cfaea6e3..f0eb233d3 100644
--- a/modules/layout/tpl/installed_layout_list.html
+++ b/modules/layout/tpl/installed_layout_list.html
@@ -27,7 +27,13 @@
 						{$lang->msg_avail_easy_update} <a href="{$layout->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a>
 					</p>
 				</td>
-				<td>{$layout->version}</td>
+				<td>
+					<!--@if(Context::isDefaultPlugin($layout->layout, 'layout'))-->
+						<img src="{\RX_BASEURL}common/img/icon.png" class="core_symbol" alt="Rhymix Core" title="Rhymix Core" />
+					<!--@else-->
+						{$layout->version}
+					<!--@endif-->
+				</td>
 				<td>
 					<block loop="$layout->author => $author">
 						<a cond="$author->homepage" href="{$author->homepage}" target="_blank">{$author->name}</a>
diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html
index dc20880ba..04a131af9 100644
--- a/modules/module/tpl/module_list.html
+++ b/modules/module/tpl/module_list.html
@@ -39,7 +39,7 @@
 				<p cond="$val->need_update" class="x_alert x_alert-info">{$lang->msg_avail_update} <button class="text" type="button" onclick="doUpdateModule('{$val->module}')">{$lang->msg_do_you_like_update}</button></p>
 			</td>
 			<td>
-				<!--@if($val->version === 'RX_VERSION')-->
+				<!--@if($val->version === 'RX_VERSION' && Context::isDefaultPlugin($val->module, 'module'))-->
 					<img src="{\RX_BASEURL}common/img/icon.png" class="core_symbol" alt="Rhymix Core" title="Rhymix Core" />
 				<!--@else-->
 					<span style="color:#aaa"|cond="Context::isBlacklistedPlugin($val->module, 'module')">{$val->version}</span>
diff --git a/modules/widget/tpl/downloaded_widget_list.html b/modules/widget/tpl/downloaded_widget_list.html
index e53171c79..e8dcc6930 100644
--- a/modules/widget/tpl/downloaded_widget_list.html
+++ b/modules/widget/tpl/downloaded_widget_list.html
@@ -27,7 +27,7 @@
 				</p>
 			</td>
 			<td>
-				<!--@if($widget->version === 'RX_VERSION')-->
+				<!--@if($widget->version === 'RX_VERSION' && Context::isDefaultPlugin($widget->widget, 'widget'))-->
 					<img src="{\RX_BASEURL}common/img/icon.png" class="core_symbol" alt="Rhymix Core" title="Rhymix Core" />
 				<!--@else-->
 					<span style="color:#aaa"|cond="$widget->isBlacklisted">{$widget->version}</span>