diff --git a/OpenIPC_Config/ViewModels/FirmwareTabViewModel.cs b/OpenIPC_Config/ViewModels/FirmwareTabViewModel.cs
index 7c0d41e..29e2d64 100644
--- a/OpenIPC_Config/ViewModels/FirmwareTabViewModel.cs
+++ b/OpenIPC_Config/ViewModels/FirmwareTabViewModel.cs
@@ -317,9 +317,13 @@ private void ClearForm()
         SelectedManufacturer = string.Empty;
         SelectedDevice = string.Empty;
         SelectedFirmware = string.Empty;
+        SelectedFirmwareBySoc = string.Empty;
+        ManualFirmwareFile = string.Empty;
+        
         IsFirmwareSelected = false;
         IsManufacturerSelected = false;
         IsManualUpdateEnabled = true;
+        
         UpdateCanExecuteCommands();
     }
 
diff --git a/OpenIPC_Config/Views/FirmwareTabView.axaml b/OpenIPC_Config/Views/FirmwareTabView.axaml
index 72ee9e1..dcb72a7 100644
--- a/OpenIPC_Config/Views/FirmwareTabView.axaml
+++ b/OpenIPC_Config/Views/FirmwareTabView.axaml
@@ -95,20 +95,23 @@
                         <TextBlock Text="Local" Grid.Row="0" Grid.Column="0"
                                    VerticalAlignment="Center" />
 
-                        <Button Grid.Row="0" Grid.Column="1" Content="Select Firmware"
+                        <TextBlock Grid.Row="0" Grid.Column="1" 
+                                 Margin="5,0,0,0"
+                                 Padding="5"
+                                 Background="#F0F0F0"
+                                 Width="400"
+                                 Height="25"
+                                 IsEnabled="{Binding CanUseSelectFirmware}"
+                                 Text="{Binding Path=ManualFirmwareFile, Mode=TwoWay}" />
+                        
+                        <Button Grid.Row="0" Grid.Column="2" Content="..."
                                 Margin="5,5,0,0"
                                 VerticalAlignment="Center"
+                                Background="LightGray"
                                 IsEnabled="{Binding CanUseSelectFirmware}"
                                 Command="{Binding SelectFirmwareCommand}"
                                 CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=Window}}" />
 
-                        <TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"
-                                 Margin="0,5,0,0"
-                                 VerticalAlignment="Center"
-                                 Background="#F0F0F0"
-                                 Width="400"
-                                 IsEnabled="{Binding CanUseSelectFirmware}"
-                                 Text="{Binding Path=ManualFirmwareFile, Mode=TwoWay}" />
                     </Grid>
                 </Border>