diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 11eb72c..958e4cb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="io.heckel.ntfy.ui.MainActivity">
+        <activity android:name="io.heckel.ntfy.ui.MainActivity"
+                  android:icon="@drawable/ntfy"
+                  android:label="@string/main_action_bar_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/io/heckel/ntfy/ui/AddFragment.kt b/app/src/main/java/io/heckel/ntfy/ui/AddFragment.kt
index 69e0022..5ae9148 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/AddFragment.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/AddFragment.kt
@@ -19,7 +19,7 @@ class AddFragment(private val listener: Listener) : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return activity?.let {
             // Build root view
-            val view = requireActivity().layoutInflater.inflate(R.layout.fragment_add, null)
+            val view = requireActivity().layoutInflater.inflate(R.layout.add_dialog_fragment, null)
             val topicNameText = view.findViewById(R.id.add_dialog_topic_text) as TextInputEditText
             val baseUrlText = view.findViewById(R.id.add_dialog_base_url_text) as TextInputEditText
             val useAnotherServerCheckbox = view.findViewById(R.id.add_dialog_use_another_server_checkbox) as CheckBox
@@ -72,7 +72,7 @@ class AddFragment(private val listener: Listener) : DialogFragment() {
                 }
                 topicNameText.addTextChangedListener(textWatcher)
                 baseUrlText.addTextChangedListener(textWatcher)
-                useAnotherServerCheckbox.setOnCheckedChangeListener { buttonView, isChecked ->
+                useAnotherServerCheckbox.setOnCheckedChangeListener { _, isChecked ->
                     if (isChecked) baseUrlText.visibility = View.VISIBLE
                     else baseUrlText.visibility = View.GONE
                     validateInput()
diff --git a/app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt b/app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt
index 19a9613..c084353 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt
@@ -31,7 +31,7 @@ class DetailActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.topic_detail_activity)
+        setContentView(R.layout.detail_activity)
 
         var subscriptionId: Long? = null
 
diff --git a/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt b/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt
index 16f5797..26bd4c1 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt
@@ -31,7 +31,7 @@ class MainActivity : AppCompatActivity(), AddFragment.Listener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        setContentView(R.layout.main_activity)
 
         // Floating action button ("+")
         val fab: View = findViewById(R.id.fab)
@@ -63,11 +63,11 @@ class MainActivity : AppCompatActivity(), AddFragment.Listener {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.menu_action_source -> {
-                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.menu_source_url))))
+                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.main_menu_source_url))))
                 true
             }
             R.id.menu_action_website -> {
-                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.menu_website_url))))
+                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.main_menu_website_url))))
                 true
             }
             else -> super.onOptionsItemSelected(item)
diff --git a/app/src/main/java/io/heckel/ntfy/ui/SubscriptionsAdapter.kt b/app/src/main/java/io/heckel/ntfy/ui/SubscriptionsAdapter.kt
index 42ea2b2..4e5680c 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/SubscriptionsAdapter.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/SubscriptionsAdapter.kt
@@ -51,7 +51,7 @@ class TopicsAdapter(private val onClick: (Subscription) -> Unit) :
     /* Creates and inflates view and return TopicViewHolder. */
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TopicViewHolder {
         val view = LayoutInflater.from(parent.context)
-            .inflate(R.layout.topic_item, parent, false)
+            .inflate(R.layout.main_fragment_item, parent, false)
         return TopicViewHolder(view, onClick)
     }
 
diff --git a/app/src/main/res/layout/fragment_add.xml b/app/src/main/res/layout/add_dialog_fragment.xml
similarity index 97%
rename from app/src/main/res/layout/fragment_add.xml
rename to app/src/main/res/layout/add_dialog_fragment.xml
index 4ed6fc8..d37bc9e 100644
--- a/app/src/main/res/layout/fragment_add.xml
+++ b/app/src/main/res/layout/add_dialog_fragment.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/add_topic_layout.xml b/app/src/main/res/layout/add_topic_layout.xml
deleted file mode 100644
index cfea4a0..0000000
--- a/app/src/main/res/layout/add_topic_layout.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2020 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp">
-
-    <TextView
-            android:id="@+id/textView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
-            android:text="@string/add_topic"
-            android:textAlignment="center"
-            android:textAppearance="?attr/textAppearanceHeadline4"/>
-    <com.google.android.material.textfield.TextInputLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:hint="@string/topic_name_edit_text"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp">
-
-        <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/add_topic_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:hint="@string/add_dialog_base_url_layout"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp">
-        <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/add_topic_base_url"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <Button
-        android:id="@+id/subscribe_button"
-        style="?attr/materialButtonOutlinedStyle"
-        android:layout_width="240dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/subscribe_button_text" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/topic_detail_activity.xml b/app/src/main/res/layout/detail_activity.xml
similarity index 100%
rename from app/src/main/res/layout/topic_detail_activity.xml
rename to app/src/main/res/layout/detail_activity.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/main_activity.xml
similarity index 100%
rename from app/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/main_activity.xml
diff --git a/app/src/main/res/layout/topic_item.xml b/app/src/main/res/layout/main_fragment_item.xml
similarity index 59%
rename from app/src/main/res/layout/topic_item.xml
rename to app/src/main/res/layout/main_fragment_item.xml
index 87eeb7b..c3f53bf 100644
--- a/app/src/main/res/layout/topic_item.xml
+++ b/app/src/main/res/layout/main_fragment_item.xml
@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2020 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="80dp"
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index c67568e..3a66530 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -1,5 +1,5 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:id="@+id/menu_action_source"
-          android:title="@string/menu_source_title"/>
-    <item android:title="@string/menu_website_title" android:id="@+id/menu_action_website"/>
+          android:title="@string/main_menu_source_title"/>
+    <item android:title="@string/main_menu_website_title" android:id="@+id/menu_action_website"/>
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 23f73ae..1c4f646 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,29 +1,27 @@
 <resources>
     <string name="app_name">Ntfy</string>
-    <string name="add_topic">Add Topic</string>
 
+    <!-- Notifications -->
+    <string name="notification_channel_name">Ntfy</string>
+    <string name="notification_channel_id">ntfy</string>
 
-    <string name="topic_name_edit_text">Topic Name</string>
-    <string name="add_dialog_base_url_layout">Service URL</string>
-    <string name="topic_base_url_default_value">https://ntfy.sh</string>
-    <string name="subscribe_button_text">Subscribe</string>
+    <!-- Main activity: Action bar -->
+    <string name="main_action_bar_label">Subscribed topics</string>
+    <string name="main_menu_source_title">Show source &amp; license</string>
+    <string name="main_menu_source_url">https://heckel.io/ntfy-android</string>
+    <string name="main_menu_website_title">Visit ntfy.sh</string>
+    <string name="main_menu_website_url">https://ntfy.sh</string>
+
+    <!-- Main activity: List and such -->
     <string name="status_connected">Connected</string>
     <string name="status_connecting">Connecting</string>
     <string name="status_text_one">%1$s, %2$d notification</string>
     <string name="status_text_not_one">%1$s, %2$d notifications</string>
     <string name="fab_content_description">fab</string>
+
+    <!-- Detail activity -->
     <string name="remove_topic">Unsubscribe</string>
 
-    <!-- Menu -->
-    <string name="menu_source_title">Show source &amp; license</string>
-    <string name="menu_source_url">https://heckel.io/ntfy-android</string>
-    <string name="menu_website_title">Visit ntfy.sh</string>
-    <string name="menu_website_url">https://ntfy.sh</string>
-
-    <!-- Notifications -->
-    <string name="notification_channel_name">Ntfy</string>
-    <string name="notification_channel_id">ntfy</string>
-
     <!-- Add dialog -->
     <string name="add_dialog_title">Subscribe to topic</string>
     <string name="add_dialog_topic_name_hint">Topic name, e.g. phils_alerts</string>