diff --git a/Correlator/ViewModels/PictureFileViewModel.cs b/Correlator/ViewModels/PictureFileViewModel.cs
index 792d6b8..afd3dea 100644
--- a/Correlator/ViewModels/PictureFileViewModel.cs
+++ b/Correlator/ViewModels/PictureFileViewModel.cs
@@ -62,9 +62,8 @@
 
         public DelegateCommand GoBackCommand { get; set; }
         public DelegateCommand<DataGrid> ItemSelectedCommand { get; set; }
-        public DelegateCommand<string> ShowPictureCommand { get; set; }
-        public DelegateCommand DeleteItemCommand { get; set; }
-        public DelegateCommand ReLoadDataCommand { get; set; }
+        public DelegateCommand ShowPictureCommand { get; set; }
+        public DelegateCommand DeletePictureCommand { get; set; }
         public DelegateCommand<FunctionEventArgs<int>> PageUpdatedCmd { get; set; }
 
         #endregion
@@ -83,13 +82,26 @@
                 _selectedFile = (ImageResultFile)dataGrid.SelectedItem;
             });
 
-            ShowPictureCommand = new DelegateCommand<string>(delegate(string fullPath)
+            ShowPictureCommand = new DelegateCommand(delegate
             {
+                if (_selectedFile == null)
+                {
+                    dialogService.ShowDialog(
+                        "AlertMessageDialog",
+                        new DialogParameters
+                        {
+                            { "AlertType", AlertType.Error }, { "Title", "温馨提示" }, { "Message", "图片文件路径错误，无法查看" }
+                        },
+                        delegate { }
+                    );
+                    return;
+                }
+                
                 dialogService.ShowDialog("BigPictureView",
-                    new DialogParameters { { "ImageFullPath", fullPath } }, delegate { });
+                    new DialogParameters { { "ImageFullPath", _selectedFile.FullPath } }, delegate { });
             });
 
-            DeleteItemCommand = new DelegateCommand(() =>
+            DeletePictureCommand = new DelegateCommand(() =>
             {
                 if (_selectedFile == null)
                 {
@@ -112,8 +124,6 @@
                 }
             });
 
-            ReLoadDataCommand = new DelegateCommand(() => { Growl.Success("刷新成功"); });
-
             PageUpdatedCmd = new DelegateCommand<FunctionEventArgs<int>>(args =>
             {
                 PictureFiles = _totalFiles

diff --git a/Correlator/ViewModels/PictureFileViewModel.cs b/Correlator/ViewModels/PictureFileViewModel.cs
index 792d6b8..afd3dea 100644
--- a/Correlator/ViewModels/PictureFileViewModel.cs
+++ b/Correlator/ViewModels/PictureFileViewModel.cs
@@ -62,9 +62,8 @@
 
         public DelegateCommand GoBackCommand { get; set; }
         public DelegateCommand<DataGrid> ItemSelectedCommand { get; set; }
-        public DelegateCommand<string> ShowPictureCommand { get; set; }
-        public DelegateCommand DeleteItemCommand { get; set; }
-        public DelegateCommand ReLoadDataCommand { get; set; }
+        public DelegateCommand ShowPictureCommand { get; set; }
+        public DelegateCommand DeletePictureCommand { get; set; }
         public DelegateCommand<FunctionEventArgs<int>> PageUpdatedCmd { get; set; }
 
         #endregion
@@ -83,13 +82,26 @@
                 _selectedFile = (ImageResultFile)dataGrid.SelectedItem;
             });
 
-            ShowPictureCommand = new DelegateCommand<string>(delegate(string fullPath)
+            ShowPictureCommand = new DelegateCommand(delegate
             {
+                if (_selectedFile == null)
+                {
+                    dialogService.ShowDialog(
+                        "AlertMessageDialog",
+                        new DialogParameters
+                        {
+                            { "AlertType", AlertType.Error }, { "Title", "温馨提示" }, { "Message", "图片文件路径错误，无法查看" }
+                        },
+                        delegate { }
+                    );
+                    return;
+                }
+                
                 dialogService.ShowDialog("BigPictureView",
-                    new DialogParameters { { "ImageFullPath", fullPath } }, delegate { });
+                    new DialogParameters { { "ImageFullPath", _selectedFile.FullPath } }, delegate { });
             });
 
-            DeleteItemCommand = new DelegateCommand(() =>
+            DeletePictureCommand = new DelegateCommand(() =>
             {
                 if (_selectedFile == null)
                 {
@@ -112,8 +124,6 @@
                 }
             });
 
-            ReLoadDataCommand = new DelegateCommand(() => { Growl.Success("刷新成功"); });
-
             PageUpdatedCmd = new DelegateCommand<FunctionEventArgs<int>>(args =>
             {
                 PictureFiles = _totalFiles
diff --git a/Correlator/Views/PictureFileView.xaml b/Correlator/Views/PictureFileView.xaml
index c111e10..b521016 100644
--- a/Correlator/Views/PictureFileView.xaml
+++ b/Correlator/Views/PictureFileView.xaml
@@ -103,85 +103,47 @@
                     FontSize="18"
                     Header="文件大小"
                     IsReadOnly="True" />
-                <DataGridTemplateColumn CanUserResize="False" Header="操作">
+                <DataGridTemplateColumn
+                    Width="180"
+                    CanUserResize="False"
+                    Header="操作">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <Button
-                                Width="40"
-                                Height="40"
-                                HorizontalAlignment="Left"
-                                Background="Transparent"
-                                BorderThickness="0"
-                                Command="{Binding DataContext.ShowPictureCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
-                                CommandParameter="{Binding FullPath}"
-                                Style="{x:Null}">
-                                <Button.Clip>
-                                    <RectangleGeometry
-                                        RadiusX="20"
-                                        RadiusY="20"
-                                        Rect="0 0 40 40" />
-                                </Button.Clip>
-                                <Image Source="/Correlator;component/Image/icon_pic1.png" />
-                            </Button>
+                            <StackPanel Orientation="Horizontal">
+                                <Button
+                                    Margin="0,0,7,0"
+                                    hc:IconElement.Geometry="{StaticResource EyeOpenGeometry}"
+                                    Command="{Binding DataContext.ShowPictureCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                                    Content="查看"
+                                    Style="{StaticResource ButtonInfo}" />
+
+                                <Button
+                                    Margin="7,0,0,0"
+                                    hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}"
+                                    Command="{Binding DataContext.DeletePictureCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                                    Content="删除"
+                                    Style="{StaticResource ButtonDanger}" />
+                            </StackPanel>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>
 
-        <Grid Grid.Row="2" Margin="30,0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Button
-                Grid.Column="1"
-                Height="40"
-                HorizontalAlignment="Left"
-                Command="{Binding DeleteItemCommand}">
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock
-                        Margin="0,0,5,0"
-                        VerticalAlignment="Center"
-                        FontFamily="/Correlator;component/Fonts/#iconfont"
-                        FontSize="20"
-                        Text="&#xe666;" />
-                    <TextBlock FontSize="18" Text="删除" />
-                </StackPanel>
-            </Button>
-
-            <hc:Pagination
-                Grid.Column="1"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                DataCountPerPage="5"
-                IsJumpEnabled="True"
-                MaxPageCount="{Binding MaxPage}"
-                PageIndex="{Binding PageIndex}">
-                <hc:Interaction.Triggers>
-                    <hc:EventTrigger EventName="PageUpdated">
-                        <hc:EventToCommand Command="{Binding PageUpdatedCmd}" PassEventArgsToCommand="True" />
-                    </hc:EventTrigger>
-                </hc:Interaction.Triggers>
-            </hc:Pagination>
-
-            <Button
-                Grid.Column="2"
-                Height="40"
-                HorizontalAlignment="Left"
-                Command="{Binding ReLoadDataCommand}">
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock
-                        Margin="0,0,5,0"
-                        VerticalAlignment="Center"
-                        FontFamily="/Correlator;component/Fonts/#iconfont"
-                        FontSize="20"
-                        Text="&#xe60a;" />
-                    <TextBlock FontSize="18" Text="刷新" />
-                </StackPanel>
-            </Button>
-        </Grid>
+        <hc:Pagination
+            Grid.Row="2"
+            Margin="30,0"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            DataCountPerPage="5"
+            IsJumpEnabled="True"
+            MaxPageCount="{Binding MaxPage}"
+            PageIndex="{Binding PageIndex}">
+            <hc:Interaction.Triggers>
+                <hc:EventTrigger EventName="PageUpdated">
+                    <hc:EventToCommand Command="{Binding PageUpdatedCmd}" PassEventArgsToCommand="True" />
+                </hc:EventTrigger>
+            </hc:Interaction.Triggers>
+        </hc:Pagination>
     </Grid>
 </UserControl>
\ No newline at end of file