diff --git a/HISTORY.rst b/HISTORY.rst
index bb58395cb9..ef3972894e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -190,6 +190,10 @@
 - Raise the NeedPassphrase exception when GPG has no terminal
   available.
 - Unified styling of signal handlers functions. 
+- Moved the authentication templates from the appearance app to
+  the authenticaton app.
+- Moved the navigation templates from the appearance app to the
+  navigation app.
 
 3.1.9 (2018-11-01)
 ==================
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