diff --git a/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java b/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java
index 7a03d33..2b777eb 100644
--- a/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java
+++ b/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java
@@ -16,6 +16,6 @@ public class MainMenu extends SaturnUi {
         draw(
                 new SaturnButton("Settings", () -> {
                     client.setScreen(new SettingsMenu());
-                }).setX(10).setY(10).setWidth(100).setHeight(20).setAnimation(SaturnAnimation.FADE_SLIDE.distance(15)));
+                }).setX(10).setY(10).setWidth(96).setHeight(25).setAnimation(SaturnAnimation.FADE_SLIDE.distance(15)));
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java b/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java
index 75049ed..1cb1bf2 100644
--- a/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java
+++ b/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java
@@ -11,9 +11,10 @@ import net.minecraft.util.math.ColorHelper;
 import net.minecraft.util.math.MathHelper;
 
 public class SaturnButton extends SaturnWidget {
+    public static final Identifier BORDER_TEXTURE = Identifier.ofVanilla("widget/saturn/button_border");
     public static final ButtonTextures TEXTURES = new ButtonTextures(
-            Identifier.ofVanilla("widget/saturn_button"), Identifier.ofVanilla("widget/saturn_button_disabled"),
-            Identifier.ofVanilla("widget/saturn_button_highlighted"));
+            Identifier.ofVanilla("widget/saturn/button"), Identifier.ofVanilla("widget/saturn/button_disabled"),
+            Identifier.ofVanilla("widget/saturn/button"));
 
     public boolean active = true;
     public String text;
@@ -31,6 +32,11 @@ public class SaturnButton extends SaturnWidget {
         context.drawGuiTexture(RenderLayer::getGuiTextured, TEXTURES.get(this.active, hovering), this.x,
                 this.y, this.width, this.height, ColorHelper.getWhite(this.alpha));
 
+        if (hovering) {
+            context.drawGuiTexture(RenderLayer::getGuiTextured, BORDER_TEXTURE, this.x,
+                    this.y, this.width, this.height, ColorHelper.getArgb(255, 251, 60, 79));
+        }
+
         int i = this.active ? 16777215 : 10526880;
         context.drawText(minecraftClient.textRenderer, this.text,
                 this.x + ((this.width - minecraftClient.textRenderer.getWidth(this.text)) / 2),
diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java b/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java
index 9744f33..ba46442 100644
--- a/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java
+++ b/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java
@@ -11,7 +11,7 @@ import net.minecraft.util.Identifier;
 import net.minecraft.util.math.ColorHelper;
 
 public class SaturnInputBox extends SaturnWidget {
-    public static final Identifier TEXTURE = Identifier.ofVanilla("widget/saturn_button");
+    public static final Identifier TEXTURE = Identifier.ofVanilla("widget/saturn/button");
 
     public String text = "";
     public String placeholder = "";
diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png
new file mode 100644
index 0000000..537a50e
Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png differ
diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_highlighted.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png.mcmeta
similarity index 54%
rename from src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_highlighted.png.mcmeta
rename to src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png.mcmeta
index 9768602..46f3896 100644
--- a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_highlighted.png.mcmeta
+++ b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png.mcmeta
@@ -2,9 +2,9 @@
   "gui": {
     "scaling": {
       "type": "nine_slice",
-      "width": 300,
-      "height": 30,
-      "border": 9
+      "width": 80,
+      "height": 80,
+      "border": 15
     }
   }
 }
diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png
new file mode 100644
index 0000000..fac642f
Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png differ
diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png.mcmeta
new file mode 100644
index 0000000..46f3896
--- /dev/null
+++ b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png.mcmeta
@@ -0,0 +1,10 @@
+{
+  "gui": {
+    "scaling": {
+      "type": "nine_slice",
+      "width": 80,
+      "height": 80,
+      "border": 15
+    }
+  }
+}
diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_disabled.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png
similarity index 100%
rename from src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_disabled.png
rename to src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png
diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png.mcmeta
rename to src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png.mcmeta
diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_highlighted.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png
similarity index 100%
rename from src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_highlighted.png
rename to src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png
diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_disabled.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_disabled.png.mcmeta
rename to src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png.mcmeta
diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png
deleted file mode 100644
index c90a966..0000000
Binary files a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png and /dev/null differ
diff --git a/src/main/resources/assets/saturnclient/textures/logo/text.png b/src/main/resources/assets/saturnclient/textures/logo/text.png
new file mode 100644
index 0000000..b976fde
Binary files /dev/null and b/src/main/resources/assets/saturnclient/textures/logo/text.png differ