diff --git a/HISTORY.rst b/HISTORY.rst
index 270b9329dc..9a11c9b36d 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -40,6 +40,8 @@
   The setting is now STORAGE_TEMPORARY_DIRECTORY.
 * Move file related utilities to the storage app.
 * Backport and remove unused code from the permission app.
+* Move the navigation and authentication templates to their
+  respective apps.
 
 3.1.11 (2019-04-XX)
 ===================
diff --git a/docs/releases/3.2.rst b/docs/releases/3.2.rst
index f211a9611e..8aff7a2e51 100644
--- a/docs/releases/3.2.rst
+++ b/docs/releases/3.2.rst
@@ -64,6 +64,8 @@ Other changes
   The setting is now STORAGE_TEMPORARY_DIRECTORY.
 * Move file related utilities to the storage app.
 * Backport and remove unused code from the permission app.
+* Move the navigation and authentication templates to their
+  respective apps.
 
 
 Removals
diff --git a/mayan/apps/appearance/templates/authentication/login.html b/mayan/apps/authentication/templates/authentication/login.html
similarity index 100%
rename from mayan/apps/appearance/templates/authentication/login.html
rename to mayan/apps/authentication/templates/authentication/login.html
diff --git a/mayan/apps/appearance/templates/authentication/password_reset_complete.html b/mayan/apps/authentication/templates/authentication/password_reset_complete.html
similarity index 100%
rename from mayan/apps/appearance/templates/authentication/password_reset_complete.html
rename to mayan/apps/authentication/templates/authentication/password_reset_complete.html
diff --git a/mayan/apps/appearance/templates/authentication/password_reset_confirm.html b/mayan/apps/authentication/templates/authentication/password_reset_confirm.html
similarity index 100%
rename from mayan/apps/appearance/templates/authentication/password_reset_confirm.html
rename to mayan/apps/authentication/templates/authentication/password_reset_confirm.html
diff --git a/mayan/apps/appearance/templates/authentication/password_reset_done.html b/mayan/apps/authentication/templates/authentication/password_reset_done.html
similarity index 100%
rename from mayan/apps/appearance/templates/authentication/password_reset_done.html
rename to mayan/apps/authentication/templates/authentication/password_reset_done.html
diff --git a/mayan/apps/appearance/templates/authentication/password_reset_email.html b/mayan/apps/authentication/templates/authentication/password_reset_email.html
similarity index 100%
rename from mayan/apps/appearance/templates/authentication/password_reset_email.html
rename to mayan/apps/authentication/templates/authentication/password_reset_email.html
diff --git a/mayan/apps/appearance/templates/authentication/password_reset_form.html b/mayan/apps/authentication/templates/authentication/password_reset_form.html
similarity index 100%
rename from mayan/apps/appearance/templates/authentication/password_reset_form.html
rename to mayan/apps/authentication/templates/authentication/password_reset_form.html
diff --git a/mayan/apps/appearance/templates/authentication/password_reset_subject.txt b/mayan/apps/authentication/templates/authentication/password_reset_subject.txt
similarity index 100%
rename from mayan/apps/appearance/templates/authentication/password_reset_subject.txt
rename to mayan/apps/authentication/templates/authentication/password_reset_subject.txt
diff --git a/mayan/apps/appearance/templates/navigation/generic_link_instance.html b/mayan/apps/navigation/templates/navigation/generic_link_instance.html
similarity index 100%
rename from mayan/apps/appearance/templates/navigation/generic_link_instance.html
rename to mayan/apps/navigation/templates/navigation/generic_link_instance.html
diff --git a/mayan/apps/appearance/templates/navigation/generic_navigation.html b/mayan/apps/navigation/templates/navigation/generic_navigation.html
similarity index 100%
rename from mayan/apps/appearance/templates/navigation/generic_navigation.html
rename to mayan/apps/navigation/templates/navigation/generic_navigation.html
diff --git a/mayan/apps/appearance/templates/navigation/generic_subnavigation.html b/mayan/apps/navigation/templates/navigation/generic_subnavigation.html
similarity index 100%
rename from mayan/apps/appearance/templates/navigation/generic_subnavigation.html
rename to mayan/apps/navigation/templates/navigation/generic_subnavigation.html
diff --git a/mayan/apps/appearance/templates/navigation/large_button_link.html b/mayan/apps/navigation/templates/navigation/large_button_link.html
similarity index 100%
rename from mayan/apps/appearance/templates/navigation/large_button_link.html
rename to mayan/apps/navigation/templates/navigation/large_button_link.html