diff --git a/LANCommander/Pages/Games/Components/ActionEditor.razor b/LANCommander/Pages/Games/Components/ActionEditor.razor
index 49dbc7d..8515403 100644
--- a/LANCommander/Pages/Games/Components/ActionEditor.razor
+++ b/LANCommander/Pages/Games/Components/ActionEditor.razor
@@ -11,16 +11,7 @@
                 <Input Type="text" @bind-Value="context.Name" />
             </PropertyColumn>
             <PropertyColumn Property="a => a.Path">
-                <Space Style="display: flex">
-                    <SpaceItem Style="flex-grow: 1">
-                        <Input Type="text" @bind-Value="context.Path" />
-                    </SpaceItem>
-                    @if (ArchiveId != Guid.Empty) {
-                        <SpaceItem>
-                            <Button OnClick="() => BrowseForActionPath(context)" Type="@ButtonType.Primary" Icon="@IconType.Outline.FolderOpen" />
-                        </SpaceItem>
-                    }
-                </Space>
+                <InputArchiveFile @bind-Value="context.Path" ArchiveId="@ArchiveId" AllowDirectories="true" />
             </PropertyColumn>
             <PropertyColumn Property="a => a.Arguments">
                 <Input Type="text" @bind-Value="context.Arguments" />
diff --git a/LANCommander/Pages/Games/Edit.razor b/LANCommander/Pages/Games/Edit.razor
index a17c6a8..aa9a325 100644
--- a/LANCommander/Pages/Games/Edit.razor
+++ b/LANCommander/Pages/Games/Edit.razor
@@ -59,17 +59,7 @@
                         <Input @bind-Value="@context.SortTitle" />
                     </FormItem>
                     <FormItem Label="Icon">
-                        <Space Style="display: flex">
-                            <SpaceItem Style="flex-grow: 1">
-                                <Input @bind-Value="@context.Icon" />
-                            </SpaceItem>
-                            @if (LatestArchiveId != Guid.Empty)
-                            {
-                                <SpaceItem>
-                                    <Button OnClick="BrowseForIcon" Type="@ButtonType.Primary">Browse</Button>
-                                </SpaceItem>
-                            }
-                        </Space>
+                        <InputArchiveFile @bind-Value="context.Icon" ArchiveId="@LatestArchiveId" AllowDirectories="true" />
                     </FormItem>
                     <FormItem Label="Description">
                         <TextArea @bind-Value="@context.Description" MaxLength=500 ShowCount />