diff --git a/frontend/data/themes/Yami.obt b/frontend/data/themes/Yami.obt
index d00b26708fc4a1..b348faa04c2a6b 100644
--- a/frontend/data/themes/Yami.obt
+++ b/frontend/data/themes/Yami.obt
@@ -449,6 +449,10 @@
 
 /* Media icons */
 
+MediaControls QPushButton {
+    min-height: var(--input_height);
+}
+
 .icon-media-play {
     qproperty-icon: url(theme:Dark/media/media_play.svg);
 }
diff --git a/frontend/dialogs/OBSBasicProperties.cpp b/frontend/dialogs/OBSBasicProperties.cpp
index 881ed5e0d2dc2d..7501e74056aaf5 100644
--- a/frontend/dialogs/OBSBasicProperties.cpp
+++ b/frontend/dialogs/OBSBasicProperties.cpp
@@ -17,6 +17,8 @@
 
 #include "OBSBasicProperties.hpp"
 
+#include <components/MediaControls.hpp>
+#include <Idian/Utils.hpp>
 #include <utility/display-helpers.hpp>
 #include <widgets/OBSBasic.hpp>
 
@@ -39,6 +41,19 @@ using namespace std;
 
 static void CreateTransitionScene(OBSSource scene, const char *text, uint32_t color);
 
+namespace {
+bool is_network_media_source(obs_source_t *source, const char *id)
+{
+	if (strcmp(id, "ffmpeg_source") != 0)
+		return false;
+
+	OBSDataAutoRelease s = obs_source_get_settings(source);
+	bool is_local_file = obs_data_get_bool(s, "is_local_file");
+
+	return !is_local_file;
+}
+} // namespace
+
 OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
 	: QDialog(parent),
 	  ui(new Ui::OBSBasicProperties),
@@ -53,12 +68,18 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
 	int cy = (int)config_get_int(App()->GetAppConfig(), "PropertiesWindow", "cy");
 
 	enum obs_source_type type = obs_source_get_type(source);
+	uint32_t caps = obs_source_get_output_flags(source);
 
 	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
+	idian::Utils utils(this);
+
 	ui->setupUi(this);
 	ui->buttonBox->button(QDialogButtonBox::Ok)->setFocus();
 
+	ui->controlsFrame->hide();
+	utils.addClass(ui->controlsFrame, "dialog-frame");
+
 	if (cx > 400 && cy > 400)
 		resize(cx, cy);
 
@@ -76,7 +97,16 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
 	ui->propertiesLayout->addWidget(view);
 
 	if (type == OBS_SOURCE_TYPE_TRANSITION) {
-		connect(view, &OBSPropertiesView::PropertiesRefreshed, this, &OBSBasicProperties::AddPreviewButton);
+		addTransitionPreviewButton();
+	}
+
+	if ((caps & OBS_SOURCE_CONTROLLABLE_MEDIA) != 0) {
+		MediaControls *mediaControls = new MediaControls(this);
+		mediaControls->SetSource(source);
+
+		ui->controlsFrame->layout()->addWidget(mediaControls);
+
+		connect(view, &OBSPropertiesView::PropertiesRefreshed, this, &OBSBasicProperties::refreshControls);
 	}
 
 	view->show();
@@ -97,7 +127,7 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
 		obs_display_add_draw_callback(ui->preview->GetDisplay(), OBSBasicProperties::DrawTransitionPreview,
 					      this);
 	};
-	uint32_t caps = obs_source_get_output_flags(source);
+
 	bool drawable_type = type == OBS_SOURCE_TYPE_INPUT || type == OBS_SOURCE_TYPE_SCENE;
 	bool drawable_preview = (caps & OBS_SOURCE_VIDEO) != 0;
 
@@ -159,11 +189,12 @@ OBSBasicProperties::~OBSBasicProperties()
 	main->UpdateContextBarDeferred(true);
 }
 
-void OBSBasicProperties::AddPreviewButton()
+void OBSBasicProperties::addTransitionPreviewButton()
 {
 	QPushButton *playButton = new QPushButton(QTStr("PreviewTransition"), this);
-	VScrollArea *area = view;
-	area->widget()->layout()->addWidget(playButton);
+
+	ui->controlsFrame->layout()->addWidget(playButton);
+	ui->controlsFrame->show();
 
 	playButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
@@ -406,6 +437,21 @@ void OBSBasicProperties::DrawTransitionPreview(void *data, uint32_t cx, uint32_t
 	gs_viewport_pop();
 }
 
+void OBSBasicProperties::refreshControls()
+{
+	uint32_t caps = obs_source_get_output_flags(source);
+
+	if ((caps & OBS_SOURCE_CONTROLLABLE_MEDIA) != 0) {
+		const char *id = obs_source_get_unversioned_id(source);
+
+		if (!is_network_media_source(source, id)) {
+			ui->controlsFrame->show();
+		} else {
+			ui->controlsFrame->hide();
+		}
+	}
+}
+
 void OBSBasicProperties::Cleanup()
 {
 	config_set_int(App()->GetAppConfig(), "PropertiesWindow", "cx", width());
diff --git a/frontend/dialogs/OBSBasicProperties.hpp b/frontend/dialogs/OBSBasicProperties.hpp
index 91738115cf8200..5ca7f1b462c137 100644
--- a/frontend/dialogs/OBSBasicProperties.hpp
+++ b/frontend/dialogs/OBSBasicProperties.hpp
@@ -39,7 +39,6 @@ class OBSBasicProperties : public QDialog {
 	OBSSignal updatePropertiesSignal;
 	OBSData oldSettings;
 	OBSPropertiesView *view;
-	QDialogButtonBox *buttonBox;
 	QSplitter *windowSplitter;
 
 	OBSSourceAutoRelease sourceA;
@@ -52,14 +51,16 @@ class OBSBasicProperties : public QDialog {
 	static void UpdateProperties(void *data, calldata_t *params);
 	static void DrawPreview(void *data, uint32_t cx, uint32_t cy);
 	static void DrawTransitionPreview(void *data, uint32_t cx, uint32_t cy);
+
+	void refreshControls();
 	void UpdateCallback(void *obj, obs_data_t *settings);
 	bool ConfirmQuit();
 	int CheckSettings();
 	void Cleanup();
+	void addTransitionPreviewButton();
 
 private slots:
 	void on_buttonBox_clicked(QAbstractButton *button);
-	void AddPreviewButton();
 
 public:
 	OBSBasicProperties(QWidget *parent, OBSSource source_);
diff --git a/frontend/forms/OBSBasicProperties.ui b/frontend/forms/OBSBasicProperties.ui
index 66a25488e697f1..cc3606ecdf0c64 100644
--- a/frontend/forms/OBSBasicProperties.ui
+++ b/frontend/forms/OBSBasicProperties.ui
@@ -44,7 +44,10 @@
       <property name="frameShadow">
        <enum>QFrame::Plain</enum>
       </property>
-      <layout class="QVBoxLayout" name="verticalLayout_7">
+      <property name="lineWidth">
+       <number>0</number>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <property name="spacing">
         <number>0</number>
        </property>
@@ -76,6 +79,42 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QFrame" name="controlsFrame">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::Shape::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Shadow::Plain</enum>
+         </property>
+         <property name="lineWidth">
+          <number>0</number>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+         </layout>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QFrame" name="propertiesFrame">