diff --git a/Assets/AppIcons/EditorLayout.svg b/Assets/AppIcons/EditorLayout.svg
new file mode 100644
index 0000000..18bca3d
--- /dev/null
+++ b/Assets/AppIcons/EditorLayout.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="EditorLayout.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="32.916667"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="m 17,16.88 c 0.56,0 1,0.44 1,1 0,0.56 -0.44,1 -1,1 -0.56,0 -1,-0.45 -1,-1 0,-0.55 0.44,-1 1,-1 m 0,-3 c 2.73,0 5.06,1.66 6,4 -0.94,2.34 -3.27,4 -6,4 -2.73,0 -5.06,-1.66 -6,-4 0.94,-2.34 3.27,-4 6,-4 m 0,1.5 c -1.38,0 -2.5,1.12 -2.5,2.5 0,1.38 1.12,2.5 2.5,2.5 1.38,0 2.5,-1.12 2.5,-2.5 0,-1.38 -1.12,-2.5 -2.5,-2.5 M 18,3 H 4 C 2.9,3 2,3.9 2,5 v 12 c 0,1.1 0.9,2 2,2 H 9.42 C 9.26,18.68 9.12,18.34 9,18 9.12,17.66 9.26,17.32 9.42,17 H 4 v -4 h 6 v 2.97 c 0.55,-0.86 1.23,-1.6 2,-2.21 V 13 h 1.15 c 1.16,-0.64 2.47,-1 3.85,-1 1.06,0 2.07,0.21 3,0.59 V 5 C 20,3.9 19.1,3 18,3 m -8,8 H 4 V 7 h 6 v 4 m 8,0 H 12 V 7 h 6 z"
+     id="path1"
+     style="display:none" />
+  <path
+     style="fill:#607d8b;stroke-width:0.000911392"
+     d="M 3.6628462,18.954277 C 2.9389876,18.812286 2.3759743,18.324642 2.1168369,17.615228 l -0.081394,-0.222823 -0.00795,-6.31273 C 2.0187833,4.1608898 2.0079771,4.5989137 2.1975777,4.1854184 2.4627257,3.6071637 3.0327014,3.1622473 3.6490655,3.0524039 4.0078744,2.98846 18.006733,2.9865703 18.3391,3.050421 c 0.772499,0.1484042 1.363905,0.6920224 1.57275,1.4456672 0.06203,0.2238257 0.06283,0.2770438 0.06283,4.1387442 0,2.1516016 -0.01025,3.9119406 -0.02278,3.9118636 -0.01253,-7.7e-5 -0.130705,-0.04212 -0.262607,-0.09342 -0.298338,-0.116046 -1.048666,-0.308327 -1.491824,-0.3823 -0.478751,-0.07991 -1.886507,-0.08033 -2.36962,-7.01e-4 -0.888588,0.146464 -1.949529,0.494282 -2.526929,0.828427 -0.122446,0.07086 -0.147925,0.07345 -0.721519,0.07345 h -0.59459 v 0.389632 0.389632 l -0.205063,0.164798 c -0.480657,0.386278 -1.187873,1.161369 -1.598081,1.751459 l -0.15635,0.22491 -0.0079,-1.460216 -0.0079,-1.460215 H 7.00224 3.9949367 v 2.020253 2.020253 h 2.6886076 c 1.4807347,0 2.6886076,0.01174 2.6886076,0.02613 0,0.01437 -0.052575,0.140828 -0.1168326,0.281013 -0.064258,0.140185 -0.1534676,0.351781 -0.1982437,0.470213 l -0.081411,0.215332 0.134109,0.333693 c 0.07376,0.183531 0.1629697,0.390265 0.1982436,0.459407 0.035274,0.06914 0.064135,0.13993 0.064135,0.157305 0,0.03934 -5.5084997,0.03791 -5.7093057,-0.0015 z M 10.010127,9.0075949 V 6.9873418 H 7.0025316 3.9949367 v 2.0202531 2.0202531 h 3.0075949 3.0075954 z m 7.989873,0 V 6.9873418 H 14.992405 11.98481 V 9.0075949 11.027848 H 14.992405 18 Z"
+     id="path2" />
+  <path
+     style="fill:#2196f3;stroke-width:0.000911392;fill-opacity:1"
+     d="m 16.426066,21.8414 c -1.029487,-0.09183 -2.15905,-0.487628 -3.013408,-1.055912 -0.958091,-0.637283 -1.676676,-1.447469 -2.190361,-2.46958 -0.23281,-0.463235 -0.231597,-0.392375 -0.01432,-0.836503 0.780517,-1.595445 2.19126,-2.786582 3.914876,-3.305459 1.824557,-0.549264 3.823645,-0.266322 5.413859,0.766254 1.009506,0.655504 1.846896,1.618122 2.329721,2.67812 l 0.123713,0.2716 -0.186695,0.378922 c -0.715355,1.451907 -1.925808,2.556638 -3.464893,3.162265 -0.353851,0.13924 -0.974949,0.300502 -1.400537,0.363635 -0.41,0.06082 -1.110727,0.08244 -1.511952,0.04666 z m 1.285326,-1.547018 c 0.362606,-0.115278 0.723028,-0.320767 0.974453,-0.55557 0.376823,-0.351912 0.585002,-0.684396 0.730974,-1.167446 0.07096,-0.234832 0.08086,-0.319606 0.08086,-0.692885 0,-0.373279 -0.0099,-0.458053 -0.08086,-0.692885 -0.213191,-0.705491 -0.660219,-1.237582 -1.315696,-1.566056 -0.446454,-0.223727 -1.086544,-0.305521 -1.591507,-0.20337 -1.296023,0.262177 -2.165591,1.462516 -2.003867,2.766108 0.133179,1.073496 0.897442,1.909623 1.975264,2.161001 0.268477,0.06262 0.966925,0.03486 1.230379,-0.0489 z"
+     id="path3" />
+  <path
+     style="fill:#2196f3;fill-opacity:1;stroke-width:0.000911392"
+     d="m 16.70278,18.811229 c -0.316978,-0.113491 -0.534483,-0.329272 -0.63793,-0.632872 -0.06423,-0.188514 -0.04057,-0.52591 0.0503,-0.717166 0.224074,-0.471628 0.817052,-0.692295 1.278645,-0.475827 0.222808,0.104487 0.362138,0.230984 0.471128,0.427734 0.08235,0.148668 0.08951,0.185873 0.08951,0.465383 0,0.280009 -0.0071,0.316545 -0.09017,0.466597 -0.228247,0.412084 -0.739454,0.617254 -1.161479,0.466151 z"
+     id="path4" />
+</svg>
diff --git a/Assets/AppIcons/HorizontalLayout.svg b/Assets/AppIcons/HorizontalLayout.svg
deleted file mode 100644
index f2618e7..0000000
--- a/Assets/AppIcons/HorizontalLayout.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg1"
-   sodipodi:docname="HorizontalLayout.svg"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="32.916667"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1" />
-  <path
-     d="M 20,2 H 4 C 2.9,2 2,2.9 2,4 v 16 c 0,1.1 0.9,2 2,2 h 16 c 1.1,0 2,-0.9 2,-2 V 4 C 22,2.9 21.1,2 20,2 M 6.5,20 H 4 V 4 H 6.5 V 20 M 11,20 H 8.5 V 4 H 11 v 16 m 4.5,0 H 13 V 4 h 2.5 V 20 M 20,20 H 17.5 V 4 H 20 Z"
-     id="path1"
-     style="display:none" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke-width:0.000911392"
-     d="M 17.513924,12 V 4.0101266 h 1.23038 1.23038 V 12 19.989873 h -1.23038 -1.23038 z"
-     id="path2" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke-width:0.000911392"
-     d="M 13.017722,12 V 4.0101266 h 1.230379 1.23038 V 12 19.989873 h -1.23038 -1.230379 z"
-     id="path3" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke-width:0.000911392"
-     d="M 8.521519,12 V 4.0101266 H 9.7518987 10.982278 V 12 19.989873 H 9.7518987 8.521519 Z"
-     id="path4" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke-width:0.000911392"
-     d="M 4.0253165,12 V 4.0101266 H 5.2556962 6.4860759 V 12 19.989873 H 5.2556962 4.0253165 Z"
-     id="path5" />
-  <path
-     style="fill:#607d8b;fill-opacity:1;stroke-width:0.000911392"
-     d="M 3.8126582,21.975791 C 3.409833,21.91582 3.0889628,21.785022 2.7913767,21.559483 2.4877736,21.329384 2.2588732,21.010805 2.1154671,20.618767 L 2.035443,20.4 2.0275241,12.098344 C 2.0187718,2.9230804 2.0049609,3.5827436 2.2148669,3.1501174 2.4741771,2.6156669 2.9780349,2.2110802 3.5696203,2.0622805 3.8184349,1.9996968 20.18008,1.99945 20.43038,2.0620261 c 0.694973,0.1737467 1.236637,0.6755781 1.463303,1.3556954 l 0.07087,0.2126582 V 12 20.36962 l -0.07087,0.212658 c -0.220781,0.662458 -0.70682,1.12592 -1.412833,1.347206 -0.142686,0.04472 -0.896441,0.04953 -8.374521,0.05338 -4.5197467,0.0023 -8.2518986,-8.54e-4 -8.2936708,-0.0071 z M 6.5164557,12 V 3.9797468 H 5.2556962 3.9949367 V 12 20.020253 h 1.2607595 1.2607595 z m 4.4962023,0 V 3.9797468 H 9.7518987 8.4911392 V 12 20.020253 h 1.2607595 1.2607593 z m 4.496203,0 V 3.9797468 h -1.26076 -1.260759 V 12 20.020253 h 1.260759 1.26076 z m 4.496202,0 V 3.9797468 h -1.260759 -1.26076 V 12 20.020253 h 1.26076 1.260759 z"
-     id="path6" />
-</svg>
diff --git a/Assets/AppIcons/VerticalLayout.svg b/Assets/AppIcons/VerticalLayout.svg
deleted file mode 100644
index 36df25f..0000000
--- a/Assets/AppIcons/VerticalLayout.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg1"
-   sodipodi:docname="VerticalLayout.svg"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="32.916667"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1" />
-  <path
-     d="M 22,20 V 4 C 22,2.9 21.1,2 20,2 H 4 C 2.9,2 2,2.9 2,4 v 16 c 0,1.1 0.9,2 2,2 h 16 c 1.1,0 2,-0.9 2,-2 M 4,6.5 V 4 H 20 V 6.5 H 4 M 4,11 V 8.5 H 20 V 11 H 4 m 0,4.5 V 13 h 16 v 2.5 H 4 M 4,20 V 17.5 H 20 V 20 Z"
-     id="path1"
-     style="display:none" />
-  <path
-     style="fill:#607d8b;fill-opacity:1;stroke-width:0.000911392"
-     d="M 3.8126582,21.975791 C 3.409833,21.91582 3.0889628,21.785022 2.7913767,21.559483 2.4877736,21.329384 2.2588732,21.010805 2.1154671,20.618767 L 2.035443,20.4 2.0275241,12.098344 C 2.0187718,2.9230804 2.0049609,3.5827436 2.2148669,3.1501174 2.4741771,2.6156669 2.9780349,2.2110802 3.5696203,2.0622805 3.8184349,1.9996968 20.18008,1.99945 20.43038,2.0620261 c 0.694973,0.1737467 1.236637,0.6755781 1.463303,1.3556954 l 0.07087,0.2126582 V 12 20.36962 l -0.07087,0.212658 c -0.220781,0.662458 -0.70682,1.12592 -1.412833,1.347206 -0.142686,0.04472 -0.896441,0.04953 -8.374521,0.05338 -4.5197467,0.0023 -8.2518986,-8.54e-4 -8.2936708,-0.0071 z M 20.005063,18.759494 v -1.26076 H 12 3.9949367 v 1.26076 1.260759 H 12 20.005063 Z m 0,-4.511393 V 12.972152 H 12 3.9949367 v 1.275949 1.27595 H 12 20.005063 Z m 0,-4.4962023 V 8.4759494 H 12 3.9949367 V 9.7518987 11.027848 H 12 20.005063 Z m 0,-4.5113924 V 3.9797468 H 12 3.9949367 V 5.2405063 6.5012658 H 12 20.005063 Z"
-     id="path2" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke-width:0.000911392"
-     d="m 4.0253165,18.759494 v -1.23038 H 12 19.974684 v 1.23038 1.230379 H 12 4.0253165 Z"
-     id="path3" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke-width:0.000911392"
-     d="M 4.0253165,14.248101 V 13.002532 H 12 19.974684 v 1.245569 1.24557 H 12 4.0253165 Z"
-     id="path4" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke-width:0.000911392"
-     d="M 4.0253165,9.7518987 V 8.5063291 H 12 19.974684 V 9.7518987 10.997468 H 12 4.0253165 Z"
-     id="path5" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke-width:0.000911392"
-     d="M 4.0253165,5.2405063 V 4.0101266 H 12 19.974684 V 5.2405063 6.4708861 H 12 4.0253165 Z"
-     id="path6" />
-</svg>
diff --git a/BallanceTasEditor/Assets/About.ico b/BallanceTasEditor/Assets/About.ico
index d62a6cc..347bf96 100644
Binary files a/BallanceTasEditor/Assets/About.ico and b/BallanceTasEditor/Assets/About.ico differ
diff --git a/BallanceTasEditor/Assets/AddFrame.ico b/BallanceTasEditor/Assets/AddFrame.ico
index 3911362..52dabdd 100644
Binary files a/BallanceTasEditor/Assets/AddFrame.ico and b/BallanceTasEditor/Assets/AddFrame.ico differ
diff --git a/BallanceTasEditor/Assets/Cancel.ico b/BallanceTasEditor/Assets/Cancel.ico
index cc6f1d3..bba838e 100644
Binary files a/BallanceTasEditor/Assets/Cancel.ico and b/BallanceTasEditor/Assets/Cancel.ico differ
diff --git a/BallanceTasEditor/Assets/CloseFile.ico b/BallanceTasEditor/Assets/CloseFile.ico
index 5a39068..d9ec3e3 100644
Binary files a/BallanceTasEditor/Assets/CloseFile.ico and b/BallanceTasEditor/Assets/CloseFile.ico differ
diff --git a/BallanceTasEditor/Assets/CopyFrame.ico b/BallanceTasEditor/Assets/CopyFrame.ico
index 7e4c28f..3813289 100644
Binary files a/BallanceTasEditor/Assets/CopyFrame.ico and b/BallanceTasEditor/Assets/CopyFrame.ico differ
diff --git a/BallanceTasEditor/Assets/Count.ico b/BallanceTasEditor/Assets/Count.ico
index 67fbee3..29b528f 100644
Binary files a/BallanceTasEditor/Assets/Count.ico and b/BallanceTasEditor/Assets/Count.ico differ
diff --git a/BallanceTasEditor/Assets/CutFrame.ico b/BallanceTasEditor/Assets/CutFrame.ico
index b76d59b..4e435a3 100644
Binary files a/BallanceTasEditor/Assets/CutFrame.ico and b/BallanceTasEditor/Assets/CutFrame.ico differ
diff --git a/BallanceTasEditor/Assets/DeleteFrame.ico b/BallanceTasEditor/Assets/DeleteFrame.ico
index 0730f56..6a2dbbb 100644
Binary files a/BallanceTasEditor/Assets/DeleteFrame.ico and b/BallanceTasEditor/Assets/DeleteFrame.ico differ
diff --git a/BallanceTasEditor/Assets/DrawMode.ico b/BallanceTasEditor/Assets/DrawMode.ico
index 5f57797..cfff08f 100644
Binary files a/BallanceTasEditor/Assets/DrawMode.ico and b/BallanceTasEditor/Assets/DrawMode.ico differ
diff --git a/BallanceTasEditor/Assets/EditorLayout.ico b/BallanceTasEditor/Assets/EditorLayout.ico
new file mode 100644
index 0000000..a27b441
Binary files /dev/null and b/BallanceTasEditor/Assets/EditorLayout.ico differ
diff --git a/BallanceTasEditor/Assets/EntrySpan.ico b/BallanceTasEditor/Assets/EntrySpan.ico
deleted file mode 100644
index f95e285..0000000
Binary files a/BallanceTasEditor/Assets/EntrySpan.ico and /dev/null differ
diff --git a/BallanceTasEditor/Assets/Exit.ico b/BallanceTasEditor/Assets/Exit.ico
index fa9b1e4..d449145 100644
Binary files a/BallanceTasEditor/Assets/Exit.ico and b/BallanceTasEditor/Assets/Exit.ico differ
diff --git a/BallanceTasEditor/Assets/FillMode.ico b/BallanceTasEditor/Assets/FillMode.ico
index d93a393..855597e 100644
Binary files a/BallanceTasEditor/Assets/FillMode.ico and b/BallanceTasEditor/Assets/FillMode.ico differ
diff --git a/BallanceTasEditor/Assets/FlipCell.ico b/BallanceTasEditor/Assets/FlipCell.ico
index 090002c..95b65a7 100644
Binary files a/BallanceTasEditor/Assets/FlipCell.ico and b/BallanceTasEditor/Assets/FlipCell.ico differ
diff --git a/BallanceTasEditor/Assets/Fps.ico b/BallanceTasEditor/Assets/Fps.ico
index 519de52..497023d 100644
Binary files a/BallanceTasEditor/Assets/Fps.ico and b/BallanceTasEditor/Assets/Fps.ico differ
diff --git a/BallanceTasEditor/Assets/Goto.ico b/BallanceTasEditor/Assets/Goto.ico
index f3c7b2f..156e57e 100644
Binary files a/BallanceTasEditor/Assets/Goto.ico and b/BallanceTasEditor/Assets/Goto.ico differ
diff --git a/BallanceTasEditor/Assets/HorizontalLayout.ico b/BallanceTasEditor/Assets/HorizontalLayout.ico
deleted file mode 100644
index 6c48d35..0000000
Binary files a/BallanceTasEditor/Assets/HorizontalLayout.ico and /dev/null differ
diff --git a/BallanceTasEditor/Assets/NewFile.ico b/BallanceTasEditor/Assets/NewFile.ico
index ca3bced..753378f 100644
Binary files a/BallanceTasEditor/Assets/NewFile.ico and b/BallanceTasEditor/Assets/NewFile.ico differ
diff --git a/BallanceTasEditor/Assets/NextItem.ico b/BallanceTasEditor/Assets/NextItem.ico
index d9d5f22..86f1494 100644
Binary files a/BallanceTasEditor/Assets/NextItem.ico and b/BallanceTasEditor/Assets/NextItem.ico differ
diff --git a/BallanceTasEditor/Assets/NextPage.ico b/BallanceTasEditor/Assets/NextPage.ico
index 67fbe07..9606399 100644
Binary files a/BallanceTasEditor/Assets/NextPage.ico and b/BallanceTasEditor/Assets/NextPage.ico differ
diff --git a/BallanceTasEditor/Assets/Ok.ico b/BallanceTasEditor/Assets/Ok.ico
index 7fd7eee..caf5ef0 100644
Binary files a/BallanceTasEditor/Assets/Ok.ico and b/BallanceTasEditor/Assets/Ok.ico differ
diff --git a/BallanceTasEditor/Assets/OpenFile.ico b/BallanceTasEditor/Assets/OpenFile.ico
index 216cdb5..becf38c 100644
Binary files a/BallanceTasEditor/Assets/OpenFile.ico and b/BallanceTasEditor/Assets/OpenFile.ico differ
diff --git a/BallanceTasEditor/Assets/PasteFrame.ico b/BallanceTasEditor/Assets/PasteFrame.ico
index 023c395..6ce5089 100644
Binary files a/BallanceTasEditor/Assets/PasteFrame.ico and b/BallanceTasEditor/Assets/PasteFrame.ico differ
diff --git a/BallanceTasEditor/Assets/Preference.ico b/BallanceTasEditor/Assets/Preference.ico
index ea4b5b6..0519ea3 100644
Binary files a/BallanceTasEditor/Assets/Preference.ico and b/BallanceTasEditor/Assets/Preference.ico differ
diff --git a/BallanceTasEditor/Assets/PreviousItem.ico b/BallanceTasEditor/Assets/PreviousItem.ico
index 4746751..f582712 100644
Binary files a/BallanceTasEditor/Assets/PreviousItem.ico and b/BallanceTasEditor/Assets/PreviousItem.ico differ
diff --git a/BallanceTasEditor/Assets/PreviousPage.ico b/BallanceTasEditor/Assets/PreviousPage.ico
index c62579f..071e50c 100644
Binary files a/BallanceTasEditor/Assets/PreviousPage.ico and b/BallanceTasEditor/Assets/PreviousPage.ico differ
diff --git a/BallanceTasEditor/Assets/Redo.ico b/BallanceTasEditor/Assets/Redo.ico
index e8d5a26..478640f 100644
Binary files a/BallanceTasEditor/Assets/Redo.ico and b/BallanceTasEditor/Assets/Redo.ico differ
diff --git a/BallanceTasEditor/Assets/ReportBug.ico b/BallanceTasEditor/Assets/ReportBug.ico
index 4334331..734a440 100644
Binary files a/BallanceTasEditor/Assets/ReportBug.ico and b/BallanceTasEditor/Assets/ReportBug.ico differ
diff --git a/BallanceTasEditor/Assets/SaveFile.ico b/BallanceTasEditor/Assets/SaveFile.ico
index 350dd6f..da6ebb9 100644
Binary files a/BallanceTasEditor/Assets/SaveFile.ico and b/BallanceTasEditor/Assets/SaveFile.ico differ
diff --git a/BallanceTasEditor/Assets/SaveFileAs.ico b/BallanceTasEditor/Assets/SaveFileAs.ico
index e19d919..4f4e847 100644
Binary files a/BallanceTasEditor/Assets/SaveFileAs.ico and b/BallanceTasEditor/Assets/SaveFileAs.ico differ
diff --git a/BallanceTasEditor/Assets/SaveFileThenRunGame.ico b/BallanceTasEditor/Assets/SaveFileThenRunGame.ico
index 9752647..143b8cc 100644
Binary files a/BallanceTasEditor/Assets/SaveFileThenRunGame.ico and b/BallanceTasEditor/Assets/SaveFileThenRunGame.ico differ
diff --git a/BallanceTasEditor/Assets/SelectMode.ico b/BallanceTasEditor/Assets/SelectMode.ico
index 2ff9f61..e8e9fa1 100644
Binary files a/BallanceTasEditor/Assets/SelectMode.ico and b/BallanceTasEditor/Assets/SelectMode.ico differ
diff --git a/BallanceTasEditor/Assets/SetCell.ico b/BallanceTasEditor/Assets/SetCell.ico
index f2dda3f..4d05be8 100644
Binary files a/BallanceTasEditor/Assets/SetCell.ico and b/BallanceTasEditor/Assets/SetCell.ico differ
diff --git a/BallanceTasEditor/Assets/SetFps.ico b/BallanceTasEditor/Assets/SetFps.ico
index 84932cb..b9fc5ab 100644
Binary files a/BallanceTasEditor/Assets/SetFps.ico and b/BallanceTasEditor/Assets/SetFps.ico differ
diff --git a/BallanceTasEditor/Assets/Undo.ico b/BallanceTasEditor/Assets/Undo.ico
index 4adabad..0f44366 100644
Binary files a/BallanceTasEditor/Assets/Undo.ico and b/BallanceTasEditor/Assets/Undo.ico differ
diff --git a/BallanceTasEditor/Assets/UnsetCell.ico b/BallanceTasEditor/Assets/UnsetCell.ico
index 687323e..6948bf5 100644
Binary files a/BallanceTasEditor/Assets/UnsetCell.ico and b/BallanceTasEditor/Assets/UnsetCell.ico differ
diff --git a/BallanceTasEditor/Assets/VerticalLayout.ico b/BallanceTasEditor/Assets/VerticalLayout.ico
deleted file mode 100644
index f34c0af..0000000
Binary files a/BallanceTasEditor/Assets/VerticalLayout.ico and /dev/null differ
diff --git a/BallanceTasEditor/BallanceTasEditor.csproj b/BallanceTasEditor/BallanceTasEditor.csproj
index 16728b3..06e34f5 100644
--- a/BallanceTasEditor/BallanceTasEditor.csproj
+++ b/BallanceTasEditor/BallanceTasEditor.csproj
@@ -17,8 +17,4 @@
     <PackageReference Include="DotNetZip" Version="1.9.1.8" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Resource Include="Assets\CloseFile.ico" />
-  </ItemGroup>
-
 </Project>
diff --git a/BallanceTasEditor/Converters/NullableIntStringConverter.cs b/BallanceTasEditor/Converters/NullableIntStringConverter.cs
deleted file mode 100644
index d88f178..0000000
--- a/BallanceTasEditor/Converters/NullableIntStringConverter.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace BallanceTasEditor.Converters {
-    public class NullableIntStringConverter : IValueConverter {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
-            throw new NotImplementedException();
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/BallanceTasEditor/Views/AboutDialog.xaml b/BallanceTasEditor/Views/AboutDialog.xaml
index c42fdef..7e9dd71 100644
--- a/BallanceTasEditor/Views/AboutDialog.xaml
+++ b/BallanceTasEditor/Views/AboutDialog.xaml
@@ -33,6 +33,6 @@ Version: 1.2 stable&#13;
 Build Date: October 21, 2025&#13;"/>
 
         <!-- 确认按钮 -->
-        <Button Grid.Row="4" Content="OK" IsDefault="True" Margin="10" Padding="5" MinWidth="80" HorizontalAlignment="Center"/>
+        <Button Grid.Row="4" Content="OK" Margin="10" HorizontalAlignment="Center" Style="{StaticResource OkButtonStyle}" IsDefault="True"/>
     </Grid>
 </Window>
diff --git a/BallanceTasEditor/Views/PreferenceDialog.xaml b/BallanceTasEditor/Views/PreferenceDialog.xaml
index 401a61f..b8f1ef7 100644
--- a/BallanceTasEditor/Views/PreferenceDialog.xaml
+++ b/BallanceTasEditor/Views/PreferenceDialog.xaml
@@ -17,7 +17,7 @@
             <StackPanel Orientation="Vertical">
                 <!-- TODO: This icon is wrong. -->
                 <GroupBox Header="Editor Layout" Margin="10" Padding="10"
-                          Style="{StaticResource AccessoryIconGroupBox}" styles:AccessoryIcon.Icon="/Assets/PasteFrame.ico">
+                          Style="{StaticResource AccessoryIconGroupBox}" styles:AccessoryIcon.Icon="/Assets/EditorLayout.ico">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
diff --git a/BallanceTasEditorTests/BallanceTasEditorTests.csproj b/BallanceTasEditorTests/BallanceTasEditorTests.csproj
index 5bf75f2..a1296c9 100644
--- a/BallanceTasEditorTests/BallanceTasEditorTests.csproj
+++ b/BallanceTasEditorTests/BallanceTasEditorTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSTest.Sdk/3.6.4">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <LangVersion>latest</LangVersion>
     <!--
       Displays error on console in addition to the log file. Note that this feature comes with a performance impact.
diff --git a/BallanceTasEditorTests/MSTestSettings.cs b/BallanceTasEditorTests/MSTestSettings.cs
index aaf278c..e466aa1 100644
--- a/BallanceTasEditorTests/MSTestSettings.cs
+++ b/BallanceTasEditorTests/MSTestSettings.cs
@@ -1 +1,3 @@
-[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]