diff --git a/WebContent/AppMain/Logon/logo_amarsoft.png b/WebContent/AppMain/Logon/logo_amarsoft.png
index b074b0a01..b0942b175 100644
Binary files a/WebContent/AppMain/Logon/logo_amarsoft.png and b/WebContent/AppMain/Logon/logo_amarsoft.png differ
diff --git a/WebContent/AppMain/Logon/logon.css b/WebContent/AppMain/Logon/logon.css
index e126935c6..1bbd7c0af 100644
--- a/WebContent/AppMain/Logon/logon.css
+++ b/WebContent/AppMain/Logon/logon.css
@@ -12,7 +12,7 @@ body{
 .logo_pic{
 	float:left;
 	height:88px;
-	width:213px;
+	width:230px;
 	background:url(logo_amarsoft.png);
 	margin-top:267px;
 	margin-left:90px;
diff --git a/WebContent/Frame/page/jspf/include/jsp_main.jspf b/WebContent/Frame/page/jspf/include/jsp_main.jspf
index d66713fb7..06b806ef0 100644
--- a/WebContent/Frame/page/jspf/include/jsp_main.jspf
+++ b/WebContent/Frame/page/jspf/include/jsp_main.jspf
@@ -51,7 +51,7 @@ function initLayout(data){
 		if(!border.is(":hidden")){
 			var rwidth = width - border.width();
 			if(!left.is(":hidden")) rwidth -= left.width();
-			right.width(rwidth);
+			right.width(rwidth-2);
 		}
 	}
 	
diff --git a/WebContent/Frame/page/resources/css/widget/main.css b/WebContent/Frame/page/resources/css/widget/main.css
index 5f9b29cc9..ab0a2cd41 100644
--- a/WebContent/Frame/page/resources/css/widget/main.css
+++ b/WebContent/Frame/page/resources/css/widget/main.css
@@ -20,7 +20,7 @@ body {
 	float: right;
 }
 .main_logo {
-	width: 99px;
+	width: 120px;
 	background: url(../../images/main/logo.png) no-repeat center;
 }
 #main_menu ul {
diff --git a/WebContent/Frame/page/resources/images/main/logo.png b/WebContent/Frame/page/resources/images/main/logo.png
index c7d34a52c..662c2d7cd 100644
Binary files a/WebContent/Frame/page/resources/images/main/logo.png and b/WebContent/Frame/page/resources/images/main/logo.png differ
diff --git a/WebContent/Frame/resources/js/vendor/datatables/images/favicon.ico b/WebContent/Frame/resources/js/vendor/datatables/images/favicon.ico
index 6eeaa2a0d..853addc83 100644
Binary files a/WebContent/Frame/resources/js/vendor/datatables/images/favicon.ico and b/WebContent/Frame/resources/js/vendor/datatables/images/favicon.ico differ
diff --git a/WebContent/Logon.jsp b/WebContent/Logon.jsp
index c5a953735..d1ab5407c 100644
--- a/WebContent/Logon.jsp
+++ b/WebContent/Logon.jsp
@@ -164,17 +164,17 @@ public boolean validUserPassword(HttpServletRequest request, Transaction Sqlca,S
 %><script type="text/javascript">
 <%
 		String sPWDState =  new UserMarkInfo(Sqlca,CurUser.getUserID()).getPasswordState();
-	//	if(true && // 开发模式不做首次登录/密码过期校验
-	//			(sPWDState.equals(String.valueOf(SecurityAuditConstants.CODE_USER_FIRST_LOGON)) || sPWDState.equals(String.valueOf(SecurityAuditConstants.CODE_PWD_OVERDUE)))){
+		if(true && // 开发模式不做首次登录/密码过期校验
+				(sPWDState.equals(String.valueOf(SecurityAuditConstants.CODE_USER_FIRST_LOGON)) || sPWDState.equals(String.valueOf(SecurityAuditConstants.CODE_PWD_OVERDUE)))){
 %>
-<%-- 			window.open("<%=CurConfig.getContextPath() %>/Redirector?ComponentURL=/AppMain/ModifyPassword.jsp","_top");
- --%><%
-	//	}else{
+ 			window.open("<%=CurConfig.getContextPath() %>/Redirector?ComponentURL=/AppMain/ModifyPassword.jsp","_top");
+<%
+	}else{
 			String mainPath=getCurUseMainPath(sUserID,Sqlca);
 %>
 			window.open("<%=CurConfig.getContextPath() %>/Redirector?ComponentURL=<%=mainPath%>","_top");
 <%	  
-	//	}
+		}
 %></script>
 <%
 	} catch (Exception e) {