diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index d823ff420..6a120d993 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -157,7 +157,9 @@ class HTMLDisplayHandler {
 
 	function _loadJSCSS()
 	{
-		$oContext =& Context::getInstance();
+		$oContext  =& Context::getInstance();
+		$lang_type =  Context::getLangType();
+
 		// add common JS/CSS files
 		if(__DEBUG__) {
 			$oContext->addJsFile('./common/js/jquery.js', false, '', -100000);
@@ -179,9 +181,11 @@ class HTMLDisplayHandler {
 		if(Context::get('module')=='admin' || strpos(Context::get('act'),'Admin')>0){
 			if(__DEBUG__) {
 				$oContext->addCSSFile('./modules/admin/tpl/css/admin.css', false, 'all', '', 100000);
+				$oContext->addCSSFile("./modules/admin/tpl/css/admin_{$lang_type}.css", false, 'all', '', 100000);
 				$oContext->addJsFile('./modules/admin/tpl/js/admin.js');
 			} else {
-				$oContext->addCSSFile('./modules/admin/tpl/css/admin.min.css', false, 'all', '',10000);
+				$oContext->addCSSFile('./modules/admin/tpl/css/admin.min.css', false, 'all', '', 100000);
+				$oContext->addCSSFile("./modules/admin/tpl/css/admin_{$lang_type}.min.css", false, 'all', '',10000);
 				$oContext->addJsFile('./modules/admin/tpl/js/admin.js');
 			}
 		}
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index 2888dfed9..d83093077 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -1,10 +1,13 @@
-{@ $db_info = Context::getDBInfo() }
+{@
+	$db_info   = Context::getDBInfo();
+	$lang_type = Context::getLangType();
+}
 <!--@if($db_info->use_html5=='Y')-->
 <!DOCTYPE html>
 <!--@else-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--@end-->
-<html lang="{Context::getLangType()}" xml:lang="{Context::getLangType()}" xmlns="http://www.w3.org/1999/xhtml">
+<html lang="{$lang_type}" xml:lang="{$lang_type}" xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="Generator" content="XpressEngine {__ZBXE_VERSION__}" />
diff --git a/modules/admin/tpl/_spHeader.html b/modules/admin/tpl/_spHeader.html
index e9fc230be..cc9bba378 100644
--- a/modules/admin/tpl/_spHeader.html
+++ b/modules/admin/tpl/_spHeader.html
@@ -4,24 +4,25 @@
 		<h1><a href="{getUrl('','module','admin')}"><img src="img/xe.h1.png" width="33" height="32" alt="XE" /> Super Admin</a></h1>
 		<div class="siteTool">
 			<a href="#moveSiteList" class="i tgAnchor" data-effect="slide" data-duration="100">Move to Site</a>
-			<div class="layer portlet tgContent" id="moveSiteList">
-				<h2 class="h2">Move to Site</h2>
+			<div class="tgContent" id="moveSiteList">
 				<ul class="lined">
 					<li>XpressEngine - <a href="#">http://xe.xpressengine.net/</a></li>
 					<li>XpressEngine - <a href="#">http://xe.xpressengine.net/</a></li>
 					<li>XpressEngine - <a href="#">http://xe.xpressengine.net/</a></li>
 				</ul>
-				<a href="#" class="more"><span>&rsaquo;</span> more</a>
+				<p class="btnArea">
+					<a href="#" class="more"><span>&rsaquo;</span> more</a>
+				</p>
 			</div>
 		</div>
 		<div class="account">
 			<ul>
 				<li><a href="#">정찬명</a></li>
 				<li><a href="{getUrl('module','admin','act','procAdminLogout')}">Log-out</a></li>
-				<li><a href="#language" class="tgAnchor" data-effect="slide" data-duration="100">Language</a>
+				<li><a href="#language" class="tgAnchor language" data-effect="slide" data-duration="100">Language</a>
 					<ul class="tgContent" id="language">
                     	<!--@foreach($lang_supported as $key => $val)-->
-						<li><a href="#" onclick="doChangeLangType('{$key}'); return false;">{$val}</a></li>
+						<li class="selected"|cond="$key==$lang_type"><a href="{getUrl('l',$key)}" data-langcode="{$key}" onclick="doChangeLangType('{$key}'); return false;">{$val}</a></li>
 						<!--@end-->
 					</ul>
 				</li>
diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index 631ca8a07..f5b8d78ac 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -371,14 +371,16 @@ button.text{border:0; overflow:visible; padding:0; margin:0; color:#33a; backgro
 .header #moveSiteList li{white-space:nowrap; margin:0; padding:4px 0; border-bottom:1px dotted #ccc}
 .header #siteMapList{padding:0 1em 1em 1em; margin:0}
 .header #siteMapList li{white-space:nowrap}
-.header .account{position:absolute;z-index:3; width:100%;padding:5px 2em 5px 0;top:0;right:0;white-space:nowrap;text-align:right;background:#333;border-bottom:1px solid #656565;color:#fff;font-size:12px;box-shadow:0 0 10px #333;-moz-box-shadow:0 0 10px #333;-webkit-box-shadow:0 0 10px #333}
+.header .account{position:absolute;z-index:3; width:100%;padding:5px 0;top:0;right:0;white-space:nowrap;text-align:right;background:#333;border-bottom:1px solid #656565;color:#fff;font-size:12px;box-shadow:0 0 10px #333;-moz-box-shadow:0 0 10px #333;-webkit-box-shadow:0 0 10px #333}
 .stAdmin .header .account{background:#0e5f69}
-.header .account ul{margin:0;padding:0;list-style:none}
+.header .account ul{margin:0 2px 0 0;padding:0;list-style:none}
 .header .account li{position:relative;display:inline;border-left:1px solid #666;padding:0 6px 0 10px}
 .header .account li:first-child{border:0}
 .header .account a{color:#fff;display:inline-block;height:14px}
-.header #language{position:absolute;top:19px;right:0;padding:10px !important;border:1px solid #666;border-top:0;background:#333}
-.header #language li{border:0;display:block;padding:0;text-align:left;line-height:1.4}
+.header .account a.language{padding-right:2px}
+.header #language{position:absolute;top:19px;right:0;padding:6px 4px !important;border:1px solid #666;border-top:0;background:#333}
+.header #language li{border:0;display:block;padding:1px 8px;text-align:left;line-height:1}
+.header #language li.selected{background:transparent url(../img/checked.png) no-repeat left center;}
 .header h1 a:hover,
 .header h1 a:active,
 .header h1 a:focus,
@@ -545,20 +547,22 @@ input#lang_mn{background:url(../img/flag.mn.gif) no-repeat 96% center}
 .noticeAlert em{font-style:normal;font-weight:bold}
 /* Theme & Skin Preview */
 .thumbPreview li{position:relative;padding-left:10px;padding-right:10px;}
-.thumbPreview li.active{background:#FFFCE0}
-.thumbPreview .prevToggle{position:absolute;top:8px;right:0;line-height:16px;padding:0 18px 0 0;text-decoration:none;background:url(../img/iconArrow.gif) no-repeat right -32px}
+.thumbPreview li.active{background:#f9f9f9}
+.thumbPreview .prevToggle{position:absolute;top:8px;right:10px;line-height:16px;padding:0 18px 0 0;text-decoration:none;background:url(../img/iconArrow.gif) no-repeat right -32px}
 .thumbPreview li.active .prevToggle{background-position:right 0}
 .thumbPreview .a{border:0;margin:0;zoom:1}
 .thumbPreview .a:after{content:"";display:block;clear:both}
 .thumbPreview .i{float:left;vertical-align:top;margin:0 1em 1em 0;padding:0;border:0;zoom:1}
 .thumbPreview .i:after{content:"";display:block;clear:both}
 .thumbPreview .i .thumb{position:relative;width:120px;height:70px;padding:10px 0 0 0;text-align:center;overflow:hidden;border:1px solid #ddd;display:block;cursor:pointer;background:#fff}
+.thumbPreview .i .thumb .frame{position:absolute;width:120px;height:70px;left:0;top:0;border:3px solid #fff}
 .thumbPreview .i .thumb img{width:120px;margin:-10px 0 0 0}
 .thumbPreview .i input{display:none}
 .thumbPreview .i ul{display:none}
 .thumbPreview .i.checked{display:block;float:none}
-.thumbPreview .i.checked .thumb{float:left;width:180px;height:120px;margin:0 1em 0 0;border:5px solid #C6DFEC;box-shadow:0 0 5px #666 inset;-moz-box-shadow:0 0 3px #666 inset;-webkit-box-shadow:0 0 5px #666 inset}
-.thumbPreview li.active .i.checked .thumb{border-color:#66A9CC}
+.thumbPreview .i.checked .thumb{float:left;width:180px;height:120px;margin:0 1em 0 0;border:2px solid #eee}
+.thumbPreview .i.checked .thumb .frame{width:180px;height:120px}
+.thumbPreview li.active .i.checked .thumb{border-color:#5ea8f6}
 .thumbPreview .i.checked .thumb img{width:180px;position:relative;z-index:-1}
 .thumbPreview li.active .i.checked .thumb img{z-index:auto}
 .thumbPreview .i.checked label{cursor:text}
diff --git a/modules/admin/tpl/img/checked.png b/modules/admin/tpl/img/checked.png
new file mode 100644
index 000000000..419b7514f
Binary files /dev/null and b/modules/admin/tpl/img/checked.png differ
diff --git a/modules/admin/tpl/js/theme.js b/modules/admin/tpl/js/theme.js
index 9b31d3246..6d995bea5 100644
--- a/modules/admin/tpl/js/theme.js
+++ b/modules/admin/tpl/js/theme.js
@@ -6,7 +6,7 @@ $('#theme,#skin')
 		// thumbnail list
 		.find('.a')
 			.has('li.i:nth-child(2)')
-				.after('<a href="#" class="prevToggle">Show</a>')
+				.after('<a href="#toggle-tp" class="prevToggle">Show</a>')
 				.next('a.prevToggle')
 					.click(function(){
 						var $list = $(this).prev('.a');
diff --git a/modules/admin/tpl/theme.html b/modules/admin/tpl/theme.html
index 6589b8370..4dd502235 100644
--- a/modules/admin/tpl/theme.html
+++ b/modules/admin/tpl/theme.html
@@ -46,7 +46,7 @@
 					<ul class="a">
 						<!--@foreach($layout_list as $val)-->
 						<li class="i">
-							<span class="thumb"><!--@if($val->thumbnail)--><img src="{$val->thumbnail}" alt="" /><!--@else-->Thumbnail does not exist<!--@end--></span>
+						<span class="thumb"><span class="frame"><!--@if($val->thumbnail)--><img src="{$val->thumbnaill}" alt="" /><!--@else-->Thumbnail does not exist<!--@end--></span></span>
 							<input type="radio" name="layout" id="layout_{$val->layout_srl}" value="{$val->layout_srl}" <!--@if($val->layout_srl == $current_layout)-->checked="checked"<!--@end--> /> 
 							<label for="layout_{$val->layout_srl}">{$val->layout_title.'('.$val->layout.')'}</label>
 							<ul>
@@ -71,7 +71,7 @@
 					<ul class="a">
 						<!--@if(!$theme_info->skin_info[$key])-->
 						<li class="i noDirection">
-							<span class="thumb"></span>
+						<span class="thumb"><span class="frame"></span></span>
 							<input type="radio" name="{$key}-skin" id="{$key}_none" value="__skin_none__" checked="checked" /> 
 							<label for="{$key}_none">선택한 {$key} 스킨 없음</label>
 							<ul>
@@ -81,7 +81,7 @@
 						<!--@end-->
 						<!--@foreach($val as $skey=>$sval)-->
 						<li class="i">
-							<span class="thumb"><!--@if($sval->thumbnail)--><img src="{$sval->thumbnail}" alt="" /><!--@else-->Thumbnail does not exist<!--@end--></span>
+						<span class="thumb"><span class="frame"><!--@if($sval->thumbnail)--><img src="{$sval->thumbnail}" alt="" /><!--@else-->Thumbnail does not exist<!--@end--></span></span>
 							<input type="radio" name="{$key}-skin" id="{$key.'_'.$skey}" value="{$skey}" <!--@if($theme_info->skin_info[$key] == $skey)-->checked="checked"<!--@end--> /> 
 							<label for="{$key.'_'.$skey}">{$sval->title.'('.$skey.')'}</label>
 							<ul>
@@ -92,7 +92,6 @@
 								<!--@endforeach-->	
 								</li>
 								<li>&rsaquo; 설명: {$sval->description}</li>
-								<li>&rsaquo; 설정: <a href="#">Edit</a></li>
 							</ul>
 						</li>
 						<!--@end-->
