diff --git a/assets/css/main.css b/assets/css/main.css
index dfd8adc..f56e9c0 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -226,9 +226,11 @@ header h2 {
     align-items: center;
     justify-content: space-between;
     vertical-align: middle;
+    margin-top: 1em;
 }
 
 .site-title {
+    display: inline;
     white-space: nowrap;
 }
 
@@ -247,8 +249,8 @@ header nav a {
 
 /* Social icons */
 .social-icons {
-    margin-top: 1em;
-    margin-bottom: 0;
+    display: inline;
+    margin: 1em 0 0 3em;
     padding: 0;
     list-style-type: none;
 }
@@ -690,12 +692,11 @@ ul.language-select > li, ul.footer-menu > li {
 }
 
 .theme-switcher {
-    color: var(--switcher-color);
-    background: var(--switcher-bg-color);
-    padding: 0.5em 1em;
-    font-size: 16px;
-    border: none;
-    margin-bottom: 1em;
+    cursor: pointer;
+}
+
+.theme-switcher-svg {
+    fill: currentColor;
 }
 
 .h-card {
diff --git a/i18n/bn.yaml b/i18n/bn.yaml
index b3fee6d..5bdcb1a 100644
--- a/i18n/bn.yaml
+++ b/i18n/bn.yaml
@@ -37,11 +37,5 @@ toAllCategories:
 skipToContent:
   other: "প্রচ্ছদে প্রবেশ করুন"
 
-darkTheme:
-  other: "অন্ধকার থিম"
-
-lightTheme:
-  other: "আলোক থিম"
-
 readNext:
   other: "পরের প্রচ্ছদ"
\ No newline at end of file
diff --git a/i18n/de.yaml b/i18n/de.yaml
index b06b956..16108e1 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -37,11 +37,5 @@ toAllCategories:
 skipToContent:
   other: "Zum Hauptinhalt springen"
 
-darkTheme:
-  other: "Dunkles Theme"
-
-lightTheme:
-  other: "Helles Theme"
-
 readNext:
   other: "Weiter lesen"
\ No newline at end of file
diff --git a/i18n/en.yaml b/i18n/en.yaml
index 922d96b..4ca1dc5 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -43,12 +43,6 @@ toAllCategories:
 skipToContent:
   other: "Skip to main content"
 
-darkTheme:
-  other: "Dark theme"
-
-lightTheme:
-  other: "Light theme"
-
 readNext:
   other: "Read next"
 
diff --git a/i18n/es.yaml b/i18n/es.yaml
index 8b6c235..e350076 100644
--- a/i18n/es.yaml
+++ b/i18n/es.yaml
@@ -37,11 +37,5 @@ toAllCategories:
 skipToContent:
   other: "Saltar al contenido principal"
 
-darkTheme:
-  other: "Dark theme"
-
-lightTheme:
-  other: "Light theme"
-
 readNext:
   other: "Leer el siguiente"
diff --git a/i18n/fr.yaml b/i18n/fr.yaml
index 3070df6..018cb5f 100644
--- a/i18n/fr.yaml
+++ b/i18n/fr.yaml
@@ -37,11 +37,5 @@ toAllCategories:
 skipToContent:
   other: "Aller au contenu"
 
-darkTheme:
-  other: "Thème sombre"
-
-lightTheme:
-  other: "Thème clair"
-
 readNext:
   other: "Lire la suite"
\ No newline at end of file
diff --git a/i18n/id.yaml b/i18n/id.yaml
index 6e72eac..8ea19a6 100644
--- a/i18n/id.yaml
+++ b/i18n/id.yaml
@@ -37,11 +37,5 @@ toAllCategories:
 skipToContent:
   other: "Lompat ke konten"
 
-darkTheme:
-  other: "Tema Gelap"
-
-lightTheme:
-  other: "Tema Terang"
-
 readNext:
   other: "Baca Selanjutnya"
\ No newline at end of file
diff --git a/i18n/pl.yaml b/i18n/pl.yaml
index cce611e..d9dc79d 100644
--- a/i18n/pl.yaml
+++ b/i18n/pl.yaml
@@ -37,11 +37,5 @@ toAllCategories:
 skipToContent:
   other: "Przejdź do głównej zawartości"
 
-darkTheme:
-  other: "Ciemny schemat"
-
-lightTheme:
-  other: "Jasny schemat"
-
 readNext:
   other: "Czytaj dalej"
\ No newline at end of file
diff --git a/i18n/pt.yaml b/i18n/pt.yaml
index 1a4b702..fe9fa8e 100644
--- a/i18n/pt.yaml
+++ b/i18n/pt.yaml
@@ -37,11 +37,5 @@ toAllCategories:
 skipToContent:
   other: "Pular para o conteúdo principal"
 
-darkTheme:
-  other: "Tema Escuro"
-
-lightTheme:
-  other: "Tema Claro"
-
 readNext:
   other: "Leia a seguir"
\ No newline at end of file
diff --git a/i18n/ru.yaml b/i18n/ru.yaml
index 19c85d5..66cd083 100644
--- a/i18n/ru.yaml
+++ b/i18n/ru.yaml
@@ -40,12 +40,6 @@ toAllCategories:
 skipToContent:
   other: "Перейти к основному контенту"
 
-darkTheme:
-  other: "Тёмная тема"
-
-lightTheme:
-  other: "Светлая тема"
-
 readNext:
   other: "Читать далее"
 
diff --git a/i18n/tw.yaml b/i18n/tw.yaml
index 05885c9..5a42c8c 100644
--- a/i18n/tw.yaml
+++ b/i18n/tw.yaml
@@ -37,11 +37,5 @@ toAllCategories:
 skipToContent:
   other: "跳至內容"
 
-darkTheme:
-  other: "暗色主題"
-
-lightTheme:
-  other: "亮色主題"
-
 readNext:
   other: "閱讀下一篇"
\ No newline at end of file
diff --git a/i18n/zh-cn.yaml b/i18n/zh-cn.yaml
index 68d33e9..caeffc8 100644
--- a/i18n/zh-cn.yaml
+++ b/i18n/zh-cn.yaml
@@ -43,11 +43,5 @@ toAllCategories:
 skipToContent:
   other: "跳至内容"
 
-darkTheme:
-  other: "暗色主题"
-
-lightTheme:
-  other: "亮色主题"
-
 readNext:
   other: "继续阅读"
diff --git a/layouts/partials/fa-icons/halfcircle.svg b/layouts/partials/fa-icons/halfcircle.svg
new file mode 100644
index 0000000..e2639e2
--- /dev/null
+++ b/layouts/partials/fa-icons/halfcircle.svg
@@ -0,0 +1,3 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 290 290">
+<path d="M142.959,0C64.131,0,0,64.132,0,142.96c0,78.828,64.131,142.959,142.959,142.959c78.828,0,142.96-64.131,142.96-142.959  C285.919,64.132,221.787,0,142.959,0z M142.959,260.919V142.96V25c65.043,0,117.96,52.917,117.96,117.96  C260.919,208.003,208.002,260.919,142.959,260.919z"/>
+</svg>
\ No newline at end of file
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 46dea49..ad70eaa 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -19,8 +19,6 @@
             {{ partial "footer-extra.html" . }}
             </p>  
         </div> 
-
-        {{ partial "theme-switcher.html" . }}   
     </div>
 
     {{ partial "h-card.html" . }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index eb4af00..7155d83 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,7 +1,13 @@
 <div class="header-top">
-    {{ partial "site-title.html" . }}
-    {{ partial "social.html" . }}
+    <div class="header-top-left">
+        {{ partial "site-title.html" . }}
+        {{ partial "social.html" . }}
+    </div>
+    <div class="header-top-right">
+        {{ partial "theme-switcher.html" . }}  
+    </div>
 </div>
+
 {{ if .Site.Menus.main }}
     <nav>
         {{ $currentPage := . }}
@@ -15,4 +21,4 @@
 
 {{ if .Site.Params.mathjax }}{{ partial "mathjax_support.html" . }}{{ end }}
 
-{{ partial "header-extra.html" . }}
+{{ partial "header-extra.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/theme-switcher.html b/layouts/partials/theme-switcher.html
index 5208ea9..5917797 100644
--- a/layouts/partials/theme-switcher.html
+++ b/layouts/partials/theme-switcher.html
@@ -5,9 +5,9 @@
 
 {{ if not (in (slice "light-without-switcher" "dark-without-switcher") $style) }}
 {{ if ne "auto-without-switcher" $style }}
-    <button class="theme-switcher">
-        {{ i18n "darkTheme" }}
-    </button>
+    <div class="theme-switcher">
+        {{ partial "font-awesome.html" (dict "iconName" "halfcircle" "custom" false) }}
+    </div>
 {{ end }}
 
 <script>
@@ -21,7 +21,6 @@ let autoDefinedScheme = window.matchMedia('(prefers-color-scheme: dark)')
 const autoChangeScheme = e => {
     currentTheme = e.matches ? 'dark' : 'light'
     document.documentElement.setAttribute('data-theme', currentTheme)
-    changeButtonText()
 }
 
 document.addEventListener('DOMContentLoaded', function() {
@@ -36,7 +35,6 @@ document.addEventListener('DOMContentLoaded', function() {
     }
 
     if (switchButton) {
-        changeButtonText()
         switchButton.addEventListener('click', switchTheme, false)
     }
   
@@ -59,13 +57,6 @@ function detectCurrentScheme() {
     return 'light'
 }
 
-function changeButtonText()
-{   
-    if (switchButton) {
-        switchButton.textContent = currentTheme == 'dark' ?  {{ i18n "lightTheme" }} : {{ i18n "darkTheme" }}
-    }
-}
-
 function switchTheme(e) {
     if (currentTheme == 'dark') {
         if (localStorage !== null)
@@ -78,7 +69,6 @@ function switchTheme(e) {
         document.documentElement.setAttribute('data-theme', 'dark')
         currentTheme = 'dark'
     }
-    changeButtonText()
 }
 
 function showContent() {