diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java
index cc7713ad2..b64243059 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java
@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.ui.account;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.effects.JFXDepthManager;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.control.SkinBase;
@@ -100,7 +101,8 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         right.getChildren().add(btnRemove);
         root.setRight(right);
 
-        root.setStyle("-fx-background-color: white; -fx-background-radius: 4; -fx-padding: 8 8 8 0;");
+        root.getStyleClass().add("card");
+        root.setPadding(new Insets(8, 8, 8, 0));
         JFXDepthManager.setDepth(root, 1);
 
         getChildren().setAll(root);
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AuthlibInjectorServersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AuthlibInjectorServersPage.java
index 47efb0d69..d10aa329e 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AuthlibInjectorServersPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AuthlibInjectorServersPage.java
@@ -23,7 +23,6 @@ import javafx.collections.ObservableList;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.ListPage;
-import org.jackhuang.hmcl.ui.construct.Navigator;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 
@@ -38,7 +37,6 @@ public class AuthlibInjectorServersPage extends ListPage<AuthlibInjectorServerIt
     public AuthlibInjectorServersPage() {
         serverItems = MappedObservableList.create(config().getAuthlibInjectorServers(), this::createServerItem);
         Bindings.bindContent(itemsProperty(), serverItems);
-        addEventHandler(Navigator.NavigationEvent.NAVIGATED, this::onDecoratorPageNavigating);
     }
 
     private AuthlibInjectorServerItem createServerItem(AuthlibInjectorServer server) {
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/FloatListCell.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/FloatListCell.java
index 26e6c3f28..5bc940d36 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/FloatListCell.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/FloatListCell.java
@@ -30,7 +30,7 @@ public abstract class FloatListCell<T> extends ListCell<T> {
         setText(null);
         setGraphic(null);
 
-        pane.setStyle("-fx-background-color: white");
+        pane.getStyleClass().add("card");
         pane.setCursor(Cursor.HAND);
         pane.setPadding(new Insets(8));
         setPadding(new Insets(5));
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java
index 9a5788b44..b063929e0 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java
@@ -75,7 +75,7 @@ public abstract class SettingsView extends StackPane {
 
         {
             VBox rootPane = new VBox();
-            rootPane.setPadding(new Insets(36, 18, 36, 18));
+            rootPane.setPadding(new Insets(32, 10, 32, 10));
             {
                 ComponentList settingsPane = new ComponentList();
                 {
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java
index fd89c032d..fa5f67958 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java
@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.ui.profile;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.effects.JFXDepthManager;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.SkinBase;
 import javafx.scene.image.ImageView;
@@ -73,7 +74,8 @@ public class ProfileListItemSkin extends SkinBase<ProfileListItem> {
         right.getChildren().add(btnRemove);
         root.setRight(right);
 
-        root.setStyle("-fx-background-color: white; -fx-background-radius: 4; -fx-padding: 8 8 8 0;");
+        root.getStyleClass().add("card");
+        root.setPadding(new Insets(8, 8, 8, 0));
         JFXDepthManager.setDepth(root, 1);
         item.titleProperty().bind(skinnable.titleProperty());
         item.subtitleProperty().bind(skinnable.subtitleProperty());
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java
index 1b385abd2..b95eab78d 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java
@@ -21,6 +21,7 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXPopup;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.effects.JFXDepthManager;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Cursor;
 import javafx.scene.control.SkinBase;
@@ -91,7 +92,8 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
         right.getChildren().add(btnManage);
         root.setRight(right);
 
-        root.setStyle("-fx-background-color: white; -fx-background-radius: 4; -fx-padding: 8 8 8 0;");
+        root.getStyleClass().add("card");
+        root.setPadding(new Insets(8, 8, 8, 0));
         JFXDepthManager.setDepth(root, 1);
 
         getChildren().setAll(root);
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java
index fb5a6cf5b..8d535a29b 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java
@@ -22,6 +22,7 @@ import com.jfoenix.controls.JFXListView;
 import com.jfoenix.controls.JFXPopup;
 import javafx.application.Platform;
 import javafx.beans.property.*;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Control;
 import javafx.scene.control.SelectionMode;
@@ -182,24 +183,17 @@ public class VersionPage extends Control implements DecoratorPage {
 
             // the root page, with the sidebar in left, navigator in center.
             BorderPane root = new BorderPane();
-            root.getStyleClass().add("gray-background");
 
             {
-                BorderPane leftRootPane = new BorderPane();
-                FXUtils.setLimitWidth(leftRootPane, 200);
-
                 StackPane drawerContainer = new StackPane();
+                FXUtils.setLimitWidth(drawerContainer, 200);
+                drawerContainer.getStyleClass().add("gray-background");
                 drawerContainer.getChildren().setAll(control.listView);
-                leftRootPane.setCenter(drawerContainer);
+                FXUtils.setOverflowHidden(drawerContainer, 8);
 
-                Rectangle separator = new Rectangle();
-                separator.heightProperty().bind(root.heightProperty());
-                separator.setWidth(1);
-                separator.setFill(Color.GRAY);
-
-                leftRootPane.setRight(separator);
-
-                root.setLeft(leftRootPane);
+                StackPane wrapper = new StackPane(drawerContainer);
+                wrapper.setPadding(new Insets(4, 0, 4, 4));
+                root.setLeft(wrapper);
             }
 
             TabHeader tabPane = new TabHeader();
@@ -277,7 +271,11 @@ public class VersionPage extends Control implements DecoratorPage {
             titleBar.setRight(toolBar);
             control.state.set(new State(i18n("version.manage.manage"), titleBar, true, false, true));
 
-            root.setCenter(control.transitionPane);
+            control.transitionPane.getStyleClass().add("gray-background");
+            FXUtils.setOverflowHidden(control.transitionPane, 8);
+            StackPane wrapper = new StackPane(control.transitionPane);
+            wrapper.setPadding(new Insets(4));
+            root.setCenter(wrapper);
 
             spinnerPane.loadingProperty().bind(control.loading);
             spinnerPane.setContent(root);
diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css
index 3bbd7f3f6..bb88e4680 100644
--- a/HMCL/src/main/resources/assets/css/root.css
+++ b/HMCL/src/main/resources/assets/css/root.css
@@ -270,6 +270,7 @@
 
 .jfx-popup-container {
     -fx-background-color: WHITE;
+    -fx-background-radius: 4;
 }
 
 .popup-list-view {
@@ -680,7 +681,8 @@
 }
 
 .card {
-    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.26), 5, 0.06, -0.5, 1);
+    -fx-background-color: WHITE;
+    -fx-background-radius: 4;
 }
 
 .options-sublist {
diff --git a/HMCL/src/main/resources/assets/fxml/download/installers.fxml b/HMCL/src/main/resources/assets/fxml/download/installers.fxml
index 76586bd20..a15b4e634 100644
--- a/HMCL/src/main/resources/assets/fxml/download/installers.fxml
+++ b/HMCL/src/main/resources/assets/fxml/download/installers.fxml
@@ -12,11 +12,11 @@
     <BorderPane>
         <center>
             <VBox fx:id="list" spacing="8">
-                <HBox spacing="8" alignment="CENTER_LEFT" style="-fx-background-color: white; -fx-padding: 20 8 20 16">
+                <HBox spacing="8" alignment="CENTER_LEFT" styleClass="card" style="-fx-padding: 20 8 20 16">
                     <Label text="%archive.name" />
                     <JFXTextField fx:id="txtName" maxWidth="300"/>
                 </HBox>
-                <BorderPane fx:id="btnGame" style="-fx-background-color: white; -fx-padding: 8">
+                <BorderPane fx:id="btnGame" styleClass="card" style="-fx-padding: 8">
                     <left>
                         <ImageView>
                             <Image url="/assets/img/grass.png" requestedHeight="32" requestedWidth="32" smooth="true" />
@@ -26,7 +26,7 @@
                         <Label fx:id="lblGame" BorderPane.alignment="CENTER_LEFT" />
                     </center>
                 </BorderPane>
-                <BorderPane fx:id="btnFabric" style="-fx-background-color: white; -fx-padding: 8; -fx-cursor: HAND">
+                <BorderPane fx:id="btnFabric" styleClass="card" style="-fx-padding: 8; -fx-cursor: HAND">
                     <left>
                         <ImageView>
                             <Image url="/assets/img/fabric.png" requestedHeight="32" requestedWidth="32" smooth="true" />
@@ -39,7 +39,7 @@
                         <fx:include BorderPane.alignment="CENTER_RIGHT" source="/assets/svg/arrow-right.fxml"/>
                     </right>
                 </BorderPane>
-                <BorderPane fx:id="btnForge" style="-fx-background-color: white; -fx-padding: 8; -fx-cursor: HAND">
+                <BorderPane fx:id="btnForge" styleClass="card" style="-fx-padding: 8; -fx-cursor: HAND">
                     <left>
                         <ImageView>
                             <Image url="/assets/img/forge.png" requestedHeight="32" requestedWidth="32" smooth="true" />
@@ -52,7 +52,7 @@
                         <fx:include BorderPane.alignment="CENTER_RIGHT" source="/assets/svg/arrow-right.fxml"/>
                     </right>
                 </BorderPane>
-                <BorderPane fx:id="btnLiteLoader" style="-fx-background-color: white; -fx-padding: 8; -fx-cursor: HAND">
+                <BorderPane fx:id="btnLiteLoader" styleClass="card" style="-fx-padding: 8; -fx-cursor: HAND">
                     <left>
                         <ImageView>
                             <Image url="/assets/img/chicken.png" requestedHeight="32" requestedWidth="32" smooth="true" />
@@ -65,7 +65,7 @@
                         <fx:include BorderPane.alignment="CENTER_RIGHT" source="/assets/svg/arrow-right.fxml"/>
                     </right>
                 </BorderPane>
-                <BorderPane fx:id="btnOptiFine" style="-fx-background-color: white; -fx-padding: 8; -fx-cursor: HAND">
+                <BorderPane fx:id="btnOptiFine" styleClass="card" style="-fx-padding: 8; -fx-cursor: HAND">
                     <left>
                         <ImageView>
                             <Image url="/assets/img/command.png" requestedHeight="32" requestedWidth="32" smooth="true" />
diff --git a/HMCL/src/main/resources/assets/fxml/version/version-settings.fxml b/HMCL/src/main/resources/assets/fxml/version/version-settings.fxml
index 489607123..8e2b4b214 100644
--- a/HMCL/src/main/resources/assets/fxml/version/version-settings.fxml
+++ b/HMCL/src/main/resources/assets/fxml/version/version-settings.fxml
@@ -11,7 +11,7 @@
          xmlns:fx="http://javafx.com/fxml"
          type="StackPane">
     <ScrollPane fx:id="scroll" fitToHeight="true" fitToWidth="true" vbarPolicy="ALWAYS">
-        <VBox fx:id="rootPane" style="-fx-padding: 20;" spacing="12">
+        <VBox fx:id="rootPane" style="-fx-padding: 10;" spacing="12">
 
             <ComponentList fx:id="iconPickerItemWrapper">
                 <ImagePickerItem fx:id="iconPickerItem" title="%settings.icon" onSelectButtonClicked="#onExploreIcon" onDeleteButtonClicked="#onDeleteIcon">