diff --git a/app/src/processing/app/ui/Start.kt b/app/src/processing/app/ui/Start.kt
index 7de371eec..d7ed635ec 100644
--- a/app/src/processing/app/ui/Start.kt
+++ b/app/src/processing/app/ui/Start.kt
@@ -46,6 +46,8 @@ class Start {
                     var visible by remember { mutableStateOf(false) }
                     val composition = rememberCoroutineScope()
                     LaunchedEffect(Unit) {
+                        Toolkit.setIcon(window)
+
                         visible = true
                         composition.launch {
                             delay(duration.toLong() + timeMargin)
diff --git a/app/src/processing/app/ui/theme/Window.kt b/app/src/processing/app/ui/theme/Window.kt
index dad06087d..f725a999b 100644
--- a/app/src/processing/app/ui/theme/Window.kt
+++ b/app/src/processing/app/ui/theme/Window.kt
@@ -19,9 +19,11 @@ import androidx.compose.ui.window.WindowPosition
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 import com.formdev.flatlaf.util.SystemInfo
+import processing.app.ui.Toolkit
 import java.awt.Dimension
 
 import javax.swing.JFrame
+import javax.swing.JRootPane
 import kotlin.reflect.KClass
 
 val LocalWindow = compositionLocalOf<JFrame> { error("No Window Set") }
@@ -116,6 +118,7 @@ private fun PDEWindowContent(
     remember {
         window.rootPane.putClientProperty("apple.awt.fullWindowContent", mac && fullWindowContent)
         window.rootPane.putClientProperty("apple.awt.transparentTitleBar", mac && fullWindowContent)
+        Toolkit.setIcon(window)
     }
     if(unique != null && windows.contains(unique) && windows[unique] != null){
         windows[unique]?.toFront()