diff --git a/.idea/.idea.Nebula/.idea/avalonia.xml b/.idea/.idea.Nebula/.idea/avalonia.xml
index e750fea..2ffb2fd 100644
--- a/.idea/.idea.Nebula/.idea/avalonia.xml
+++ b/.idea/.idea.Nebula/.idea/avalonia.xml
@@ -5,6 +5,7 @@
       <map>
         <entry key="Nebula.Launcher/App.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Assets/Icons.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Assets/Resources.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Assets/Style.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/ViewModels/Styles1.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Controls/PlayerContainerControl.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
diff --git a/Nebula.Launcher/App.axaml b/Nebula.Launcher/App.axaml
index fc76dc2..9a29325 100644
--- a/Nebula.Launcher/App.axaml
+++ b/Nebula.Launcher/App.axaml
@@ -11,7 +11,6 @@
 
     <Application.Styles>
         <FluentTheme />
-        <StyleInclude Source="Assets/Icons.axaml" />
         <StyleInclude Source="Assets/Style.axaml" />
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/Icons.axaml b/Nebula.Launcher/Assets/Icons.axaml
deleted file mode 100644
index 5a4125b..0000000
--- a/Nebula.Launcher/Assets/Icons.axaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style>
-        <Style.Resources>
-            <StreamGeometry x:Key="List">M9 8h10M9 12h10M9 16h10M4.99 8H5m-.02 4h.01m0 4H5</StreamGeometry>
-            <StreamGeometry x:Key="Account">M69.3677,51.0059a30,30,0,1,0-42.7354,0A41.9971,41.9971,0,0,0,0,90a5.9966,5.9966,0,0,0,6,6H90a5.9966,5.9966,0,0,0,6-6A41.9971,41.9971,0,0,0,69.3677,51.0059ZM48,12A18,18,0,1,1,30,30,18.02,18.02,0,0,1,48,12ZM12.5977,84A30.0624,30.0624,0,0,1,42,60H54A30.0624,30.0624,0,0,1,83.4023,84Z</StreamGeometry>
-            <StreamGeometry x:Key="LineHorizontal3Regular">M2 4.5C2 4.22386 2.22386 4 2.5 4H17.5C17.7761 4 18 4.22386 18 4.5C18 4.77614 17.7761 5 17.5 5H2.5C2.22386 5 2 4.77614 2 4.5Z M2 9.5C2 9.22386 2.22386 9 2.5 9H17.5C17.7761 9 18 9.22386 18 9.5C18 9.77614 17.7761 10 17.5 10H2.5C2.22386 10 2 9.77614 2 9.5Z M2.5 14C2.22386 14 2 14.2239 2 14.5C2 14.7761 2.22386 15 2.5 15H17.5C17.7761 15 18 14.7761 18 14.5C18 14.2239 17.7761 14 17.5 14H2.5Z</StreamGeometry>
-            <StreamGeometry x:Key="HomeRegular">M21.6062 5.85517C23.0048 4.71494 24.9952 4.71494 26.3938 5.85517L39.5688 16.5966C40.4736 17.3342 41 18.4492 41 19.628V39.1134C41 41.2599 39.2875 43 37.175 43H32.075C29.9625 43 28.25 41.2599 28.25 39.1134V29.7492C28.25 29.0337 27.6792 28.4536 26.975 28.4536H21.025C20.3208 28.4536 19.75 29.0337 19.75 29.7492V39.1134C19.75 41.2599 18.0375 43 15.925 43H10.825C8.71251 43 7 41.2599 7 39.1134V19.628C7 18.4493 7.52645 17.3342 8.43124 16.5966L21.6062 5.85517ZM24.7979 7.87612C24.3317 7.49604 23.6683 7.49604 23.2021 7.87612L10.0271 18.6175C9.72548 18.8634 9.55 19.2351 9.55 19.628V39.1134C9.55 39.8289 10.1208 40.4089 10.825 40.4089H15.925C16.6292 40.4089 17.2 39.8289 17.2 39.1134V29.7492C17.2 27.6027 18.9125 25.8626 21.025 25.8626H26.975C29.0875 25.8626 30.8 27.6027 30.8 29.7492V39.1134C30.8 39.8289 31.3708 40.4089 32.075 40.4089H37.175C37.8792 40.4089 38.45 39.8289 38.45 39.1134V19.628C38.45 19.2351 38.2745 18.8634 37.9729 18.6175L24.7979 7.87612Z</StreamGeometry>
-            <StreamGeometry x:Key="TextNumberFormatRegular">M4.94272 3.00005C5.15176 3.00298 5.33691 3.13579 5.40683 3.33281L7.18103 8.33281C7.27338 8.59307 7.13727 8.87896 6.87702 8.97124C6.61676 9.06353 6.33093 8.92754 6.23859 8.66729L6.0018 8.00005H3.72983L3.46643 8.68047C3.36673 8.93804 3.07715 9.06597 2.81964 8.96636C2.5621 8.86675 2.43417 8.57695 2.53384 8.31963L4.46933 3.31963C4.5448 3.12456 4.73364 2.99712 4.94272 3.00005ZM4.11694 7.00005H5.647L4.91522 4.93779L4.11694 7.00005Z M8.50025 3.00005H10.0031C10.1654 3.00005 10.6055 3.00005 11.0111 3.22808C11.2253 3.34868 11.4286 3.5313 11.5747 3.79839C11.7195 4.06279 11.7936 4.38286 11.7936 4.75884C11.7936 5.21441 11.6695 5.56939 11.4732 5.83599C11.6219 5.94194 11.7606 6.08159 11.8716 6.26397C12.0344 6.5313 12.118 6.85796 12.118 7.24175C12.118 7.99321 11.7656 8.46953 11.3196 8.72881C10.9124 8.96538 10.4681 9.00029 10.25 9.00029L8.5 9.00005C8.22385 9.00005 8 8.77617 8 8.50005V3.50005C8 3.22393 8.22409 3.00005 8.50025 3.00005ZM10.0002 4.00005H9V5.50005H10.0236C10.1442 5.50005 10.3544 5.4771 10.5184 5.37749C10.6432 5.30181 10.7936 5.15581 10.7936 4.75884C10.7936 4.51397 10.7458 4.3665 10.6976 4.27861C10.6508 4.19316 10.5903 4.13872 10.5209 4.09966C10.3616 4.01006 10.1578 4.00005 10.0002 4.00005ZM9 6.50005V8.00029H10.25C10.39 8.00029 10.6296 7.97319 10.817 7.86431C10.9655 7.77788 11.118 7.62505 11.118 7.24175C11.118 7.10527 11.1013 7.00127 11.0775 6.92217C11.0669 6.88652 11.0548 6.85601 11.0423 6.82964C11.0342 6.81279 11.0258 6.79766 11.0175 6.78398C10.9683 6.70317 10.9008 6.64653 10.8142 6.60356C10.6188 6.50689 10.3729 6.50029 10.1857 6.50029H9.37146L9.35831 6.50005H9Z M17.4081 4.5291C17.162 3.84307 16.8042 3.4229 16.3545 3.20122C15.9449 2.99956 15.5215 2.99981 15.2464 3.00005H15.2188C14.6654 3.00005 14.2248 3.18975 13.892 3.48711C13.5697 3.7752 13.371 4.14312 13.2464 4.47686C13.1211 4.81304 13.0605 5.1419 13.0307 5.38189C13.0156 5.50298 13.008 5.60503 13.0041 5.67778C13.0021 5.7144 13.0011 5.74395 13.0006 5.76519L13.0001 5.79082L13 5.79888L13 5.80156V5.825C12.9999 6.2083 12.9997 6.91045 13.2491 7.54912C13.3796 7.88359 13.5844 8.21807 13.9063 8.48467C14.2311 8.75347 14.6477 8.92998 15.1632 8.9876C15.5798 9.03399 16.8262 9.00103 17.3933 7.74224C17.5068 7.49053 17.3947 7.19439 17.1429 7.0811C16.8911 6.96758 16.5951 7.07964 16.4816 7.33159C16.1894 7.98027 15.5516 8.02471 15.2742 7.9937C14.9304 7.95537 14.7025 7.84551 14.5439 7.71416C14.3824 7.58062 14.2649 7.40142 14.1806 7.1856C14.005 6.73565 14 6.20415 14 5.80278L14.0003 5.79009C14.0006 5.77764 14.0013 5.75762 14.0027 5.73101C14.0055 5.67803 14.0113 5.5999 14.023 5.50518C14.0469 5.31328 14.0938 5.06646 14.1833 4.82647C14.2736 4.58452 14.3972 4.37676 14.5583 4.23296C14.7089 4.09819 14.9128 4.00005 15.2188 4.00005C15.5222 4.00005 15.7284 4.00762 15.9125 4.09819C16.0704 4.17607 16.2832 4.35479 16.4668 4.86675C16.5601 5.12651 16.8463 5.26177 17.1063 5.16851C17.3662 5.07524 17.5013 4.78887 17.4081 4.5291Z M14.1967 12.2046C14.0737 12.313 14.0084 12.4495 13.9807 12.5464C13.9048 12.8121 13.6281 12.9656 13.3626 12.8899C13.0971 12.814 12.9433 12.5374 13.0191 12.2718C13.0866 12.0354 13.2375 11.7173 13.5352 11.4546C13.8425 11.1836 14.2748 11 14.846 11C16.0138 11 16.6922 11.8545 16.6922 12.6365C16.6922 12.9397 16.6338 13.4124 16.3123 13.8169C16.2696 13.8707 16.2234 13.9217 16.1737 13.97C16.2098 14.0005 16.245 14.033 16.279 14.0677C16.3293 14.1192 16.377 14.1756 16.421 14.2374C16.5965 14.4837 16.6922 14.7859 16.6922 15.1365C16.6922 15.7657 16.4796 16.2584 16.0941 16.5838C15.7236 16.8965 15.2583 17 14.846 17C14.4592 17 14.0723 16.9358 13.7372 16.7237C13.3926 16.5054 13.1641 16.1702 13.0249 15.7474C12.9386 15.4849 13.0813 15.2024 13.3436 15.116C13.6059 15.0296 13.8885 15.1724 13.9749 15.4346C14.0182 15.5662 14.0674 15.6619 14.119 15.7327L14.1339 15.7525C14.1446 15.7659 14.1554 15.7784 14.1662 15.7901L14.1813 15.8057L14.1979 15.8218C14.2227 15.8445 14.2475 15.8631 14.2722 15.8787C14.3102 15.9029 14.3549 15.9244 14.4084 15.9424C14.5147 15.9783 14.6555 16 14.846 16C15.1069 16 15.3146 15.9332 15.449 15.8196C15.5683 15.719 15.6922 15.5298 15.6922 15.1365C15.6922 14.9754 15.6511 14.8802 15.6065 14.8174C15.5585 14.75 15.4832 14.689 15.3731 14.6375C15.14 14.5281 14.8358 14.5 14.6217 14.5C14.3456 14.5 14.1217 14.2762 14.1217 14C14.1217 13.7239 14.3456 13.5 14.6217 13.5C15.1952 13.5 15.4258 13.325 15.5295 13.1946C15.6507 13.0423 15.6922 12.8331 15.6922 12.6365C15.6922 12.4185 15.4732 12 14.846 12C14.5035 12 14.3104 12.1043 14.1967 12.2046Z M9 12.8636C9 12.4209 9.37012 12 9.83521 12C10.1714 12 10.4493 12.1575 10.5869 12.3692C10.7095 12.5577 10.7686 12.8636 10.5168 13.2923C10.3948 13.4998 10.2126 13.6819 9.97385 13.8704C9.85483 13.9644 9.72788 14.0555 9.59137 14.1519L9.53442 14.1922C9.41727 14.2747 9.293 14.3624 9.17294 14.4527C8.60672 14.879 8 15.4632 8 16.5C8 16.7762 8.22385 17 8.5 17L8.52564 16.9993L8.55127 17H11.193C11.4691 17 11.693 16.7762 11.693 16.5C11.693 16.2239 11.4691 16 11.193 16H9.09686C9.21872 15.7181 9.45169 15.4947 9.77423 15.2518C9.87647 15.1749 9.98193 15.1001 10.0942 15.0208L10.1091 15.0105L10.1686 14.9686C10.3059 14.8714 10.4519 14.7671 10.5937 14.6553C10.8764 14.4319 11.1671 14.1595 11.379 13.7989C11.7948 13.0911 11.783 12.3741 11.4252 11.824C11.0824 11.2969 10.4701 11 9.83521 11C8.74658 11 8 11.9427 8 12.8636C8 13.1399 8.22385 13.3636 8.5 13.3636C8.77615 13.3636 9 13.1399 9 12.8636Z M4.41754 13.7344C4.62433 13.5965 4.82217 13.4344 5.00415 13.2554V16.5C5.00415 16.7764 5.228 17 5.50415 17C5.7803 17 6.00415 16.7764 6.00415 16.5V11.5C6.00415 11.24 5.8056 11.0264 5.55182 11.0025C5.30316 10.9781 5.0701 11.1431 5.01538 11.3934C4.91281 11.8621 4.46332 12.502 3.86285 12.9024C3.63309 13.0555 3.57098 13.366 3.72415 13.5958C3.87735 13.8255 4.18778 13.8875 4.41754 13.7344Z</StreamGeometry>
-            <StreamGeometry x:Key="CalendarCheckmarkRegular">M17.75 3C19.5449 3 21 4.45507 21 6.25V12.0218C20.5368 11.7253 20.0335 11.4858 19.5 11.3135V8.5H4.5V17.75C4.5 18.7165 5.2835 19.5 6.25 19.5H11.3135C11.4858 20.0335 11.7253 20.5368 12.0218 21H6.25C4.45507 21 3 19.5449 3 17.75V6.25C3 4.45507 4.45507 3 6.25 3H17.75ZM17.75 4.5H6.25C5.2835 4.5 4.5 5.2835 4.5 6.25V7H19.5V6.25C19.5 5.2835 18.7165 4.5 17.75 4.5Z M23 17.5C23 20.5376 20.5376 23 17.5 23C14.4624 23 12 20.5376 12 17.5C12 14.4624 14.4624 12 17.5 12C20.5376 12 23 14.4624 23 17.5ZM20.8536 15.1464C20.6583 14.9512 20.3417 14.9512 20.1464 15.1464L16.5 18.7929L14.8536 17.1464C14.6583 16.9512 14.3417 16.9512 14.1464 17.1464C13.9512 17.3417 13.9512 17.6583 14.1464 17.8536L16.1464 19.8536C16.3417 20.0488 16.6583 20.0488 16.8536 19.8536L20.8536 15.8536C21.0488 15.6583 21.0488 15.3417 20.8536 15.1464Z</StreamGeometry>
-            <StreamGeometry x:Key="CursorHoverRegular">M4 12.75C4 10.1266 6.12665 8 8.75 8H39.25C41.8734 8 44 10.1266 44 12.75V31.25C44 33.6523 42.2166 35.6381 39.9015 35.9557C39.7616 35.4003 39.4744 34.8783 39.0481 34.452L38.0961 33.5H39.25C40.4926 33.5 41.5 32.4926 41.5 31.25V12.75C41.5 11.5074 40.4926 10.5 39.25 10.5H8.75C7.50736 10.5 6.5 11.5074 6.5 12.75V31.25C6.5 32.4926 7.50736 33.5 8.75 33.5H18V36H8.75C6.12665 36 4 33.8734 4 31.25V12.75Z M22.1339 20.3661C21.7764 20.0086 21.2387 19.9017 20.7716 20.0952C20.3046 20.2886 20 20.7444 20 21.25V42.75C20 43.2993 20.3586 43.7842 20.8837 43.9451C21.4089 44.1061 21.9776 43.9053 22.2854 43.4504L27.2462 36.1169C27.4237 35.8545 27.7469 35.732 28.0537 35.8106L36.4395 37.9608C36.9851 38.1007 37.5569 37.8585 37.8359 37.3692C38.1149 36.8799 38.0322 36.2644 37.6339 35.8661L22.1339 20.3661ZM22.5 38.6713V24.2678L32.6372 34.405L28.6747 33.389C27.3451 33.048 25.9446 33.5792 25.1755 34.7161L22.5 38.6713Z</StreamGeometry>
-            <StreamGeometry x:Key="ImageRegular">M30.9968 12C33.7582 12 35.9968 14.2386 35.9968 17C35.9968 19.7614 33.7582 22 30.9968 22C28.2354 22 25.9968 19.7614 25.9968 17C25.9968 14.2386 28.2354 12 30.9968 12ZM28.4968 17C28.4968 18.3807 29.6161 19.5 30.9968 19.5C32.3775 19.5 33.4968 18.3807 33.4968 17C33.4968 15.6193 32.3775 14.5 30.9968 14.5C29.6161 14.5 28.4968 15.6193 28.4968 17Z M6 10.75C6 8.12665 8.12665 6 10.75 6H37.25C39.8734 6 42 8.12665 42 10.75V37.25C42 38.4377 41.5641 39.5236 40.8435 40.3565C40.7898 40.4531 40.7223 40.5441 40.641 40.6268C40.5548 40.7144 40.4589 40.7866 40.3566 40.8434C39.5238 41.564 38.4378 42 37.25 42H10.75C9.55998 42 8.47218 41.5624 7.63873 40.8393C7.53919 40.7832 7.44575 40.7123 7.36158 40.6268C7.28258 40.5466 7.21664 40.4583 7.16373 40.3648C6.43884 39.5309 6 38.4417 6 37.25V10.75ZM39.5 37.25V10.75C39.5 9.50736 38.4926 8.5 37.25 8.5H10.75C9.50736 8.5 8.5 9.50736 8.5 10.75V37.25C8.5 37.4065 8.51598 37.5592 8.54639 37.7067L21.3697 25.0851C22.8291 23.6486 25.171 23.6485 26.6306 25.0849L39.454 37.7048C39.4842 37.5579 39.5 37.4058 39.5 37.25ZM10.75 39.5H37.25C37.3948 39.5 37.5364 39.4863 37.6736 39.4602L24.877 26.8668C24.3905 26.388 23.6099 26.388 23.1234 26.8668L10.3284 39.4606C10.465 39.4865 10.6059 39.5 10.75 39.5Z</StreamGeometry>
-            <StreamGeometry x:Key="GridRegular">M10.75,15 C11.9926407,15 13,16.0073593 13,17.25 L13,22.75 C13,23.9926407 11.9926407,25 10.75,25 L5.25,25 C4.00735931,25 3,23.9926407 3,22.75 L3,17.25 C3,16.0073593 4.00735931,15 5.25,15 L10.75,15 Z M22.75,15 C23.9926407,15 25,16.0073593 25,17.25 L25,22.75 C25,23.9926407 23.9926407,25 22.75,25 L17.25,25 C16.0073593,25 15,23.9926407 15,22.75 L15,17.25 C15,16.0073593 16.0073593,15 17.25,15 L22.75,15 Z M10.75,16.5 L5.25,16.5 C4.83578644,16.5 4.5,16.8357864 4.5,17.25 L4.5,22.75 C4.5,23.1642136 4.83578644,23.5 5.25,23.5 L10.75,23.5 C11.1642136,23.5 11.5,23.1642136 11.5,22.75 L11.5,17.25 C11.5,16.8357864 11.1642136,16.5 10.75,16.5 Z M22.75,16.5 L17.25,16.5 C16.8357864,16.5 16.5,16.8357864 16.5,17.25 L16.5,22.75 C16.5,23.1642136 16.8357864,23.5 17.25,23.5 L22.75,23.5 C23.1642136,23.5 23.5,23.1642136 23.5,22.75 L23.5,17.25 C23.5,16.8357864 23.1642136,16.5 22.75,16.5 Z M10.75,3 C11.9926407,3 13,4.00735931 13,5.25 L13,10.75 C13,11.9926407 11.9926407,13 10.75,13 L5.25,13 C4.00735931,13 3,11.9926407 3,10.75 L3,5.25 C3,4.00735931 4.00735931,3 5.25,3 L10.75,3 Z M22.75,3 C23.9926407,3 25,4.00735931 25,5.25 L25,10.75 C25,11.9926407 23.9926407,13 22.75,13 L17.25,13 C16.0073593,13 15,11.9926407 15,10.75 L15,5.25 C15,4.00735931 16.0073593,3 17.25,3 L22.75,3 Z M10.75,4.5 L5.25,4.5 C4.83578644,4.5 4.5,4.83578644 4.5,5.25 L4.5,10.75 C4.5,11.1642136 4.83578644,11.5 5.25,11.5 L10.75,11.5 C11.1642136,11.5 11.5,11.1642136 11.5,10.75 L11.5,5.25 C11.5,4.83578644 11.1642136,4.5 10.75,4.5 Z M22.75,4.5 L17.25,4.5 C16.8357864,4.5 16.5,4.83578644 16.5,5.25 L16.5,10.75 C16.5,11.1642136 16.8357864,11.5 17.25,11.5 L22.75,11.5 C23.1642136,11.5 23.5,11.1642136 23.5,10.75 L23.5,5.25 C23.5,4.83578644 23.1642136,4.5 22.75,4.5 Z</StreamGeometry>
-            <StreamGeometry x:Key="TapDoubleRegular">M11.75,7 C13.098658,7 13.9287944,7.96910845 13.995631,9.32894133 L14,9.50847912 L14,11.6239658 L16.2191671,12.0269265 C16.3059934,12.0426926 16.3921415,12.0619885 16.4773973,12.0847662 C18.1517032,12.5320892 19.1698052,14.2081266 18.8210232,15.8840108 L18.7783909,16.0635133 L17.7302473,19.9866586 C17.5121898,20.8028361 16.8573252,21.4232391 16.0413431,21.6030664 L15.8760801,21.6330849 L13.4578534,21.9800873 C12.5332557,22.1127621 11.6296196,21.6605333 11.1775403,20.856652 L11.0981723,20.7018603 L11.0690771,20.6393109 C10.834274,20.1345269 10.4818276,19.6948369 10.0427315,19.3563662 L9.84933278,19.2176097 L7.96560087,17.9617884 L7.87170895,17.903392 L7.87170895,17.903392 L7.77431661,17.8510415 L5.41140295,16.6755814 C5.16192093,16.5514735 5.00180973,16.2992831 4.99563339,16.0207048 C4.97105537,14.9121345 5.46115528,14.0567901 6.4145898,13.5800728 C7.11643491,13.2291503 8.04963171,13.2489716 9.24079301,13.5967061 L9.5,13.6762241 L9.5,9.50847912 C9.5,8.05521072 10.3427047,7 11.75,7 Z M11.75,8.5 C11.290032,8.5 11.0376066,8.77493989 11.0038926,9.36636053 L11,9.50847912 L11,14.7525154 C11,15.2865066 10.4577823,15.6494397 9.96410876,15.4458885 C8.50347817,14.843642 7.52268831,14.7030746 7.0854102,14.9217136 C6.83140559,15.0487159 6.66519107,15.2126417 6.57561324,15.4407321 L6.53715909,15.5602504 L8.44240897,16.5080402 L8.62328046,16.6052624 L8.62328046,16.6052624 L8.79765116,16.713713 L10.6813831,17.9695342 C11.3640898,18.424672 11.9221531,19.041075 12.3072464,19.7624149 L12.4291383,20.0066708 L12.4582335,20.0692202 C12.5822556,20.3358453 12.8485386,20.5022497 13.1361683,20.5029349 L13.2447939,20.4952959 L15.6630206,20.1482935 C15.9231839,20.1109615 16.1419003,19.9409604 16.2444544,19.7046345 L16.2810763,19.5994847 L17.32922,15.6763394 C17.5786886,14.7425919 17.0239709,13.7834058 16.0902234,13.5339372 L16.021017,13.5169491 L16.021017,13.5169491 L13.1160046,12.9879766 C12.7949778,12.9296839 12.5528355,12.672241 12.5076173,12.3570515 L12.5,12.2500435 L12.5,9.50847912 C12.5,8.8188652 12.2453502,8.5 11.75,8.5 Z M11.7488353,2 C15.7532421,2 18.9994553,5.24621313 18.9994553,9.25061996 C18.9994553,10.2367051 18.8026079,11.1768142 18.4460653,12.033795 C18.0706958,11.7019776 17.6316339,11.4335469 17.1414982,11.2489273 C17.3733162,10.6271229 17.4994553,9.95360212 17.4994553,9.25061996 C17.4994553,6.07464025 14.924815,3.5 11.7488353,3.5 C8.5728556,3.5 5.99821535,6.07464025 5.99821535,9.25061996 C5.99821535,10.404202 6.33788608,11.4784498 6.92266794,12.3788036 C6.58493584,12.4339349 6.26708189,12.5357928 5.96737621,12.6856456 C5.80641169,12.7661279 5.6546981,12.8551435 5.51245904,12.9521463 C4.86871384,11.8697434 4.49821535,10.6034489 4.49821535,9.25061996 C4.49821535,5.24621313 7.74442848,2 11.7488353,2 Z M11.7488353,4.50178465 C14.3715446,4.50178465 16.4976706,6.62791064 16.4976706,9.25061996 C16.4976706,9.86873244 16.3795777,10.4592629 16.1647233,11.0008799 L15,10.7891954 L15,9.50847912 L14.995901,9.31367137 L14.9976706,9.25061996 C14.9976706,8.57003016 14.7883948,7.93831934 14.4306835,7.41632766 L14.3413894,7.28382734 C13.783327,6.49647237 12.8919799,6 11.75,6 C10.5749055,6 9.66519001,6.52568276 9.11090606,7.35305011 C8.72674857,7.88671571 8.5,8.54218785 8.5,9.25061996 L8.50233174,9.36135296 L8.5,9.50847912 L8.5,9.50847912 L8.5,12.3984093 L8.23787572,12.3620912 C8.0004694,12.3323902 7.7815796,12.2185559 7.62093571,12.0412498 C7.20697857,11.5843564 7,10.6541465 7,9.25061996 C7,6.62791064 9.12612599,4.50178465 11.7488353,4.50178465 Z</StreamGeometry>
-            <StreamGeometry x:Key="LockRegular">M12,2 C14.209139,2 16,3.790861 16,6 L16,8 L17.75,8 C18.9926407,8 20,9.00735931 20,10.25 L20,19.75 C20,20.9926407 18.9926407,22 17.75,22 L6.25,22 C5.00735931,22 4,20.9926407 4,19.75 L4,10.25 C4,9.00735931 5.00735931,8 6.25,8 L8,8 L8,6 C8,3.790861 9.790861,2 12,2 Z M17.75,9.5 L6.25,9.5 C5.83578644,9.5 5.5,9.83578644 5.5,10.25 L5.5,19.75 C5.5,20.1642136 5.83578644,20.5 6.25,20.5 L17.75,20.5 C18.1642136,20.5 18.5,20.1642136 18.5,19.75 L18.5,10.25 C18.5,9.83578644 18.1642136,9.5 17.75,9.5 Z M12.000125,13.5 C12.8285521,13.5 13.500125,14.1715729 13.500125,15 C13.500125,15.8284271 12.8285521,16.5 12.000125,16.5 C11.1716979,16.5 10.500125,15.8284271 10.500125,15 C10.500125,14.1715729 11.1716979,13.5 12.000125,13.5 Z M12,3.5 C10.6192881,3.5 9.5,4.61928813 9.5,6 L9.5,8 L14.5,8 L14.5,6 C14.5,4.61928813 13.3807119,3.5 12,3.5 Z</StreamGeometry>
-            <StreamGeometry x:Key="PollRegular">M11.7518706,1.99956021 C13.2716867,1.99956021 14.5037411,3.23161462 14.5037411,4.75143076 L14.5037411,19.2499651 C14.5037411,20.7697812 13.2716867,22.0018356 11.7518706,22.0018356 C10.2320544,22.0018356 9,20.7697812 9,19.2499651 L9,4.75143076 C9,3.23161462 10.2320544,1.99956021 11.7518706,1.99956021 Z M18.7518706,6.99956021 C20.2716867,6.99956021 21.5037411,8.23161462 21.5037411,9.75143076 L21.5037411,19.2499651 C21.5037411,20.7697812 20.2716867,22.0018356 18.7518706,22.0018356 C17.2320544,22.0018356 16,20.7697812 16,19.2499651 L16,9.75143076 C16,8.23161462 17.2320544,6.99956021 18.7518706,6.99956021 Z M4.75187055,11.9995602 C6.27168669,11.9995602 7.5037411,13.2316146 7.5037411,14.7514308 L7.5037411,19.2499651 C7.5037411,20.7697812 6.27168669,22.0018356 4.75187055,22.0018356 C3.23205441,22.0018356 2,20.7697812 2,19.2499651 L2,14.7514308 C2,13.2316146 3.23205441,11.9995602 4.75187055,11.9995602 Z M11.7518706,3.49956021 C11.0604815,3.49956021 10.5,4.06004175 10.5,4.75143076 L10.5,19.2499651 C10.5,19.9413541 11.0604815,20.5018356 11.7518706,20.5018356 C12.4432596,20.5018356 13.0037411,19.9413541 13.0037411,19.2499651 L13.0037411,4.75143076 C13.0037411,4.06004175 12.4432596,3.49956021 11.7518706,3.49956021 Z M18.7518706,8.49956021 C18.0604815,8.49956021 17.5,9.06004175 17.5,9.75143076 L17.5,19.2499651 C17.5,19.9413541 18.0604815,20.5018356 18.7518706,20.5018356 C19.4432596,20.5018356 20.0037411,19.9413541 20.0037411,19.2499651 L20.0037411,9.75143076 C20.0037411,9.06004175 19.4432596,8.49956021 18.7518706,8.49956021 Z M4.75187055,13.4995602 C4.06048154,13.4995602 3.5,14.0600417 3.5,14.7514308 L3.5,19.2499651 C3.5,19.9413541 4.06048154,20.5018356 4.75187055,20.5018356 C5.44325957,20.5018356 6.0037411,19.9413541 6.0037411,19.2499651 L6.0037411,14.7514308 C6.0037411,14.0600417 5.44325957,13.4995602 4.75187055,13.4995602 Z</StreamGeometry>
-        </Style.Resources>
-    </Style>
-</Styles>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/Style.axaml b/Nebula.Launcher/Assets/Style.axaml
index 812d78a..b8963bb 100644
--- a/Nebula.Launcher/Assets/Style.axaml
+++ b/Nebula.Launcher/Assets/Style.axaml
@@ -1,10 +1,4 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <!--  Add Controls for Previewer Here  -->
-        </Border>
-    </Design.PreviewWith>
-
     <Style Selector="Window">
         <Setter Property="Background" Value="#121212" />
     </Style>
diff --git a/Nebula.Launcher/Assets/account.png b/Nebula.Launcher/Assets/account.png
deleted file mode 100644
index 77dff4b..0000000
Binary files a/Nebula.Launcher/Assets/account.png and /dev/null differ
diff --git a/Nebula.Launcher/Assets/attribution.txt b/Nebula.Launcher/Assets/attribution.txt
deleted file mode 100644
index 7e13daa..0000000
--- a/Nebula.Launcher/Assets/attribution.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-account.png Icon by Icon Desai
-list.png Icon by Vector Stall
-settings.png Icon by Smashicons
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/back.png b/Nebula.Launcher/Assets/back.png
deleted file mode 100644
index f8911f5..0000000
Binary files a/Nebula.Launcher/Assets/back.png and /dev/null differ
diff --git a/Nebula.Launcher/Assets/dir.png b/Nebula.Launcher/Assets/dir.png
deleted file mode 100644
index 443ce59..0000000
Binary files a/Nebula.Launcher/Assets/dir.png and /dev/null differ
diff --git a/Nebula.Launcher/Assets/file.png b/Nebula.Launcher/Assets/file.png
deleted file mode 100644
index 235adb7..0000000
Binary files a/Nebula.Launcher/Assets/file.png and /dev/null differ
diff --git a/Nebula.Launcher/Assets/filter.png b/Nebula.Launcher/Assets/filter.png
deleted file mode 100644
index 2c77c33..0000000
Binary files a/Nebula.Launcher/Assets/filter.png and /dev/null differ
diff --git a/Nebula.Launcher/Assets/go.png b/Nebula.Launcher/Assets/go.png
deleted file mode 100644
index b869536..0000000
Binary files a/Nebula.Launcher/Assets/go.png and /dev/null differ
diff --git a/Nebula.Launcher/Assets/list.png b/Nebula.Launcher/Assets/list.png
deleted file mode 100644
index 4db0a25..0000000
Binary files a/Nebula.Launcher/Assets/list.png and /dev/null differ
diff --git a/Nebula.Launcher/Assets/refresh.png b/Nebula.Launcher/Assets/refresh.png
deleted file mode 100644
index f561040..0000000
Binary files a/Nebula.Launcher/Assets/refresh.png and /dev/null differ
diff --git a/Nebula.Launcher/Assets/settings.png b/Nebula.Launcher/Assets/settings.png
deleted file mode 100644
index da87b53..0000000
Binary files a/Nebula.Launcher/Assets/settings.png and /dev/null differ
diff --git a/Nebula.Launcher/Assets/star-full.png b/Nebula.Launcher/Assets/star-full.png
deleted file mode 100644
index 56e2a3e..0000000
Binary files a/Nebula.Launcher/Assets/star-full.png and /dev/null differ
diff --git a/Nebula.Launcher/Assets/star.png b/Nebula.Launcher/Assets/star.png
deleted file mode 100644
index dc02027..0000000
Binary files a/Nebula.Launcher/Assets/star.png and /dev/null differ
diff --git a/Nebula.Launcher/Assets/svg/browser.svg b/Nebula.Launcher/Assets/svg/browser.svg
new file mode 100644
index 0000000..332ddee
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/browser.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><path d="M472.403,0H39.597C18.945,0,2.763,16.183,2.763,36.835v438.331C2.763,495.817,18.945,512,39.597,512h432.806 c20.652,0,36.835-16.177,36.835-36.835V36.835C509.237,16.183,493.055,0,472.403,0z M472.403,475.165H39.597L39.315,36.859 c0,0,0.086-0.025,0.282-0.025h432.806V475.165z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g><g><g><rect x="21.18" y="152.249" width="469.026" height="36.835" fill="#000000" style="fill: rgb(255, 255, 255);"></rect></g></g><g><g><circle cx="97.305" cy="94.542" r="29.468" fill="#000000" style="fill: rgb(255, 255, 255);"></circle></g></g><g><g><circle cx="173.429" cy="94.542" r="29.468" fill="#000000" style="fill: rgb(255, 255, 255);"></circle></g></g><g><g><path d="M401.803,76.125H274.11c-10.172,0-18.417,8.245-18.417,18.417c0,10.172,8.245,18.417,18.417,18.417h127.693 c10.172,0,18.417-8.245,18.417-18.417C420.221,84.37,411.976,76.125,401.803,76.125z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/delete.svg b/Nebula.Launcher/Assets/svg/delete.svg
new file mode 100644
index 0000000..01efb45
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/delete.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><g><polygon points="353.574,176.526 313.496,175.056 304.807,412.34 344.885,413.804 " fill="#000000" style="fill: rgb(255, 255, 255);"></polygon><rect x="235.948" y="175.791" width="40.104" height="237.285" fill="#000000" style="fill: rgb(255, 255, 255);"></rect><polygon points="207.186,412.334 198.497,175.049 158.419,176.52 167.109,413.804 " fill="#000000" style="fill: rgb(255, 255, 255);"></polygon><path d="M17.379,76.867v40.104h41.789L92.32,493.706C93.229,504.059,101.899,512,112.292,512h286.74 c10.394,0,19.07-7.947,19.972-18.301l33.153-376.728h42.464V76.867H17.379z M380.665,471.896H130.654L99.426,116.971h312.474 L380.665,471.896z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></g><g><g><path d="M321.504,0H190.496c-18.428,0-33.42,14.992-33.42,33.42v63.499h40.104V40.104h117.64v56.815h40.104V33.42 C354.924,14.992,339.932,0,321.504,0z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/file.svg b/Nebula.Launcher/Assets/svg/file.svg
new file mode 100644
index 0000000..b837644
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/file.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><path d="M448.39,147.322L297.99,5.242C294.419,1.875,289.709,0,284.8,0h-208C66.195,0,57.6,8.595,57.6,19.2v473.6 c0,10.605,8.595,19.2,19.2,19.2h358.4c10.605,0,19.2-8.595,19.2-19.2V161.28C454.4,156,452.224,150.95,448.39,147.322z M416,473.6 H96V38.4h181.165L416,169.555V473.6z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g><g><g><path d="M345.6,313.6H160c-10.605,0-19.2,8.595-19.2,19.2S149.395,352,160,352h185.6c10.605,0,19.2-8.595,19.2-19.2 S356.205,313.6,345.6,313.6z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g><g><g><path d="M268.8,236.8H160c-10.605,0-19.2,8.595-19.2,19.2s8.595,19.2,19.2,19.2h108.8c10.605,0,19.2-8.595,19.2-19.2 S279.405,236.8,268.8,236.8z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g><g><g><path d="M345.6,390.4H160c-10.605,0-19.2,8.595-19.2,19.2c0,10.605,8.595,19.2,19.2,19.2h185.6c10.605,0,19.2-8.595,19.2-19.2 S356.205,390.4,345.6,390.4z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g><g><g><path d="M300.8,147.2v-128h-38.4v147.2c0,10.605,8.595,19.2,19.2,19.2h153.6v-38.4H300.8z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/filter.svg b/Nebula.Launcher/Assets/svg/filter.svg
new file mode 100644
index 0000000..ef63fa1
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/filter.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><path d="M500.191,10.674C496.879,4.128,490.171,0,482.834,0H29.164c-7.336,0-14.044,4.128-17.356,10.674 c-3.305,6.546-2.644,14.401,1.705,20.305l177.677,241.133v220.445c0,10.739,8.704,19.443,19.443,19.443h90.734 c10.739,0,19.443-8.704,19.443-19.443V272.112L498.486,30.979C502.841,25.075,503.496,17.22,500.191,10.674z M285.714,254.192 c-2.463,3.338-3.791,7.375-3.791,11.53v207.392h-51.848V265.721c0-4.154-1.329-8.192-3.791-11.53L67.641,38.886h376.722 L285.714,254.192z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/folder.svg b/Nebula.Launcher/Assets/svg/folder.svg
new file mode 100644
index 0000000..b7047d4
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/folder.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><path d="M480,105.6H244.909L182.08,41.011c-3.616-3.712-8.576-5.811-13.76-5.811H32c-17.645,0-32,14.355-32,32v377.6 c0,17.645,14.355,32,32,32h448c17.645,0,32-14.355,32-32V137.6C512,119.955,497.645,105.6,480,105.6z M473.6,438.4H38.4V73.6 h121.811l62.829,64.589c3.616,3.712,8.576,5.811,13.76,5.811h236.8V438.4z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/home.svg b/Nebula.Launcher/Assets/svg/home.svg
new file mode 100644
index 0000000..28e307d
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/home.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><path d="M475.425,200.225L262.092,4.669c-6.951-6.359-17.641-6.204-24.397,0.35L36.213,200.574 c-3.449,3.348-5.399,7.953-5.399,12.758v280.889c0,9.819,7.958,17.778,17.778,17.778h148.148c9.819,0,17.778-7.959,17.778-17.778 v-130.37h82.963v130.37c0,9.819,7.958,17.778,17.778,17.778h148.148c9.819,0,17.778-7.953,17.778-17.778V213.333 C481.185,208.349,479.099,203.597,475.425,200.225z M445.629,476.444H333.037v-130.37c0-9.819-7.959-17.778-17.778-17.778H196.741 c-9.819,0-17.778,7.959-17.778,17.778v130.37H66.37V220.853L250.424,42.216l195.206,178.939V476.444z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/information.svg b/Nebula.Launcher/Assets/svg/information.svg
new file mode 100644
index 0000000..b569795
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/information.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 97.083 97.083" style="enable-background:new 0 0 97.083 97.083;" xml:space="preserve"><g><g><path d="M62.079,83.595h-5.137V30.29c0-1.104-0.896-2-2-2H35.005c-1.104,0-2,0.896-2,2v6.685c0,1.104,0.896,2,2,2h5.646v44.62 h-5.137c-1.104,0-2,0.896-2,2v9.488c0,1.104,0.896,2,2,2h26.564c1.104,0,2-0.896,2-2v-9.488 C64.079,84.491,63.185,83.595,62.079,83.595z" fill="#000000" style="fill: rgb(255, 255, 255);"></path><path d="M48.542,23.428c6.459,0,11.714-5.255,11.714-11.714S55.001,0,48.542,0S36.828,5.255,36.828,11.714 S42.083,23.428,48.542,23.428z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/newspaper.svg b/Nebula.Launcher/Assets/svg/newspaper.svg
new file mode 100644
index 0000000..8bc262e
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/newspaper.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><path d="M351.028,144.402H223.873c-11.207,0-20.291,9.083-20.291,20.291c0,11.207,9.083,20.291,20.291,20.291h127.155 c11.214,0,20.291-9.083,20.291-20.291C371.318,153.485,362.235,144.402,351.028,144.402z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g><g><g><path d="M399.725,242.473H223.873c-11.207,0-20.291,9.083-20.291,20.291c0,11.207,9.083,20.291,20.291,20.291h175.852 c11.207,0,20.291-9.083,20.291-20.291C420.016,251.556,410.932,242.473,399.725,242.473z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g><g><g><path d="M491.709,17.247H132.565c-11.207,0-20.291,9.083-20.291,20.291v191.408H76.428C34.284,228.946,0,263.237,0,305.374 v112.951c0,42.144,34.284,76.428,76.428,76.428c3.449,0,6.845-0.23,10.166-0.676h334.775c49.969,0,90.631-40.656,90.631-90.631 V37.538C512,26.33,502.917,17.247,491.709,17.247z M112.275,418.325c0,17.389-12.452,31.931-28.907,35.17h-6.939v0.676 c-19.77,0-35.847-16.084-35.847-35.847V305.374c0-19.763,16.084-35.847,35.847-35.847h35.847V418.325z M471.419,403.445 c0,27.129-22.915,50.05-50.05,50.05H144.273c5.485-10.531,8.583-22.496,8.583-35.17V57.828h318.563V403.445z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g><g><g><path d="M351.028,334.464H223.873c-11.207,0-20.291,9.083-20.291,20.291c0,11.207,9.083,20.291,20.291,20.291h127.155 c11.214,0,20.291-9.083,20.291-20.291C371.318,343.547,362.235,334.464,351.028,334.464z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/next.svg b/Nebula.Launcher/Assets/svg/next.svg
new file mode 100644
index 0000000..c1a8a4e
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/next.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512.002 512.002" style="enable-background:new 0 0 512.002 512.002;" xml:space="preserve"><g><g><path d="M388.425,241.951L151.609,5.79c-7.759-7.733-20.321-7.72-28.067,0.04c-7.74,7.759-7.72,20.328,0.04,28.067l222.72,222.105 L123.574,478.106c-7.759,7.74-7.779,20.301-0.04,28.061c3.883,3.89,8.97,5.835,14.057,5.835c5.074,0,10.141-1.932,14.017-5.795 l236.817-236.155c3.737-3.718,5.834-8.778,5.834-14.05S392.156,245.676,388.425,241.951z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/play.svg b/Nebula.Launcher/Assets/svg/play.svg
new file mode 100644
index 0000000..3df41c6
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/play.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><path d="M369.324,235.336L39.109,10.189C31.445,4.952,21.514,4.41,13.325,8.738C5.128,13.066,0,21.58,0,30.853v450.293 c0,9.281,5.128,17.787,13.325,22.114c3.669,1.943,7.688,2.902,11.691,2.902c4.937,0,9.865-1.468,14.092-4.336l330.215-225.147 c6.838-4.661,10.924-12.391,10.924-20.672S376.153,239.997,369.324,235.336z M50.033,433.807V78.183l260.786,177.816 L50.033,433.807z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g><g><g><path d="M486.984,34.188c-13.817,0-25.016,11.199-25.016,25.016v393.59c0,13.817,11.199,25.016,25.016,25.016 c13.826,0,25.016-11.199,25.016-25.016V59.204C512,45.387,500.801,34.188,486.984,34.188z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/pulse.svg b/Nebula.Launcher/Assets/svg/pulse.svg
new file mode 100644
index 0000000..697d927
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/pulse.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><path d="M493.929,237.927H409.6c-6.795,0-13.011,3.813-16.095,9.866l-71.325,139.794L209.769,72.84 c-2.427-6.795-8.656-11.493-15.854-11.957c-7.21-0.5-13.981,3.391-17.257,9.818L91.335,237.933H18.071 C8.09,237.933,0,246.029,0,256.003c0,9.975,8.09,18.071,18.071,18.071h84.335c6.789,0,13.005-3.813,16.095-9.861l71.319-139.794 l112.411,314.748c2.427,6.794,8.662,11.493,15.854,11.957c0.391,0.024,0.783,0.036,1.169,0.036c6.752,0,12.987-3.783,16.089-9.854 l85.323-167.237h73.264c9.981,0,18.071-8.09,18.071-18.071S503.91,237.927,493.929,237.927z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/refresh.svg b/Nebula.Launcher/Assets/svg/refresh.svg
new file mode 100644
index 0000000..d26e9be
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/refresh.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><path d="M256,64c-63.749,0-116.539,27.751-153.514,61.856l1.762-105.739C104.432,9.191,95.716,0.178,84.784,0 c-0.112,0-0.224,0-0.336,0C73.673,0,64.845,8.65,64.66,19.464l-2.639,158.351c-0.086,5.364,2.006,10.537,5.806,14.331 c3.794,3.794,8.94,5.885,14.331,5.793l154.392-2.639c10.926-0.191,19.635-9.198,19.451-20.13 c-0.185-10.814-9.013-19.457-19.787-19.457c-0.112,0-0.224,0-0.343,0l-109.13,1.867c30.515-28.919,75.54-53.991,129.26-53.991 c110.113,0,184.082,95.182,184.082,184.082c0,89.217-73.969,184.742-184.082,184.742c-120.109,0-184.082-107.296-184.082-184.742 c0-10.933-8.861-19.794-19.794-19.794S32.33,276.737,32.33,287.67C32.33,396.008,122.207,512,256,512 s223.67-115.992,223.67-224.336C479.67,179.649,389.793,64,256,64z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/settings.svg b/Nebula.Launcher/Assets/svg/settings.svg
new file mode 100644
index 0000000..46dcc45
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/settings.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><g><path d="M255.997,149.109c-58.775,0-106.592,47.817-106.592,106.592c0,58.775,47.817,106.592,106.592,106.592 c58.769,0,106.592-47.817,106.592-106.592C362.589,196.925,314.766,149.109,255.997,149.109z M255.997,326.363 c-38.966,0-70.662-31.696-70.662-70.662c0-38.966,31.696-70.662,70.662-70.662s70.662,31.696,70.662,70.662 C326.659,294.667,294.963,326.363,255.997,326.363z" fill="#000000" style="fill: rgb(255, 255, 255);"></path><path d="M474.361,179.871l-25.564-4.258l14.552-20.702c13.222-17.636,11.228-42.954-4.216-57.422l-45.511-45.511 c-15.552-15.552-40.379-17.24-57.392-4.234l-20.264,14.713l-4.078-24.169C328.857,16.103,310.539,0,288.334,0H223.66 c-21.761,0-40.475,16.156-43.469,37.169l-4.288,25.738l-20.702-14.546c-17.642-13.234-42.966-11.24-57.422,4.21L52.269,98.082 c-15.546,15.54-17.252,40.367-4.3,57.296l14.989,20.923l-24.366,4.114c-22.193,3.024-38.295,21.336-38.295,43.547v64.674 c0,22.121,15.803,40.427,37.163,43.463l25.738,4.294l-14.546,20.702c-13.228,17.636-11.234,42.954,4.21,57.416l45.517,45.517 c8.168,8.174,19.857,13.049,31.265,13.049c9.408,0,18.516-3.108,26.031-8.749l20.923-14.989l4.114,24.366 C183.73,495.897,202.048,512,224.259,512h64.674c22.115,0,40.427-15.809,43.457-37.157l4.294-25.744l20.51,14.408 c7.952,5.958,17.019,8.982,26.941,8.982c11.749,0,22.857-4.641,31.271-13.055l45.511-45.511 c15.552-15.54,17.252-40.367,4.12-57.554l-15.432-20.761l23.803-4.012c22.193-3.03,38.295-21.348,38.295-43.553V223.37 C511.704,201.692,495.673,183.033,474.361,179.871z M475.768,288.026c0,4.174-2.91,7.366-7.785,8.042l-53.29,8.982 c-6.162,1.036-11.342,5.21-13.677,11.013s-1.479,12.396,2.246,17.42l33.079,44.505c2.24,2.922,1.85,7.845-0.826,10.521 l-45.511,45.511c-1.725,1.725-3.587,2.527-5.863,2.527c-2.096,0-3.707-0.533-5.839-2.12l-44.313-31.139 c-5.054-3.563-11.581-4.246-17.27-1.874c-5.689,2.383-9.767,7.527-10.779,13.617l-9.048,54.308 c-0.557,3.898-3.904,6.731-7.964,6.731h-64.674c-4.162,0-7.36-2.904-8.03-7.779l-8.982-53.296 c-1.03-6.108-5.138-11.252-10.869-13.617c-2.204-0.916-4.533-1.359-6.845-1.359c-3.695,0-7.366,1.138-10.462,3.353 l-44.637,31.977c-1.587,1.192-3.198,1.797-4.785,1.797c-1.844,0-4.473-1.126-5.863-2.521l-45.93-45.918 c-2.617-2.449-2.803-6.988-0.413-10.108c0.15-0.192,0.293-0.389,0.431-0.587l31.139-44.313c3.551-5.054,4.258-11.575,1.874-17.27 c-2.383-5.689-7.527-9.767-13.617-10.779l-54.308-9.048c-3.898-0.557-6.731-3.904-6.731-7.964v-64.674 c0-4.168,2.898-7.36,7.773-8.036l53.296-8.982c6.114-1.03,11.258-5.138,13.623-10.869c2.365-5.731,1.611-12.276-2-17.312 L76.845,134c-2.234-2.928-1.85-7.845,0.826-10.521l45.912-45.924c2.455-2.623,6.988-2.797,10.114-0.407 c0.192,0.144,0.383,0.287,0.581,0.425l44.313,31.139c5.048,3.551,11.569,4.264,17.27,1.874 c5.695-2.383,9.767-7.527,10.779-13.617l9.048-54.308c0.557-3.898,3.904-6.731,7.964-6.731h64.674 c4.174,0,7.366,2.904,8.048,7.785l8.982,53.296c1.03,6.132,5.162,11.294,10.917,13.647c5.749,2.347,12.312,1.557,17.348-2.096 l44.068-32.008c2.916-2.234,7.839-1.856,10.521,0.826l45.924,45.912c2.611,2.449,2.797,6.994,0.407,10.114 c-0.138,0.192-0.287,0.383-0.419,0.581l-31.139,44.313c-3.551,5.054-4.252,11.575-1.874,17.27 c2.383,5.695,7.527,9.767,13.617,10.779l53.895,8.982c0.138,0.024,0.275,0.048,0.413,0.066c3.898,0.557,6.731,3.904,6.731,7.964 V288.026z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/stop.svg b/Nebula.Launcher/Assets/svg/stop.svg
new file mode 100644
index 0000000..7a1e61f
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/stop.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><path d="M256,0C114.843,0,0,114.843,0,256s114.843,256,256,256s256-114.843,256-256S397.157,0,256,0z M256,476.279 c-121.463,0-220.279-98.816-220.279-220.279S134.537,35.721,256,35.721S476.279,134.537,476.279,256S377.463,476.279,256,476.279z " fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g><g><g><path d="M172.651,172.651v166.698h166.698V172.651H172.651z M303.628,303.628h-95.256v-95.256h95.256V303.628z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/undo.svg b/Nebula.Launcher/Assets/svg/undo.svg
new file mode 100644
index 0000000..72f1b42
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/undo.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><path d="M142.716,293.147l-94-107.602l94-107.602c7.596-8.705,6.71-21.924-1.995-29.527c-8.705-7.596-21.917-6.703-29.527,1.995 L5.169,171.782c-6.892,7.882-6.892,19.65,0,27.532l106.026,121.372c4.143,4.729,9.94,7.157,15.771,7.157 c4.883,0,9.786-1.702,13.755-5.169C149.427,315.071,150.319,301.852,142.716,293.147z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g><g><g><path d="M359.93,164.619H20.926C9.368,164.619,0,173.986,0,185.545c0,11.558,9.368,20.926,20.926,20.926H359.93 c60.776,0,110.218,49.441,110.218,110.211S420.706,426.893,359.93,426.893H48.828c-11.558,0-20.926,9.368-20.926,20.926 c0,11.558,9.368,20.926,20.926,20.926H359.93c83.844,0,152.07-68.219,152.07-152.063S443.781,164.619,359.93,164.619z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Assets/svg/user.svg b/Nebula.Launcher/Assets/svg/user.svg
new file mode 100644
index 0000000..3b09909
--- /dev/null
+++ b/Nebula.Launcher/Assets/svg/user.svg
@@ -0,0 +1 @@
+<!-- icon666.com - MILLIONS OF FREE VECTOR ICONS --><svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"><g><g><path d="M256,288.389c-153.837,0-238.56,72.776-238.56,204.925c0,10.321,8.365,18.686,18.686,18.686h439.747 c10.321,0,18.686-8.365,18.686-18.686C494.56,361.172,409.837,288.389,256,288.389z M55.492,474.628 c7.35-98.806,74.713-148.866,200.508-148.866s193.159,50.06,200.515,148.866H55.492z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g><g><g><path d="M256,0c-70.665,0-123.951,54.358-123.951,126.437c0,74.19,55.604,134.54,123.951,134.54s123.951-60.35,123.951-134.534 C379.951,54.358,326.665,0,256,0z M256,223.611c-47.743,0-86.579-43.589-86.579-97.168c0-51.611,36.413-89.071,86.579-89.071 c49.363,0,86.579,38.288,86.579,89.071C342.579,180.022,303.743,223.611,256,223.611z" fill="#000000" style="fill: rgb(255, 255, 255);"></path></g></g></svg>
\ No newline at end of file
diff --git a/Nebula.Launcher/Converters/TypeConverters.cs b/Nebula.Launcher/Converters/TypeConverters.cs
index c58571a..261ed4a 100644
--- a/Nebula.Launcher/Converters/TypeConverters.cs
+++ b/Nebula.Launcher/Converters/TypeConverters.cs
@@ -7,15 +7,10 @@ namespace Nebula.Launcher.Converters;
 
 public class TypeConverters
 {
-    private const string StreamGeometryNotFound =
-        "M24 4C35.0457 4 44 12.9543 44 24C44 35.0457 35.0457 44 24 44C12.9543 44 4 35.0457 4 24C4 12.9543 12.9543 4 24 4ZM24 6.5C14.335 6.5 6.5 14.335 6.5 24C6.5 33.665 14.335 41.5 24 41.5C33.665 41.5 41.5 33.665 41.5 24C41.5 14.335 33.665 6.5 24 6.5ZM24.25 32C25.0784 32 25.75 32.6716 25.75 33.5C25.75 34.3284 25.0784 35 24.25 35C23.4216 35 22.75 34.3284 22.75 33.5C22.75 32.6716 23.4216 32 24.25 32ZM24.25 13C27.6147 13 30.5 15.8821 30.5 19.2488C30.502 21.3691 29.7314 22.7192 27.8216 24.7772L26.8066 25.8638C25.7842 27.0028 25.3794 27.7252 25.3409 28.5793L25.3379 28.7411L25.3323 28.8689L25.3143 28.9932C25.2018 29.5636 24.7009 29.9957 24.0968 30.0001C23.4065 30.0049 22.8428 29.4493 22.8379 28.7589C22.8251 26.9703 23.5147 25.7467 25.1461 23.9739L26.1734 22.8762C27.5312 21.3837 28.0012 20.503 28 19.25C28 17.2634 26.2346 15.5 24.25 15.5C22.3307 15.5 20.6142 17.1536 20.5055 19.0587L20.4935 19.3778C20.4295 20.0081 19.8972 20.5 19.25 20.5C18.5596 20.5 18 19.9404 18 19.25C18 15.8846 20.8864 13 24.25 13Z";
-
-    public static FuncValueConverter<string, StreamGeometry> IconConverter { get; } =
+    public static FuncValueConverter<string, string?> IconConverter { get; } =
         new(iconKey =>
         {
-            if (iconKey is null) return StreamGeometry.Parse(StreamGeometryNotFound);
-
-            Application.Current!.TryFindResource(iconKey, out var resource);
-            return resource as StreamGeometry ?? StreamGeometry.Parse(StreamGeometryNotFound);
+            if (iconKey == null) return null;
+            return $"/Assets/svg/{iconKey}.svg";
         });
 }
\ No newline at end of file
diff --git a/Nebula.Launcher/Nebula.Launcher.csproj b/Nebula.Launcher/Nebula.Launcher.csproj
index dd855bf..5179039 100644
--- a/Nebula.Launcher/Nebula.Launcher.csproj
+++ b/Nebula.Launcher/Nebula.Launcher.csproj
@@ -17,6 +17,7 @@
         <PackageReference Include="AsyncImageLoader.Avalonia" Version="3.3.0"/>
         <PackageReference Include="Avalonia" Version="11.2.1"/>
         <PackageReference Include="Avalonia.Desktop" Version="11.2.1"/>
+        <PackageReference Include="Avalonia.Svg.Skia" Version="11.2.0.2" />
         <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.1"/>
         <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.1"/>
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
diff --git a/Nebula.Launcher/ViewModels/MainViewModel.cs b/Nebula.Launcher/ViewModels/MainViewModel.cs
index 52faa0a..b5aa9a0 100644
--- a/Nebula.Launcher/ViewModels/MainViewModel.cs
+++ b/Nebula.Launcher/ViewModels/MainViewModel.cs
@@ -20,9 +20,9 @@ public partial class MainViewModel : ViewModelBase
 {
     private readonly List<ListItemTemplate> _templates =
     [
-        new ListItemTemplate(typeof(AccountInfoViewModel), "Account", "Account"),
-        new ListItemTemplate(typeof(ServerListViewModel), "HomeRegular", "Servers"),
-        new ListItemTemplate(typeof(ContentBrowserViewModel), "GridRegular", "Content")
+        new ListItemTemplate(typeof(AccountInfoViewModel), "user", "Account"),
+        new ListItemTemplate(typeof(ServerListViewModel), "file", "Servers"),
+        new ListItemTemplate(typeof(ContentBrowserViewModel), "folder", "Content")
     ];
 
     private readonly List<PopupViewModelBase> _viewQueue = new();
diff --git a/Nebula.Launcher/ViewModels/Pages/ContentBrowserViewModel.cs b/Nebula.Launcher/ViewModels/Pages/ContentBrowserViewModel.cs
index 31e2385..611b54b 100644
--- a/Nebula.Launcher/ViewModels/Pages/ContentBrowserViewModel.cs
+++ b/Nebula.Launcher/ViewModels/Pages/ContentBrowserViewModel.cs
@@ -208,9 +208,6 @@ public sealed partial class ContentBrowserViewModel : ViewModelBase
 
 public class ContentEntry
 {
-    public static IImage DirImage = new Bitmap(AssetLoader.Open(new Uri("avares://Nebula.Launcher/Assets/dir.png")));
-    public static IImage IconImage = new Bitmap(AssetLoader.Open(new Uri("avares://Nebula.Launcher/Assets/file.png")));
-
     private readonly Dictionary<string, ContentEntry> _childs = new();
     private readonly ContentBrowserViewModel _viewModel;
 
@@ -229,7 +226,7 @@ public class ContentEntry
     public string Name { get; private set; }
     public string PathName { get; }
     public string ServerName { get; }
-    public IImage IconPath { get; set; } = DirImage;
+    public string IconPath { get; set; } = "/Assets/svg/folder.svg";
 
     public ContentEntry? Parent { get; private set; }
     public bool IsRoot => Parent == null;
@@ -297,7 +294,7 @@ public class ContentEntry
         };
 
         dirEntry.TryAddChild(entry);
-        entry.IconPath = IconImage;
+        entry.IconPath = "/Assets/svg/file.svg";
         return entry;
     }
 
diff --git a/Nebula.Launcher/ViewModels/Pages/ServerListViewModel.cs b/Nebula.Launcher/ViewModels/Pages/ServerListViewModel.cs
index e70c30d..f4c4efa 100644
--- a/Nebula.Launcher/ViewModels/Pages/ServerListViewModel.cs
+++ b/Nebula.Launcher/ViewModels/Pages/ServerListViewModel.cs
@@ -26,7 +26,6 @@ public partial class ServerListViewModel : ViewModelBase
     //Design think
     protected override void InitialiseInDesignMode()
     {
-        Console.WriteLine("SOSAL");
         ServerInfos.Add(CreateServerView(new ServerHubInfo("ss14://localhost",
             new ServerStatus("Nebula", "TestCraft", ["16+", "RU"], "super", 12, 55, 1, false, DateTime.Now, 20), [])));
         ServerInfos.Add(CreateServerView(new ServerHubInfo("ss14://localhost",
@@ -38,7 +37,6 @@ public partial class ServerListViewModel : ViewModelBase
     //real think
     protected override void Initialise()
     {
-        Console.WriteLine("SOSAL!!");
         foreach (var info in HubService.ServerList) UnsortedServers.Add(info);
 
         HubService.HubServerChangedEventArgs += HubServerChangedEventArgs;
diff --git a/Nebula.Launcher/Views/MainView.axaml b/Nebula.Launcher/Views/MainView.axaml
index 898ff4f..728930f 100644
--- a/Nebula.Launcher/Views/MainView.axaml
+++ b/Nebula.Launcher/Views/MainView.axaml
@@ -52,10 +52,9 @@
                                 <ListBox.ItemTemplate>
                                     <DataTemplate DataType="{x:Type models:ListItemTemplate}">
                                         <StackPanel Orientation="Horizontal" Spacing="17">
-                                            <PathIcon
-                                                Data="{Binding IconKey, Converter={x:Static converters:TypeConverters.IconConverter}}"
-                                                Height="40"
-                                                Width="40" />
+                                            <Svg Path="{Binding IconKey, Converter={x:Static converters:TypeConverters.IconConverter}}"
+                                                 Height="40"
+                                                 Width="40"/>
                                             <TextBlock Text="{Binding Label}" VerticalAlignment="Center" />
                                         </StackPanel>
                                     </DataTemplate>
diff --git a/Nebula.Launcher/Views/Pages/AccountInfoView.axaml b/Nebula.Launcher/Views/Pages/AccountInfoView.axaml
index 1335394..21c186a 100644
--- a/Nebula.Launcher/Views/Pages/AccountInfoView.axaml
+++ b/Nebula.Launcher/Views/Pages/AccountInfoView.axaml
@@ -78,10 +78,10 @@
                 Padding="15">
                 <Panel>
                     <StackPanel IsVisible="{Binding !IsLogged}" Spacing="15">
-                        <Image
+                        <Svg
                             Height="100"
                             Margin="0,0,0,20"
-                            Source="/Assets/account.png" />
+                            Path="/Assets/svg/user.svg"/>
                         <StackPanel HorizontalAlignment="Center">
                             <StackPanel Orientation="Horizontal">
                                 <Label VerticalAlignment="Center">
@@ -141,19 +141,19 @@
                     </StackPanel>
 
                     <StackPanel IsVisible="{Binding IsLogged}">
-                        <Image
+                        <Svg
                             Height="100"
                             Margin="0,0,0,20"
-                            Source="/Assets/account.png" />
+                            Path="/Assets/svg/user.svg"/>
                         <Label>
                             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                                <TextBlock>Hello:</TextBlock>
+                                <TextBlock>Hello,</TextBlock>
                                 <TextBlock Text="{Binding CurrentLogin}" />
                             </StackPanel>
                         </Label>
                         <StackPanel
                             HorizontalAlignment="Center"
-                            Margin="5"
+                            Margin="5,20,5,5"
                             Orientation="Horizontal"
                             Spacing="5">
                             <Button Command="{Binding Logout}">
diff --git a/Nebula.Launcher/Views/Pages/ContentBrowserView.axaml b/Nebula.Launcher/Views/Pages/ContentBrowserView.axaml
index 859edc3..69a1802 100644
--- a/Nebula.Launcher/Views/Pages/ContentBrowserView.axaml
+++ b/Nebula.Launcher/Views/Pages/ContentBrowserView.axaml
@@ -15,10 +15,9 @@
 
     <Grid
         ColumnDefinitions="*,2*,40,40"
-        Margin="5,5,5,0"
+        Margin="8"
         RowDefinitions="40,*">
         <Border
-            BorderThickness="2,0,0,0"
             CornerRadius="10,10,0,0"
             Grid.ColumnSpan="4" />
         <TextBox
@@ -40,14 +39,14 @@
             Grid.Column="2"
             Grid.Row="0"
             Padding="10">
-            <Image Source="/Assets/back.png" />
+            <Svg Path="/Assets/svg/undo.svg"></Svg>
         </Button>
         <Button
             Command="{Binding OnGoEnter}"
             Grid.Column="3"
             Grid.Row="0"
             Padding="10">
-            <Image Source="/Assets/go.png" />
+            <Svg Path="/Assets/svg/next.svg"></Svg>
         </Button>
 
         <ScrollViewer
@@ -71,10 +70,10 @@
                                     Background="#00000000"
                                     BorderThickness="0,0,2,0"
                                     CornerRadius="0">
-                                    <Image
+                                    <Svg
                                         Height="15"
                                         Margin="10,0,10,0"
-                                        Source="{Binding IconPath}" />
+                                        Path="{Binding IconPath}" />
                                 </Border>
                                 <Label>
                                     <TextBlock Text="{Binding Name}" VerticalAlignment="Center" />
diff --git a/Nebula.Launcher/Views/Pages/ServerListView.axaml b/Nebula.Launcher/Views/Pages/ServerListView.axaml
index 9331142..eaebe91 100644
--- a/Nebula.Launcher/Views/Pages/ServerListView.axaml
+++ b/Nebula.Launcher/Views/Pages/ServerListView.axaml
@@ -16,7 +16,7 @@
 
     <Grid
         ColumnDefinitions="*"
-        Margin="5,0,5,5"
+        Margin="8,0,8,5"
         RowDefinitions="*,40">
         <ScrollViewer Margin="0,0,0,10" Padding="0,0,10,0" Grid.RowSpan="2">
             <ItemsControl
@@ -41,13 +41,13 @@
                     Command="{Binding FilterRequired}"
                     Grid.Column="1"
                     Padding="10">
-                    <Image Source="/Assets/filter.png" />
+                    <Svg Path="/Assets/svg/filter.svg"></Svg>
                 </Button>
                 <Button
                     Command="{Binding UpdateRequired}"
                     Grid.Column="2"
                     Padding="10">
-                    <Image Source="/Assets/refresh.png" />
+                    <Svg Path="/Assets/svg/refresh.svg"></Svg>
                 </Button>
             </Grid>
         </Border>
diff --git a/Nebula.Launcher/Views/Popup/LogPopupView.axaml b/Nebula.Launcher/Views/Popup/LogPopupView.axaml
index 694c09a..6e35d81 100644
--- a/Nebula.Launcher/Views/Popup/LogPopupView.axaml
+++ b/Nebula.Launcher/Views/Popup/LogPopupView.axaml
@@ -22,8 +22,8 @@
                         <StackPanel Orientation="Horizontal" Spacing="5" Margin="0">
                             <Border MinWidth="100"
                                     Background="{Binding CategoryColor}"
-                                    CornerRadius="5,0,0,5"
-                                    Padding="10,0,12,0" BorderThickness="2,0,2,0">
+                                    CornerRadius="5"
+                                    Padding="10,0,12,0" >
                                 <Label FontSize="15" VerticalAlignment="Center">
                                     <TextBlock Text="{Binding Category }" />
                                 </Label>
diff --git a/Nebula.Launcher/Views/ServerEntryView.axaml b/Nebula.Launcher/Views/ServerEntryView.axaml
index 7960abf..559f50c 100644
--- a/Nebula.Launcher/Views/ServerEntryView.axaml
+++ b/Nebula.Launcher/Views/ServerEntryView.axaml
@@ -10,13 +10,14 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:system="clr-namespace:System;assembly=System.Runtime"
     xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:Nebula.Launcher.Converters">
     <Design.DataContext>
         <viewModels:ServerEntryModelView />
     </Design.DataContext>
 
     <Border CornerRadius="10" Margin="0,5,0,5">
-        <Grid ColumnDefinitions="30,*,80,120" RowDefinitions="35,*,*">
+        <Grid ColumnDefinitions="30,*,80,90" RowDefinitions="35,*,*">
             <Border
                 BorderThickness="0,0,0,2"
                 CornerRadius="10"
@@ -31,9 +32,7 @@
                 Grid.Row="0"
                 Grid.RowSpan="3"
                 VerticalAlignment="Stretch">
-                <Label VerticalAlignment="Center">
-                    ^
-                </Label>
+                <Label VerticalAlignment="Bottom" Margin="5,0,5,2">i</Label>
             </Button>
             <ScrollViewer
                 Grid.Column="1"
@@ -68,31 +67,26 @@
                     HorizontalAlignment="Stretch"
                     IsVisible="{Binding RunVisible}"
                     VerticalAlignment="Stretch">
-                    <Label HorizontalAlignment="Center" VerticalAlignment="Center">
-                        Play
-                    </Label>
+                    <Svg Path="/Assets/svg/play.svg"/>
                 </Button>
-                <Grid Grid.ColumnDefinitions="*,*" IsVisible="{Binding !RunVisible}">
+                <Grid ColumnDefinitions="*,*" 
+                      IsVisible="{Binding !RunVisible}">
                     <Button
                         Command="{Binding ReadLog}"
                         CornerRadius="10,0,0,10"
                         HorizontalAlignment="Stretch"
-                        Margin="0,0,1,0"
+                        Margin="0,0,2,0"
                         VerticalAlignment="Stretch">
-                        <Label HorizontalAlignment="Center" VerticalAlignment="Center">
-                            Log
-                        </Label>
+                        <Svg Path="/Assets/svg/newspaper.svg"/>
                     </Button>
                     <Button
                         Command="{Binding StopInstance}"
-                        CornerRadius="10,0,10,0"
+                        CornerRadius="0,10,10,0"
                         Grid.Column="1"
                         HorizontalAlignment="Stretch"
-                        Margin="1,0,0,0"
+                        Margin="2,0,0,0"
                         VerticalAlignment="Stretch">
-                        <Label HorizontalAlignment="Center" VerticalAlignment="Center">
-                            Stop
-                        </Label>
+                        <Svg Path="/Assets/svg/stop.svg"/>
                     </Button>
                 </Grid>
             </Panel>