6 files changed, 44 insertions, 4 deletions
diff --git a/app/src/main/java/mygram/droid/FolderActivity.java b/app/src/main/java/mygram/droid/FolderActivity.java
index c7002c5..dd674c4 100644
--- a/app/src/main/java/mygram/droid/FolderActivity.java
+++ b/app/src/main/java/mygram/droid/FolderActivity.java
@@ -19,6 +19,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
@@ -51,9 +52,15 @@ public final class FolderActivity extends Activity {
 		super.onCreate(state);
 		LinearLayout column = new LinearLayout(this);
 		column.setOrientation(LinearLayout.VERTICAL);
+		LinearLayout header = new LinearLayout(this);
+		header.setGravity(Gravity.CENTER_VERTICAL);
+		int p = Ui.dp(this, 16);
+		header.setPadding(p * 2, p, p * 2, 0);
+		header.addView(Ui.iconButton(this, R.drawable.ic_arrow_back, "Back", v -> finish()));
 		TextView title = Ui.text(this, getIntent().getStringExtra("name"), 24);
-		title.setPadding(Ui.dp(this, 36), Ui.dp(this, 24), 0, 0);
-		column.addView(title);
+		title.setPadding(p, 0, 0, 0);
+		header.addView(title);
+		column.addView(header);
 		content = new FrameLayout(this);
 		column.addView(content, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1));
 		setContentView(column);
diff --git a/app/src/main/java/mygram/droid/MainActivity.java b/app/src/main/java/mygram/droid/MainActivity.java
index 3292f90..7c29e0a 100644
--- a/app/src/main/java/mygram/droid/MainActivity.java
+++ b/app/src/main/java/mygram/droid/MainActivity.java
@@ -220,6 +220,16 @@ public final class MainActivity extends Activity {
 		handler.removeCallbacks(rotate);
 	}
 
+	/** Back from Liked or Folders returns to Home; from Home it leaves the app. */
+	@Override
+	@SuppressWarnings("deprecation") // no predictive back on this TV; onBackPressed still fires
+	public void onBackPressed() {
+		if (ready && tab != HOME)
+			show(HOME);
+		else
+			super.onBackPressed();
+	}
+
 	@Override
 	protected void onDestroy() {
 		handler.removeCallbacks(rotate);
diff --git a/app/src/main/java/mygram/droid/Ui.java b/app/src/main/java/mygram/droid/Ui.java
index 65de7f8..586aa65 100644
--- a/app/src/main/java/mygram/droid/Ui.java
+++ b/app/src/main/java/mygram/droid/Ui.java
@@ -113,7 +113,7 @@ final class Ui {
 		t.setVisibility(View.INVISIBLE);
 		box.addView(t);
 		box.setFocusable(true);
-		box.setForeground(c.getDrawable(R.drawable.focus_ring));
+		box.setBackground(c.getDrawable(R.drawable.focus_glow));
 		box.setOnFocusChangeListener((v, has) -> {
 			t.setVisibility(has ? View.VISIBLE : View.INVISIBLE);
 			zoom(v, has);
diff --git a/app/src/main/res/drawable/focus_glow.xml b/app/src/main/res/drawable/focus_glow.xml
new file mode 100644
index 0000000..e90b268
--- /dev/null
+++ b/app/src/main/res/drawable/focus_glow.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2026 Danilo M. <danix@danix.xyz>
+     Licensed under the GNU General Public License version 2 only. -->
+<!-- Icon buttons: a soft highlight behind the icon instead of a ring. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="#40FFFFFF" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="#00000000" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/focus_ring.xml b/app/src/main/res/drawable/focus_ring.xml
index 1cab3f8..ed924f3 100644
--- a/app/src/main/res/drawable/focus_ring.xml
+++ b/app/src/main/res/drawable/focus_ring.xml
@@ -5,7 +5,7 @@
     <item android:state_focused="true">
         <shape>
             <corners android:radius="8dp" />
-            <stroke android:width="3dp" android:color="#FFFFFFFF" />
+            <stroke android:width="2dp" android:color="#B3FFFFFF" />
         </shape>
     </item>
     <item>
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 0000000..637f25c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,6 @@
+<!-- Material Icons "arrow_back", Apache License 2.0 -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp" android:height="24dp"
+    android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>