diff --git a/site/components/common/I18nWidget/I18nWidget.module.css b/site/components/common/I18nWidget/I18nWidget.module.css
index f17d2702d..a3c19babb 100644
--- a/site/components/common/I18nWidget/I18nWidget.module.css
+++ b/site/components/common/I18nWidget/I18nWidget.module.css
@@ -3,7 +3,7 @@
 }
 
 .button {
-  @apply h-10 pl-2 pr-0.5 rounded-md border border-accent-2 flex items-center justify-center transition-colors ease-linear;
+  @apply h-10 pl-2 pr-1 rounded-md border border-accent-2 flex items-center justify-center transition-colors ease-linear;
 }
 
 .button:hover {
diff --git a/site/components/common/I18nWidget/I18nWidget.tsx b/site/components/common/I18nWidget/I18nWidget.tsx
index 9bbb626d5..f9e2d62f7 100644
--- a/site/components/common/I18nWidget/I18nWidget.tsx
+++ b/site/components/common/I18nWidget/I18nWidget.tsx
@@ -54,13 +54,13 @@ const I18nWidget: FC = () => {
             <Image
               width="20"
               height="20"
-              className="block mr-2 w-5"
+              className="block w-5"
               src={`/${LOCALES_MAP[currentLocale].img.filename}`}
               alt={LOCALES_MAP[currentLocale].img.alt}
               unoptimized
             />
             {options && (
-              <span className="cursor-pointer">
+              <span className="cursor-pointer ml-1">
                 <ChevronRight className={cn(s.icon, { [s.active]: display })} />
               </span>
             )}
diff --git a/site/components/ui/ThemeSwitcher/ThemeSwitcher.tsx b/site/components/ui/ThemeSwitcher/ThemeSwitcher.tsx
index 21a954548..d5886653c 100644
--- a/site/components/ui/ThemeSwitcher/ThemeSwitcher.tsx
+++ b/site/components/ui/ThemeSwitcher/ThemeSwitcher.tsx
@@ -18,17 +18,15 @@ const ThemeSwitcher = () => {
         >
           <button
             className={
-              'w-[110px] h-10 pl-2 pr-0.5 rounded-md border border-accent-2 flex items-center justify-between transition-colors ease-linear hover:border-accent-3 hover:shadow-sm'
+              'w-[120px] h-10 pl-2 pr-1 rounded-md border border-accent-2 flex items-center justify-between transition-colors ease-linear hover:border-accent-3 hover:shadow-sm'
             }
             aria-label="Theme Switcher"
           >
-            <ThemeIcon width={20} height={20} theme={theme} />
-            <span
-              className={cn('capitalize leading-none ml-2', {
-                'text-sm': theme === 'system',
-              })}
-            >
-              {theme}
+            <span className="flex flex-shrink items-center">
+              <ThemeIcon width={20} height={20} theme={theme} />
+              <span className={cn('capitalize leading-none ml-2')}>
+                {theme}
+              </span>
             </span>
             <span className="cursor-pointer">
               <ChevronRight