diff --git a/src/admin/config.php b/src/admin/config.php
index cb04f043..d010f0cb 100644
--- a/src/admin/config.php
+++ b/src/admin/config.php
@@ -138,7 +138,7 @@ function DedeInclude($filename, $isabs = FALSE)
     return $isabs ? $filename : DEDEADMIN.'/'.$filename;
 }
 /**
- *  根据会员mid获取会员名称
+ *  根据会员mid获取账号
  *
  * @access    public
  * @param     int  $mid   会员id
diff --git a/src/admin/index_testenv.php b/src/admin/index_testenv.php
index 6f503c6b..fc2afeac 100644
--- a/src/admin/index_testenv.php
+++ b/src/admin/index_testenv.php
@@ -78,7 +78,7 @@ if (!function_exists('PostHost')) {
 	}
 }
 if (!function_exists('TestAdminPWD')) {
-	//返回结果，1没有修改默认管理员名称，2没有修改默认管理员会员名和密码，3没有发现默认账号
+	//返回结果，1没有修改默认管理员名称，2没有修改默认管理员账号和密码，3没有发现默认账号
 	function TestAdminPWD()
 	{
 		global $dsql;
diff --git a/src/admin/member_do.php b/src/admin/member_do.php
index e7b1d540..5a99a9d5 100644
--- a/src/admin/member_do.php
+++ b/src/admin/member_do.php
@@ -52,7 +52,7 @@ if ($dopost == "delmember") {
                 exit();
             }
         }
-        ShowMsg("成功删除一个会员", $ENV_GOBACK_URL);
+        ShowMsg("成功删除一个账户", $ENV_GOBACK_URL);
         exit();
     }
     $randcode = mt_rand(10000, 99999);
@@ -124,11 +124,11 @@ else if ($dopost == "recommend") {
     $id = preg_replace("#[^0-9]#", "", $id);
     if ($matt == 0) {
         $dsql->ExecuteNoneQuery("UPDATE `#@__member` SET matt=1 WHERE mid='$id' AND matt<>10 LIMIT 1");
-        ShowMsg("成功设置一个会员推荐", $ENV_GOBACK_URL);
+        ShowMsg("成功设置一个账户推荐", $ENV_GOBACK_URL);
         exit();
     } else {
         $dsql->ExecuteNoneQuery("UPDATE `#@__member` SET matt=0 WHERE mid='$id' AND matt<>10 LIMIT 1");
-        ShowMsg("成功取消一个会员推荐", $ENV_GOBACK_URL);
+        ShowMsg("成功取消一个账户推荐", $ENV_GOBACK_URL);
         exit();
     }
 }
diff --git a/src/admin/member_pmone.php b/src/admin/member_pmone.php
index 70303425..0c4b5a2e 100644
--- a/src/admin/member_pmone.php
+++ b/src/admin/member_pmone.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * 发送一个会员短消息
+ * 发送一个账户短消息
  *
  * @version        $id:member_pmone.php 11:24 2010年7月20日 tianya $
  * @package        DedeBIZ.Administrator
@@ -10,8 +10,8 @@
  */
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('member_Pm');
-//检查会员名的合法性
-function CheckUserID($uid, $msgtitle = '会员名', $ckhas = true)
+//检查账号的合法性
+function CheckUserID($uid, $msgtitle = '账号', $ckhas = true)
 {
     global $cfg_mb_notallow, $cfg_mb_idmin, $cfg_md_idurl, $cfg_soft_lang, $dsql;
     if ($cfg_mb_notallow != '') {
@@ -52,7 +52,7 @@ if ($action == "post") {
         ShowMsg("请填写信息标题", "-1");
         exit();
     }
-    $msg = CheckUserID($msgtoid, "会员名", false);
+    $msg = CheckUserID($msgtoid, "账号", false);
     if ($msg != 'ok') {
         ShowMsg($msg, "-1");
         exit();
diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php
index 27d72de6..15221b6f 100644
--- a/src/admin/sys_admin_user_add.php
+++ b/src/admin/sys_admin_user_add.php
@@ -15,7 +15,7 @@ if (empty($dopost)) $dopost = '';
 if ($dopost == 'add') {
     CheckCSRF();
     if (preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd) || preg_match("#[^0-9a-zA-Z_@!\.-]#", $userid)) {
-        ShowMsg('密码或或会员名不合法，使用[0-9a-zA-Z_@!.-]范围以内字符', '-1', 0, 3000);
+        ShowMsg('密码或或账号不合法，使用[0-9a-zA-Z_@!.-]范围以内字符', '-1', 0, 3000);
         exit();
     }
     $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24);
@@ -25,7 +25,7 @@ if ($dopost == 'add') {
     }
     $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__member` WHERE userid LIKE '$userid' ");
     if ($row['dd'] > 0) {
-        ShowMsg('会员名已存在', '-1');
+        ShowMsg('账号已存在', '-1');
         exit();
     }
     $pfd = "pwd";
@@ -60,7 +60,7 @@ if ($dopost == 'add') {
     $adminquery = "Insert Into `#@__member_space` (`mid`,`pagesize`,`matt`,`spacename`,`spacelogo`,`spacestyle`,`sign`,`spacenews`)
         VALUES ('$mid','10','0','{$uname}的空间','','person','',''); ";
     $dsql->ExecuteNoneQuery($adminquery);
-    ShowMsg('成功添加一个用户', 'sys_admin_user.php');
+    ShowMsg('成功添加一个账户', 'sys_admin_user.php');
     exit();
 }
 $randcode = mt_rand(10000, 99999);
diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php
index 32b5a7ca..873e7faa 100644
--- a/src/admin/sys_admin_user_edit.php
+++ b/src/admin/sys_admin_user_edit.php
@@ -47,12 +47,12 @@ if ($dopost == 'saveedit') {
     if ($olduserid !== $userid) {
         $row = $dsql->GetOne("SELECT mid FROM `#@__member` WHERE userid LIKE '$userid' ");
         if (is_array($row)) {
-            ShowMsg("您指定的会员名<span class='text-primary'>{$userid}</span>已存在，请使用别的会员名", "-1");
+            ShowMsg("您指定的账号<span class='text-primary'>{$userid}</span>已存在，请使用别的账号", "-1");
             exit();
         }
         $row = $dsql->GetOne("SELECT id FROM `#@__admin` WHERE userid LIKE '$userid' ");
         if (is_array($row)) {
-            ShowMsg("您指定的会员名<span class='text-primary'>{$userid}</span>已存在，请使用别的会员名", "-1");
+            ShowMsg("您指定的账号<span class='text-primary'>{$userid}</span>已存在，请使用别的账号", "-1");
             exit();
         }
         $usql = ",userid='$userid'";
@@ -65,7 +65,7 @@ if ($dopost == 'saveedit') {
     $dsql->ExecuteNoneQuery($query);
     $query = "UPDATE `#@__member` SET uname='$uname',email='$email'$pwdm $usql WHERE mid='$id'";
     $dsql->ExecuteNoneQuery($query);
-    ShowMsg("成功修改一个用户", "sys_admin_user.php");
+    ShowMsg("成功修改一个账户", "sys_admin_user.php");
     exit();
 } else if ($dopost == 'delete') {
     if (empty($userok)) $userok = "";
diff --git a/src/admin/sys_group_edit.php b/src/admin/sys_group_edit.php
index d8df7c01..7d6cea98 100644
--- a/src/admin/sys_group_edit.php
+++ b/src/admin/sys_group_edit.php
@@ -28,7 +28,7 @@ if ($dopost == 'save') {
     exit();
 } else if ($dopost == 'del') {
     $dsql->ExecuteNoneQuery("DELETE FROM `#@__admintype` WHERE CONCAT(`rank`)='$rank' AND `system`='0';");
-    ShowMsg("成功删除一个会员组", "sys_group.php");
+    ShowMsg("成功删除一个账户组", "sys_group.php");
     exit();
 }
 $groupRanks = array();
diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm
index 8081271f..0ceb7110 100644
--- a/src/admin/templets/album_add.htm
+++ b/src/admin/templets/album_add.htm
@@ -96,7 +96,7 @@
 								<td width="120">缩略图：</td>
 								<td width="630">
 									<input type="text" name="picname" id="picname" class="admin-input-lg">
-									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
+									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-30"> 远程</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
 									<button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-sm btn-success delete">清空</button>
@@ -139,7 +139,7 @@
 										echo "</select>";
 										?>
 									</span>
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid')" title="快捷选择"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid')" title="快捷选择"></i></span>
 									<?php
 									if ($cfg_need_typeid2=='Y') {
 									  echo "<a href='javascript:AddTypeid2();' class='btn btn-success btn-sm'>选择副栏目</a>";
@@ -160,7 +160,7 @@
 								<td>
 									<span id="typeid2ct"></span>
 									<input type="text" name="typeid2" id="typeid2" value="" class="admin-input-sm">
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2')" title="选择副栏目"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2')" title="选择副栏目"></i></span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm
index 36b444c0..d5d1bb19 100644
--- a/src/admin/templets/album_edit.htm
+++ b/src/admin/templets/album_edit.htm
@@ -97,7 +97,7 @@
 								<td width="120">缩略图：</td>
 								<td width="630">
 									<input type="text" name="picname" id="picname" value="<?php echo $arcRow['litpic']?>" class="admin-input-lg">
-									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
+									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-30"> 远程</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
 									<button type="button" name="Submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
@@ -138,7 +138,7 @@
 									echo $typeOptions;
 									echo '</select>';
 									?>
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid','<?php echo $arcRow['typeid'];?>')" title="快捷选择"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid','<?php echo $arcRow['typeid'];?>')" title="快捷选择"></i></span>
 								</td>
 								<td width="120">需要金币：</td>
 								<td><input type="text" name="money" id="money" value="<?php echo $arcRow['money']?>" class="admin-input-sm"></td>
@@ -155,7 +155,7 @@
 								<td>
 									<span id="typeid2ct"></span>
 									<input type="text" name="typeid2" id="typeid2" value="<?php echo ($arcRow['typeid2']=='0' ? '' : $arcRow['typeid2']);?>" class="admin-input-sm">
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2','<?php echo $arcRow['typeid2'];?>')" title="选择副栏目"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2','<?php echo $arcRow['typeid2'];?>')" title="选择副栏目"></i></span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm
index 558b36dd..9ebca2aa 100644
--- a/src/admin/templets/archives_add.htm
+++ b/src/admin/templets/archives_add.htm
@@ -90,7 +90,7 @@
 								<td width="120">缩略图：</td>
 								<td width="630">
 									<input type="text" name="picname" id="picname" class="admin-input-lg">
-									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
+									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-30"> 远程</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
 									<button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success delete">清空</button>
@@ -140,7 +140,7 @@
 										echo "</select>";
 										?>
 									</span>
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid')" title="快捷选择"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid')" title="快捷选择"></i></span>
 									<?php
 									if ($cfg_need_typeid2=='Y') {
 										echo "<a href='javascript:AddTypeid2();' class='btn btn-success btn-sm'>选择副栏目</a>";
@@ -161,7 +161,7 @@
 								<td>
 									<span id="typeid2ct"></span>
 									<input type="text" name="typeid2" id="typeid2" value="" class="admin-input-sm">
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2')" title="选择副栏目"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2')" title="选择副栏目"></i></span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm
index f231aeaf..17881ec3 100644
--- a/src/admin/templets/archives_edit.htm
+++ b/src/admin/templets/archives_edit.htm
@@ -92,7 +92,7 @@
 								<td width="120">缩略图：</td>
 								<td width="630">
 									<input name="picname" type="text" id="picname" value="<?php echo $arcRow['litpic']?>" class="admin-input-lg">
-									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
+									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-30"> 远程</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
 									<button type="button" name="Submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
 									<button id="btnClearAll" type="button" class="btn btn-success btn-sm">清空</button>
@@ -142,7 +142,7 @@
 									echo $typeOptions;
 									echo "</select>";
 									?>
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid')" title="快捷选择"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid')" title="快捷选择"></i></span>
 								</td>
 								<td width="120">需要金币：</td>
 								<td><input name="money" type="text" id="money" value="<?php echo $arcRow['money']?>" class="admin-input-sm"></td>
@@ -159,7 +159,7 @@
 								<td>
 									<span id="typeid2ct"></span>
 									<input type="text" name="typeid2" id="typeid2" value="<?php echo ($arcRow['typeid2']=='0' ? '' : $arcRow['typeid2']);?>" class="admin-input-sm">
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2','<?php echo $arcRow['typeid2'];?>')" title="选择副栏目"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2','<?php echo $arcRow['typeid2'];?>')" title="选择副栏目"></i></span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm
index e15d4b19..1ee9617d 100644
--- a/src/admin/templets/archives_sg_add.htm
+++ b/src/admin/templets/archives_sg_add.htm
@@ -63,7 +63,7 @@
 								<td width="120">缩略图：</td>
 								<td width="630">
 									<input type="text" name="picname" id="picname" class="admin-input-lg">
-									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
+									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-30"> 远程</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
 									<button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
@@ -93,7 +93,7 @@
 										echo "</select>";
 										?>
 									</span>
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid')" title="快捷选择"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid')" title="快捷选择"></i></span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm
index 2c55545c..82475b4e 100644
--- a/src/admin/templets/archives_sg_edit.htm
+++ b/src/admin/templets/archives_sg_edit.htm
@@ -67,7 +67,7 @@
 								<td width="120">缩略图：</td>
 								<td width="630">
 									<input type="text" name="picname" id="picname" class="admin-input-lg" value="<?php echo $addRow['litpic']?>">
-									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
+									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-30"> 远程</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
 									<button type="button" name="Submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
@@ -95,7 +95,7 @@
 									echo $typeOptions;
 									echo "</select>";
 									?>
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid','<?php echo $addRow['typeid'];?>')" title="快捷选择"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid','<?php echo $addRow['typeid'];?>')" title="快捷选择"></i></span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm
index 12178c4d..42c118e7 100644
--- a/src/admin/templets/article_add.htm
+++ b/src/admin/templets/article_add.htm
@@ -90,7 +90,7 @@
 								<td width="120">缩略图：</td>
 								<td width="630">
 									<input type="text" name="picname" id="picname" class="admin-input-lg">
-									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
+									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-30"> 远程</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
 									<button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
@@ -133,7 +133,7 @@
 										echo "</select>";
 										?>
 									</span>
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid')" title="快捷选择"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid')" title="快捷选择"></i></span>
 									<?php
 									if ($cfg_need_typeid2=='Y') {
 										echo "<a href='javascript:AddTypeid2();' class='btn btn-success btn-sm'>选择副栏目</a>";
@@ -154,7 +154,7 @@
 								<td>
 									<span id="typeid2ct"></span>
 									<input type="text" name="typeid2" id="typeid2" value="" class="admin-input-sm">
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2')" title="选择副栏目"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2')" title="选择副栏目"></i></span>
 								</td>
 							</tr>
 						</table>
@@ -208,8 +208,8 @@
 							<tr>
 								<td width="120">分页方式：</td>
 								<td>
-									<label class="l-height-28"><input type="radio" name="sptype" value="hand" <?php if ($cfg_arcautosp=='N') echo "checked='checked'"?>> 手动</label>
-									<label class="l-height-28"><input type="radio" name="sptype" value="auto" <?php if ($cfg_arcautosp=='Y') echo "checked='checked'"?>> 自动</label>
+									<label class="l-height-30"><input type="radio" name="sptype" value="hand" <?php if ($cfg_arcautosp=='N') echo "checked='checked'"?>> 手动</label>
+									<label class="l-height-30"><input type="radio" name="sptype" value="auto" <?php if ($cfg_arcautosp=='Y') echo "checked='checked'"?>> 自动</label>
 									<label>大小：<input name="spsize" type="text" id="spsize" value="<?php echo $cfg_arcautosp_size?>" class="admin-input-xs"> K（分页符为：#p#分页标题#e#）</label>
 								</td>
 							</tr>
diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm
index cef9ae58..1ea405d0 100644
--- a/src/admin/templets/article_edit.htm
+++ b/src/admin/templets/article_edit.htm
@@ -97,7 +97,7 @@
 								<td width="120">缩略图：</td>
 								<td width="630">
 									<input name="picname" type="text" id="picname" value="<?php echo $arcRow['litpic']?>" class="admin-input-lg">
-									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
+									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-30"> 远程</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
 									<button type="button" name="Submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
 									<button id="btnClearAll" type="button" class="btn btn-success btn-sm">清空</button>
@@ -138,7 +138,7 @@
 									echo $typeOptions;
 									echo "</select>";
 									?>
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid','<?php echo $arcRow['typeid'];?>')" title="快捷选择"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid','<?php echo $arcRow['typeid'];?>')" title="快捷选择"></i></span>
 								</td>
 								<td width="120">需要金币：</td>
 								<td><input name="money" type="text" id="money" value="<?php echo $arcRow['money']?>" class="admin-input-sm"></td>
@@ -155,7 +155,7 @@
 								<td>
 									<span id="typeid2ct"></span>
 									<input type="text" name="typeid2" id="typeid2" value="<?php echo ($arcRow['typeid2']=='0'?'':$arcRow['typeid2']);?>" class="admin-input-sm">
-									<i class='btn btn-sm fa fa-search' onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2','<?php echo $arcRow['typeid2'];?>')" title="选择副栏目"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2','<?php echo $arcRow['typeid2'];?>')" title="选择副栏目"></i></span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm
index 32362774..8bfc6950 100644
--- a/src/admin/templets/catalog_add.htm
+++ b/src/admin/templets/catalog_add.htm
@@ -166,9 +166,9 @@
 					</td>
 					<td>栏目交叉：</td>
 					<td>
-						<label class="l-height-28"><input type="radio" name="cross" id="cross0" value="0" onclick="CheckCross()" checked="checked"> 不交叉</label>
-						<label class="l-height-28"><input type="radio" name="cross" id="cross1" value="1" onclick="CheckCross()"> 自动获取同名栏目</label>
-						<label class="l-height-28"><input type="radio" name="cross" id="cross2" value="2" onclick="CheckCross()"> 指定交叉栏目id（英文逗号分开）</label>
+						<label class="l-height-30"><input type="radio" name="cross" id="cross0" value="0" onclick="CheckCross()" checked="checked"> 不交叉</label>
+						<label class="l-height-30"><input type="radio" name="cross" id="cross1" value="1" onclick="CheckCross()"> 自动获取同名栏目</label>
+						<label class="l-height-30"><input type="radio" name="cross" id="cross2" value="2" onclick="CheckCross()"> 指定交叉栏目id（英文逗号分开）</label>
 						<span onclick="ShowHide('helpvarco')" title="帮助" class="btn btn-success btn-sm"><i class="fa fa-question-circle"></i></span><br>
 						<textarea name="crossid" id="crossid" class="admin-textarea-sm" style="display:none"></textarea>
 						<div id="helpvarco" class="alert alert-info my-2" style="display:none">交叉栏目是大栏目与另一个非子栏目交叉的情况，相当于副栏目功能，需要在栏目里设置好</div>
@@ -265,8 +265,8 @@
 					<td>是否支持跨站调用：</td>
 					<td>
 						<input type="text" name="apikey" id="apikey" class="admin-input-lg" placeholder="请输入跨站调用秘钥">
-						<label class="l-height-28"><input type="radio" name="apienabled" value="1"> 支持</label>
-						<label class="l-height-28"><input type="radio" name="apienabled" value="0" checked="checked"> 不支持</label>
+						<label class="l-height-30"><input type="radio" name="apienabled" value="1"> 支持</label>
+						<label class="l-height-30"><input type="radio" name="apienabled" value="0" checked="checked"> 不支持</label>
 						<span class="btn btn-success btn-sm ml-2" title="更新秘钥" onclick="makeAPIKey()"><i class="fa fa-repeat"></i></span>
 					</td>
 				</tr>
diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm
index 92ba7c29..58c83f38 100644
--- a/src/admin/templets/catalog_edit.htm
+++ b/src/admin/templets/catalog_edit.htm
@@ -152,9 +152,9 @@
 					</td>
 					<td>栏目交叉：</td>
 					<td>
-						<label class="l-height-28"><input type="radio" name="cross" id="cross0" value="0" onclick="CheckCross()" <?php if ($myrow['cross']==0) echo "checked='checked'";?>> 不交叉</label>
-						<label class="l-height-28"><input type="radio" name="cross" id="cross1" value="1" onclick="CheckCross()" <?php if ($myrow['cross']==1) echo "checked='checked'";?>> 自动获取同名栏目</label>
-						<label class="l-height-28"><input type="radio" name="cross" id="cross2" value="2" onclick="CheckCross()" <?php if ($myrow['cross']==2) echo "checked='checked'";?>> 指定交叉栏目id（英文逗号分开）</label>
+						<label class="l-height-30"><input type="radio" name="cross" id="cross0" value="0" onclick="CheckCross()" <?php if ($myrow['cross']==0) echo "checked='checked'";?>> 不交叉</label>
+						<label class="l-height-30"><input type="radio" name="cross" id="cross1" value="1" onclick="CheckCross()" <?php if ($myrow['cross']==1) echo "checked='checked'";?>> 自动获取同名栏目</label>
+						<label class="l-height-30"><input type="radio" name="cross" id="cross2" value="2" onclick="CheckCross()" <?php if ($myrow['cross']==2) echo "checked='checked'";?>> 指定交叉栏目id（英文逗号分开）</label>
 						<span onclick="ShowHide('helpvarco')" title="帮助" class="btn btn-success btn-sm"><i class="fa fa-question-circle"></i></span><br>
 						<textarea name="crossid" id="crossid" class="admin-textarea-sm" style="<?php if ($myrow['cross']!=2) echo'display:none';?>"><?php echo $myrow['crossid'];?></textarea>
 						<div id="helpvarco" class="alert alert-info my-2" style="display:none">交叉栏目是大栏目与另一个非子栏目交叉的情况，相当于副栏目功能，需要在栏目里设置好</div>
diff --git a/src/admin/templets/diy_list.htm b/src/admin/templets/diy_list.htm
index 4bbafcfe..f0fd18d3 100644
--- a/src/admin/templets/diy_list.htm
+++ b/src/admin/templets/diy_list.htm
@@ -38,8 +38,8 @@
 					<td colspan="3">
 						<input type="button" name="select" onclick="selAll()" class="btn btn-success btn-sm" value="全选">
 						<input type="button" name="select" onclick="noSelAll()" class="btn btn-success btn-sm mr-2" value="取消">
-						<label class="l-height-28 mr-2"><input type="radio" name="action" value="check"> 审核</label>
-						<label class="l-height-28 mr-2"><input type="radio" name="action" value="delete"> 删除</label>
+						<label class="l-height-30 mr-2"><input type="radio" name="action" value="check"> 审核</label>
+						<label class="l-height-30 mr-2"><input type="radio" name="action" value="delete"> 删除</label>
 						<button type="submit" name="submit" class="btn btn-success btn-sm">提交</button>
 						<a href="../apps/diy.php?action=list&diyid=<?php echo $diy->diyid;?>" target="_blank" class="btn btn-success btn-sm">预览</a>
 					</td>
diff --git a/src/admin/templets/freelist_add.htm b/src/admin/templets/freelist_add.htm
index 77483f40..011df644 100644
--- a/src/admin/templets/freelist_add.htm
+++ b/src/admin/templets/freelist_add.htm
@@ -65,7 +65,7 @@
 					<td>目录默认页名称：</td>
 					<td>
 						<input type="text" name="defaultpage" id="defaultpage" value="index.html" class="admin-input-lg">
-						<label class="l-height-28"><input type="checkbox" name="nodefault" id="nodefault" value="1"> 不使用目录默认首页</label>
+						<label class="l-height-30"><input type="checkbox" name="nodefault" id="nodefault" value="1"> 不使用目录默认首页</label>
 					</td>
 				</tr>
 				<tr>
@@ -144,9 +144,9 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<label class="l-height-28">高级筛选：<input type="checkbox" name="types[]" id="type1" value="image"> 带缩略图</label>
-						<label class="l-height-28"><input type="checkbox" name="types[]" id="type2" value="commend"> 推荐</label>
-						<label class="l-height-28"><input type="checkbox" name="types[]" id="type3" value="spec"> 专题</label>
+						<label class="l-height-30">高级筛选：<input type="checkbox" name="types[]" id="type1" value="image"> 带缩略图</label>
+						<label class="l-height-30"><input type="checkbox" name="types[]" id="type2" value="commend"> 推荐</label>
+						<label class="l-height-30"><input type="checkbox" name="types[]" id="type3" value="spec"> 专题</label>
 						<label>关键词：<input type="text" name="keywordarc" id="keywordarc">（英文逗号分开）</label>
 					</td>
 				</tr>
@@ -162,8 +162,8 @@
 							<option value="lastpost">最后评论时间</option>
 							<option value="postnum">评论总数</option>
 						</select>
-						<label class="l-height-28"><input type="radio" name="order" value="desc" checked="checked"> 由高到低</label>
-						<label class="l-height-28"><input type="radio" name="order" value="asc"> 由低到高</label>
+						<label class="l-height-30"><input type="radio" name="order" value="desc" checked="checked"> 由高到低</label>
+						<label class="l-height-30"><input type="radio" name="order" value="asc"> 由低到高</label>
 					</td>
 				</tr>
 				<tr>
diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm
index c417e8f1..60eb9009 100644
--- a/src/admin/templets/freelist_edit.htm
+++ b/src/admin/templets/freelist_edit.htm
@@ -137,9 +137,9 @@
 						if ($setype=='') $setype = 'X';
 						?>
 						<span>高级筛选：</span>
-						<label class="l-height-28"><input type="checkbox" name="types[]" id="type1" value="image" <?php if (preg_match("#image#i",$setype)) echo ' checked';?>> 带缩略图</label>
-						<label class="l-height-28"><input type="checkbox" name="types[]" id="type2" value="commend" <?php if (preg_match("#commend#i", $setype)) echo ' checked';?>> 推荐</label>
-						<label class="l-height-28"><input type="checkbox" name="types[]" id="type3" value="spec" <?php if (preg_match("#spec#i", $setype)) echo ' checked';?>> 专题</label>
+						<label class="l-height-30"><input type="checkbox" name="types[]" id="type1" value="image" <?php if (preg_match("#image#i",$setype)) echo ' checked';?>> 带缩略图</label>
+						<label class="l-height-30"><input type="checkbox" name="types[]" id="type2" value="commend" <?php if (preg_match("#commend#i", $setype)) echo ' checked';?>> 推荐</label>
+						<label class="l-height-30"><input type="checkbox" name="types[]" id="type3" value="spec" <?php if (preg_match("#spec#i", $setype)) echo ' checked';?>> 专题</label>
 						<label>关键词：<input type="text" name="keywordarc" id="keywordarc" value="<?php echo $ctag->GetAtt('keyword')?>">（英文逗号分开）</label>
 					</td>
 				</tr>
@@ -167,8 +167,8 @@
 							<option value="lastpost">最后评论时间</option>
 							<option value="postnum">评论总数</option>
 						</select>
-						<label class="l-height-28"><input type="radio" name="order" value="desc" <?php if ($ctag->GetAtt('orderway')=='desc') echo "checked";?>> 由高到低</label>
-						<label class="l-height-28"><input type="radio" name="order" value="asc" <?php if ($ctag->GetAtt('orderway')=='asc') echo "checked";?>> 由低到高</label>
+						<label class="l-height-30"><input type="radio" name="order" value="desc" <?php if ($ctag->GetAtt('orderway')=='desc') echo "checked";?>> 由高到低</label>
+						<label class="l-height-30"><input type="radio" name="order" value="asc" <?php if ($ctag->GetAtt('orderway')=='asc') echo "checked";?>> 由低到高</label>
 					</td>
 				</tr>
 				<tr>
diff --git a/src/admin/templets/member_edit.htm b/src/admin/templets/member_edit.htm
index 2842e51a..a41c075f 100644
--- a/src/admin/templets/member_edit.htm
+++ b/src/admin/templets/member_edit.htm
@@ -21,7 +21,7 @@
 				</tr>
 				<?php if ($row['matt']==10) echo '<tr><td colspan="2"><div class="alert alert-info mb-0">该会员关连网站管理员，修改不当会导致无法登录</div></td></tr>';?>
 				<tr>
-					<td width="260">头像/会员名：</td>
+					<td width="260">头像/账号：</td>
 					<td>
 						<span class="mr-1"><?php if ($row['face']!='') {echo "<img src='{$row['face']}' class='user-img-sm'>";};echo "".$row['userid']."";?></span>
 						<span class="btn btn-outline-success btn-sm"><?php echo GetMemberTypeName($row['rank']);?></span>
diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm
index c7be3f84..8deeb7ca 100644
--- a/src/admin/templets/member_main.htm
+++ b/src/admin/templets/member_main.htm
@@ -57,7 +57,7 @@
 				<tr bgcolor="#e9ecef" align="center">
 					<td width="6%">选择</td>
 					<td width="6%">mid</td>
-					<td width="12%">头像/会员名</td>
+					<td width="12%">头像/账号</td>
 					<td width="8%">昵称</td>
 					<td width="8%">等级</td>
 					<td width="16%">钱包积分</td>
diff --git a/src/admin/templets/member_pm.htm b/src/admin/templets/member_pm.htm
index 17ef982e..95375160 100644
--- a/src/admin/templets/member_pm.htm
+++ b/src/admin/templets/member_pm.htm
@@ -15,7 +15,7 @@
 				<tr>
 					<td bgcolor="#f5f5f5">
 						<input type="text" name="keyword" id="keyword" value="{dede:global name='keyword'/}" placeholder="请输入关键词" class="admin-input-lg mr-3">
-						<input type="text" name="username" id="username" value="{dede:global name='username'/}" placeholder="请输入会员名" class="admin-input-lg mr-3">
+						<input type="text" name="username" id="username" value="{dede:global name='username'/}" placeholder="请输入账号" class="admin-input-lg mr-3">
 						<select name="folder" id="folder" class="admin-input-sm mr-3">
 							<option value="inbox">收件箱</option>
 							<option value="outbox">发件箱</option>
diff --git a/src/admin/templets/member_pmall.htm b/src/admin/templets/member_pmall.htm
index 198f0232..2a695aa3 100644
--- a/src/admin/templets/member_pmall.htm
+++ b/src/admin/templets/member_pmall.htm
@@ -14,7 +14,7 @@
 				<tr>
 					<td bgcolor="#f5f5f5">
 						<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" class="admin-input-lg mr-3">
-						<input type="text" name="username" id="username" placeholder="请输入会员名" class="admin-input-lg mr-3">
+						<input type="text" name="username" id="username" placeholder="请输入账号" class="admin-input-lg mr-3">
 						<select name="folder" id="folder" class="admin-input-sm mr-3">
 							<option value="inbox">收件箱</option>
 							<option value="outbox">发件箱</option>
diff --git a/src/admin/templets/member_pmone.htm b/src/admin/templets/member_pmone.htm
index d66954dc..82b565bc 100644
--- a/src/admin/templets/member_pmone.htm
+++ b/src/admin/templets/member_pmone.htm
@@ -14,7 +14,7 @@
 				<tr>
 					<td bgcolor="#f5f5f5">
 						<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" class="admin-input-lg mr-3">
-						<input type="text" name="username" id="username" placeholder="请输入会员名" class="admin-input-lg mr-3">
+						<input type="text" name="username" id="username" placeholder="请输入账号" class="admin-input-lg mr-3">
 						<select name="folder" id="folder" class="admin-input-sm mr-3">
 							<option value="inbox">收件箱</option>
 							<option value="outbox">发件箱</option>
diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm
index fc249d69..e3ea60f1 100644
--- a/src/admin/templets/member_toadmin.htm
+++ b/src/admin/templets/member_toadmin.htm
@@ -22,7 +22,7 @@
 				</tr>
 				<?php if ($row['matt']==10) {echo '<tr><td colspan="2"><div class="alert alert-info mb-0">您已经是管理员，不要提升了</div></td></tr>';} else {?>
 				<tr>
-					<td width="260">会员名：</td>
+					<td width="260">账号：</td>
 					<td><?php if ($row['face']!='') {echo "<img src='{$row['face']}' class='user-img-sm'>";};echo "".$row['userid']."";?></td>
 				</tr>
 				<tr>
diff --git a/src/admin/templets/mychannel_field_add.htm b/src/admin/templets/mychannel_field_add.htm
index c0928c51..8b66346c 100644
--- a/src/admin/templets/mychannel_field_add.htm
+++ b/src/admin/templets/mychannel_field_add.htm
@@ -105,7 +105,7 @@
 							}
 							?>
 						</select>
-						<label class="l-height-28"><input type="checkbox" name="relation_automake" id="relation_automake" value="1"> 发布时自动更新关联文档</label>
+						<label class="l-height-30"><input type="checkbox" name="relation_automake" id="relation_automake" value="1"> 发布时自动更新关联文档</label>
 					</td>
 				</tr>
 				<tr>
diff --git a/src/admin/templets/mychannel_field_edit.htm b/src/admin/templets/mychannel_field_edit.htm
index 7e10ae81..f4409ab5 100644
--- a/src/admin/templets/mychannel_field_edit.htm
+++ b/src/admin/templets/mychannel_field_edit.htm
@@ -117,7 +117,7 @@
 							}
 							?>
 						</select>
-						<label class="l-height-28"><input type="checkbox" name="relation_automake" id="relation_automake" value="1" <?php echo $ctag->GetAtt('automake')==1? "checked" : "";?>> 发布时自动更新关联文档</label>
+						<label class="l-height-30"><input type="checkbox" name="relation_automake" id="relation_automake" value="1" <?php echo $ctag->GetAtt('automake')==1? "checked" : "";?>> 发布时自动更新关联文档</label>
 					</td>
 				</tr>
 				<tr>
diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm
index 1e9624ff..b3f5e222 100644
--- a/src/admin/templets/soft_add.htm
+++ b/src/admin/templets/soft_add.htm
@@ -106,7 +106,7 @@
 								<td width="120">缩略图：</td>
 								<td width="630">
 									<input type="text" name="picname" id="picname" class="admin-input-lg">
-									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
+									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-30"> 远程</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
 									<button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
@@ -149,7 +149,7 @@
 										echo "</select>";
 										?>
 									</span>
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event, this, <?php echo $channelid;?>, 'typeid')" title="快捷选择"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid')" title="快捷选择"></i></span>
 									<?php 
 									if ($cfg_need_typeid2=='Y') {
 										echo "<a href='javascript:AddTypeid2();' class='btn btn-success btn-sm'>选择副栏目</a>";
@@ -170,7 +170,7 @@
 								<td>
 									<span id="typeid2ct"></span>
 									<input type="text" name="typeid2" id="typeid2" value="" class="admin-input-sm">
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event, this, <?php echo $channelid;?>, 'typeid2')" title='选择副栏目' style='cursor:pointer'></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2')" title="选择副栏目"></i></span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm
index bd6bb1e7..7c3d83ea 100644
--- a/src/admin/templets/soft_edit.htm
+++ b/src/admin/templets/soft_edit.htm
@@ -108,7 +108,7 @@
 								<td width="120">缩略图：</td>
 								<td width="630">
 									<input type="text" name="picname" id="picname" value="<?php echo $arcRow['litpic']?>" class="admin-input-lg">
-									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
+									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-30"> 远程</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
 									<button type="button" name="Submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
@@ -149,7 +149,7 @@
 									echo $typeOptions;
 									echo "</select>";
 									?>
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid','<?php echo $arcRow['typeid'];?>')" title="快捷选择"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid','<?php echo $arcRow['typeid'];?>')" title="快捷选择"></i></span>
 								</td>
 								<td width="120">需要金币：</td>
 								<td><input type="text" name="needmoney" id="needmoney" value="<?php echo $needmoney;?>" class="admin-input-sm"></td>
@@ -166,7 +166,7 @@
 								<td>
 									<span id="typeid2ct"></span>
 									<input type="text" name="typeid2" id="typeid2" value="<?php echo ($arcRow['typeid2']=='0' ? '' : $arcRow['typeid2']);?>" class="admin-input-sm">
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2','<?php echo $arcRow['typeid2'];?>')" title="选择副栏目"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,<?php echo $channelid;?>,'typeid2','<?php echo $arcRow['typeid2'];?>')" title="选择副栏目"></i></span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm
index d4f957ea..7e53ca75 100644
--- a/src/admin/templets/spec_add.htm
+++ b/src/admin/templets/spec_add.htm
@@ -110,7 +110,7 @@
 								<td width="120">缩略图：</td>
 								<td width="630">
 									<input type="text" name="picname" id="picname" class="admin-input-lg">
-									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
+									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-30"> 远程</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
 									<button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
@@ -143,7 +143,7 @@
 									echo $typeOptions;
 									echo "</select>";
 									?>
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,0,'typeid')" title="快捷选择"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,0,'typeid')" title="快捷选择"></i></span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm
index 3e900e12..4e3e0329 100644
--- a/src/admin/templets/spec_edit.htm
+++ b/src/admin/templets/spec_edit.htm
@@ -110,7 +110,7 @@
 								<td width="120">缩略图：</td>
 								<td width="630">
 									<input type="text" name="picname" id="picname" value="<?php echo $arcRow['litpic']?>" class="admin-input-lg">
-									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
+									<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-30"> 远程</label>
 									<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
 									<button type="button" name="Submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
 									<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
@@ -143,7 +143,7 @@
 									echo $typeOptions;
 									echo "</select>";
 									?>
-									<i class="btn btn-sm fa fa-search" onclick="ShowCatMap(event,this,0,'typeid')" title="快捷选择"></i>
+									<span class="btn btn-success btn-sm"><i class="fa fa-search" onclick="ShowCatMap(event,this,0,'typeid')" title="快捷选择"></i></span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/sys_admin_user.htm b/src/admin/templets/sys_admin_user.htm
index 2a0ffd4f..8ba7af7b 100644
--- a/src/admin/templets/sys_admin_user.htm
+++ b/src/admin/templets/sys_admin_user.htm
@@ -24,7 +24,7 @@
 				<td bgcolor="#f5f5f5" colspan="6">管理员管理</td>
 			</tr>
 			<tr bgcolor="#e9ecef" align="center">
-				<td width="10%">会员名</td>
+				<td width="10%">账号</td>
 				<td width="20%">昵称</td>
 				<td width="20%">等级</td>
 				<td width="16%">地址时间</td>
diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm
index 09e7ff5e..6fa5d936 100644
--- a/src/admin/templets/sys_admin_user_add.htm
+++ b/src/admin/templets/sys_admin_user_add.htm
@@ -20,7 +20,7 @@
 					<td bgcolor="#f5f5f5" colspan="2">添加管理员</td>
 				</tr>
 				<tr>
-					<td width="260">会员名：</td>
+					<td width="260">账号：</td>
 					<td>
 						<input type="text" name="userid" id="userid" class="admin-input-sm">
 						<span>（使用[0-9a-zA-Z_@!.-]范围以内字符）</span>
@@ -89,7 +89,7 @@
 		<script>
 			function checkSubmit() {
 				if (document.form1.userid.value == "") {
-					ShowMsg("会员名不能为空");
+					ShowMsg("账号不能为空");
 					return false;
 				}
 				if (document.form1.uname.value == "") {
@@ -97,7 +97,7 @@
 					return false;
 				}
 				if (document.form1.pwd.value == "") {
-					ShowMsg("会员密码不能为空");
+					ShowMsg("密码不能为空");
 					return false;
 				}
 				return true;
diff --git a/src/admin/templets/sys_admin_user_edit.htm b/src/admin/templets/sys_admin_user_edit.htm
index a9c96c44..79b566f7 100644
--- a/src/admin/templets/sys_admin_user_edit.htm
+++ b/src/admin/templets/sys_admin_user_edit.htm
@@ -19,7 +19,7 @@
 					<td bgcolor="#f5f5f5" colspan="2">修改管理员</td>
 				</tr>
 				<tr>
-					<td width="260">会员名：</td>
+					<td width="260">账号：</td>
 					<td><input type="text" name="userid" id="userid" value="<?php echo $row['userid']?>" class="admin-input-sm"></td>
 				</tr>
 				<tr>
diff --git a/src/admin/templets/sys_login.htm b/src/admin/templets/sys_login.htm
index 484b0af8..92e2b074 100644
--- a/src/admin/templets/sys_login.htm
+++ b/src/admin/templets/sys_login.htm
@@ -22,7 +22,7 @@
 						<label for="iptAppID">登录方式</label>
 						<div class="form-check form-check-inline">
 							<input name="loginType" class="form-check-input" type="checkbox" id="loginType1" value="option1" checked disabled>
-							<label class="form-check-label" for="loginType1">会员名密码</label>
+							<label class="form-check-label" for="loginType1">账号密码</label>
 						</div>
 						<div class="form-check form-check-inline">
 							<input name="loginType" class="form-check-input" type="checkbox" id="loginType2" value="option2">
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index 9ed2984c..81992dc7 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -68,7 +68,7 @@ form,label {
 }
 input {
 	padding:.375rem .75rem;
-	height:28px;
+	height:30px;
 	color:#545b62;
 	background:#fff;
 	border:1px solid #dee2e6;
@@ -82,9 +82,10 @@ input[type=file] {
 	vertical-align:middle
 }
 input[type=button],input[type=submit],input[type=reset] {
-	padding:.25rem .5rem;
-	line-height:1.5;
-	font-size:.875rem;
+	padding:.375rem .55rem;
+	height:30px;
+	line-height:1.6;
+	font-size:12px;
 	color:#fff;
 	background:#1eb867;
 	border:0;
@@ -98,7 +99,7 @@ input[type=radio],input[type=checkbox],input[type=radio]:focus,input[type=checkb
 }
 select {
 	padding:.375rem .75rem;
-	height:28px;
+	height:30px;
 	color:#545b62;
 	background:#fff;
 	border:1px solid #dee2e6;
@@ -108,6 +109,12 @@ select {
 select[multiple=yes] {
 	height:180px
 }
+option {
+	display:flex;
+	padding:0;
+	height:30px;
+	align-items:center
+}
 textarea {
 	padding:.375rem .75rem;
 	color:#545b62;
@@ -423,7 +430,7 @@ body.hidemenu .body-right {
 }
 .quickselitem {
 	display:block;
-	line-height:28px
+	line-height:30px
 }
 .quickselitem .topcat {
 	margin-bottom:1rem;
@@ -510,15 +517,22 @@ body.hidemenu .body-right {
 	color:inherit;
 	cursor:pointer
 }
-.l-height-28 {
-	line-height:28px
+.l-height-30 {
+	line-height:30px
 }
 .list-group-item {
 	padding:.5rem 0
 }
+.btn-sm {
+	padding:.375rem .55rem;
+	height:30px;
+	line-height:1.4;
+	font-size:12px
+}
 .btn-xs {
 	padding:.2rem;
-	line-height:12px;
+	height:20px;
+	line-height:1;
 	font-size:12px
 }
 .btn+.btn {
@@ -553,8 +567,7 @@ body.hidemenu .body-right {
 	height:60px
 }
 .admin-input-lg {
-	width:360px;
-	height:28px
+	width:360px
 }
 .admin-input-md {
 	width:260px
@@ -656,7 +669,7 @@ table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubd
 }
 @media (max-width:480px) {
 	.web-info {
-	word-break:break-all
+		word-break:break-all
 	}
 	.tips {
 		padding:0 15px
@@ -670,6 +683,6 @@ table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubd
 }
 @media (min-width:480px) {
 	.modal-dialog {
-	max-width:500px
+		max-width:500px
 	}
 }
\ No newline at end of file
diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css
index 646f7efe..80f15e11 100644
--- a/src/static/web/css/style.css
+++ b/src/static/web/css/style.css
@@ -449,7 +449,7 @@ input[type=file] {
 }
 @media (max-width:480px) {
 	.m-pb-1 {
-	padding-bottom:1rem
+		padding-bottom:1rem
 	}
 	.m-pb-2 {
 		padding-bottom:2rem
diff --git a/src/system/memberlogin.class.php b/src/system/memberlogin.class.php
index 4f552adc..a09df68c 100755
--- a/src/system/memberlogin.class.php
+++ b/src/system/memberlogin.class.php
@@ -11,7 +11,7 @@ if (!defined('DEDEINC')) exit ('dedebiz');
  */
 helper('cache');
 /**
- *  检查会员名的合法性
+ *  检查账号的合法性
  *
  * @access    public
  * @param     string  $uid  会员UID
@@ -19,7 +19,7 @@ helper('cache');
  * @param     string  $ckhas  检查是否存在
  * @return    string
  */
-function CheckUserID($uid, $msgtitle = '会员名', $ckhas = TRUE)
+function CheckUserID($uid, $msgtitle = '账号', $ckhas = TRUE)
 {
     global $cfg_mb_notallow, $cfg_mb_idmin, $cfg_md_idurl, $cfg_soft_lang, $dsql;
     if ($cfg_mb_notallow != '') {
@@ -394,15 +394,15 @@ class MemberLogin
      *  检查会员是否合法
      *
      * @access    public
-     * @param     string  $loginuser  登录会员名
-     * @param     string  $loginpwd  会员密码
+     * @param     string  $loginuser  登录账号
+     * @param     string  $loginpwd  密码
      * @return    string
      */
     function CheckUser(&$loginuser, $loginpwd)
     {
-        //检测会员名的合法性
-        $rs = CheckUserID($loginuser, '会员名', FALSE);
-        //会员名不正确时返回验证错误，原登录名通过引用返回错误提示信息
+        //检测账号的合法性
+        $rs = CheckUserID($loginuser, '账号', FALSE);
+        //账号不正确时返回验证错误，原登录名通过引用返回错误提示信息
         if ($rs != 'ok') {
             $loginuser = $rs;
             return '0';
@@ -454,8 +454,8 @@ class MemberLogin
      */
     function getLoginError($loginuser)
     {
-        $rs = CheckUserID($loginuser, '会员名', FALSE);
-        //会员名不正确时返回验证错误，原登录名通过引用返回错误提示信息
+        $rs = CheckUserID($loginuser, '账号', FALSE);
+        //账号不正确时返回验证错误，原登录名通过引用返回错误提示信息
         if ($rs != 'ok') {
             return -1;
         }
@@ -477,8 +477,8 @@ class MemberLogin
      */
     function loginError($loginuser)
     {
-        $rs = CheckUserID($loginuser, '会员名', FALSE);
-        //会员名不正确时返回验证错误，原登录名通过引用返回错误提示信息
+        $rs = CheckUserID($loginuser, '账号', FALSE);
+        //账号不正确时返回验证错误，原登录名通过引用返回错误提示信息
         if ($rs != 'ok') {
             return;
         }
diff --git a/src/system/userlogin.class.php b/src/system/userlogin.class.php
index 48a35589..7be4486e 100755
--- a/src/system/userlogin.class.php
+++ b/src/system/userlogin.class.php
@@ -203,14 +203,14 @@ class userLogin
      *  检验会员是否正确
      *
      * @access    public
-     * @param     string    $username  会员名
+     * @param     string    $username  账号
      * @param     string    $userpwd  密码
      * @return    string
      */
     function checkUser($username, $userpwd)
     {
         global $dsql;
-        //只允许会员名和密码用0-9,a-z,A-Z,'@','_','.','-'这些字符
+        //只允许账号和密码用0-9,a-z,A-Z,'@','_','.','-'这些字符
         $this->userName = preg_replace("/[^0-9a-zA-Z_@!\.-]/", '', $username);
         $this->userPwd = preg_replace("/[^0-9a-zA-Z_@!\.-]/", '', $userpwd);
         $pwd = substr(md5($this->userPwd), 5, 20);
diff --git a/src/theme/dedebiz/widget_article_feedback.htm b/src/theme/dedebiz/widget_article_feedback.htm
index 67b6440c..ea292eb0 100644
--- a/src/theme/dedebiz/widget_article_feedback.htm
+++ b/src/theme/dedebiz/widget_article_feedback.htm
@@ -7,7 +7,7 @@
 			<div class="form-group">
 				<div class="row">
 					<div class="col-md-6">
-						<label for="iptUsername">会员名</label>
+						<label for="iptUsername">账号</label>
 						<input type="text" class="form-control" id="iptUsername">
 					</div>
 					<div class="col-md-6 areaValidate" style="display:none">
diff --git a/src/user/inc/inc_pwd_functions.php b/src/user/inc/inc_pwd_functions.php
index be4c0208..e4456018 100755
--- a/src/user/inc/inc_pwd_functions.php
+++ b/src/user/inc/inc_pwd_functions.php
@@ -107,7 +107,7 @@ function newmail($mid, $userid, $mailto, $type, $send)
     }
 }
 /**
- *  查询会员信息，mail会员输入邮箱地址，userid会员名
+ *  查询会员信息，mail会员输入邮箱地址，userid账号
  *
  * @param     string  $mail  邮件
  * @param     string  $userid  会员id
@@ -130,7 +130,7 @@ function member($mail, $userid)
  *  查询是否发送过验证码
  *
  * @param     string  $mid  会员id
- * @param     string  $userid  会员名称
+ * @param     string  $userid  账号
  * @param     string  $mailto  发送邮件地址
  * @param     string  $send  为Y发送邮件,为N不发送邮件默认为Y
  * @return    string
diff --git a/src/user/index_do.php b/src/user/index_do.php
index 536af922..768510d8 100755
--- a/src/user/index_do.php
+++ b/src/user/index_do.php
@@ -70,15 +70,15 @@ if ($fmdo == 'sendMail') {
     ShowMsg('会员缓存已清理', 'login.php');
     exit();
 } else if ($fmdo == 'user') {
-    //检查会员名是否存在
+    //检查账号是否存在
     if ($dopost == "checkuser") {
         AjaxHead();
         $msg = '';
         $uid = trim($uid);
         if ($cktype == 0) {
-            $msgtitle = '会员名';
+            $msgtitle = '账号';
         } else {
-            $msgtitle = '会员名';
+            $msgtitle = '账号';
         }
         if ($cktype != 0 || $cfg_mb_wnameone == 'N') {
             $msg = CheckUserID($uid, $msgtitle);
@@ -106,7 +106,7 @@ if ($fmdo == 'sendMail') {
                 if (!is_array($row)) {
                     $msg = "<span class='text-success'><i class='fa fa-check'></i> 可以使用</span>";
                 } else {
-                    $msg = "<span class='text-danger'><i class='fa fa-times'></i> 邮箱已经被另一个会员占用</span>";
+                    $msg = "<span class='text-danger'><i class='fa fa-times'></i> 邮箱已经被另一个账户占用</span>";
                 }
             }
         }
@@ -156,7 +156,7 @@ if ($fmdo == 'sendMail') {
         }
         if (CheckUserID($userid, '', false) != 'ok') {
             ResetVdValue();
-            ShowMsg("您输入的会员名<span class='text-primary'>{$userid}</span>已禁止", "index.php");
+            ShowMsg("您输入的账号<span class='text-primary'>{$userid}</span>已禁止", "index.php");
             exit();
         }
         if ($pwd == '') {
diff --git a/src/user/reg_new.php b/src/user/reg_new.php
index 43822521..a9e62fe5 100755
--- a/src/user/reg_new.php
+++ b/src/user/reg_new.php
@@ -34,17 +34,17 @@ if ($step == 1) {
         $pMid = isset($pRow['mid'])? intval($pRow['mid']) : 0;
         $pwd = trim($userpwd);
         $pwdc = trim($userpwdok);
-        $rs = CheckUserID($userid, '会员名');
+        $rs = CheckUserID($userid, '账号');
         if ($rs != 'ok') {
             ShowMsg($rs, '-1');
             exit();
         }
         if (strlen($userid) > 20 || strlen($uname) > 36) {
-            ShowMsg('您的会员名或会员名称过长，不允许注册', '-1');
+            ShowMsg('您的账号或账号过长，不允许注册', '-1');
             exit();
         }
         if (strlen($userid) < $cfg_mb_idmin || strlen($pwd) < $cfg_mb_pwdmin) {
-            ShowMsg("您的会员名或密码过短，不允许注册", "-1");
+            ShowMsg("您的账号或密码过短，不允许注册", "-1");
             exit();
         }
         if ($pwdc != $pwd) {
@@ -53,10 +53,10 @@ if ($step == 1) {
         }
         $uname = HtmlReplace($uname, 1);
         $userid = HtmlReplace($userid, 1);
-        //检测会员名是否存在
+        //检测账号是否存在
         $row = $dsql->GetOne("SELECT mid FROM `#@__member` WHERE userid LIKE '$userid' ");
         if (is_array($row)) {
-            ShowMsg("您指定的会员名<span class='text-primary'>{$userid}</span>已存在，请使用别的会员名", "-1");
+            ShowMsg("您指定的账号<span class='text-primary'>{$userid}</span>已存在，请使用别的账号", "-1");
             exit();
         }
         //会员的默认金币
diff --git a/src/user/resetpassword.php b/src/user/resetpassword.php
index f6517e13..7bf34882 100755
--- a/src/user/resetpassword.php
+++ b/src/user/resetpassword.php
@@ -25,15 +25,15 @@ if ($dopost == "") {
         ShowMsg("验证码输入错误", "-1");
         exit();
     }
-    //验证邮箱，会员名
+    //验证邮箱，账号
     if (empty($mail) && empty($userid)) {
-        showmsg('请输入会员名或邮箱', '-1');
+        showmsg('请输入账号或邮箱', '-1');
         exit;
     } else if (!empty($mail) && !preg_match("#(.*)@(.*)\.(.*)#", $mail)) {
         showmsg('请输入正确的邮箱格式', '-1');
         exit;
     } else if (CheckUserID($userid, '', false) != 'ok') {
-        ShowMsg("您输入的会员名<span class='text-primary'>{$userid}</span>不合法", "-1");
+        ShowMsg("您输入的账号<span class='text-primary'>{$userid}</span>不合法", "-1");
         exit();
     }
     $member = member($mail, $userid);
diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm
index 42deb801..2035377b 100755
--- a/src/user/templets/edit_baseinfo.htm
+++ b/src/user/templets/edit_baseinfo.htm
@@ -31,7 +31,7 @@
 								</div>
 							</div>
 							<div class="form-group row">
-								<label class="col-sm-3 col-form-label">会员名：</label>
+								<label class="col-sm-3 col-form-label">账号：</label>
 								<div class="col-sm-9 input-text"><?php echo $cfg_ml->M_LoginID;?></div>
 							</div>
 							<div class="form-group row">
diff --git a/src/user/templets/login.htm b/src/user/templets/login.htm
index 9ece90a2..6d70db51 100755
--- a/src/user/templets/login.htm
+++ b/src/user/templets/login.htm
@@ -25,12 +25,12 @@
 								<input type="hidden" name="keeptime" value="604800">
 								<input type="hidden" name="gourl" value="<?php if (!empty($gourl)) echo $gourl;?>">
 								<div class="form-group">
-									<label>会员账号</label>
-									<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入登录会员账号" required="required">
+									<label>账号</label>
+									<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入登录账号" required="required">
 								</div>
 								<div class="form-group">
-									<label>会员密码</label>
-									<input type="password" name="pwd" id="iptPwd" class="form-control" placeholder="请输入登录会员密码" required="required">
+									<label>密码</label>
+									<input type="password" name="pwd" id="iptPwd" class="form-control" placeholder="请输入登录密码" required="required">
 								</div>
 								<div id="vdimgck" class="form-group" style="display:none">
 									<label>验证码</label>
@@ -39,7 +39,7 @@
 										<img src="<?php echo $cfg_cmsurl;?>/apps/vdimgck.php" id="validateimg" onclick="this.src='<?php echo $cfg_cmsurl;?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
 									</div>
 								</div>
-								<div class="form-group"><a href="<?php echo $cfg_memberurl;?>/resetpassword.php">忘记会员密码？</a></div>
+								<div class="form-group"><a href="<?php echo $cfg_memberurl;?>/resetpassword.php">忘记密码？</a></div>
 								<div class="form-group"><button type="submit" class="btn btn-success btn-md btn-block">登录</button></div>
 								<div><a href="<?php echo $cfg_memberurl;?>/index_do.php?fmdo=user&dopost=regnew" class="btn btn-outline-success btn-md btn-block">注册</a></div>
 							</form>
diff --git a/src/user/templets/reg-new.htm b/src/user/templets/reg-new.htm
index 251c38fa..e0f7c371 100755
--- a/src/user/templets/reg-new.htm
+++ b/src/user/templets/reg-new.htm
@@ -24,16 +24,16 @@
 								<input type="hidden" name="mtype" value="个人">
 								<input type="hidden" name="pid" value="<?php echo $pid;?>">
 								<div class="form-group">
-									<label>会员账号</label>
-									<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入会员账号" required="required">
+									<label>账号</label>
+									<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入账号" required="required">
 								</div>
 								<div class="form-group">
-									<label>会员密码</label>
-									<input type="password" name="userpwd" id="iptUserpwd" class="form-control" placeholder="请输入会员密码" required="required">
+									<label>密码</label>
+									<input type="password" name="userpwd" id="iptUserpwd" class="form-control" placeholder="请输入密码" required="required">
 								</div>
 								<div class="form-group">
-									<label>确认会员密码</label>
-									<input type="password" name="userpwdok" id="iptUserpwdok" class="form-control" placeholder="请输入确认会员密码" required="required">
+									<label>确认密码</label>
+									<input type="password" name="userpwdok" id="iptUserpwdok" class="form-control" placeholder="请输入确认密码" required="required">
 								</div>
 								<div class="form-group">
 									<label>验证码</label>
diff --git a/src/user/templets/resetpassword.htm b/src/user/templets/resetpassword.htm
index 0bb0c04a..2b76044d 100755
--- a/src/user/templets/resetpassword.htm
+++ b/src/user/templets/resetpassword.htm
@@ -21,8 +21,8 @@
 						<input type="hidden" name="dopost" value="getpwd">
 						<input type="hidden" name="gourl" value="<?php if (!empty($gourl)) echo $gourl;?>">
 						<div class="form-group">
-							<label>会员账号</label>
-							<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入会员账号" required="required">
+							<label>账号</label>
+							<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入账号" required="required">
 						</div>
 						<div class="form-group">
 							<label>找回方式</label>
diff --git a/src/user/templets/resetpassword2.htm b/src/user/templets/resetpassword2.htm
index a1d9a8df..8a8f50ed 100755
--- a/src/user/templets/resetpassword2.htm
+++ b/src/user/templets/resetpassword2.htm
@@ -22,7 +22,7 @@
 						<input type="hidden" name="setp" value="2">
 						<input type="hidden" name="id" value="<?php echo $id;?>">
 						<div class="form-group">
-							<label>会员账号</label>
+							<label>账号</label>
 							<input type="text" name="userid" readonly="readonly" id="iptUserid" class="form-control" value="<?php echo $row['membername']?>">
 						</div>
 						<?php if (empty($key)) {?>