diff --git a/www/theme/zui/fonts/ZentaoIcon.eot b/www/theme/zui/fonts/ZentaoIcon.eot
old mode 100644
new mode 100755
diff --git a/www/theme/zui/fonts/ZentaoIcon.svg b/www/theme/zui/fonts/ZentaoIcon.svg
old mode 100644
new mode 100755
index 492f48abd4..0e502a6ade
--- a/www/theme/zui/fonts/ZentaoIcon.svg
+++ b/www/theme/zui/fonts/ZentaoIcon.svg
@@ -138,11 +138,7 @@
 <glyph unicode="&#xe972;" glyph-name="fullscreen-exit" d="M637.387 167.182h313.469v-125.387h-188.082v-188.082h-125.387v313.469zM73.143 167.182h313.469v-313.469h-125.387v188.082h-188.082v125.387zM261.224 731.427h125.387v-313.469h-313.469v125.387h188.082v188.082zM950.857 543.345v-125.387h-313.469v313.469h125.387v-188.082h188.082z" />
 <glyph unicode="&#xe973;" glyph-name="severity" d="M181.734 318.751c-39.401-79.447-56.602-133.939-57.401-204.115-1.892-166.082 165.156-306.765 390.691-298.78 217.314 7.694 384.594 179.734 384.661 351.255 0.044 112.949-41.602 227.76-111.617 321.908-6.808-33.102-21.504-64.526-46.52-87.481l-54.048-49.595-16.982 71.361c-30.889 129.8-114.427 252.919-193.722 306.709-15.011-138.585-84.741-306.571-201.813-418.57l-46.149-44.15-23.644 59.33c-3.099 7.778-3.628 12.197-4.519 25.254-0.041 0.605-0.141 2.182-0.267 4.17-8.080-16.231-18.382-36.713-18.669-37.293zM712.422 433.274c6.045 5.548 58.723 83.177 19.681 179.293 122.818-106.638 210.724-272.732 210.657-445.474s-163.607-384.99-426.213-394.287c-262.606-9.296-437.341 162.127-435.289 342.32s117.319 275.051 123.535 389.243c22.508-31.044 31.313-72.123 35.266-105.245 0-7.933 1.714-26.787 5.144-56.558 26.56 25.99 39.752 40.054 39.577 42.191 120.433 142.858 154.342 328.667 151.832 411.688 204.616-86.152 273.83-354.848 275.811-363.172z" />
 <glyph unicode="&#xe974;" glyph-name="menu-report" d="M256.001 146.286c17.955 0 32.887-12.937 35.981-29.999l0.589-6.573v-292.571c0-17.953-12.937-32.885-29.999-35.981l-6.575-0.589h-219.429c-17.955 0-32.887 12.937-35.981 29.999l-0.589 6.573v292.569c0 17.955 12.937 32.887 29.997 35.983l6.575 0.589h219.429zM621.715 292.571c17.953 0 32.885-12.937 35.981-29.999l0.589-6.573v-438.856c0-17.953-12.937-32.885-29.999-35.981l-6.573-0.589h-219.429c-17.955 0-32.887 12.937-35.981 29.999l-0.589 6.573v438.856c0 17.955 12.937 32.885 29.997 35.981l6.575 0.589h219.429zM987.428 438.856c17.953 0 32.885-12.937 35.981-29.997l0.589-6.573v-585.143c0-17.953-12.937-32.885-29.999-35.981l-6.573-0.589h-219.429c-17.953 0-32.885 12.937-35.981 29.999l-0.589 6.573v585.143c0 17.955 12.937 32.887 29.999 35.981l6.575 0.589h219.429zM73.071 73.363l-0.147-219.648 146.579-0.145 0.145 219.721-146.577 0.073zM438.857 219.648l-0.293-365.933 146.579-0.145 0.219 366.005-146.505 0.073zM804.571 365.934l-0.293-512.219 146.577-0.145 0.219 512.292-146.505 0.073zM368.895 573.594l-282.499-251.053c-0.189-0.169-0.381-0.335-0.573-0.5-15.308-13.041-38.291-11.205-51.332 4.104-13.352 15.672-11.579 39.177 3.973 52.669l308.831 267.913c12.692 11.009 31.253 11.956 44.997 2.293l217.987-153.247 289.605 238.005h-48.225c-20.685 0-34.519 14.184-34.519 35.395s13.832 35.395 34.519 35.395h137.825c20.685 0 34.519-14.184 34.519-35.395v-141.455c0-21.212-13.832-35.395-34.519-35.395s-34.519 14.184-34.519 35.395v63.635l-323.279-268.017c-12.651-10.489-30.745-11.251-44.233-1.863l-218.556 152.119z" />
-<<<<<<< HEAD
 <glyph unicode="&#xe975;" glyph-name="menu-users" d="M788.635 463.44c0-189.381-147.569-341.131-332.915-341.737h-7.084c-177.083-3.641-328.193-132.325-361.248-310.781-3.541-18.817-18.299-30.349-36.597-30.349h-3.541c-22.431 3.641-33.055 26.708-29.515 45.524 29.515 159.639 136.353 284.681 276.839 341.739-103.888 56.451-169.999 166.924-169.999 295.605 0 189.381 148.159 341.131 332.324 341.131s331.735-151.748 331.735-341.131zM198.359 463.44c0-144.465 110.972-261.615 251.457-265.863h11.215c139.895 4.249 254.409 121.399 254.409 265.863 0 148.107-114.513 265.863-258.541 265.863s-258.541-117.757-258.541-265.863zM938.667 53.638c35.009 0 63.863-26.353 67.807-60.305l0.46-7.961v-136.533c0-35.009-26.353-63.863-60.305-67.807l-7.963-0.46h-204.8c-35.009 0-63.863 26.353-67.807 60.305l-0.46 7.961v136.533c0 35.009 26.355 63.863 60.305 67.807l7.961 0.46h204.8zM938.667-14.629h-204.8v-136.533h204.8v136.533zM818.057-117.486c-18.791 0-36.409 13.763-36.409 34.133s14.095 34.133 36.409 34.133h36.409c21.728 0 36.409-13.763 36.409-34.133s-14.095-34.133-36.409-34.133h-36.409z" />
-=======
-<glyph unicode="&#xe975;" glyph-name="text-box-search-outline" d="M788.635 463.44c0-189.381-147.569-341.131-332.915-341.737h-7.084c-177.083-3.641-328.193-132.325-361.248-310.781-3.541-18.817-18.299-30.349-36.597-30.349h-3.541c-22.431 3.641-33.055 26.708-29.515 45.524 29.515 159.639 136.353 284.681 276.839 341.739-103.888 56.451-169.999 166.924-169.999 295.605 0 189.381 148.159 341.131 332.324 341.131s331.735-151.748 331.735-341.131zM198.359 463.44c0-144.465 110.972-261.615 251.457-265.863h11.215c139.895 4.249 254.409 121.399 254.409 265.863 0 148.107-114.513 265.863-258.541 265.863s-258.541-117.757-258.541-265.863zM938.667 53.638c35.009 0 63.863-26.353 67.807-60.305l0.46-7.961v-136.533c0-35.009-26.353-63.863-60.305-67.807l-7.963-0.46h-204.8c-35.009 0-63.863 26.353-67.807 60.305l-0.46 7.961v136.533c0 35.009 26.355 63.863 60.305 67.807l7.961 0.46h204.8zM938.667-14.629h-204.8v-136.533h204.8v136.533zM818.057-117.486c-18.791 0-36.409 13.763-36.409 34.133s14.095 34.133 36.409 34.133h36.409c21.728 0 36.409-13.763 36.409-34.133s-14.095-34.133-36.409-34.133h-36.409z" />
->>>>>>> master
 <glyph unicode="&#xe976;" glyph-name="menu-backend" d="M402.285 0h73.143v-219.429h-73.143v219.429zM548.571 0h73.143v-219.429h-73.143v219.429zM329.143-146.286h365.715c20.199 0 36.571-16.375 36.571-36.571s-16.375-36.571-36.571-36.571h-365.715c-20.197 0-36.571 16.375-36.571 36.571s16.375 36.571 36.571 36.571zM73.143 694.858v-658.285h877.715v658.285h-877.715zM36.571 768h950.857c20.197 0 36.571-16.373 36.571-36.571v-731.429c0-20.199-16.375-36.571-36.571-36.571h-950.857c-20.199 0-36.571 16.375-36.571 36.571v731.429c0 20.197 16.373 36.571 36.571 36.571zM524.991 474.256c10.017 17.195 30.729 24.38 48.899 17.885l5.864-2.633 6.436-3.496c17.251-9.917 24.511-30.613 17.944-48.961l-2.707-6.011-96.207-168.884c-9.623-17.499-30.372-24.993-48.599-18.523l-6.952 3.271-5.853 3.135c-17.252 9.917-24.512 30.615-17.944 48.963l2.707 6.011 96.412 169.245zM299.645 481.49c11.849 11.791 29.331 14.992 44.227 8.931l6.201-3.167 1.591-1.125 5.699-4.673c11.931-12.081 15.107-29.551 8.257-45.451l-3.553-6.699-4.685-5.667-52.751-52.532 54.507-54.107 4.561-5.943c9.911-16.024 7.597-36.933-5.907-50.408-11.815-11.789-29.305-15-45.281-8.204l-6.733 3.529-5.724 4.683-81.789 81.205c-11.761 11.999-14.971 29.583-8.236 45.699l3.5 6.796 4.865 6.029 81.249 81.101zM673.603 481.982c11.815 11.791 29.307 15 44.215 8.956l6.207-3.159 1.593-1.121 5.756-4.715 81.208-81.081c4.644-4.275 8.145-9.585 10.352-16.208l1.769-7.071 0.349-7.44-0.643-6.527c-0.675-3.587-1.824-7.060-3.711-10.733l-3.415-5.701-4.255-5.051-81.601-80.871c-12.037-12.129-29.867-15.313-46.087-8.025l-5.992 3.227-5.845 4.805c-11.781 11.88-14.987 29.323-8.169 45.243l3.54 6.709 4.693 5.696 52.724 52.671-52.751 52.605c-12.399 12.427-15.139 30.84-8.225 45.911l3.553 6.227 4.735 5.655z" />
 <glyph unicode="&#xe977;" glyph-name="menu-recent" d="M73.143 731.428v-877.715h877.715v877.715h-877.715zM10.971 804.571h1002.057c6.059 0 10.971-4.912 10.971-10.971v-1002.057c0-6.059-4.912-10.971-10.971-10.971h-1002.057c-6.059 0-10.971 4.912-10.971 10.971v1002.057c0 6.059 4.912 10.971 10.971 10.971zM486.4 548.571h51.2c6.059 0 10.971-4.912 10.971-10.971v-343.771c0-6.059-4.912-10.971-10.971-10.971h-51.2c-6.059 0-10.971 4.912-10.971 10.971v343.771c0 6.059 4.912 10.971 10.971 10.971zM522.972 256h197.485c6.059 0 10.971-4.912 10.971-10.971v-51.2c0-6.059-4.912-10.971-10.971-10.971h-197.485c-6.059 0-10.971 4.912-10.971 10.971v51.2c0 6.059 4.912 10.971 10.971 10.971z" />
 <glyph unicode="&#xe978;" glyph-name="menu-doc" horiz-adv-x="951" d="M754.189 804.136l7.973-1.287c31.345-6.879 55.703-34.159 59.043-67.861l0.4-8.3-0.009-463.951 6.919-6.917 51.729-0.047 8.067-0.427 7.975-1.285c31.348-6.879 55.708-34.159 59.049-67.861l0.4-8.3-0.009-319.788-0.417-8.301-1.261-8.211c-6.727-32.269-33.349-57.216-66.092-60.624l-8.059-0.407-812.481 0.435-7.973 1.287c-31.345 6.879-55.701 34.159-59.043 67.861l-0.4 8.3 0.009 547.853 0.417 8.301 1.261 8.211c6.727 32.269 33.349 57.216 66.092 60.624l8.059 0.407 51.377-0.009 6.925 6.919v236.269l0.417 8.301 1.261 8.211c6.727 32.269 33.349 57.216 66.092 60.624l8.059 0.407 544.221-0.435zM283.962 413.227h-208.481l-6.927-6.919v-548.195l6.927-6.919h804.78l6.925 6.919v320.125l-6.925 6.917h-384.507l-12.604 0.464-12.124 1.337c-52.119 7.689-98.423 39.761-124.765 87.233l-5.829 11.455-3.621 8.355-46.429 114.895-6.423 4.329zM746.129 733.948h-536.521l-6.927-6.919v-229.212l6.927-6.917h74.353l8.605-0.46 8.761-1.417c23.039-5.071 43.261-20.321 54.855-41.98l4.087-8.769 46.352-114.681 3.983-8.615 5.503-9.253c15.865-23.677 40.988-39.212 69.023-42.353l10.245-0.577 250.76 0.037 6.925 6.917v457.279l-6.925 6.919zM611.998 445.623l6.103-0.505c17.884-2.995 31.581-18.935 31.581-38.215 0-21.423-16.911-38.72-37.684-38.72h-134.129l-6.103 0.507c-17.884 2.995-31.581 18.933-31.581 38.213 0 21.423 16.911 38.72 37.684 38.72h134.129zM611.998 628.552l6.103-0.507c17.884-2.995 31.581-18.933 31.581-38.213 0-21.423-16.911-38.72-37.684-38.72h-268.26l-6.103 0.505c-17.884 2.995-31.581 18.935-31.581 38.215 0 21.423 16.911 38.72 37.684 38.72h268.26z" />
diff --git a/www/theme/zui/fonts/ZentaoIcon.ttf b/www/theme/zui/fonts/ZentaoIcon.ttf
old mode 100644
new mode 100755
diff --git a/www/theme/zui/fonts/ZentaoIcon.woff b/www/theme/zui/fonts/ZentaoIcon.woff
old mode 100644
new mode 100755