diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json
index e5adcce1..ebda9dfa 100644
--- a/src/assets/locales/en.json
+++ b/src/assets/locales/en.json
@@ -62,6 +62,7 @@
     "css-note-l3": "To remove all custom styles, delete the contents and hit Save Changes"
   },
   "alternate-views": {
+    "alternate-view-heading": "Switch View",
     "default": "Default",
     "workspace": "Workspace",
     "minimal": "Minimal"
diff --git a/src/components/LinkItems/Item.vue b/src/components/LinkItems/Item.vue
index 800c8658..02da9d04 100644
--- a/src/components/LinkItems/Item.vue
+++ b/src/components/LinkItems/Item.vue
@@ -431,8 +431,6 @@ export default {
   border-bottom-color: transparent!important;
   bottom: -11px;
   left: calc(50% - 5px);
-  margin-top: 0;
-  margin-bottom: 0;
   width: 0;
   height: 0;
   border-style: solid;
diff --git a/src/components/Settings/ConfigLauncher.vue b/src/components/Settings/ConfigLauncher.vue
index b0d2e89a..8e3bbd23 100644
--- a/src/components/Settings/ConfigLauncher.vue
+++ b/src/components/Settings/ConfigLauncher.vue
@@ -6,7 +6,7 @@
       <IconSpanner @click="showEditor()" tabindex="-2"
         v-tooltip="tooltip($t('settings.config-launcher-tooltip'))" />
        <IconViewMode @click="openChangeViewMenu()" tabindex="-2"
-        v-tooltip="tooltip($t('settings.config-launcher-tooltip'))" />
+        v-tooltip="tooltip($t('alternate-views.alternate-view-heading'))" />
     </div>
 
     <!-- Modal containing all the configuration options -->
diff --git a/src/components/Settings/ThemeSelector.vue b/src/components/Settings/ThemeSelector.vue
index f5574628..cba01269 100644
--- a/src/components/Settings/ThemeSelector.vue
+++ b/src/components/Settings/ThemeSelector.vue
@@ -12,6 +12,7 @@
     <IconPalette
       class="color-button"
       @click="openThemeConfigurator"
+      v-tooltip="$t('theme-maker.title')"
     />
     <CustomThemeMaker
       v-if="themeConfiguratorOpen"
diff --git a/src/styles/global-styles.scss b/src/styles/global-styles.scss
index 0303bf0f..14a1e5ab 100644
--- a/src/styles/global-styles.scss
+++ b/src/styles/global-styles.scss
@@ -88,4 +88,30 @@ html {
       }
     }
   }
+}
+
+/* Overriding styles for tooltip component */
+.tooltip {
+  background: var(--description-tooltip-background);
+  border: 1px solid var(--description-tooltip-color);
+  border-radius: var(--curve-factor-small);
+  color: var(--description-tooltip-color);
+  padding: 0.2rem 0.5rem;
+  max-width: 250px;
+  z-index: 5;
+}
+.tooltip-arrow {
+  border-width: 5px 5px 0 5px;
+  border-color: var(--description-tooltip-color);
+  border-left-color: transparent!important;
+  border-right-color: transparent!important;
+  border-bottom-color: transparent!important;
+  bottom: -11px;
+  left: calc(50% - 5px);
+  margin: 5px;
+  width: 0;
+  height: 0;
+  border-style: solid;
+  position: absolute;
+  z-index: 3;
 }
\ No newline at end of file