diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 5b0e8a1359..15c8c47dec 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -327,6 +327,12 @@
     <Compile Include="RomGame.cs" />
     <Compile Include="ScreenSaver.cs" />
     <Compile Include="Sound.cs" />
+    <Compile Include="tools\TAStudio.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="tools\TAStudio.Designer.cs">
+      <DependentUpon>TAStudio.cs</DependentUpon>
+    </Compile>
     <Compile Include="tools\ToolBox.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -441,6 +447,9 @@
       <DependentUpon>RamSearch.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="tools\TAStudio.resx">
+      <DependentUpon>TAStudio.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="tools\ToolBox.resx">
       <DependentUpon>ToolBox.cs</DependentUpon>
       <SubType>Designer</SubType>
diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs
index b7fcc34ad2..e0a213d0c4 100644
--- a/BizHawk.MultiClient/Config.cs
+++ b/BizHawk.MultiClient/Config.cs
@@ -195,6 +195,13 @@
         public int CheatsDomainWidth = -1;
         public int CheatsOnWidth = -1;
         
+        // TAStudio Dialog
+        public bool TAStudioSaveWindowPosition = true;
+        public int TASWndx = -1;
+        public int TASWndy = -1;
+        public int TASWidth = -1;
+        public int TASHeight = -1;
+
         // NES Game Genie Encoder/Decoder
         public bool NESGGAutoload = false;
         public bool NESGGSaveWindowPosition = true;
diff --git a/BizHawk.MultiClient/images/.ico b/BizHawk.MultiClient/images/.ico
new file mode 100644
index 0000000000..1ccba9bb45
Binary files /dev/null and b/BizHawk.MultiClient/images/.ico differ