STRLCPY/NETworkManager

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/ARPTableView.xaml

		skipped 183 lines
184	184		<ColumnDefinition Width="Auto" />
185	185		<ColumnDefinition Width="*" />
186	186		</Grid.ColumnDefinitions>
187		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	187	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
188	188		<Rectangle.OpacityMask>
189	189		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
190	190		</Rectangle.OpacityMask>
191	191		</Rectangle>
192		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" TextAlignment="Center" Margin="10,5" />
	192	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" Style="{StaticResource ButtonWithImageTextBlock}" />
193	193		</Grid>
194	194		</Button>
195	195		<WrapPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right">
		skipped 3 lines
199	199		<ColumnDefinition Width="Auto" />
200	200		<ColumnDefinition Width="*" />
201	201		</Grid.ColumnDefinitions>
202		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	202	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
203	203		<Rectangle.OpacityMask>
204	204		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
205	205		</Rectangle.OpacityMask>
206	206		</Rectangle>
207		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddEntryDots}" TextAlignment="Center" Margin="10,5" />
	207	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddEntryDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
208	208		</Grid>
209	209		</Button>
210	210		<Button Command="{Binding DeleteEntryCommand}" Margin="0,0,10,0">
		skipped 12 lines
223	223		<ColumnDefinition Width="Auto" />
224	224		<ColumnDefinition Width="*" />
225	225		</Grid.ColumnDefinitions>
226		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	226	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
227	227		<Rectangle.OpacityMask>
228	228		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" />
229	229		</Rectangle.OpacityMask>
230	230		</Rectangle>
231		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteEntry}" TextAlignment="Center" Margin="10,5" />
	231	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteEntry}" Style="{StaticResource ButtonWithImageTextBlock}" />
232	232		</Grid>
233	233		</Button>
234	234		<Button Command="{Binding DeleteTableCommand}" Style="{StaticResource ImageWithTextButton}">
		skipped 2 lines
237	237		<ColumnDefinition Width="Auto" />
238	238		<ColumnDefinition Width="*" />
239	239		</Grid.ColumnDefinitions>
240		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	240	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
241	241		<Rectangle.OpacityMask>
242	242		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" />
243	243		</Rectangle.OpacityMask>
244	244		</Rectangle>
245		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteTable}" TextAlignment="Center" Margin="10,5" />
	245	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteTable}" Style="{StaticResource ButtonWithImageTextBlock}" />
246	246		</Grid>
247	247		</Button>
248	248		</WrapPanel>
		skipped 7 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/AWSSessionManagerHostView.xaml

		skipped 617 lines
618	618		<ColumnDefinition Width="Auto" />
619	619		<ColumnDefinition Width="*" />
620	620		</Grid.ColumnDefinitions>
621		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	621	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
622	622		<Rectangle.OpacityMask>
623	623		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
624	624		</Rectangle.OpacityMask>
625	625		</Rectangle>
626		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	626	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" Style="{StaticResource ButtonWithImageTextBlock}" />
627	627		</Grid>
628	628		</Button.Content>
629	629		</Button>
		skipped 16 lines
646	646		<ColumnDefinition Width="Auto" />
647	647		<ColumnDefinition Width="*" />
648	648		</Grid.ColumnDefinitions>
649		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	649	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
650	650		<Rectangle.OpacityMask>
651	651		<VisualBrush Stretch="Uniform" Visual="{iconPacks:MaterialLight Kind=Cog}" />
652	652		</Rectangle.OpacityMask>
653	653		</Rectangle>
654		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenSettings}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	654	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenSettings}" Style="{StaticResource ButtonWithImageTextBlock}" />
655	655		</Grid>
656	656		</Button.Content>
657	657		</Button>
		skipped 6 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/AWSSessionManagerSettingsView.xaml

		skipped 88 lines
89	89		<ColumnDefinition Width="Auto" />
90	90		<ColumnDefinition Width="*" />
91	91		</Grid.ColumnDefinitions>
92		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	92	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
93	93		<Rectangle.OpacityMask>
94	94		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" />
95	95		</Rectangle.OpacityMask>
96	96		</Rectangle>
97		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	97	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
98	98		</Grid>
99	99		</Button.Content>
100	100		</Button>
		skipped 19 lines
120	120		<ColumnDefinition Width="Auto" />
121	121		<ColumnDefinition Width="*" />
122	122		</Grid.ColumnDefinitions>
123		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	123	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
124	124		<Rectangle.OpacityMask>
125	125		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" />
126	126		</Rectangle.OpacityMask>
127	127		</Rectangle>
128		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	128	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
129	129		</Grid>
130	130		</Button.Content>
131	131		</Button>
		skipped 4 lines
136	136		<ColumnDefinition Width="Auto" />
137	137		<ColumnDefinition Width="*" />
138	138		</Grid.ColumnDefinitions>
139		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	139	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
140	140		<Rectangle.OpacityMask>
141	141		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
142	142		</Rectangle.OpacityMask>
143	143		</Rectangle>
144		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	144	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
145	145		</Grid>
146	146		</Button.Content>
147	147		</Button>
		skipped 64 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/AboutView.xaml

		skipped 221 lines
222	222		<ColumnDefinition Width="Auto" />
223	223		<ColumnDefinition Width="*" />
224	224		</Grid.ColumnDefinitions>
225		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	225	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
226	226		<Rectangle.OpacityMask>
227	227		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FolderOpen}" />
228	228		</Rectangle.OpacityMask>
229	229		</Rectangle>
230		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.ShowLocalLicenses}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	230	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.ShowLocalLicenses}" Style="{StaticResource ButtonWithImageTextBlock}" />
231	231		</Grid>
232	232		</Button.Content>
233	233		</Button>
		skipped 76 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/BitCalculatorView.xaml

		skipped 76 lines
77	77		<ColumnDefinition Width="Auto" />
78	78		<ColumnDefinition Width="*" />
79	79		</Grid.ColumnDefinitions>
80		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	80	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
81	81		<Rectangle.OpacityMask>
82	82		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Calculator}" />
83	83		</Rectangle.OpacityMask>
84	84		</Rectangle>
85		-	<TextBlock Grid.Column="1" FontSize="14" Text="{x:Static localization:Strings.Calculate}" Margin="10,5" TextAlignment="Center" />
	85	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Calculate}" Style="{StaticResource ButtonWithImageTextBlock}" />
86	86		</Grid>
87	87		</Button.Content>
88	88		</Button>
		skipped 76 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/ConnectionsView.xaml

		skipped 199 lines
200	200		<ColumnDefinition Width="Auto" />
201	201		<ColumnDefinition Width="*" />
202	202		</Grid.ColumnDefinitions>
203		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	203	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
204	204		<Rectangle.OpacityMask>
205	205		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
206	206		</Rectangle.OpacityMask>
207	207		</Rectangle>
208		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" TextAlignment="Center" Margin="10,5" />
	208	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" Style="{StaticResource ButtonWithImageTextBlock}" />
209	209		</Grid>
210	210		</Button.Content>
211	211		</Button>
		skipped 8 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/DNSLookupSettingsView.xaml

		skipped 84 lines
85	85		<ColumnDefinition Width="Auto" />
86	86		<ColumnDefinition Width="*" />
87	87		</Grid.ColumnDefinitions>
88		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	88	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
89	89		<Rectangle.OpacityMask>
90	90		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" />
91	91		</Rectangle.OpacityMask>
92	92		</Rectangle>
93		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	93	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
94	94		</Grid>
95	95		</Button.Content>
96	96		</Button>
		skipped 19 lines
116	116		<ColumnDefinition Width="Auto" />
117	117		<ColumnDefinition Width="*" />
118	118		</Grid.ColumnDefinitions>
119		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	119	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
120	120		<Rectangle.OpacityMask>
121	121		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" />
122	122		</Rectangle.OpacityMask>
123	123		</Rectangle>
124		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	124	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
125	125		</Grid>
126	126		</Button.Content>
127	127		</Button>
		skipped 4 lines
132	132		<ColumnDefinition Width="Auto" />
133	133		<ColumnDefinition Width="*" />
134	134		</Grid.ColumnDefinitions>
135		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	135	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
136	136		<Rectangle.OpacityMask>
137	137		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
138	138		</Rectangle.OpacityMask>
139	139		</Rectangle>
140		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	140	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
141	141		</Grid>
142	142		</Button.Content>
143	143		</Button>
		skipped 41 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/DNSLookupView.xaml

		skipped 94 lines
95	95		<ColumnDefinition Width="Auto" />
96	96		<ColumnDefinition Width="*" />
97	97		</Grid.ColumnDefinitions>
98		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5">
	98	+	<Rectangle>
99	99		<Rectangle.Resources>
100	100		<VisualBrush x:Key="VisualMagnify" Stretch="Uniform" Visual="{iconPacks:Material Kind=Magnify}" />
101	101		</Rectangle.Resources>
102	102		<Rectangle.Style>
103		-	<Style TargetType="{x:Type Rectangle}">
	103	+	<Style TargetType="{x:Type Rectangle}" BasedOn="{StaticResource ButtonWithImageRectangle}">
104	104		<Setter Property="OpacityMask" Value="{StaticResource VisualMagnify}" />
105		-	<Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
106	105		</Style>
107	106		</Rectangle.Style>
108	107		</Rectangle>
109		-	<TextBlock Grid.Column="1" FontSize="14" Text="{x:Static localization:Strings.Lookup}" Margin="10,5" TextAlignment="Center" />
	108	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Lookup}" Style="{StaticResource ButtonWithImageTextBlock}" />
110	109		</Grid>
111	110		</Button.Content>
112	111		</Button>
		skipped 144 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/DiscoveryProtocolView.xaml

		skipped 156 lines
157	157		<Button.Style>
158	158		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
159	159		<Style.Triggers>
160		-	<!--
161		-	<DataTrigger Binding="{Binding IsNetworkInterfaceLoading}" Value="True">
162		-	<Setter Property="IsEnabled" Value="False" />
163		-	</DataTrigger>
164		-	-->
165		-	<!--
166		-	<DataTrigger Binding="{Binding CanCapture}" Value="False">
167		-	<Setter Property="IsEnabled" Value="False" />
168		-	</DataTrigger>
169		-	-->
170	160		<DataTrigger Binding="{Binding IsCapturing}" Value="True">
171	161		<Setter Property="IsEnabled" Value="False" />
172	162		</DataTrigger>
		skipped 6 lines
179	169		<ColumnDefinition Width="Auto" />
180	170		<ColumnDefinition Width="*" />
181	171		</Grid.ColumnDefinitions>
182		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	172	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
183	173		<Rectangle.OpacityMask>
184	174		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=TimerRecord}" />
185	175		</Rectangle.OpacityMask>
186	176		</Rectangle>
187		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Capture}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	177	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Capture}" Style="{StaticResource ButtonWithImageTextBlock}" />
188	178		</Grid>
189	179		</Button.Content>
190	180		</Button>
		skipped 109 lines
300	290		<TextBlock Text="{Binding TimeRemainingMessage}" Style="{StaticResource DefaultTextBlock}" Foreground="{DynamicResource MahApps.Brushes.Gray3}" HorizontalAlignment="Center" />
301	291		</StackPanel>
302	292		</Grid>
303		-	<!--
304		-	<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding NetworkInterfaces.Count, Converter={StaticResource IntZeroToVisibilityCollapsedConverter}}">
305		-	<StackPanel.Style>
306		-	<Style TargetType="{x:Type StackPanel}">
307		-	<Setter Property="Visibility" Value="Collapsed" />
308		-	<Style.Triggers>
309		-	<DataTrigger Binding="{Binding NetworkInterfaces.Count}" Value="0">
310		-	<Setter Property="Visibility" Value="Visible" />
311		-	</DataTrigger>
312		-	</Style.Triggers>
313		-	</Style>
314		-	</StackPanel.Style>
315		-	<TextBlock Text="{x:Static localization:Strings.NoEnabledNetworkAdaptersFound}" Style="{StaticResource MessageTextBlock}" Margin="0,0,0,10" />
316		-	<Button Command="{Binding OpenNetworkConnectionsCommand}" HorizontalAlignment="Center" Style="{StaticResource ImageWithTextButton}">
317		-	<Button.Content>
318		-	<Grid>
319		-	<Grid.ColumnDefinitions>
320		-	<ColumnDefinition Width="Auto" />
321		-	<ColumnDefinition Width="*" />
322		-	</Grid.ColumnDefinitions>
323		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
324		-	<Rectangle.OpacityMask>
325		-	<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Network}" />
326		-	</Rectangle.OpacityMask>
327		-	</Rectangle>
328		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.NetworkConnectionsDots}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
329		-	</Grid>
330		-	</Button.Content>
331		-	</Button>
332		-	</StackPanel>
333		-	-->
334	293		</Grid>
335		-
336	294		<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=IsAdmin, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
337	295		<TextBlock Text="{x:Static localization:Strings.NetworkPacketsCaptureAdminMessage}" Style="{StaticResource MessageTextBlock}" Margin="0,0,0,10" />
338	296		<Button Command="{Binding RestartAsAdminCommand}" HorizontalAlignment="Center" Style="{StaticResource ImageWithTextButton}">
		skipped 20 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/IPScannerSettingsView.xaml

		skipped 109 lines
110	110		<ColumnDefinition Width="Auto" />
111	111		<ColumnDefinition Width="*" />
112	112		</Grid.ColumnDefinitions>
113		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	113	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
114	114		<Rectangle.OpacityMask>
115	115		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" />
116	116		</Rectangle.OpacityMask>
117	117		</Rectangle>
118		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	118	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
119	119		</Grid>
120	120		</Button.Content>
121	121		</Button>
		skipped 19 lines
141	141		<ColumnDefinition Width="Auto" />
142	142		<ColumnDefinition Width="*" />
143	143		</Grid.ColumnDefinitions>
144		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	144	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
145	145		<Rectangle.OpacityMask>
146	146		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" />
147	147		</Rectangle.OpacityMask>
148	148		</Rectangle>
149		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	149	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
150	150		</Grid>
151	151		</Button.Content>
152	152		</Button>
		skipped 4 lines
157	157		<ColumnDefinition Width="Auto" />
158	158		<ColumnDefinition Width="*" />
159	159		</Grid.ColumnDefinitions>
160		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	160	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
161	161		<Rectangle.OpacityMask>
162	162		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
163	163		</Rectangle.OpacityMask>
164	164		</Rectangle>
165		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	165	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
166	166		</Grid>
167	167		</Button.Content>
168	168		</Button>
		skipped 18 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/IPScannerView.xaml

		skipped 106 lines
107	107		<ColumnDefinition Width="Auto" />
108	108		<ColumnDefinition Width="*" />
109	109		</Grid.ColumnDefinitions>
110		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5">
	110	+	<Rectangle>
111	111		<Rectangle.Resources>
112	112		<VisualBrush x:Key="VisualControlPlay" Stretch="Uniform" Visual="{iconPacks:Material Kind=Play}"/>
113	113		<VisualBrush x:Key="VisualClose" Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" />
114	114		</Rectangle.Resources>
115	115		<Rectangle.Style>
116		-	<Style TargetType="{x:Type Rectangle}">
	116	+	<Style TargetType="{x:Type Rectangle}" BasedOn="{StaticResource ButtonWithImageRectangle}">
117	117		<Setter Property="OpacityMask" Value="{StaticResource VisualControlPlay}" />
118		-	<Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
119	118		<Style.Triggers>
120	119		<DataTrigger Binding="{Binding IsScanRunning}" Value="True">
121	120		<Setter Property="OpacityMask" Value="{StaticResource VisualClose}" />
		skipped 2 lines
124	123		</Style>
125	124		</Rectangle.Style>
126	125		</Rectangle>
127		-	<TextBlock Grid.Column="1" Margin="10,5" TextAlignment="Center">
	126	+	<TextBlock Grid.Column="1">
128	127		<TextBlock.Style>
129		-	<Style TargetType="{x:Type TextBlock}">
	128	+	<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ButtonWithImageTextBlock}">
130	129		<Setter Property="Text" Value="{x:Static localization:Strings.Scan}"/>
131	130		<Style.Triggers>
132	131		<DataTrigger Binding="{Binding IsScanRunning}" Value="True" >
		skipped 503 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/ListenersView.xaml

		skipped 168 lines
169	169		<ColumnDefinition Width="Auto" />
170	170		<ColumnDefinition Width="*" />
171	171		</Grid.ColumnDefinitions>
172		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	172	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
173	173		<Rectangle.OpacityMask>
174	174		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
175	175		</Rectangle.OpacityMask>
176	176		</Rectangle>
177		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" TextAlignment="Center" Margin="10,5" />
	177	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" Style="{StaticResource ButtonWithImageTextBlock}" />
178	178		</Grid>
179	179		</Button.Content>
180	180		</Button>
		skipped 6 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/LookupOUILookupView.xaml

		skipped 73 lines
74	74		<ColumnDefinition Width="Auto" />
75	75		<ColumnDefinition Width="*" />
76	76		</Grid.ColumnDefinitions>
77		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	77	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
78	78		<Rectangle.OpacityMask>
79	79		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Magnify}" />
80	80		</Rectangle.OpacityMask>
81	81		</Rectangle>
82		-	<TextBlock Grid.Column="1" Margin="10,5" TextAlignment="Center" Text="{x:Static localization:Strings.Lookup}" />
	82	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Lookup}" Style="{StaticResource ButtonWithImageTextBlock}" />
83	83		</Grid>
84	84		</Button.Content>
85	85		</Button>
		skipped 67 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/LookupPortLookupView.xaml

		skipped 72 lines
73	73		<ColumnDefinition Width="Auto" />
74	74		<ColumnDefinition Width="*" />
75	75		</Grid.ColumnDefinitions>
76		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	76	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
77	77		<Rectangle.OpacityMask>
78	78		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Magnify}" />
79	79		</Rectangle.OpacityMask>
80	80		</Rectangle>
81		-	<TextBlock Grid.Column="1" Margin="10,5" TextAlignment="Center" Text="{x:Static localization:Strings.Lookup}" />
	81	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Lookup}" Style="{StaticResource ButtonWithImageTextBlock}" />
82	82		</Grid>
83	83		</Button.Content>
84	84		</Button>
		skipped 96 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/NetworkInterfaceView.xaml

		skipped 765 lines
766	766		<ColumnDefinition Width="Auto" />
767	767		<ColumnDefinition Width="*" />
768	768		</Grid.ColumnDefinitions>
769		-	<Rectangle Width="20" Height="20" Margin="10,4,0,4" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	769	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}" Margin="10,4,0,4">
770	770		<Rectangle.OpacityMask>
771	771		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ExpansionCardVariant}" />
772	772		</Rectangle.OpacityMask>
773	773		</Rectangle>
774		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AdditionalConfigDots}" FontSize="14" Margin="10,4" TextAlignment="Center"/>
	774	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AdditionalConfigDots}" Style="{StaticResource ButtonWithImageTextBlock}" Margin="10,4" />
775	775		</Grid>
776	776		</mah:DropDownButton.Content>
777	777		<mah:DropDownButton.Items>
		skipped 25 lines
803	803		<ColumnDefinition Width="Auto" />
804	804		<ColumnDefinition Width="*" />
805	805		</Grid.ColumnDefinitions>
806		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	806	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
807	807		<Rectangle.OpacityMask>
808	808		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ContentSave}" />
809	809		</Rectangle.OpacityMask>
810	810		</Rectangle>
811		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Apply}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	811	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Apply}" Style="{StaticResource ButtonWithImageTextBlock}" />
812	812		</Grid>
813	813		</Button.Content>
814	814		<Button.Style>
		skipped 324 lines
1139	1139		<ColumnDefinition Width="Auto" />
1140	1140		<ColumnDefinition Width="*" />
1141	1141		</Grid.ColumnDefinitions>
1142		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	1142	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
1143	1143		<Rectangle.OpacityMask>
1144	1144		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Network}" />
1145	1145		</Rectangle.OpacityMask>
1146	1146		</Rectangle>
1147		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.NetworkConnectionsDots}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	1147	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.NetworkConnectionsDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
1148	1148		</Grid>
1149	1149		</Button.Content>
1150	1150		</Button>
		skipped 3 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/PingMonitorHostView.xaml

		skipped 81 lines
82	82		<ColumnDefinition Width="Auto" />
83	83		<ColumnDefinition Width="*" />
84	84		</Grid.ColumnDefinitions>
85		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5">
	85	+	<Rectangle>
86	86		<Rectangle.Resources>
87	87		<VisualBrush x:Key="VisualControlPlay" Stretch="Uniform" Visual="{iconPacks:Material Kind=Play}" />
88	88		</Rectangle.Resources>
89	89		<Rectangle.Style>
90		-	<Style TargetType="{x:Type Rectangle}">
	90	+	<Style TargetType="{x:Type Rectangle}" BasedOn="{StaticResource ButtonWithImageRectangle}">
91	91		<Setter Property="OpacityMask" Value="{StaticResource VisualControlPlay}" />
92		-	<Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
93	92		</Style>
94	93		</Rectangle.Style>
95	94		</Rectangle>
96		-	<TextBlock Grid.Column="1" FontSize="14" Margin="10,5" TextAlignment="Center">
	95	+	<TextBlock Grid.Column="1">
97	96		<TextBlock.Style>
98		-	<Style TargetType="{x:Type TextBlock}">
	97	+	<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ButtonWithImageTextBlock}">
99	98		<Setter Property="Text" Value="{x:Static localization:Strings.Ping}"/>
100	99		</Style>
101	100		</TextBlock.Style>
		skipped 345 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/PortScannerSettingsView.xaml

		skipped 80 lines
81	81		<ColumnDefinition Width="Auto" />
82	82		<ColumnDefinition Width="*" />
83	83		</Grid.ColumnDefinitions>
84		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	84	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
85	85		<Rectangle.OpacityMask>
86	86		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" />
87	87		</Rectangle.OpacityMask>
88	88		</Rectangle>
89		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	89	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
90	90		</Grid>
91	91		</Button.Content>
92	92		</Button>
		skipped 19 lines
112	112		<ColumnDefinition Width="Auto" />
113	113		<ColumnDefinition Width="*" />
114	114		</Grid.ColumnDefinitions>
115		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	115	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
116	116		<Rectangle.OpacityMask>
117	117		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" />
118	118		</Rectangle.OpacityMask>
119	119		</Rectangle>
120		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	120	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
121	121		</Grid>
122	122		</Button.Content>
123	123		</Button>
		skipped 4 lines
128	128		<ColumnDefinition Width="Auto" />
129	129		<ColumnDefinition Width="*" />
130	130		</Grid.ColumnDefinitions>
131		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	131	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
132	132		<Rectangle.OpacityMask>
133	133		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
134	134		</Rectangle.OpacityMask>
135	135		</Rectangle>
136		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	136	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
137	137		</Grid>
138	138		</Button.Content>
139	139		</Button>
		skipped 22 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/PortScannerView.xaml

		skipped 112 lines
113	113		<ColumnDefinition Width="Auto" />
114	114		<ColumnDefinition Width="*" />
115	115		</Grid.ColumnDefinitions>
116		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5">
	116	+	<Rectangle>
117	117		<Rectangle.Resources>
118	118		<VisualBrush x:Key="VisualControlPlay" Stretch="Uniform" Visual="{iconPacks:Material Kind=Play}"/>
119	119		<VisualBrush x:Key="VisualClose" Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" />
120	120		</Rectangle.Resources>
121	121		<Rectangle.Style>
122		-	<Style TargetType="{x:Type Rectangle}">
	122	+	<Style TargetType="{x:Type Rectangle}" BasedOn="{StaticResource ButtonWithImageRectangle}">
123	123		<Setter Property="OpacityMask" Value="{StaticResource VisualControlPlay}" />
124		-	<Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
125	124		<Style.Triggers>
126	125		<DataTrigger Binding="{Binding IsScanRunning}" Value="True">
127	126		<Setter Property="OpacityMask" Value="{StaticResource VisualClose}" />
		skipped 2 lines
130	129		</Style>
131	130		</Rectangle.Style>
132	131		</Rectangle>
133		-	<TextBlock Grid.Column="1" Margin="10,5" TextAlignment="Center">
	132	+	<TextBlock Grid.Column="1">
134	133		<TextBlock.Style>
135		-	<Style TargetType="{x:Type TextBlock}">
	134	+	<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ButtonWithImageTextBlock}">
136	135		<Setter Property="Text" Value="{x:Static localization:Strings.Scan}"/>
137	136		<Style.Triggers>
138	137		<DataTrigger Binding="{Binding IsScanRunning}" Value="True" >
		skipped 217 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/PowerShellHostView.xaml

		skipped 517 lines
518	518		<ColumnDefinition Width="Auto" />
519	519		<ColumnDefinition Width="*" />
520	520		</Grid.ColumnDefinitions>
521		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	521	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
522	522		<Rectangle.OpacityMask>
523	523		<VisualBrush Stretch="Uniform" Visual="{iconPacks:MaterialLight Kind=Cog}" />
524	524		</Rectangle.OpacityMask>
525	525		</Rectangle>
526		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenSettings}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	526	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenSettings}" Style="{StaticResource ButtonWithImageTextBlock}" />
527	527		</Grid>
528	528		</Button.Content>
529	529		</Button>
		skipped 5 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/ProfilesView.xaml

		skipped 81 lines
82	82		<ColumnDefinition Width="Auto" />
83	83		<ColumnDefinition Width="*" />
84	84		</Grid.ColumnDefinitions>
85		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	85	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
86	86		<Rectangle.OpacityMask>
87	87		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
88	88		</Rectangle.OpacityMask>
89	89		</Rectangle>
90		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	90	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
91	91		</Grid>
92	92		</Button.Content>
93	93		</Button>
		skipped 116 lines
210	210		<ColumnDefinition Width="Auto" />
211	211		<ColumnDefinition Width="*" />
212	212		</Grid.ColumnDefinitions>
213		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	213	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
214	214		<Rectangle.OpacityMask>
215	215		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" />
216	216		</Rectangle.OpacityMask>
217	217		</Rectangle>
218		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	218	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
219	219		</Grid>
220	220		</Button.Content>
221	221		</Button>
		skipped 19 lines
241	241		<ColumnDefinition Width="Auto" />
242	242		<ColumnDefinition Width="*" />
243	243		</Grid.ColumnDefinitions>
244		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	244	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
245	245		<Rectangle.OpacityMask>
246	246		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" />
247	247		</Rectangle.OpacityMask>
248	248		</Rectangle>
249		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	249	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
250	250		</Grid>
251	251		</Button.Content>
252	252		</Button>
		skipped 19 lines
272	272		<ColumnDefinition Width="Auto" />
273	273		<ColumnDefinition Width="*" />
274	274		</Grid.ColumnDefinitions>
275		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	275	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
276	276		<Rectangle.OpacityMask>
277	277		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ContentDuplicate}" />
278	278		</Rectangle.OpacityMask>
279	279		</Rectangle>
280		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.CopyAsDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	280	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.CopyAsDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
281	281		</Grid>
282	282		</Button.Content>
283	283		</Button>
		skipped 4 lines
288	288		<ColumnDefinition Width="Auto" />
289	289		<ColumnDefinition Width="*" />
290	290		</Grid.ColumnDefinitions>
291		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	291	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
292	292		<Rectangle.OpacityMask>
293	293		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
294	294		</Rectangle.OpacityMask>
295	295		</Rectangle>
296		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	296	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
297	297		</Grid>
298	298		</Button.Content>
299	299		</Button>
		skipped 9 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/PuTTYHostView.xaml

		skipped 527 lines
528	528		<ColumnDefinition Width="Auto" />
529	529		<ColumnDefinition Width="*" />
530	530		</Grid.ColumnDefinitions>
531		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	531	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
532	532		<Rectangle.OpacityMask>
533	533		<VisualBrush Stretch="Uniform" Visual="{iconPacks:MaterialLight Kind=Cog}" />
534	534		</Rectangle.OpacityMask>
535	535		</Rectangle>
536		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenSettings}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	536	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenSettings}" Style="{StaticResource ButtonWithImageTextBlock}" />
537	537		</Grid>
538	538		</Button.Content>
539	539		</Button>
		skipped 5 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/SNMPView.xaml

		skipped 398 lines
399	399		<ColumnDefinition Width="Auto" />
400	400		<ColumnDefinition Width="*" />
401	401		</Grid.ColumnDefinitions>
402		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5">
	402	+	<Rectangle>
403	403		<Rectangle.Resources>
404	404		<VisualBrush x:Key="VisualControlPlay" Stretch="Uniform" Visual="{iconPacks:Material Kind=Play}"/>
405	405		</Rectangle.Resources>
406	406		<Rectangle.Style>
407		-	<Style TargetType="{x:Type Rectangle}">
	407	+	<Style TargetType="{x:Type Rectangle}" BasedOn="{StaticResource ButtonWithImageRectangle}">
408	408		<Setter Property="OpacityMask" Value="{StaticResource VisualControlPlay}" />
409		-	<Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
410	409		</Style>
411	410		</Rectangle.Style>
412	411		</Rectangle>
413		-	<TextBlock Grid.Column="1" Margin="10,5" TextAlignment="Center">
	412	+	<TextBlock Grid.Column="1">
414	413		<TextBlock.Style>
415		-	<Style TargetType="{x:Type TextBlock}">
	414	+	<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ButtonWithImageTextBlock}">
416	415		<Setter Property="Text" Value="{x:Static localization:Strings.Query}"/>
417	416		<Style.Triggers>
418	417		<DataTrigger Binding="{Binding Mode}" Value="Set">
		skipped 144 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/SNTPLookupSettingsView.xaml

		skipped 83 lines
84	84		<ColumnDefinition Width="Auto" />
85	85		<ColumnDefinition Width="*" />
86	86		</Grid.ColumnDefinitions>
87		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	87	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
88	88		<Rectangle.OpacityMask>
89	89		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" />
90	90		</Rectangle.OpacityMask>
91	91		</Rectangle>
92		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	92	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
93	93		</Grid>
94	94		</Button.Content>
95	95		</Button>
		skipped 19 lines
115	115		<ColumnDefinition Width="Auto" />
116	116		<ColumnDefinition Width="*" />
117	117		</Grid.ColumnDefinitions>
118		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	118	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
119	119		<Rectangle.OpacityMask>
120	120		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" />
121	121		</Rectangle.OpacityMask>
122	122		</Rectangle>
123		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	123	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
124	124		</Grid>
125	125		</Button.Content>
126	126		</Button>
		skipped 4 lines
131	131		<ColumnDefinition Width="Auto" />
132	132		<ColumnDefinition Width="*" />
133	133		</Grid.ColumnDefinitions>
134		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	134	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
135	135		<Rectangle.OpacityMask>
136	136		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
137	137		</Rectangle.OpacityMask>
138	138		</Rectangle>
139		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	139	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
140	140		</Grid>
141	141		</Button.Content>
142	142		</Button>
		skipped 6 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/SNTPLookupView.xaml

		skipped 60 lines
61	61		<ColumnDefinition Width="Auto" />
62	62		<ColumnDefinition Width="*" />
63	63		</Grid.ColumnDefinitions>
64		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5">
	64	+	<Rectangle>
65	65		<Rectangle.Resources>
66	66		<VisualBrush x:Key="VisualMagnify" Stretch="Uniform" Visual="{iconPacks:Material Kind=Magnify}" />
67	67		</Rectangle.Resources>
68	68		<Rectangle.Style>
69		-	<Style TargetType="{x:Type Rectangle}">
	69	+	<Style TargetType="{x:Type Rectangle}" BasedOn="{StaticResource ButtonWithImageRectangle}">
70	70		<Setter Property="OpacityMask" Value="{StaticResource VisualMagnify}" />
71		-	<Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
72	71		</Style>
73	72		</Rectangle.Style>
74	73		</Rectangle>
75		-	<TextBlock Grid.Column="1" FontSize="14" Text="{x:Static localization:Strings.Lookup}" Margin="10,5" TextAlignment="Center" />
	74	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Lookup}" Style="{StaticResource ButtonWithImageTextBlock}"/>
76	75		</Grid>
77	76		</Button.Content>
78	77		</Button>
		skipped 135 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/SettingsProfilesView.xaml

		skipped 29 lines
30	30		<ColumnDefinition Width="Auto" />
31	31		<ColumnDefinition Width="*" />
32	32		</Grid.ColumnDefinitions>
33		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	33	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
34	34		<Rectangle.OpacityMask>
35	35		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FolderOpen}" />
36	36		</Rectangle.OpacityMask>
37	37		</Rectangle>
38		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenLocation}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	38	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenLocation}" Style="{StaticResource ButtonWithImageTextBlock}" />
39	39		</Grid>
40	40		</Button.Content>
41	41		</Button>
		skipped 97 lines
139	139		<ColumnDefinition Width="Auto" />
140	140		<ColumnDefinition Width="*" />
141	141		</Grid.ColumnDefinitions>
142		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	142	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
143	143		<Rectangle.OpacityMask>
144	144		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" />
145	145		</Rectangle.OpacityMask>
146	146		</Rectangle>
147		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	147	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.DeleteDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
148	148		</Grid>
149	149		</Button.Content>
150	150		</Button>
		skipped 19 lines
170	170		<ColumnDefinition Width="Auto" />
171	171		<ColumnDefinition Width="*" />
172	172		</Grid.ColumnDefinitions>
173		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	173	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
174	174		<Rectangle.OpacityMask>
175	175		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" />
176	176		</Rectangle.OpacityMask>
177	177		</Rectangle>
178		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	178	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.EditDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
179	179		</Grid>
180	180		</Button.Content>
181	181		</Button>
		skipped 4 lines
186	186		<ColumnDefinition Width="Auto" />
187	187		<ColumnDefinition Width="*" />
188	188		</Grid.ColumnDefinitions>
189		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	189	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
190	190		<Rectangle.OpacityMask>
191	191		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
192	192		</Rectangle.OpacityMask>
193	193		</Rectangle>
194		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource DefaultTextBlock}" TextAlignment="Center" Margin="10,5" />
	194	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddDots}" Style="{StaticResource ButtonWithImageTextBlock}" />
195	195		</Grid>
196	196		</Button.Content>
197	197		</Button>
		skipped 4 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/SettingsSettingsView.xaml

		skipped 24 lines
25	25		<ColumnDefinition Width="Auto" />
26	26		<ColumnDefinition Width="*" />
27	27		</Grid.ColumnDefinitions>
28		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	28	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
29	29		<Rectangle.OpacityMask>
30	30		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FolderOpen}" />
31	31		</Rectangle.OpacityMask>
32	32		</Rectangle>
33		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenLocation}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	33	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenLocation}" Style="{StaticResource ButtonWithImageTextBlock}" />
34	34		</Grid>
35	35		</Button.Content>
36	36		</Button>
		skipped 7 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/SubnetCalculatorCalculatorView.xaml

		skipped 49 lines
50	50		<ColumnDefinition Width="Auto" />
51	51		<ColumnDefinition Width="*" />
52	52		</Grid.ColumnDefinitions>
53		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	53	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
54	54		<Rectangle.OpacityMask>
55	55		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Calculator}" />
56	56		</Rectangle.OpacityMask>
57	57		</Rectangle>
58		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Calculate}" Margin="10,5" FontSize="14" TextAlignment="Center"/>
	58	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Calculate}" Style="{StaticResource ButtonWithImageTextBlock}" />
59	59		</Grid>
60	60		</Button.Content>
61	61		<Button.Style>
		skipped 61 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml

		skipped 96 lines
97	97		<ColumnDefinition Width="Auto" />
98	98		<ColumnDefinition Width="*" />
99	99		</Grid.ColumnDefinitions>
100		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5">
	100	+	<Rectangle>
101	101		<Rectangle.Resources>
102	102		<VisualBrush x:Key="VisualCalculator" Stretch="Uniform" Visual="{iconPacks:Material Kind=Calculator}"/>
103	103		</Rectangle.Resources>
104	104		<Rectangle.Style>
105		-	<Style TargetType="{x:Type Rectangle}">
	105	+	<Style TargetType="{x:Type Rectangle}" BasedOn="{StaticResource ButtonWithImageRectangle}">
106	106		<Setter Property="OpacityMask" Value="{StaticResource VisualCalculator}" />
107		-	<Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
108	107		</Style>
109	108		</Rectangle.Style>
110	109		</Rectangle>
111		-	<TextBlock Grid.Column="1" Margin="10,5" TextAlignment="Center">
	110	+	<TextBlock>
112	111		<TextBlock.Style>
113		-	<Style TargetType="{x:Type TextBlock}">
	112	+	<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ButtonWithImageTextBlock}">
114	113		<Setter Property="Text" Value="{x:Static localization:Strings.Calculate}"/>
115	114		</Style>
116	115		</TextBlock.Style>
		skipped 149 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/SubnetCalculatorWideSubnetView.xaml

		skipped 88 lines
89	89		<ColumnDefinition Width="Auto" />
90	90		<ColumnDefinition Width="*" />
91	91		</Grid.ColumnDefinitions>
92		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5">
	92	+	<Rectangle>
93	93		<Rectangle.Resources>
94	94		<VisualBrush x:Key="VisualCalculator" Stretch="Uniform" Visual="{iconPacks:Material Kind=Calculator}"/>
95	95		</Rectangle.Resources>
96	96		<Rectangle.Style>
97		-	<Style TargetType="{x:Type Rectangle}">
	97	+	<Style TargetType="{x:Type Rectangle}" BasedOn="{StaticResource ButtonWithImageRectangle}">
98	98		<Setter Property="OpacityMask" Value="{StaticResource VisualCalculator}" />
99		-	<Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
100	99		</Style>
101	100		</Rectangle.Style>
102	101		</Rectangle>
103		-	<TextBlock Grid.Column="1" Margin="10,5" TextAlignment="Center">
	102	+	<TextBlock Grid.Column="1">
104	103		<TextBlock.Style>
105		-	<Style TargetType="{x:Type TextBlock}">
	104	+	<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ButtonWithImageTextBlock}">
106	105		<Setter Property="Text" Value="{x:Static localization:Strings.Calculate}"/>
107	106		</Style>
108	107		</TextBlock.Style>
		skipped 54 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/TigerVNCHostView.xaml

		skipped 498 lines
499	499		<ColumnDefinition Width="Auto" />
500	500		<ColumnDefinition Width="*" />
501	501		</Grid.ColumnDefinitions>
502		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	502	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
503	503		<Rectangle.OpacityMask>
504	504		<VisualBrush Stretch="Uniform" Visual="{iconPacks:MaterialLight Kind=Cog}" />
505	505		</Rectangle.OpacityMask>
506	506		</Rectangle>
507		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenSettings}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	507	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenSettings}" Style="{StaticResource ButtonWithImageTextBlock}" />
508	508		</Grid>
509	509		</Button.Content>
510	510		</Button>
		skipped 5 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/TracerouteView.xaml

		skipped 78 lines
79	79		<ColumnDefinition Width="Auto" />
80	80		<ColumnDefinition Width="*" />
81	81		</Grid.ColumnDefinitions>
82		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5">
	82	+	<Rectangle>
83	83		<Rectangle.Resources>
84	84		<VisualBrush x:Key="VisualControlPlay" Stretch="Uniform" Visual="{iconPacks:Material Kind=Play}" />
85	85		<VisualBrush x:Key="VisualClose" Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" />
86	86		</Rectangle.Resources>
87	87		<Rectangle.Style>
88		-	<Style TargetType="{x:Type Rectangle}">
	88	+	<Style TargetType="{x:Type Rectangle}" BasedOn="{StaticResource ButtonWithImageRectangle}">
89	89		<Setter Property="OpacityMask" Value="{StaticResource VisualControlPlay}" />
90		-	<Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
91	90		<Style.Triggers>
92	91		<DataTrigger Binding="{Binding IsRunning}" Value="True">
93	92		<Setter Property="OpacityMask" Value="{StaticResource VisualClose}" />
		skipped 2 lines
96	95		</Style>
97	96		</Rectangle.Style>
98	97		</Rectangle>
99		-	<TextBlock Grid.Column="1" FontSize="14" Margin="10,5" TextAlignment="Center">
	98	+	<TextBlock Grid.Column="1">
100	99		<TextBlock.Style>
101		-	<Style TargetType="{x:Type TextBlock}">
	100	+	<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ButtonWithImageTextBlock}">
102	101		<Setter Property="Text" Value="{x:Static localization:Strings.Trace}"/>
103	102		<Style.Triggers>
104	103		<DataTrigger Binding="{Binding IsRunning}" Value="True" >
		skipped 247 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/WakeOnLANView.xaml

		skipped 82 lines
83	83		<ColumnDefinition Width="Auto" />
84	84		<ColumnDefinition Width="*" />
85	85		</Grid.ColumnDefinitions>
86		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	86	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
87	87		<Rectangle.OpacityMask>
88	88		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Power}" />
89	89		</Rectangle.OpacityMask>
90	90		</Rectangle>
91		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.WakeUp}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	91	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.WakeUp}" Style="{StaticResource ButtonWithImageTextBlock}" />
92	92		</Grid>
93	93		</Button.Content>
94	94		<Button.Style>
		skipped 297 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/WhoisView.xaml

		skipped 72 lines
73	73		<ColumnDefinition Width="Auto" />
74	74		<ColumnDefinition Width="*" />
75	75		</Grid.ColumnDefinitions>
76		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5">
	76	+	<Rectangle>
77	77		<Rectangle.Resources>
78	78		<VisualBrush x:Key="VisualControlPlay" Stretch="Uniform" Visual="{iconPacks:Material Kind=Play}"/>
79	79		</Rectangle.Resources>
80	80		<Rectangle.Style>
81		-	<Style TargetType="{x:Type Rectangle}">
	81	+	<Style TargetType="{x:Type Rectangle}" BasedOn="{StaticResource ButtonWithImageRectangle}">
82	82		<Setter Property="OpacityMask" Value="{StaticResource VisualControlPlay}" />
83	83		<Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
84	84		</Style>
85	85		</Rectangle.Style>
86	86		</Rectangle>
87		-	<TextBlock Grid.Column="1" Margin="10,5" TextAlignment="Center" Text="{x:Static localization:Strings.Query}" />
	87	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Query}" Style="{StaticResource ButtonWithImageTextBlock}" />
88	88		</Grid>
89	89		</Button.Content>
90	90		</Button>
		skipped 38 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/WiFiView.xaml

		skipped 364 lines
365	365		<ColumnDefinition Width="Auto" />
366	366		<ColumnDefinition Width="*" />
367	367		</Grid.ColumnDefinitions>
368		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	368	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
369	369		<Rectangle.OpacityMask>
370	370		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
371	371		</Rectangle.OpacityMask>
372	372		</Rectangle>
373		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" TextAlignment="Center" Margin="10,5" />
	373	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" Style="{StaticResource ButtonWithImageTextBlock}" />
374	374		</Grid>
375	375		</Button.Content>
376	376		</Button>
		skipped 10 lines
387	387		<ColumnDefinition Width="Auto" />
388	388		<ColumnDefinition Width="*" />
389	389		</Grid.ColumnDefinitions>
390		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	390	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
391	391		<Rectangle.OpacityMask>
392	392		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
393	393		</Rectangle.OpacityMask>
394	394		</Rectangle>
395		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	395	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" Style="{StaticResource ButtonWithImageTextBlock}" />
396	396		</Grid>
397	397		</Button.Content>
398	398		</Button>
		skipped 150 lines
549	549		<ColumnDefinition Width="Auto" />
550	550		<ColumnDefinition Width="*" />
551	551		</Grid.ColumnDefinitions>
552		-	<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}" Margin="10,5,0,5">
	552	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
553	553		<Rectangle.OpacityMask>
554	554		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
555	555		</Rectangle.OpacityMask>
556	556		</Rectangle>
557		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" TextAlignment="Center" Margin="10,5" />
	557	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" Style="{StaticResource ButtonWithImageTextBlock}" />
558	558		</Grid>
559	559		</Button.Content>
560	560		</Button>
		skipped 9 lines
570	570		<ColumnDefinition Width="Auto" />
571	571		<ColumnDefinition Width="*" />
572	572		</Grid.ColumnDefinitions>
573		-	<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource MahApps.Brushes.Gray3}">
	573	+	<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
574	574		<Rectangle.OpacityMask>
575	575		<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
576	576		</Rectangle.OpacityMask>
577	577		</Rectangle>
578		-	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
	578	+	<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.Refresh}" Style="{StaticResource ButtonWithImageTextBlock}" />
579	579		</Grid>
580	580		</Button.Content>
581	581		</Button>
		skipped 15 lines

■ ■ ■ ■ ■ ■

docs/Changelog/next-release.md

		skipped 60 lines
61	61
62	62		## Other
63	63
64		-	- Code cleanup [#2024](https://github.com/BornToBeRoot/NETworkManager/pull/2024){:target="\_blank"} [#2026](https://github.com/BornToBeRoot/NETworkManager/pull/2026){:target="\_blank"} [#2060](https://github.com/BornToBeRoot/NETworkManager/pull/2060){:target="\_blank"}
	64	+	- Code cleanup [#2024](https://github.com/BornToBeRoot/NETworkManager/pull/2024){:target="\_blank"} [#2026](https://github.com/BornToBeRoot/NETworkManager/pull/2026){:target="\_blank"} [#2060](https://github.com/BornToBeRoot/NETworkManager/pull/2060){:target="\_blank"} [#2068](https://github.com/BornToBeRoot/NETworkManager/pull/2068){:target="\_blank"}
65	65		- Language files updated [#transifex](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Ftransifex-integration){:target="\_blank"}
66	66		- Dependencies updated [#dependencies](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Fdependabot){:target="\_blank"}
67	67

Chore: Apply style to button with image and text (#2068)