diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 63bb97bcc..83107ea81 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -60,4 +60,4 @@ You can also contribute by...
 
 ----
 
-*PhotoPrism® is a registered trademark. Our [Trademark and Brand Guidelines](https://photoprism.app/trademark), which may be updated from time to time, describe how our Brand Assets may be used. It is important to us that any permitted use of our Brand Assets is fair and meets the highest standards.*
+*PhotoPrism® is a [registered trademark](https://photoprism.app/trademark). Docs [are available](https://github.com/photoprism/photoprism-docs) under the [CC BY-NC-SA 4.0 License](https://creativecommons.org/licenses/by-nc-sa/4.0/); [additional terms](https://github.com/photoprism/photoprism/blob/develop/assets/LICENSE) may apply. By using our software and services, you agree to our [terms & conditions](https://photoprism.app/terms).*
diff --git a/README.md b/README.md
index 27ccd7e00..eab0f80c3 100644
--- a/README.md
+++ b/README.md
@@ -124,5 +124,4 @@ We welcome [contributions](CONTRIBUTING.md) of any kind, including blog posts, t
 
 ----
 
-*PhotoPrism® is a registered trademark. Our [Trademark and Brand Guidelines](https://photoprism.app/trademark), which may be updated from time to time, describe how our Brand Assets may be used. It is important to us that any permitted use of our Brand Assets is fair and meets the highest standards.*
-
+*PhotoPrism® is a [registered trademark](https://photoprism.app/trademark). Docs [are available](https://github.com/photoprism/photoprism-docs) under the [CC BY-NC-SA 4.0 License](https://creativecommons.org/licenses/by-nc-sa/4.0/); [additional terms](https://github.com/photoprism/photoprism/blob/develop/assets/LICENSE) may apply. By using our software and services, you agree to our [terms & conditions](https://photoprism.app/terms).*
diff --git a/assets/LICENSE b/assets/LICENSE
index 5c8e3caf1..f3bf596ee 100644
--- a/assets/LICENSE
+++ b/assets/LICENSE
@@ -1,12 +1,20 @@
-Michael Mayer and his legal successors hereby grant you a non-exclusive, non-transferable right
-to use these assets as part of the official software distribution. Additional terms may apply.
+Michael Mayer and his legal successors ("PhotoPrism") hereby grant you a non-exclusive,
+non-transferable right to use these assets as part of the official software distribution.
+Additional terms and conditions may apply. PhotoPrism® is a registered trademark.
+Visit https://photoprism.app/trademark to learn more.
 
-Unless you know specific assets were licensed under a permissive licence by the creator or copyright
-holder, you are advised to ask before using them for your own private or commercial projects.
+Documentation is available under the CC BY-NC-SA 4.0 License:
 
-Visit https://docs.photoprism.app/credits/ for more information about images and other artwork.
+  https://creativecommons.org/licenses/by-nc-sa/4.0/
 
-PhotoPrism® is a registered trademark. It is important to us that any permitted use is fair and
-meets the highest standards.
+By using our software and services, you agree to our terms & conditions:
 
-Visit https://photoprism.app/trademark to read our trademark and brand guidelines.
\ No newline at end of file
+  https://photoprism.app/terms
+
+If you are not aware that certain assets have been licensed under a permissive license by the
+original author or copyright holder, you should check before using them in your own work,
+whether commercial or non-commercial in nature.
+
+A big thank you to everyone who made this possible:
+
+  https://docs.photoprism.app/credits/