diff --git a/Wave/Components/Layout/MainLayout.razor b/Wave/Components/Layout/MainLayout.razor
index a614e18..a58f755 100644
--- a/Wave/Components/Layout/MainLayout.razor
+++ b/Wave/Components/Layout/MainLayout.razor
@@ -29,7 +29,7 @@
 					Powered by 
 					<a class="link link-primary" target="_blank" href="https://github.com/miawinter98/Wave">Wave</a>
 				</span>
-				<div class="join w-56">
+				<div class="join w-56" title="@Localizer["Language_Label"]">
 					<button type="button" class="btn btn-sm btn-neutral btn-square no-animation join-item">
 						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
 							<path d="M21.721 12.752a9.711 9.711 0 0 0-.945-5.003 12.754 12.754 0 0 1-4.339 2.708 18.991 18.991 0 0 1-.214 4.772 17.165 17.165 0 0 0 5.498-2.477ZM14.634 15.55a17.324 17.324 0 0 0 .332-4.647c-.952.227-1.945.347-2.966.347-1.021 0-2.014-.12-2.966-.347a17.515 17.515 0 0 0 .332 4.647 17.385 17.385 0 0 0 5.268 0ZM9.772 17.119a18.963 18.963 0 0 0 4.456 0A17.182 17.182 0 0 1 12 21.724a17.18 17.18 0 0 1-2.228-4.605ZM7.777 15.23a18.87 18.87 0 0 1-.214-4.774 12.753 12.753 0 0 1-4.34-2.708 9.711 9.711 0 0 0-.944 5.004 17.165 17.165 0 0 0 5.498 2.477ZM21.356 14.752a9.765 9.765 0 0 1-7.478 6.817 18.64 18.64 0 0 0 1.988-4.718 18.627 18.627 0 0 0 5.49-2.098ZM2.644 14.752c1.682.971 3.53 1.688 5.49 2.099a18.64 18.64 0 0 0 1.988 4.718 9.765 9.765 0 0 1-7.478-6.816ZM13.878 2.43a9.755 9.755 0 0 1 6.116 3.986 11.267 11.267 0 0 1-3.746 2.504 18.63 18.63 0 0 0-2.37-6.49ZM12 2.276a17.152 17.152 0 0 1 2.805 7.121c-.897.23-1.837.353-2.805.353-.968 0-1.908-.122-2.805-.353A17.151 17.151 0 0 1 12 2.276ZM10.122 2.43a18.629 18.629 0 0 0-2.37 6.49 11.266 11.266 0 0 1-3.746-2.504 9.754 9.754 0 0 1 6.116-3.985Z" />
@@ -45,9 +45,12 @@
 						}
 					</select>
 				</div>
-				<div class="join w-56">
-					<button type="button" class="btn btn-sm btn-neutral no-animation join-item">
-						@Localizer["Theme_Label"]
+				<div class="join w-56" title="@Localizer["Theme_Label"]">
+					<button type="button" class="btn btn-square btn-sm btn-neutral no-animation join-item">
+						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
+							<path fill-rule="evenodd" d="M2.25 4.125c0-1.036.84-1.875 1.875-1.875h5.25c1.036 0 1.875.84 1.875 1.875V17.25a4.5 4.5 0 1 1-9 0V4.125Zm4.5 14.25a1.125 1.125 0 1 0 0-2.25 1.125 1.125 0 0 0 0 2.25Z" clip-rule="evenodd" />
+							<path d="M10.719 21.75h9.156c1.036 0 1.875-.84 1.875-1.875v-5.25c0-1.036-.84-1.875-1.875-1.875h-.14l-8.742 8.743c-.09.089-.18.175-.274.257ZM12.738 17.625l6.474-6.474a1.875 1.875 0 0 0 0-2.651L15.5 4.787a1.875 1.875 0 0 0-2.651 0l-.1.099V17.25c0 .126-.003.251-.01.375Z" />
+						</svg>
 					</button>
 					<select data-choose-theme class="select select-bordered select-sm md:text-center join-item min-w-0 flex-1">
 						<option value="">@Localizer["Theme_Default"]</option>
diff --git a/Wave/Resources/Components/Layout/MainLayout.de-DE.resx b/Wave/Resources/Components/Layout/MainLayout.de-DE.resx
index 06154be..e3309d2 100644
--- a/Wave/Resources/Components/Layout/MainLayout.de-DE.resx
+++ b/Wave/Resources/Components/Layout/MainLayout.de-DE.resx
@@ -110,4 +110,7 @@
     <data name="Theme_Label" xml:space="preserve">
         <value>Oberfläche</value>
     </data>
+    <data name="Language_Label" xml:space="preserve">
+        <value>Sprache</value>
+    </data>
 </root>
\ No newline at end of file
diff --git a/Wave/Resources/Components/Layout/MainLayout.resx b/Wave/Resources/Components/Layout/MainLayout.resx
index 16ae91f..27bc7c0 100644
--- a/Wave/Resources/Components/Layout/MainLayout.resx
+++ b/Wave/Resources/Components/Layout/MainLayout.resx
@@ -110,4 +110,7 @@
     <data name="Theme_WaveDark" xml:space="preserve">
         <value>Wave Dark</value>
     </data>
+    <data name="Language_Label" xml:space="preserve">
+        <value>Language</value>
+    </data>
 </root>
\ No newline at end of file