diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index c1d6df3b7..9d21af2af 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -9,7 +9,7 @@
     <div class="cl"></div>
     <div class="fl" style="width:440px;">
       <p class="footer_con-p">Email:zhiqingcs@163.com</p>
-      <p class="footer_con-p">Copyright 2007~2017, 智擎信息All Rights Reserved</p>
+      <p class="footer_con-p">Copyright 2007~2017, 智擎信息 All Rights Reserved</p>
     </div>
     <div class="fr mt20"  >
       <ul class="saoma-box fl mr30">
diff --git a/app/views/layouts/_org_custom_footer.html.erb b/app/views/layouts/_org_custom_footer.html.erb
index 064154495..b467e990b 100644
--- a/app/views/layouts/_org_custom_footer.html.erb
+++ b/app/views/layouts/_org_custom_footer.html.erb
@@ -9,5 +9,5 @@
     <li ><a href="<%= forums_path %>" target="_blank" class="" > 问吧交流</a></li>
     <div class="cl"></div>
   </ul>
-  <p>Copyright 2007~2017, 智擎信息All Rights Reserved</p>
+  <p>Copyright 2007~2017, 智擎信息 All Rights Reserved</p>
 </div>
diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index edb810849..cd48be2c9 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -413,7 +413,7 @@
         <li><a href="<%= forums_path %>" target="_blank" class="fl"> 问吧交流</a></li>
       </ul>
       <div class="cl"></div>
-      <p>Copyright 2007~2017, 智擎信息All Rights Reserved</p>
+      <p>Copyright 2007~2017, 智擎信息 All Rights Reserved</p>
     </div>
   </div>
   <!--backtop end-->
diff --git a/app/views/users/_user_message_applied.html.erb b/app/views/users/_user_message_applied.html.erb
index 72799e63e..4d7a2bd0a 100644
--- a/app/views/users/_user_message_applied.html.erb
+++ b/app/views/users/_user_message_applied.html.erb
@@ -7,7 +7,7 @@
               <% applied_user = User.find(ma.applied_user_id) %>
               <%= link_to image_tag(url_to_avatar(applied_user), :width => "30", :height => "30"), user_path(applied_user), :target => '_blank' %>
           <% else %>
-              <%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %>
+              <%= image_tag("/images/bigdata-logo.png", width: "30px", height: "30px", class: "mt3") %>
           <% end %>
         </li>
         <li class="homepageNewsPubType fl">
diff --git a/app/views/users/_user_message_contest.html.erb b/app/views/users/_user_message_contest.html.erb
index 5370ad218..ee66d8f57 100644
--- a/app/views/users/_user_message_contest.html.erb
+++ b/app/views/users/_user_message_contest.html.erb
@@ -69,7 +69,7 @@
         <ul class="homepageNewsList fl">
           <div class="longMessageWidth">
             <li class="homepageNewsPortrait fl">
-              <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
+              <div class="navHomepageLogo fl"><%= image_tag("/images/bigdata-logo.png", width: "30px", height: "30px", class: "mt3") %></div>
             </li>
             <li class="homepageNewsPubType fl">
               <span class="newsBlue homepageNewsPublisher">系统提示</span>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index e970ec3a4..460380c1b 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -649,7 +649,7 @@
     <ul class="homepageNewsList fl">
       <div class="longMessageWidth">
         <li class="homepageNewsPortrait fl">
-          <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
+          <div class="navHomepageLogo fl"><%= image_tag("/images/bigdata-logo.png", width: "30px", height: "30px", class: "mt3") %></div>
         </li>
         <li class="homepageNewsPubType fl">
           <span class="newsBlue homepageNewsPublisher">系统提示</span>
@@ -763,7 +763,7 @@
     <ul class="homepageNewsList fl">
       <div class="longMessageWidth">
         <li class="homepageNewsPortrait fl">
-          <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
+          <div class="navHomepageLogo fl"><%= image_tag("/images/bigdata-logo.png", width: "30px", height: "30px", class: "mt3") %></div>
         </li>
         <li class="homepageNewsPubType fl">
           <span class="newsBlue homepageNewsPublisher">系统提示</span>
diff --git a/app/views/users/_user_message_org.html.erb b/app/views/users/_user_message_org.html.erb
index a14b12d2c..5ec35f331 100644
--- a/app/views/users/_user_message_org.html.erb
+++ b/app/views/users/_user_message_org.html.erb
@@ -29,7 +29,7 @@
     <ul class="homepageNewsList fl">
       <div class="longMessageWidth">
         <li class="homepageNewsPortrait fl">
-          <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
+          <div class="navHomepageLogo fl"><%= image_tag("/images/bigdata-logo.png", width: "30px", height: "30px", class: "mt3") %></div>
         </li>
         <li class="homepageNewsPubType fl">
           <span class='homepageNewsType fl'>管理员同意了您的子域名申请：</span>
diff --git a/app/views/users/_user_message_system.html.erb b/app/views/users/_user_message_system.html.erb
index 6545bbb72..de0f9a356 100644
--- a/app/views/users/_user_message_system.html.erb
+++ b/app/views/users/_user_message_system.html.erb
@@ -2,7 +2,7 @@
     <ul class="homepageNewsList fl">
       <div class="longMessageWidth">
         <li class="homepageNewsPortrait fl">
-          <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
+          <div class="navHomepageLogo fl"><%= image_tag("/images/bigdata-logo.png", width: "30px", height: "30px", class: "mt3") %></div>
         </li>
         <li class="homepageNewsPubType fl">
           <span style="color: red;float: left">系统消息：</span>
diff --git a/app/views/users/user_system_messages.html.erb b/app/views/users/user_system_messages.html.erb
index 9c461cb4a..2479ca667 100644
--- a/app/views/users/user_system_messages.html.erb
+++ b/app/views/users/user_system_messages.html.erb
@@ -4,7 +4,7 @@
     <div class="resources mt10" id="position_<%= system_message.id %>">
       <div class="homepagePostBrief break_word">
         <div class="homepagePostPortrait">
-          <%= image_tag("/images/trustie_logo1.png", :width => "50", :height => "50") %>
+          <%= image_tag("/images/bigdata-logo.png", :width => "50", :height => "50") %>
         </div>
         <div class="homepagePostDes">
           <div class="homepagePostTo break_word">
diff --git a/public/favicon.ico b/public/favicon.ico
index 75a4c3dfd..1e84c3e12 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/favicon1.ico b/public/favicon1.ico
new file mode 100644
index 000000000..75a4c3dfd
Binary files /dev/null and b/public/favicon1.ico differ