Merge branch 'dev' into clock

Author: onesounds

Flow.Launcher/SettingWindow.xaml

@@ -14,7 +14,7 @@
     xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
     Title="{DynamicResource flowlauncher_settings}"
     Width="1000"
-    Height="650"
+    Height="700"
     MinWidth="900"
     MinHeight="600"
     d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"
@@ -2547,6 +2547,26 @@
                                     </ItemsControl>
                                 </Border>
 
+                                <Border Height="62" Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Icons" />
+                                        </StackPanel>
+                                        <TextBlock
+                                            Margin="0,0,-12,0"
+                                            VerticalAlignment="Center"
+                                            Style="{StaticResource SideTextAbout}">
+                                            <Hyperlink NavigateUri="https://icons8.com" RequestNavigate="OnRequestNavigate">
+                                                <Run Text="icons8.com" />
+                                            </Hyperlink>
+
+                                        </TextBlock>
+                                        <TextBlock Style="{StaticResource Glyph}">
+                                            &#xE8FE;
+                                        </TextBlock>
+                                    </ItemsControl>
+                                </Border>
+
                                 <Border Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
@@ -2573,19 +2593,7 @@
                                     </ItemsControl>
                                 </Border>
                                 <TextBlock
-                                    Margin="14,14,0,0"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Bottom"
-                                    FontSize="12"
-                                    Foreground="{DynamicResource Color15B}"
-                                    TextWrapping="WrapWithOverflow">
-                                    <Hyperlink NavigateUri="https://icons8.com" RequestNavigate="OnRequestNavigate">
-                                        <Run Text="Icons by icons8.com" />
-                                    </Hyperlink>
-                                </TextBlock>
-
-                                <TextBlock
-                                    Margin="14,4,0,0"
+                                    Margin="14,20,0,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Bottom"
                                     DockPanel.Dock="Bottom"