diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/VideoConferenceConfigProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Lib/VideoConferenceConfigProperties.cs
index 49eff76b48..11fc7b691e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/VideoConferenceConfigProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Lib/VideoConferenceConfigProperties.cs
@@ -46,7 +46,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
 
             Theme = new StringProperty("light");
 
-            this.HideOverlayWhenUnmuted = new BoolProperty(true);
+            this.HideToolbarWhenUnmuted = new BoolProperty(true);
         }
 
         [JsonPropertyName("mute_camera_and_microphone_hotkey")]
@@ -61,11 +61,11 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
         [JsonPropertyName("selected_camera")]
         public StringProperty SelectedCamera { get; set; } = string.Empty;
 
-        [JsonPropertyName("overlay_position")]
-        public StringProperty OverlayPosition { get; set; } = "Top right corner";
+        [JsonPropertyName("toolbar_position")]
+        public StringProperty ToolbarPosition { get; set; } = "Top right corner";
 
-        [JsonPropertyName("overlay_monitor")]
-        public StringProperty OverlayMonitor { get; set; } = "Main monitor";
+        [JsonPropertyName("toolbar_monitor")]
+        public StringProperty ToolbarMonitor { get; set; } = "Main monitor";
 
         [JsonPropertyName("camera_overlay_image_path")]
         public StringProperty CameraOverlayImagePath { get; set; } = string.Empty;
@@ -73,8 +73,8 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
         [JsonPropertyName("theme")]
         public StringProperty Theme { get; set; }
 
-        [JsonPropertyName("hide_overlay_when_unmuted")]
-        public BoolProperty HideOverlayWhenUnmuted { get; set; }
+        [JsonPropertyName("hide_toolbar_when_unmuted")]
+        public BoolProperty HideToolbarWhenUnmuted { get; set; }
 
         // converts the current to a json string.
         public string ToJsonString()
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 8e7efb91b3..07f0dd7309 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -494,44 +494,44 @@ Disabling module or closing PowerToys will unmute microphone and camera</value>
 	<data name="VideoConference_CameraOverlayImagePathHeader.Text" xml:space="preserve">
     <value>Camera overlay image</value>
   </data>
-	<data name="VideoConference_OverlayPosition.Header" xml:space="preserve">
-    <value>Overlay postion</value>
+	<data name="VideoConference_ToolbarPosition.Header" xml:space="preserve">
+    <value>Toolbar postion</value>
   </data>
-	<data name="VideoConference_OverlayPosition_TopCenter.Content" xml:space="preserve">
+	<data name="VideoConference_ToolbarPosition_TopCenter.Content" xml:space="preserve">
     <value>Top center</value>
   </data>
-	<data name="VideoConference_OverlayPosition_TopLeftCorner.Content" xml:space="preserve">
+	<data name="VideoConference_ToolbarPosition_TopLeftCorner.Content" xml:space="preserve">
     <value>Top left corner</value>
   </data>
-	<data name="VideoConference_OverlayPosition_TopRightCorner.Content" xml:space="preserve">
+	<data name="VideoConference_ToolbarPosition_TopRightCorner.Content" xml:space="preserve">
     <value>Top right corner</value>
   </data>
-	<data name="VideoConference_OverlayPosition_BottomLeftCorner.Content" xml:space="preserve">
+	<data name="VideoConference_ToolbarPosition_BottomLeftCorner.Content" xml:space="preserve">
     <value>Bottom left corner</value>
   </data>
-	<data name="VideoConference_OverlayPosition_BottomCenter.Content" xml:space="preserve">
+	<data name="VideoConference_ToolbarPosition_BottomCenter.Content" xml:space="preserve">
     <value>Bottom center</value>
   </data>
-	<data name="VideoConference_OverlayPosition_BottomRightCorner.Content" xml:space="preserve">
+	<data name="VideoConference_ToolbarPosition_BottomRightCorner.Content" xml:space="preserve">
     <value>Bottom right corner</value>
   </data>
-	<data name="VideoConference_OverlayMonitor.Header" xml:space="preserve">
-    <value>Show overlay on</value>
+	<data name="VideoConference_ToolbarMonitor.Header" xml:space="preserve">
+    <value>Show toolbar on</value>
   </data>
-	<data name="VideoConference_OverlayMonitor_Main.Content" xml:space="preserve">
+	<data name="VideoConference_ToolbarMonitor_Main.Content" xml:space="preserve">
     <value>Main monitor</value>
   </data>
-	<data name="VideoConference_OverlayMonitor_UnderCursor.Content" xml:space="preserve">
+	<data name="VideoConference_ToolbarMonitor_UnderCursor.Content" xml:space="preserve">
     <value>Monitor under cursor</value>
   </data>
-	<data name="VideoConference_OverlayMonitor_ActiveWindow.Content" xml:space="preserve">
+	<data name="VideoConference_ToolbarMonitor_ActiveWindow.Content" xml:space="preserve">
     <value>Active window monitor</value>
   </data>
-	<data name="VideoConference_OverlayMonitor_All.Content" xml:space="preserve">
+	<data name="VideoConference_ToolbarMonitor_All.Content" xml:space="preserve">
     <value>All monitors</value>
   </data>
-	<data name="VideoConference_HideOverlayWhenUnmuted.Content" xml:space="preserve">
-    <value>Hide overlay when both camera and microphone are unmuted</value>
+	<data name="VideoConference_HideToolbarWhenUnmuted.Content" xml:space="preserve">
+    <value>Hide toolbar when both camera and microphone are unmuted</value>
   </data>
   <data name="ImageResizer_CustomSizes.Text" xml:space="preserve">
     <value>Image sizes</value>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/VideoConferenceViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/VideoConferenceViewModel.cs
index ef9b5f689e..7ea280a7e8 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/VideoConferenceViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/VideoConferenceViewModel.cs
@@ -77,38 +77,38 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             this.SelectOverlayImage = new ButtonClickCommand(SelectOverlayImageAction);
             this.ClearOverlayImage = new ButtonClickCommand(ClearOverlayImageAction);
 
-            this._hideOverlayWhenUnmuted = Settings.Properties.HideOverlayWhenUnmuted.Value;
+            this._hideToolbarWhenUnmuted = Settings.Properties.HideToolbarWhenUnmuted.Value;
 
-            switch (Settings.Properties.OverlayPosition.Value)
+            switch (Settings.Properties.ToolbarPosition.Value)
             {
                 case "Top left corner":
-                    _overlayPositionIndex = 0;
+                    _toolbarPositionIndex = 0;
                     break;
                 case "Top center":
-                    _overlayPositionIndex = 1;
+                    _toolbarPositionIndex = 1;
                     break;
                 case "Top right corner":
-                    _overlayPositionIndex = 2;
+                    _toolbarPositionIndex = 2;
                     break;
                 case "Bottom left corner":
-                    _overlayPositionIndex = 3;
+                    _toolbarPositionIndex = 3;
                     break;
                 case "Bottom center":
-                    _overlayPositionIndex = 4;
+                    _toolbarPositionIndex = 4;
                     break;
                 case "Bottom right corner":
-                    _overlayPositionIndex = 5;
+                    _toolbarPositionIndex = 5;
                     break;
             }
 
-            switch (Settings.Properties.OverlayMonitor.Value)
+            switch (Settings.Properties.ToolbarMonitor.Value)
             {
                 case "Main monitor":
-                    _overlayMonitorIndex = 0;
+                    _toolbarMonitorIndex = 0;
                     break;
 
                 case "All monitors":
-                    _overlayMonitorIndex = 1;
+                    _toolbarMonitorIndex = 1;
                     break;
             }
         }
@@ -120,13 +120,13 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         }
 
         private bool _isEnabled = false;
-        private int _overlayPositionIndex;
-        private int _overlayMonitorIndex;
+        private int _toolbarPositionIndex;
+        private int _toolbarMonitorIndex;
         private HotkeySettings _cameraAndMicrophoneMuteHotkey;
         private HotkeySettings _mirophoneMuteHotkey;
         private HotkeySettings _cameraMuteHotkey;
         private int _selectedCameraIndex = -1;
-        private bool _hideOverlayWhenUnmuted;
+        private bool _hideToolbarWhenUnmuted;
 
         public List<string> CameraNames { get; }
 
@@ -270,47 +270,47 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        public int OverlayPostionIndex
+        public int ToolbarPostionIndex
         {
             get
             {
-                return _overlayPositionIndex;
+                return _toolbarPositionIndex;
             }
 
             set
             {
-                if (_overlayPositionIndex != value)
+                if (_toolbarPositionIndex != value)
                 {
-                    _overlayPositionIndex = value;
-                    switch (_overlayPositionIndex)
+                    _toolbarPositionIndex = value;
+                    switch (_toolbarPositionIndex)
                     {
                         case 0:
-                            Settings.Properties.OverlayPosition.Value = "Top left corner";
+                            Settings.Properties.ToolbarPosition.Value = "Top left corner";
                             RaisePropertyChanged();
                             break;
 
                         case 1:
-                            Settings.Properties.OverlayPosition.Value = "Top center";
+                            Settings.Properties.ToolbarPosition.Value = "Top center";
                             RaisePropertyChanged();
                             break;
 
                         case 2:
-                            Settings.Properties.OverlayPosition.Value = "Top right corner";
+                            Settings.Properties.ToolbarPosition.Value = "Top right corner";
                             RaisePropertyChanged();
                             break;
 
                         case 3:
-                            Settings.Properties.OverlayPosition.Value = "Bottom left corner";
+                            Settings.Properties.ToolbarPosition.Value = "Bottom left corner";
                             RaisePropertyChanged();
                             break;
 
                         case 4:
-                            Settings.Properties.OverlayPosition.Value = "Bottom center";
+                            Settings.Properties.ToolbarPosition.Value = "Bottom center";
                             RaisePropertyChanged();
                             break;
 
                         case 5:
-                            Settings.Properties.OverlayPosition.Value = "Bottom right corner";
+                            Settings.Properties.ToolbarPosition.Value = "Bottom right corner";
                             RaisePropertyChanged();
                             break;
                     }
@@ -318,27 +318,27 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        public int OverlayMonitorIndex
+        public int ToolbarMonitorIndex
         {
             get
             {
-                return _overlayMonitorIndex;
+                return _toolbarMonitorIndex;
             }
 
             set
             {
-                if (_overlayMonitorIndex != value)
+                if (_toolbarMonitorIndex != value)
                 {
-                    _overlayMonitorIndex = value;
-                    switch (_overlayMonitorIndex)
+                    _toolbarMonitorIndex = value;
+                    switch (_toolbarMonitorIndex)
                     {
                         case 0:
-                            Settings.Properties.OverlayMonitor.Value = "Main monitor";
+                            Settings.Properties.ToolbarMonitor.Value = "Main monitor";
                             RaisePropertyChanged();
                             break;
 
                         case 1:
-                            Settings.Properties.OverlayMonitor.Value = "All monitors";
+                            Settings.Properties.ToolbarMonitor.Value = "All monitors";
                             RaisePropertyChanged();
                             break;
                     }
@@ -346,19 +346,19 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        public bool HideOverlayWhenUnmuted
+        public bool HideToolbarWhenUnmuted
         {
             get
             {
-                return _hideOverlayWhenUnmuted;
+                return _hideToolbarWhenUnmuted;
             }
 
             set
             {
-                if (value != _hideOverlayWhenUnmuted)
+                if (value != _hideToolbarWhenUnmuted)
                 {
-                    _hideOverlayWhenUnmuted = value;
-                    Settings.Properties.HideOverlayWhenUnmuted.Value = value;
+                    _hideToolbarWhenUnmuted = value;
+                    Settings.Properties.HideToolbarWhenUnmuted.Value = value;
                     RaisePropertyChanged();
                 }
             }
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/VideoConference.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/VideoConference.xaml
index db14117ebc..9c40353e0f 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/VideoConference.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/VideoConference.xaml
@@ -104,30 +104,30 @@
                         HorizontalAlignment="Left" />
             </StackPanel>
 
-            <ComboBox x:Uid="VideoConference_OverlayPosition" 
+            <ComboBox x:Uid="VideoConference_ToolbarPosition" 
                       MinWidth="240"
                       Margin="{StaticResource MediumTopMargin}"
-                      SelectedIndex="{ Binding Mode=TwoWay, Path=OverlayPostionIndex}"
+                      SelectedIndex="{ Binding Mode=TwoWay, Path=ToolbarPostionIndex}"
                       IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}">
-                <ComboBoxItem x:Uid="VideoConference_OverlayPosition_TopLeftCorner"/>
-                <ComboBoxItem x:Uid="VideoConference_OverlayPosition_TopCenter"/>
-                <ComboBoxItem x:Uid="VideoConference_OverlayPosition_TopRightCorner"/>
-                <ComboBoxItem x:Uid="VideoConference_OverlayPosition_BottomLeftCorner"/>
-                <ComboBoxItem x:Uid="VideoConference_OverlayPosition_BottomCenter"/>
-                <ComboBoxItem x:Uid="VideoConference_OverlayPosition_BottomRightCorner"/>
+                <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_TopLeftCorner"/>
+                <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_TopCenter"/>
+                <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_TopRightCorner"/>
+                <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_BottomLeftCorner"/>
+                <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_BottomCenter"/>
+                <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_BottomRightCorner"/>
             </ComboBox>
 
-            <ComboBox x:Uid="VideoConference_OverlayMonitor" 
+            <ComboBox x:Uid="VideoConference_ToolbarMonitor" 
                       MinWidth="240"
                       Margin="{StaticResource MediumTopMargin}"
-                      SelectedIndex="{ Binding Mode=TwoWay, Path=OverlayMonitorIndex}"
+                      SelectedIndex="{ Binding Mode=TwoWay, Path=ToolbarMonitorIndex}"
                       IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}">
-                <ComboBoxItem x:Uid="VideoConference_OverlayMonitor_Main"/>
-                <ComboBoxItem x:Uid="VideoConference_OverlayMonitor_All"/>
+                <ComboBoxItem x:Uid="VideoConference_ToolbarMonitor_Main"/>
+                <ComboBoxItem x:Uid="VideoConference_ToolbarMonitor_All"/>
             </ComboBox>
 
-            <CheckBox x:Uid="VideoConference_HideOverlayWhenUnmuted"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.HideOverlayWhenUnmuted}"
+            <CheckBox x:Uid="VideoConference_HideToolbarWhenUnmuted"
+                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.HideToolbarWhenUnmuted}"
                       Margin="{StaticResource SmallTopMargin}"
                       IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
                       />
diff --git a/src/modules/videoconference/VideoConferenceModule/CVolumeNotification.cpp b/src/modules/videoconference/VideoConferenceModule/CVolumeNotification.cpp
index 46aeb78447..88e0b66825 100644
--- a/src/modules/videoconference/VideoConferenceModule/CVolumeNotification.cpp
+++ b/src/modules/videoconference/VideoConferenceModule/CVolumeNotification.cpp
@@ -33,7 +33,7 @@ STDMETHODIMP_(HRESULT __stdcall) CVolumeNotification::QueryInterface(REFIID IID,
 
 STDMETHODIMP_(HRESULT __stdcall) CVolumeNotification::OnNotify(PAUDIO_VOLUME_NOTIFICATION_DATA NotificationData)
 {
-    Overlay::setMicrophoneMute(NotificationData->bMuted);
+    Toolbar::setMicrophoneMute(NotificationData->bMuted);
 
     return S_OK;
 }
diff --git a/src/modules/videoconference/VideoConferenceModule/CVolumeNotification.h b/src/modules/videoconference/VideoConferenceModule/CVolumeNotification.h
index 6fefd3b5d6..216c406589 100644
--- a/src/modules/videoconference/VideoConferenceModule/CVolumeNotification.h
+++ b/src/modules/videoconference/VideoConferenceModule/CVolumeNotification.h
@@ -3,7 +3,7 @@
 #include <mmdeviceapi.h>
 #include <endpointvolume.h>
 
-#include "Overlay.h"
+#include "Toolbar.h"
 
 class CVolumeNotification : public IAudioEndpointVolumeCallback
 {
diff --git a/src/modules/videoconference/VideoConferenceModule/Overlay.cpp b/src/modules/videoconference/VideoConferenceModule/Toolbar.cpp
similarity index 88%
rename from src/modules/videoconference/VideoConferenceModule/Overlay.cpp
rename to src/modules/videoconference/VideoConferenceModule/Toolbar.cpp
index 3ae1ee0a97..291d5d3d51 100644
--- a/src/modules/videoconference/VideoConferenceModule/Overlay.cpp
+++ b/src/modules/videoconference/VideoConferenceModule/Toolbar.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "Overlay.h"
+#include "Toolbar.h"
 
 #include <windowsx.h>
 
@@ -7,29 +7,29 @@
 
 #include "VideoConferenceModule.h"
 
-OverlayImages Overlay::darkImages;
-OverlayImages Overlay::lightImages;
+ToolbarImages Toolbar::darkImages;
+ToolbarImages Toolbar::lightImages;
 
-bool Overlay::valueUpdated = false;
-bool Overlay::cameraMuted = false;
-bool Overlay::cameraInUse = false;
-bool Overlay::microphoneMuted = false;
+bool Toolbar::valueUpdated = false;
+bool Toolbar::cameraMuted = false;
+bool Toolbar::cameraInUse = false;
+bool Toolbar::microphoneMuted = false;
 
-std::wstring Overlay::theme = L"system";
+std::wstring Toolbar::theme = L"system";
 
-bool Overlay::hideOverlayWhenUnmuted = true;
+bool Toolbar::HideToolbarWhenUnmuted = true;
 
-std::vector<HWND> Overlay::hwnds;
+std::vector<HWND> Toolbar::hwnds;
 
-UINT_PTR Overlay::nTimerId;
+UINT_PTR Toolbar::nTimerId;
 
-unsigned __int64 Overlay::lastTimeCamOrMicMuteStateChanged;
+unsigned __int64 Toolbar::lastTimeCamOrMicMuteStateChanged;
 
 const int REFRESH_RATE = 100;
 const int OVERLAY_SHOW_TIME = 500;
 const int BORDER_OFFSET = 12;
 
-Overlay::Overlay()
+Toolbar::Toolbar()
 {
     darkImages.camOnMicOn = Gdiplus::Image::FromFile(L"modules/VideoConference/Icons/On-On Dark.png");
     darkImages.camOffMicOn = Gdiplus::Image::FromFile(L"modules/VideoConference/Icons/On-Off Dark.png");
@@ -46,7 +46,7 @@ Overlay::Overlay()
     lightImages.camUnusedMicOff = Gdiplus::Image::FromFile(L"modules/VideoConference/Icons/Off-NotInUse Light.png");
 }
 
-LRESULT Overlay::WindowProcessMessages(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
+LRESULT Toolbar::WindowProcessMessages(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 {
     switch (msg)
     {
@@ -79,7 +79,7 @@ LRESULT Overlay::WindowProcessMessages(HWND hwnd, UINT msg, WPARAM wparam, LPARA
 
         Gdiplus::Graphics graphic(hdc);
 
-        OverlayImages* themeImages = &darkImages;
+        ToolbarImages* themeImages = &darkImages;
 
         if (theme == L"light" || (theme == L"system" && !WindowsColors::is_dark_mode()))
         {
@@ -134,7 +134,7 @@ LRESULT Overlay::WindowProcessMessages(HWND hwnd, UINT msg, WPARAM wparam, LPARA
         InvalidateRect(hwnd, NULL, NULL);
         using namespace std::chrono;
 
-        if (cameraInUse || microphoneMuted || !hideOverlayWhenUnmuted)
+        if (cameraInUse || microphoneMuted || !HideToolbarWhenUnmuted)
         {
             ShowWindow(hwnd, SW_SHOW);
         }
@@ -163,7 +163,7 @@ LRESULT Overlay::WindowProcessMessages(HWND hwnd, UINT msg, WPARAM wparam, LPARA
     return DefWindowProc(hwnd, msg, wparam, lparam);
 }
 
-void Overlay::showOverlay(std::wstring position, std::wstring monitorString)
+void Toolbar::show(std::wstring position, std::wstring monitorString)
 {
     valueUpdated = false;
     for (auto& hwnd : hwnds)
@@ -263,7 +263,7 @@ void Overlay::showOverlay(std::wstring position, std::wstring monitorString)
     }
 }
 
-void Overlay::hideOverlay()
+void Toolbar::hide()
 {
     for (auto& hwnd : hwnds)
     {
@@ -272,24 +272,24 @@ void Overlay::hideOverlay()
     hwnds.clear();
 }
 
-bool Overlay::getCameraMute()
+bool Toolbar::getCameraMute()
 {
     return cameraMuted;
 }
 
-void Overlay::setCameraMute(bool mute)
+void Toolbar::setCameraMute(bool mute)
 {
     valueUpdated = true;
     lastTimeCamOrMicMuteStateChanged = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
     cameraMuted = mute;
 }
 
-bool Overlay::getMicrophoneMute()
+bool Toolbar::getMicrophoneMute()
 {
     return microphoneMuted;
 }
 
-void Overlay::setMicrophoneMute(bool mute)
+void Toolbar::setMicrophoneMute(bool mute)
 {
     if (mute != microphoneMuted)
     {
@@ -300,12 +300,12 @@ void Overlay::setMicrophoneMute(bool mute)
     microphoneMuted = mute;
 }
 
-void Overlay::setHideOverlayWhenUnmuted(bool hide)
+void Toolbar::setHideToolbarWhenUnmuted(bool hide)
 {
-    hideOverlayWhenUnmuted = hide;
+    HideToolbarWhenUnmuted = hide;
 }
 
-void Overlay::setTheme(std::wstring theme)
+void Toolbar::setTheme(std::wstring theme)
 {
-    Overlay::theme = theme;
+    Toolbar::theme = theme;
 }
diff --git a/src/modules/videoconference/VideoConferenceModule/Overlay.h b/src/modules/videoconference/VideoConferenceModule/Toolbar.h
similarity index 76%
rename from src/modules/videoconference/VideoConferenceModule/Overlay.h
rename to src/modules/videoconference/VideoConferenceModule/Toolbar.h
index 7d3dd1cd6a..86a3916920 100644
--- a/src/modules/videoconference/VideoConferenceModule/Overlay.h
+++ b/src/modules/videoconference/VideoConferenceModule/Toolbar.h
@@ -5,7 +5,7 @@
 
 #include "common/monitors.h"
 
-struct OverlayImages
+struct ToolbarImages
 {
     Gdiplus::Image* camOnMicOn = nullptr;
     Gdiplus::Image* camOffMicOn = nullptr;
@@ -15,13 +15,13 @@ struct OverlayImages
     Gdiplus::Image* camUnusedMicOff = nullptr;
 };
 
-class Overlay
+class Toolbar
 {
 public:
-    Overlay();
+    Toolbar();
 
-    static void showOverlay(std::wstring position, std::wstring monitorString);
-    static void hideOverlay();
+    static void show(std::wstring position, std::wstring monitorString);
+    static void hide();
 
     bool static getCameraMute();
     void static setCameraMute(bool mute);
@@ -29,7 +29,7 @@ public:
     void static setMicrophoneMute(bool mute);
 
     void static setTheme(std::wstring theme);
-    void static setHideOverlayWhenUnmuted(bool hide);
+    void static setHideToolbarWhenUnmuted(bool hide);
 
 private:
     static LRESULT CALLBACK WindowProcessMessages(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
@@ -37,8 +37,8 @@ private:
     // Window callback can't be non-static so this members can't as well
     static std::vector<HWND> hwnds;
 
-    static OverlayImages darkImages;
-    static OverlayImages lightImages;
+    static ToolbarImages darkImages;
+    static ToolbarImages lightImages;
 
     static bool valueUpdated;
     static bool cameraMuted;
@@ -47,7 +47,7 @@ private:
 
     static std::wstring theme;
 
-    static bool hideOverlayWhenUnmuted;
+    static bool HideToolbarWhenUnmuted;
 
     static unsigned __int64 lastTimeCamOrMicMuteStateChanged;
 
diff --git a/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.cpp b/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.cpp
index 63f2b73769..fef6143fe6 100644
--- a/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.cpp
+++ b/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.cpp
@@ -17,7 +17,7 @@ extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 VideoConferenceModule* instance = nullptr;
 
-Overlay VideoConferenceModule::overlay;
+Toolbar VideoConferenceModule::toolbar;
 
 CVolumeNotification* VideoConferenceModule::volumeNotification;
 
@@ -25,8 +25,8 @@ PowerToysSettings::HotkeyObject VideoConferenceModule::cameraAndMicrophoneMuteHo
 PowerToysSettings::HotkeyObject VideoConferenceModule::microphoneMuteHotkey = PowerToysSettings::HotkeyObject::from_settings(true, false, false, true, 65);
 PowerToysSettings::HotkeyObject VideoConferenceModule::cameraMuteHotkey = PowerToysSettings::HotkeyObject::from_settings(true, false, false, true, 79);
 
-std::wstring VideoConferenceModule::overlayPositionString;
-std::wstring VideoConferenceModule::overlayMonitorString;
+std::wstring VideoConferenceModule::toolbarPositionString;
+std::wstring VideoConferenceModule::toolbarMonitorString;
 
 std::wstring VideoConferenceModule::selectedCamera;
 std::wstring VideoConferenceModule::imageOverlayPath;
@@ -71,7 +71,7 @@ void VideoConferenceModule::reverseMicrophoneMute()
                 {
                     if (microphoneEndpoint->SetMute(!currentMute, NULL) == S_OK)
                     {
-                        //overlay.setMicrophoneMute(!currentMute);
+                        //toolbar.setMicrophoneMute(!currentMute);
                     }
                 }
 
@@ -170,10 +170,10 @@ LRESULT CALLBACK VideoConferenceModule::LowLevelKeyboardProc(int nCode, WPARAM w
             if (isHotkeyPressed(kbd->vkCode, cameraAndMicrophoneMuteHotkey))
             {
                 reverseMicrophoneMute();
-                if (overlay.getCameraMute() != overlay.getMicrophoneMute())
+                if (toolbar.getCameraMute() != toolbar.getMicrophoneMute())
                 {
                     reverseVirtualCameraMuteState();
-                    overlay.setCameraMute(getVirtualCameraMuteState());
+                    toolbar.setCameraMute(getVirtualCameraMuteState());
                 }
             }
             else if (isHotkeyPressed(kbd->vkCode, microphoneMuteHotkey))
@@ -183,7 +183,7 @@ LRESULT CALLBACK VideoConferenceModule::LowLevelKeyboardProc(int nCode, WPARAM w
             else if (isHotkeyPressed(kbd->vkCode, cameraMuteHotkey))
             {
                 reverseVirtualCameraMuteState();
-                overlay.setCameraMute(getVirtualCameraMuteState());
+                toolbar.setCameraMute(getVirtualCameraMuteState());
             }
         }
     }
@@ -205,23 +205,23 @@ VideoConferenceModule::VideoConferenceModule()
     sendSourceCameraNameUpdate();
     sendOverlayImageUpdate();
 
-    overlay.showOverlay(overlayPositionString, overlayMonitorString);
+    toolbar.show(toolbarPositionString, toolbarMonitorString);
 }
 
 inline VideoConferenceModule::~VideoConferenceModule()
 {
-    if (overlay.getCameraMute())
+    if (toolbar.getCameraMute())
     {
         reverseVirtualCameraMuteState();
-        overlay.setCameraMute(getVirtualCameraMuteState());
+        toolbar.setCameraMute(getVirtualCameraMuteState());
     }
 
-    if (overlay.getMicrophoneMute())
+    if (toolbar.getMicrophoneMute())
     {
         reverseMicrophoneMute();
     }
 
-    overlay.hideOverlay();
+    toolbar.hide();
 }
 
 const wchar_t* VideoConferenceModule::get_name()
@@ -256,13 +256,13 @@ void VideoConferenceModule::set_config(const wchar_t* config)
             {
                 cameraMuteHotkey = PowerToysSettings::HotkeyObject::from_json(*val);
             }
-            if (const auto val = values.get_string_value(L"overlay_position"))
+            if (const auto val = values.get_string_value(L"toolbar_position"))
             {
-                overlayPositionString = val.value();
+                toolbarPositionString = val.value();
             }
-            if (const auto val = values.get_string_value(L"overlay_monitor"))
+            if (const auto val = values.get_string_value(L"toolbar_monitor"))
             {
-                overlayMonitorString = val.value();
+                toolbarMonitorString = val.value();
             }
             if (const auto val = values.get_string_value(L"selected_camera"); val && val != selectedCamera)
             {
@@ -276,14 +276,14 @@ void VideoConferenceModule::set_config(const wchar_t* config)
             }
             if (const auto val = values.get_string_value(L"theme"))
             {
-                Overlay::setTheme(val.value());
+                Toolbar::setTheme(val.value());
             }
-            if (const auto val = values.get_bool_value(L"hide_overlay_when_unmuted"))
+            if (const auto val = values.get_bool_value(L"hide_toolbar_when_unmuted"))
             {
-                Overlay::setHideOverlayWhenUnmuted(val.value());
+                Toolbar::setHideToolbarWhenUnmuted(val.value());
             }
 
-            overlay.showOverlay(overlayPositionString, overlayMonitorString);
+            toolbar.show(toolbarPositionString, toolbarMonitorString);
         }
     }
     catch (...)
@@ -310,13 +310,13 @@ void VideoConferenceModule::init_settings()
         {
             cameraMuteHotkey = PowerToysSettings::HotkeyObject::from_json(*val);
         }
-        if (const auto val = settings.get_string_value(L"overlay_position"))
+        if (const auto val = settings.get_string_value(L"toolbar_position"))
         {
-            overlayPositionString = val.value();
+            toolbarPositionString = val.value();
         }
-        if (const auto val = settings.get_string_value(L"overlay_monitor"))
+        if (const auto val = settings.get_string_value(L"toolbar_monitor"))
         {
-            overlayMonitorString = val.value();
+            toolbarMonitorString = val.value();
         }
         if (const auto val = settings.get_string_value(L"selected_camera"))
         {
@@ -328,11 +328,11 @@ void VideoConferenceModule::init_settings()
         }
         if (const auto val = settings.get_string_value(L"theme"))
         {
-            Overlay::setTheme(val.value());
+            Toolbar::setTheme(val.value());
         }
-        if (const auto val = settings.get_bool_value(L"hide_overlay_when_unmuted"))
+        if (const auto val = settings.get_bool_value(L"hide_toolbar_when_unmuted"))
         {
-            Overlay::setHideOverlayWhenUnmuted(val.value());
+            Toolbar::setHideToolbarWhenUnmuted(val.value());
         }
     }
     catch (std::exception&)
@@ -345,10 +345,10 @@ void VideoConferenceModule::enable()
 {
     if (!_enabled)
     {
-        overlay.setMicrophoneMute(getMicrophoneMuteState());
-        overlay.setCameraMute(getVirtualCameraMuteState());
+        toolbar.setMicrophoneMute(getMicrophoneMuteState());
+        toolbar.setCameraMute(getVirtualCameraMuteState());
 
-        overlay.showOverlay(overlayPositionString, overlayMonitorString);
+        toolbar.show(toolbarPositionString, toolbarMonitorString);
 
         _enabled = true;
 
@@ -375,18 +375,18 @@ void VideoConferenceModule::disable()
             }
         }
 
-        if (overlay.getCameraMute())
+        if (toolbar.getCameraMute())
         {
             reverseVirtualCameraMuteState();
-            overlay.setCameraMute(getVirtualCameraMuteState());
+            toolbar.setCameraMute(getVirtualCameraMuteState());
         }
 
-        if (overlay.getMicrophoneMute())
+        if (toolbar.getMicrophoneMute())
         {
             reverseMicrophoneMute();
         }
 
-        overlay.hideOverlay();
+        toolbar.hide();
 
         _enabled = false;
     }
diff --git a/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.h b/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.h
index faba2ba374..f61e3b38da 100644
--- a/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.h
+++ b/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.h
@@ -7,7 +7,7 @@
 
 #include "common/settings_objects.h"
 
-#include "Overlay.h"
+#include "Toolbar.h"
 #include "CVolumeNotification.h"
 
 #include <SerializedSharedMemory.h>
@@ -53,7 +53,7 @@ private:
     std::optional<SerializedSharedMemory> _imageOverlayChannel;
     std::optional<SerializedSharedMemory> _settingsUpdateChannel;
 
-    static Overlay overlay;
+    static Toolbar toolbar;
 
     static CVolumeNotification* volumeNotification;
 
@@ -61,8 +61,8 @@ private:
     static PowerToysSettings::HotkeyObject microphoneMuteHotkey;
     static PowerToysSettings::HotkeyObject cameraMuteHotkey;
 
-    static std::wstring overlayPositionString;
-    static std::wstring overlayMonitorString;
+    static std::wstring toolbarPositionString;
+    static std::wstring toolbarMonitorString;
 
     static std::wstring selectedCamera;
     static std::wstring imageOverlayPath;
diff --git a/src/modules/videoconference/VideoConferenceModule/WDK_Video Conference.vcxproj b/src/modules/videoconference/VideoConferenceModule/WDK_Video Conference.vcxproj
index bfc0b9a1d3..4010b1e944 100644
--- a/src/modules/videoconference/VideoConferenceModule/WDK_Video Conference.vcxproj	
+++ b/src/modules/videoconference/VideoConferenceModule/WDK_Video Conference.vcxproj	
@@ -110,14 +110,14 @@ xcopy /y /I  "$(ProjectDir)black.bmp*" "$(OutDir)"</Command>
   <ItemGroup>
     <ClInclude Include="CVolumeNotification.h" />
     <ClInclude Include="framework.h" />
-    <ClInclude Include="Overlay.h" />
+    <ClInclude Include="Toolbar.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="VideoConferenceModule.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CVolumeNotification.cpp" />
     <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="Overlay.cpp" />
+    <ClCompile Include="Toolbar.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>