diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 6a6ad5c6d525b1e5863a1ceed764cc48fb7b3d5e..7f554e32b45039af744d376a840352db0fe7cd7d 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -750,10 +750,8 @@ libqt_plugin_la_QML = \
 	gui/qt/player/qml/PlayerMenuItem.qml \
 	gui/qt/player/qml/ResumeDialog.qml \
 	gui/qt/player/qml/SliderBar.qml \
-	gui/qt/player/qml/TeletextWidget.qml \
 	gui/qt/player/qml/TopBar.qml \
 	gui/qt/player/qml/TrackInfo.qml \
-	gui/qt/player/qml/VolumeWidget.qml \
 	gui/qt/player/qml/ButtonsLayout.qml \
 	gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml \
 	gui/qt/player/qml/controlbarcontrols/AspectRatioWidget.qml \
@@ -786,6 +784,8 @@ libqt_plugin_la_QML = \
 	gui/qt/player/qml/controlbarcontrols/SnapshotButton.qml \
 	gui/qt/player/qml/controlbarcontrols/SpacerWidget.qml \
 	gui/qt/player/qml/controlbarcontrols/StopButton.qml \
+	gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml \
+	gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml \
 	gui/qt/playlist/qml/PlaylistDelegate.qml \
 	gui/qt/playlist/qml/PlaylistListView.qml \
 	gui/qt/playlist/qml/PlaylistOverlayMenu.qml \
diff --git a/modules/gui/qt/player/qml/ControlButtons.qml b/modules/gui/qt/player/qml/ControlButtons.qml
index c6b25c7e06e4c8b647b82deceaad50936ad2da0b..9be48c7c3d78303484697663ce96c9a6944e4d85 100644
--- a/modules/gui/qt/player/qml/ControlButtons.qml
+++ b/modules/gui/qt/player/qml/ControlButtons.qml
@@ -155,9 +155,9 @@ QtObject {
 
     readonly property Component aspectRatioDelegate : Controls.AspectRatioWidget { }
 
-    readonly property Component teletextdelegate : TeletextWidget { }
+    readonly property Component teletextdelegate : Controls.TeletextWidget { }
 
-    readonly property Component volumeBtnDelegate : VolumeWidget { parentWindow: controlButtons.parentWindow }
+    readonly property Component volumeBtnDelegate : Controls.VolumeWidget { parentWindow: controlButtons.parentWindow }
 
     readonly property Component playerSwitchBtnDelegate : Controls.PlayerSwitchButton { }
 
diff --git a/modules/gui/qt/player/qml/TeletextWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml
similarity index 100%
rename from modules/gui/qt/player/qml/TeletextWidget.qml
rename to modules/gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml
diff --git a/modules/gui/qt/player/qml/VolumeWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml
similarity index 100%
rename from modules/gui/qt/player/qml/VolumeWidget.qml
rename to modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index 0a954dccd191102171bf393e6a2b847f73c4db7a..e69e931d531bf9be7578b7cc36291a6ca994be96 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -334,8 +334,6 @@
         <file alias="SliderBar.qml">player/qml/SliderBar.qml</file>
         <file alias="TrackInfo.qml">player/qml/TrackInfo.qml</file>
         <file alias="ControlButtons.qml">player/qml/ControlButtons.qml</file>
-        <file alias="VolumeWidget.qml">player/qml/VolumeWidget.qml</file>
-        <file alias="TeletextWidget.qml">player/qml/TeletextWidget.qml</file>
         <file alias="MiniPlayer.qml">player/qml/MiniPlayer.qml</file>
         <file alias="TopBar.qml">player/qml/TopBar.qml</file>
         <file alias="PIPPlayer.qml">player/qml/PIPPlayer.qml</file>
@@ -378,6 +376,8 @@
         <file alias="SnapshotButton.qml">player/qml/controlbarcontrols/SnapshotButton.qml</file>
         <file alias="SpacerWidget.qml">player/qml/controlbarcontrols/SpacerWidget.qml</file>
         <file alias="StopButton.qml">player/qml/controlbarcontrols/StopButton.qml</file>
+        <file alias="TeletextWidget.qml">player/qml/controlbarcontrols/TeletextWidget.qml</file>
+        <file alias="VolumeWidget.qml">player/qml/controlbarcontrols/VolumeWidget.qml</file>
     </qresource>
     <qresource prefix="/about">
         <file alias="About.qml">dialogs/help/qml/About.qml</file>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5f2e8a800c5b04d263bb07bb003fd695ac7338a7..696eb4832f8d818f6ee8534ad2e8171d2e9b7636 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -864,9 +864,9 @@ modules/gui/qt/player/qml/ControlButtons.qml
 modules/gui/qt/player/qml/LanguageMenu.qml
 modules/gui/qt/player/qml/Player.qml
 modules/gui/qt/player/qml/ResumeDialog.qml
-modules/gui/qt/player/qml/TeletextWidget.qml
 modules/gui/qt/player/qml/TopBar.qml
-modules/gui/qt/player/qml/VolumeWidget.qml
+modules/gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml
+modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml
 modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml
 modules/gui/qt/player/qml/controlbarcontrols/AspectRatioWidget.qml
 modules/gui/qt/player/qml/controlbarcontrols/AtoBButton.qml