diff --git a/Correlator/Dialog/NumericKeypadDialog.xaml b/Correlator/Dialog/NumericKeypadDialog.xaml
index 3dbbb3d..11cff38 100644
--- a/Correlator/Dialog/NumericKeypadDialog.xaml
+++ b/Correlator/Dialog/NumericKeypadDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
     Width="360"
-    Height="435"
+    Height="445"
     d:DataContext="{d:DesignInstance Type=vm:NumericKeypadDialogViewModel}"
     mc:Ignorable="d">
 
@@ -42,35 +42,55 @@
     </UserControl.Resources>
 
     <StackPanel Orientation="Vertical">
-        <UniformGrid
-            Height="55"
-            Margin="10,0"
-            Columns="4">
+        <hc:ButtonGroup
+            Height="60"
+            Margin="22,0"
+            Style="{StaticResource ButtonGroupBaseStyle}">
             <RadioButton
                 x:Name="PipeDiameterRadioButton"
+                Height="40"
+                hc:VisualElement.HighlightBackground="{DynamicResource MainThemeBrush}"
+                hc:VisualElement.HighlightBorderBrush="{DynamicResource MainThemeBrush}"
+                hc:VisualElement.HighlightForeground="{DynamicResource TextIconBrush}"
                 Content="管径"
+                FontSize="16"
                 GroupName="PipeParam"
                 Style="{StaticResource RadioButtonStyle}" />
             <RadioButton
                 x:Name="PipeLengthRadioButton"
+                Height="40"
+                hc:VisualElement.HighlightBackground="{DynamicResource MainThemeBrush}"
+                hc:VisualElement.HighlightBorderBrush="{DynamicResource MainThemeBrush}"
+                hc:VisualElement.HighlightForeground="{DynamicResource TextIconBrush}"
                 Content="管长"
+                FontSize="16"
                 GroupName="PipeParam"
                 Style="{StaticResource RadioButtonStyle}" />
             <RadioButton
                 x:Name="MinFrequencyRadioButton"
+                Height="40"
+                hc:VisualElement.HighlightBackground="{DynamicResource MainThemeBrush}"
+                hc:VisualElement.HighlightBorderBrush="{DynamicResource MainThemeBrush}"
+                hc:VisualElement.HighlightForeground="{DynamicResource TextIconBrush}"
                 Content="低频"
+                FontSize="16"
                 GroupName="PipeParam"
                 Style="{StaticResource RadioButtonStyle}" />
             <RadioButton
                 x:Name="MaxFrequencyRadioButton"
+                Height="40"
+                hc:VisualElement.HighlightBackground="{DynamicResource MainThemeBrush}"
+                hc:VisualElement.HighlightBorderBrush="{DynamicResource MainThemeBrush}"
+                hc:VisualElement.HighlightForeground="{DynamicResource TextIconBrush}"
                 Content="高频"
+                FontSize="16"
                 GroupName="PipeParam"
                 Style="{StaticResource RadioButtonStyle}" />
-        </UniformGrid>
+        </hc:ButtonGroup>
 
         <hc:TextBox
             Height="55"
-            Margin="22,0,22,10"
+            Margin="22,10,22,10"
             HorizontalContentAlignment="Right"
             FontSize="22"
             Foreground="Black"