diff --git a/Makefile b/Makefile
index 3a2dc76c01..16295cbf5f 100644
--- a/Makefile
+++ b/Makefile
@@ -443,22 +443,26 @@ clean: | clean-common
 run: rcc $(RUN_TARGET)
 
 NIM_STATUS_CLIENT_DEV ?= t
+STATUS_PORT ?= 30306
 
 run-linux:
 	echo -e "\e[92mRunning:\e[39m bin/nim_status_client"
 	NIM_STATUS_CLIENT_DEV="$(NIM_STATUS_CLIENT_DEV)" \
 	LD_LIBRARY_PATH="$(QT5_LIBDIR)":"$(STATUSGO_LIBDIR)" \
+	STATUS_PORT="$(STATUS_PORT)" \
 	./bin/nim_status_client
 
 run-macos:
 	echo -e "\e[92mRunning:\e[39m bin/nim_status_client"
 	NIM_STATUS_CLIENT_DEV="$(NIM_STATUS_CLIENT_DEV)" \
+	STATUS_PORT="$(STATUS_PORT)" \
 	./bin/nim_status_client
 
 run-windows: $(NIM_WINDOWS_PREBUILT_DLLS)
 	echo -e "\e[92mRunning:\e[39m bin/nim_status_client.exe"
 	NIM_STATUS_CLIENT_DEV="$(NIM_STATUS_CLIENT_DEV)" \
 	PATH="$(shell pwd)"/"$(shell dirname "$(DOTHERSIDE)")":"$(STATUSGO_LIBDIR)":"$(shell pwd)"/"$(shell dirname "$(NIM_WINDOWS_PREBUILT_DLLS)")":"$(PATH)" \
+	STATUS_PORT="$(STATUS_PORT)" \
 	./bin/nim_status_client.exe
 
 endif # "variables.mk" was not included
diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim
index 0688c397d2..9c48bdd250 100644
--- a/src/nim_status_client.nim
+++ b/src/nim_status_client.nim
@@ -47,9 +47,11 @@ proc mainProc() =
       if getEnv("NIM_STATUS_CLIENT_DEV").string == "":
         "/../Resources/status-icon.icns"
       else:
-        "/../status-icon.icns"
+        "/../status-dev-icon.icns"
     elif defined(windows) and getEnv("NIM_STATUS_CLIENT_DEV").string == "":
       "/../resources/status.svg"
+    elif getEnv("NIM_STATUS_CLIENT_DEV").string != "":
+      "/../status-dev.svg"
     else:
       "/../status.svg"
   app.icon(app.applicationDirPath & statusAppIcon)
diff --git a/status-dev-icon.icns b/status-dev-icon.icns
new file mode 100644
index 0000000000..716b21f7de
Binary files /dev/null and b/status-dev-icon.icns differ
diff --git a/status-dev.svg b/status-dev.svg
new file mode 100644
index 0000000000..5d19b08d55
--- /dev/null
+++ b/status-dev.svg
@@ -0,0 +1,17 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512 60.0073C262.365 60 60 262.362 60 512C60 761.638 262.365 964 512 964C761.635 964 964 761.631 964 512C964 262.369 761.635 60.0073 512 60.0073Z" fill="white"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M588.242 507.825C534.068 510.947 500.117 498.327 445.935 501.457C432.497 502.211 419.152 504.159 406.057 507.277C414.055 407.079 484.967 319.428 581.397 313.857C640.572 310.443 699.719 346.978 702.926 406.29C706.083 464.585 661.634 503.584 588.25 507.818L588.242 507.825ZM442.764 712.775C386.074 715.978 329.421 681.774 326.345 626.272C323.319 571.713 365.909 535.214 436.21 531.251C488.102 528.327 520.632 540.142 572.524 537.21C585.391 536.505 598.173 534.682 610.726 531.763C603.078 625.534 535.147 707.569 442.764 712.775ZM512 60.0073C262.365 60 60 262.362 60 512C60 761.638 262.365 964 512 964C761.635 964 964 761.631 964 512C964 262.369 761.635 60 512 60" fill="orangered"/>
+<defs>
+<filter id="filter0_d" x="35" y="60.0073" width="954" height="962.993" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="34"/>
+<feGaussianBlur stdDeviation="12.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/status-icon.icns b/status-icon.icns
index 35e982c298..dc14b213e2 100644
Binary files a/status-icon.icns and b/status-icon.icns differ