diff --git a/css/edu-common.css b/css/edu-common.css
index 56790f055..96a8277df 100755
--- a/css/edu-common.css
+++ b/css/edu-common.css
@@ -114,6 +114,14 @@ a:visited {
   color: #898989;
 }
 
+a:hover {
+  color: #FF7500;
+}
+
+a:hover.fa {
+  color: #FF7500;
+}
+
 input,
 textarea,
 select {
diff --git a/css/edu-main.css b/css/edu-main.css
index 1d9959033..3cbe5fcbb 100644
--- a/css/edu-main.css
+++ b/css/edu-main.css
@@ -97,6 +97,10 @@ a:visited {
   color: #05101a;
 }
 
+a:hover {
+  color: #459be5;
+}
+
 ol,
 ul,
 li {
diff --git a/css/edu-purge.css b/css/edu-purge.css
index 5011767da..1dc17448b 100644
--- a/css/edu-purge.css
+++ b/css/edu-purge.css
@@ -1364,7 +1364,7 @@ a:visited {
 }
 
 a:hover {
-  color: #2A61FF!important;
+  color: #459be5;
 }
 
 ol,
@@ -1473,7 +1473,7 @@ a.edu-txt-w80,
 
 /*隐藏*/
 .none {
-  display: none!important;
+  display: none
 }
 
 .block {
@@ -2424,16 +2424,10 @@ input::-ms-clear {
 .color-grey-c {
   color: #ccc !important;
 }
-a.hoverLine:hover{
-  text-decoration: underline;
-}
+
 .color-grey-cd {
   color: #cdcdcd !important;
 }
-.color-grey-d {
-  color: #ddd;
-}
-
 
 .color-grey-9 {
   color: #999999 !important;
@@ -2471,16 +2465,19 @@ a.hoverLine:hover{
 a.color-grey-name:hover,
 a.color-dark:hover,
 a.color-grey-6:hover,
-a.color-grey-3:hover,a.color-ooo:hover {
-  color: #2A61FF !important;
+a.color-grey-3:hover {
+  color: #4cacff !important;
+}
+
+a.color-grey-9:hover,
+a.color-grey-8:hover,
+a.color-grey-c:hover {
+  color: #111C24 !important;
 }
 
 /*蓝色*/
 .color-blue {
-  color: #2A61FF !important;
-}
-.color-blue-file {
-  color: #0054CC!important;
+  color: #4CACFF !important;
 }
 /* 绿色 */
 .color-green-file{
@@ -2491,6 +2488,10 @@ a.color-grey-3:hover,a.color-ooo:hover {
   color: #4CACFF !important;
 }
 
+a.color-blue:hover,
+a.color-blue_4C:hover {
+  color: #459BE6 !important;
+}
 
 /*橙色*/
 .color-orange {
diff --git a/css/iconfont.css b/css/iconfont.css
index 9085ebb05..a15df586f 100644
--- a/css/iconfont.css
+++ b/css/iconfont.css
@@ -1,14 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-<<<<<<< HEAD
   src: url('iconfont.woff2?t=1628841816999') format('woff2'),
        url('iconfont.woff?t=1628841816999') format('woff'),
        url('iconfont.ttf?t=1628841816999') format('truetype');
-=======
-  src: url('iconfont.woff2?t=1628836445900') format('woff2'),
-       url('iconfont.woff?t=1628836445900') format('woff'),
-       url('iconfont.ttf?t=1628836445900') format('truetype');
->>>>>>> upstream/develop
 }
 
 .iconfont {