diff --git a/assets/rojo-logo-square.png b/assets/rojo-logo-square.png
deleted file mode 100644
index 57a339f4..00000000
Binary files a/assets/rojo-logo-square.png and /dev/null differ
diff --git a/assets/rojo-logo.png b/assets/rojo-logo.png
deleted file mode 100644
index 49b2a572..00000000
Binary files a/assets/rojo-logo.png and /dev/null differ
diff --git a/assets/rojo-plugin-logo.png b/assets/rojo-plugin-logo.png
deleted file mode 100644
index b86e4197..00000000
Binary files a/assets/rojo-plugin-logo.png and /dev/null differ
diff --git a/assets/rojo-polling-icon.png b/assets/rojo-polling-icon.png
deleted file mode 100644
index c0bcfaac..00000000
Binary files a/assets/rojo-polling-icon.png and /dev/null differ
diff --git a/assets/rojo-r-black.png b/assets/rojo-r-black.png
deleted file mode 100644
index 3b417db1..00000000
Binary files a/assets/rojo-r-black.png and /dev/null differ
diff --git a/assets/rojo-r-light-gray.png b/assets/rojo-r-light-gray.png
deleted file mode 100644
index 8479b957..00000000
Binary files a/assets/rojo-r-light-gray.png and /dev/null differ
diff --git a/assets/rojo-r.png b/assets/rojo-r.png
deleted file mode 100644
index 6b347a3a..00000000
Binary files a/assets/rojo-r.png and /dev/null differ
diff --git a/assets/rojo-sync-in.png b/assets/rojo-sync-in.png
deleted file mode 100644
index 90e7fd0d..00000000
Binary files a/assets/rojo-sync-in.png and /dev/null differ
diff --git a/assets/rojo-test-icon.png b/assets/rojo-test-icon.png
deleted file mode 100644
index 7ee4a422..00000000
Binary files a/assets/rojo-test-icon.png and /dev/null differ
diff --git a/plugin/src/Assets.lua b/plugin/src/Assets.lua
index 156dde61..cdeefe59 100644
--- a/plugin/src/Assets.lua
+++ b/plugin/src/Assets.lua
@@ -15,7 +15,8 @@ local Assets = {
 		},
 	},
 	Images = {
-		Logo = "rbxassetid://2773210620",
+		Logo = "rbxassetid://3405346157",
+		Icon = "rbxassetid://3405341609",
 	},
 	StartSession = "",
 	SessionActive = "",
diff --git a/plugin/src/Components/App.lua b/plugin/src/Components/App.lua
index b566c1db..7fcd4095 100644
--- a/plugin/src/Components/App.lua
+++ b/plugin/src/Components/App.lua
@@ -1,15 +1,14 @@
-local Studio = settings().Studio
-
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
 
 local Roact = require(Rojo.Roact)
 
-local Session = require(Plugin.Session)
+local Assets = require(Plugin.Assets)
 local Config = require(Plugin.Config)
-local Version = require(Plugin.Version)
-local Logging = require(Plugin.Logging)
 local DevSettings = require(Plugin.DevSettings)
+local Logging = require(Plugin.Logging)
+local Session = require(Plugin.Session)
+local Version = require(Plugin.Version)
 local preloadAssets = require(Plugin.preloadAssets)
 
 local ConnectPanel = require(Plugin.Components.ConnectPanel)
@@ -53,13 +52,6 @@ local function checkUpgrade(plugin)
 	plugin:SetSetting("LastRojoVersion", Config.version)
 end
 
--- Since we need to switch our plugin icon based on the theme, we use the
--- insta-deprecated theme API. There isn't really an alternative here!
-local pluginButtonIcons = {
-	[Enum.UITheme.Dark] = "rbxassetid://3294408143",
-	[Enum.UITheme.Light] = "rbxassetid://3294218933",
-}
-
 local SessionStatus = {
 	Disconnected = "Disconnected",
 	Connected = "Connected",
@@ -90,17 +82,12 @@ function App:init()
 	self.toggleButton = toolbar:CreateButton(
 		"Rojo",
 		"Show or hide the Rojo panel",
-		"")
+		Assets.Images.Icon)
 	self.toggleButton.ClickableWhenViewportHidden = true
 	self.toggleButton.Click:Connect(function()
 		self.dockWidget.Enabled = not self.dockWidget.Enabled
 	end)
 
-	self:setToolbarButtonIcon()
-	self.signals.theme = Studio.ThemeChanged:Connect(function()
-		self:setToolbarButtonIcon()
-	end)
-
 	local widgetInfo = DockWidgetPluginGuiInfo.new(
 		Enum.InitialDockState.Right,
 		false, -- Initially enabled state
@@ -120,10 +107,6 @@ function App:init()
 	end)
 end
 
-function App:setToolbarButtonIcon()
-	self.toggleButton.Icon = pluginButtonIcons[Studio["UI Theme"]]
-end
-
 function App:render()
 	local children