diff --git a/source/gui/gfx.cpp b/source/gui/gfx.cpp
index 02e1000..9abbcde 100644
--- a/source/gui/gfx.cpp
+++ b/source/gui/gfx.cpp
@@ -165,11 +165,14 @@ static int blinkDelay = 40;
 static bool blinkState = true, batteryLow = false;
 void GFX::DrawBattery() {
 	u8 chargeState = false, level = 0;
+	bool chargerPlugged = false;
+
 	PTMU_GetBatteryChargeState(&chargeState); // Get Charge state.
 	PTMU_GetBatteryLevel(&level); // Get Battery Level.
+	PTMU_GetAdapterState(&chargerPlugged); // Get if charger adapter is plugged.
 
-	if (chargeState) {
-		GFX::DrawSprite((level < 5 ? sprites_battery_charge_idx : sprites_battery_charge_full_idx), 366, 1);
+	if (chargerPlugged) {
+		GFX::DrawSprite((chargeState ? sprites_battery_charge_idx : sprites_battery_charge_full_idx), 366, 1);
 		if (batteryLow) batteryLow = false; // Cause we're charging.
 
 	} else {
diff --git a/source/menu/settings.cpp b/source/menu/settings.cpp
index 23993a5..9585f91 100644
--- a/source/menu/settings.cpp
+++ b/source/menu/settings.cpp
@@ -78,7 +78,7 @@ static const std::vector<Structs::ButtonPos> dirIcons = {
 };
 
 static const Structs::ButtonPos back = { 45, 0, 24, 24 }; // Back arrow for directory.
-static const Structs::ButtonPos Themes = { 40, 220, 280, 24 }; // Themes.
+static const Structs::ButtonPos Themes = { 40, 196, 280, 24 }; // Themes.
 
 
 static const std::vector<std::string> mainStrings = { "LANGUAGE", "SELECT_UNISTORE", "AUTO_UPDATE_SETTINGS_BTN", "GUI_SETTINGS_BTN", "DIRECTORY_SETTINGS_BTN", "CREDITS", "EXIT_APP" };