diff --git a/public/favicon.ico b/public/favicon.ico
index 34b63ac63..266c07166 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/api/settings.js b/src/api/settings.js
index d2b74777d..af7bb74ab 100644
--- a/src/api/settings.js
+++ b/src/api/settings.js
@@ -52,3 +52,9 @@ export function getPublicSettings() {
     method: 'get'
   })
 }
+export function getLogo() {
+  return request({
+    url: '/api/v1/xpack/interface/setting',
+    method: 'get'
+  })
+}
diff --git a/src/layout/components/NavBar/Logo.vue b/src/layout/components/NavBar/Logo.vue
index 0fda227cb..f383c3da4 100644
--- a/src/layout/components/NavBar/Logo.vue
+++ b/src/layout/components/NavBar/Logo.vue
@@ -6,7 +6,8 @@
         <h1 v-else class="sidebar-title">{{ title }}</h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logoText" :src="logoText" class="sidebar-logo-text">
+        <img v-if="customSettings.logo_index != '/static/img/logo_text.png' " :src="customSettings.logo_index" class="sidebar-logo">
+        <img v-else-if="logoText" :src="logoText" class="sidebar-logo-text">
         <!--        <h1 class="sidebar-title">{{ title }}</h1>-->
       </router-link>
     </transition>
@@ -14,6 +15,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   name: 'SidebarLogo',
   props: {
@@ -26,8 +28,17 @@ export default {
     return {
       title: 'JumpServer',
       logoText: require('@/assets/img/logo-text.png'),
-      logo: require('@/assets/img/logo.png')
+      logo: require('@/assets/img/logo.png'),
+      xpackData: {}
     }
+  },
+  computed: {
+    ...mapGetters([
+      'customSettings'
+    ])
+  },
+  created() {
+    console.log(this.customSettings.logo_index)
   }
 }
 </script>
diff --git a/src/store/getters.js b/src/store/getters.js
index bf8d4b5bf..919ec58b3 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -9,6 +9,7 @@ const getters = {
   visitedViews: state => state.tagsView.visitedViews,
   cachedViews: state => state.tagsView.cachedViews,
   publicSettings: state => state.settings.publicSettings,
+  customSettings: state => state.settings.customSettings,
   getCurrentOrgRoles: state => state.users.profile.current_org_roles
 }
 export default getters
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 6ba828ec7..44111aa58 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,5 +1,5 @@
 import defaultSettings from '@/settings'
-import { getPublicSettings } from '@/api/settings'
+import { getPublicSettings, getLogo } from '@/api/settings'
 
 const { showSettings, fixedHeader, sidebarLogo, tagsView } = defaultSettings
 
@@ -8,7 +8,8 @@ const state = {
   fixedHeader: fixedHeader,
   sidebarLogo: sidebarLogo,
   tagsView: tagsView,
-  publicSettings: null
+  publicSettings: null,
+  customSettings: null
 }
 
 const mutations = {
@@ -19,6 +20,9 @@ const mutations = {
   },
   SET_PUBLIC_SETTINGS: (state, settings) => {
     state.publicSettings = settings
+  },
+  SET_CUSTOM_SETTINGS: (state, settings) => {
+    state.customSettings = settings
   }
 }
 
@@ -31,6 +35,13 @@ const actions = {
     return new Promise((resolve, reject) => {
       getPublicSettings().then(response => {
         commit('SET_PUBLIC_SETTINGS', response.data)
+        if (response.data.XPACK_ENABLED) {
+          if (response.data.XPACK_LICENSE_IS_VALID) {
+            getLogo().then((res) => {
+              commit('SET_CUSTOM_SETTINGS', res)
+            })
+          }
+        }
         resolve(response)
       }).catch(error => {
         reject(error)