diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index 7c654bdc..a28c37e3 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -73,7 +73,16 @@ export default {
       })
     },
     logo () { return this.$store.state.instance.logo },
+    mergedConfig () {
+      return this.$store.getters.mergedConfig
+    },
     sitename () { return this.$store.state.instance.name },
+    hideSiteFavicon () {
+      return this.mergedConfig.hideSiteFavicon
+    },
+    hideSiteName () {
+      return this.mergedConfig.hideSiteName
+    },
     hideSitename () { return this.$store.state.instance.hideSitename },
     logoLeft () { return this.$store.state.instance.logoLeft },
     currentUser () { return this.$store.state.users.currentUser },
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 9ce21ee3..e3fe47df 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -13,11 +13,12 @@
           active-class="home"
         >
           <img
+            v-if="!hideSiteFavicon"
             class="favicon"
             src="/favicon.png"
           >
           <span
-            v-if="!hideSitename"
+            v-if="!hideSiteName"
             class="site-name"
           >
             {{ sitename }}
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index 713fd37b..7a356921 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -41,7 +41,12 @@ const MobileNav = {
     unseenNotificationsCount () {
       return this.unseenNotifications.length
     },
-    hideSitename () { return this.$store.state.instance.hideSitename },
+    mergedConfig () {
+      return this.$store.getters.mergedConfig
+    },
+    hideSiteName () {
+      return this.mergedConfig.hideSiteName
+    },
     sitename () { return this.$store.state.instance.name }
   },
   methods: {
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 3583ab3c..308c8d57 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -22,7 +22,7 @@
           />
         </button>
         <router-link
-          v-if="!hideSitename"
+          v-if="!hideSiteName"
           class="site-name"
           :to="{ name: 'root' }"
           active-class="home"
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 1db25752..b805f5f6 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -25,6 +25,16 @@
             {{ $t('settings.hide_wallpaper') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting path="hideSiteFavicon">
+            {{ $t('settings.hide_site_favicon') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting path="hideSiteName">
+            {{ $t('settings.hide_site_name') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting path="stopGifs">
             {{ $t('settings.stop_gifs') }}
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 9ce58f85..a2b8ad92 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -458,6 +458,8 @@
         "hide_muted_threads": "Hide muted threads",
         "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
         "hide_shoutbox": "Hide instance shoutbox",
+        "hide_site_favicon": "Hide instance favicon in top panel",
+        "hide_site_name": "Hide instance name in top panel",
         "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
         "hide_wallpaper": "Hide instance wallpaper",
         "hide_wordfiltered_statuses": "Hide word-filtered statuses",
diff --git a/src/modules/config.js b/src/modules/config.js
index 93d7487f..357e2491 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -35,6 +35,8 @@ export const defaultState = {
   muteBotStatuses: undefined, // instance default
   collapseMessageWithSubject: undefined, // instance default
   padEmoji: true,
+  hideSiteFavicon: undefined, // instance default
+  hideSiteName: undefined, // instance default
   hideAttachments: false,
   hideAttachmentsInConv: false,
   maxThumbnails: 16,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 8fe7f7a0..15e4393f 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -33,7 +33,8 @@ const defaultState = {
   hideWordFilteredPosts: false,
   hidePostStats: false,
   hideBotIndication: false,
-  hideSitename: false,
+  hideSiteFavicon: false,
+  hideSiteName: false,
   hideUserStats: false,
   muteBotStatuses: false,
   loginMethod: 'password',