diff --git a/deploy/gk2_win_setup.nsi b/deploy/gk2_win_setup.nsi index 0c68e4643..503869cd3 100644 --- a/deploy/gk2_win_setup.nsi +++ b/deploy/gk2_win_setup.nsi @@ -6,7 +6,7 @@ Unicode true !include "MUI2.nsh" !include "DotNetChecker.nsh" -!define MUI_ICON "..\projects\GKv2\GEDKeeper2\GEDKeeper2.ico" +!define MUI_ICON "..\projects\GEDKeeper_48.ico" Name "GEDKeeper" OutFile "gedkeeper_2.28.1_win86.exe" diff --git a/deploy/gk3_win_setup.nsi b/deploy/gk3_win_setup.nsi index 719a86376..9ee71a8ce 100644 --- a/deploy/gk3_win_setup.nsi +++ b/deploy/gk3_win_setup.nsi @@ -5,7 +5,7 @@ Unicode true !include "MUI2.nsh" -!define MUI_ICON "..\projects\GKv3\GEDKeeper3\icon_gedkeeper.ico" +!define MUI_ICON "..\projects\GEDKeeper_48.ico" Name "GEDKeeper" OutFile "gedkeeper_3.4.1_win86.exe" diff --git a/projects/GEDKeeper_48.ico b/projects/GEDKeeper_48.ico new file mode 100644 index 000000000..386fba82e Binary files /dev/null and b/projects/GEDKeeper_48.ico differ diff --git a/projects/GKCore/Resources/icon_gedkeeper.ico b/projects/GKCore/Resources/icon_gedkeeper.ico index f1e29cafb..386fba82e 100644 Binary files a/projects/GKCore/Resources/icon_gedkeeper.ico and b/projects/GKCore/Resources/icon_gedkeeper.ico differ diff --git a/projects/GKCore/Resources/icon_gedkeeper.png b/projects/GKCore/Resources/icon_gedkeeper.png index 295333e25..3e2d5673b 100644 Binary files a/projects/GKCore/Resources/icon_gedkeeper.png and b/projects/GKCore/Resources/icon_gedkeeper.png differ diff --git a/projects/GKv2/GEDKeeper2/GEDKeeper2.csproj b/projects/GKv2/GEDKeeper2/GEDKeeper2.csproj index 52a78abbc..ff8abba22 100644 --- a/projects/GKv2/GEDKeeper2/GEDKeeper2.csproj +++ b/projects/GKv2/GEDKeeper2/GEDKeeper2.csproj @@ -10,7 +10,7 @@ <SignAssembly>False</SignAssembly> <DelaySign>False</DelaySign> <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> - <ApplicationIcon>GEDKeeper2.ico</ApplicationIcon> + <ApplicationIcon>..\..\GEDKeeper_48.ico</ApplicationIcon> <ApplicationManifest>app.manifest</ApplicationManifest> <MapFileExtensions>true</MapFileExtensions> <UseApplicationTrust>false</UseApplicationTrust> diff --git a/projects/GKv2/GEDKeeper2/GEDKeeper2.ico b/projects/GKv2/GEDKeeper2/GEDKeeper2.ico deleted file mode 100644 index f1e29cafb..000000000 Binary files a/projects/GKv2/GEDKeeper2/GEDKeeper2.ico and /dev/null differ diff --git a/projects/GKv3/GEDKeeper3/GEDKeeper3.csproj b/projects/GKv3/GEDKeeper3/GEDKeeper3.csproj index 9cdeaef32..4a853bbd4 100644 --- a/projects/GKv3/GEDKeeper3/GEDKeeper3.csproj +++ b/projects/GKv3/GEDKeeper3/GEDKeeper3.csproj @@ -45,7 +45,7 @@ <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <StartupObject>GEDKeeper3.GKProgram</StartupObject> - <ApplicationIcon>icon_gedkeeper.ico</ApplicationIcon> + <ApplicationIcon>..\..\GEDKeeper_48.ico</ApplicationIcon> </PropertyGroup> <ItemGroup Condition=" $(DefineConstants.Contains('OS_MSWIN')) "> diff --git a/projects/GKv3/GEDKeeper3/icon_gedkeeper.ico b/projects/GKv3/GEDKeeper3/icon_gedkeeper.ico deleted file mode 100644 index f1e29cafb..000000000 Binary files a/projects/GKv3/GEDKeeper3/icon_gedkeeper.ico and /dev/null differ