From: Soren Stoutner <soren@stoutner.com>
Date: Fri, 19 May 2017 00:56:17 +0000 (-0700)
Subject: Updates about_licenses, adding the full text of the Apache License 2.0 and the 3... 
X-Git-Tag: v2.3~6
X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=f82135d919d64d4909c37c79a18e14ceba802579;p=PrivacyBrowserAndroid.git

Updates about_licenses, adding the full text of the Apache License 2.0 and the 3-Clause BSD License.
---

diff --git a/app/build.gradle b/app/build.gradle
index d6155919..16dd5a44 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/free/assets/de/about_permissions.html b/app/src/free/assets/de/about_permissions.html
index 45083853..75b01770 100644
--- a/app/src/free/assets/de/about_permissions.html
+++ b/app/src/free/assets/de/about_permissions.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/free/assets/de/about_privacy_policy.html b/app/src/free/assets/de/about_privacy_policy.html
index 6ffc5a00..b0215646 100644
--- a/app/src/free/assets/de/about_privacy_policy.html
+++ b/app/src/free/assets/de/about_privacy_policy.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/free/assets/en/about_permissions.html b/app/src/free/assets/en/about_permissions.html
index 400286bd..bbddbb57 100644
--- a/app/src/free/assets/en/about_permissions.html
+++ b/app/src/free/assets/en/about_permissions.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/free/assets/en/about_privacy_policy.html b/app/src/free/assets/en/about_privacy_policy.html
index 6ffc5a00..b0215646 100644
--- a/app/src/free/assets/en/about_privacy_policy.html
+++ b/app/src/free/assets/en/about_privacy_policy.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/free/assets/es/about_permissions.html b/app/src/free/assets/es/about_permissions.html
index 00601b66..b8da6438 100644
--- a/app/src/free/assets/es/about_permissions.html
+++ b/app/src/free/assets/es/about_permissions.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/free/assets/es/about_privacy_policy.html b/app/src/free/assets/es/about_privacy_policy.html
index 79c65b68..476b821d 100644
--- a/app/src/free/assets/es/about_privacy_policy.html
+++ b/app/src/free/assets/es/about_privacy_policy.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/free/assets/it/about_permissions.html b/app/src/free/assets/it/about_permissions.html
index 00003b2b..0ca7449b 100644
--- a/app/src/free/assets/it/about_permissions.html
+++ b/app/src/free/assets/it/about_permissions.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/free/assets/it/about_privacy_policy.html b/app/src/free/assets/it/about_privacy_policy.html
index fca61b86..31efb31f 100644
--- a/app/src/free/assets/it/about_privacy_policy.html
+++ b/app/src/free/assets/it/about_privacy_policy.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/free/assets/zh-rTW/about_permissions.html b/app/src/free/assets/zh-rTW/about_permissions.html
index 400286bd..bbddbb57 100644
--- a/app/src/free/assets/zh-rTW/about_permissions.html
+++ b/app/src/free/assets/zh-rTW/about_permissions.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/free/assets/zh-rTW/about_privacy_policy.html b/app/src/free/assets/zh-rTW/about_privacy_policy.html
index 6ffc5a00..b0215646 100644
--- a/app/src/free/assets/zh-rTW/about_privacy_policy.html
+++ b/app/src/free/assets/zh-rTW/about_privacy_policy.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/free/java/com/stoutner/privacybrowser/BannerAd.java b/app/src/free/java/com/stoutner/privacybrowser/BannerAd.java
index 88e3985b..c9263c27 100644
--- a/app/src/free/java/com/stoutner/privacybrowser/BannerAd.java
+++ b/app/src/free/java/com/stoutner/privacybrowser/BannerAd.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/free/res/layout/main_webview.xml b/app/src/free/res/layout/main_webview.xml
index a6fd37b4..c58d242f 100644
--- a/app/src/free/res/layout/main_webview.xml
+++ b/app/src/free/res/layout/main_webview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/free/res/values-de/strings.xml b/app/src/free/res/values-de/strings.xml
index 8e2f2cab..df0c9029 100644
--- a/app/src/free/res/values-de/strings.xml
+++ b/app/src/free/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/free/res/values-es/strings.xml b/app/src/free/res/values-es/strings.xml
index 6416972f..f720d8e5 100644
--- a/app/src/free/res/values-es/strings.xml
+++ b/app/src/free/res/values-es/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/free/res/values-it/strings.xml b/app/src/free/res/values-it/strings.xml
index 3450c4ef..abf7c81d 100644
--- a/app/src/free/res/values-it/strings.xml
+++ b/app/src/free/res/values-it/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/free/res/values-zh-rTW/strings.xml b/app/src/free/res/values-zh-rTW/strings.xml
index f9a8389f..abf7c81d 100644
--- a/app/src/free/res/values-zh-rTW/strings.xml
+++ b/app/src/free/res/values-zh-rTW/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/free/res/values/strings.xml b/app/src/free/res/values/strings.xml
index a9e98400..6a5db003 100644
--- a/app/src/free/res/values/strings.xml
+++ b/app/src/free/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2d572fa7..d7784e6e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html
index a72b4c98..e26c76fd 100644
--- a/app/src/main/assets/de/about_changelog.html
+++ b/app/src/main/assets/de/about_changelog.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/de/about_contributors.html b/app/src/main/assets/de/about_contributors.html
index cbedfb60..e222b0e8 100644
--- a/app/src/main/assets/de/about_contributors.html
+++ b/app/src/main/assets/de/about_contributors.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/de/about_licenses.html b/app/src/main/assets/de/about_licenses.html
index a9b150c8..645c0c69 100644
--- a/app/src/main/assets/de/about_licenses.html
+++ b/app/src/main/assets/de/about_licenses.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
@@ -48,16 +48,25 @@
         <p>Privacy Browser ist copyright © 2015-2017 von <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.</p>
 
         <h3>Lizenz</h3>
-        <p>Privacy Browser ist veröffentlicht unter der <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ Lizenz</a>.
-            Der volle Inhalt dieser Lizenz ist unten auf dieser Seite angegeben.</p>
+        <p>Privacy Browser ist veröffentlicht unter der <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ Lizenz</a>. The full text of the license is below.</p>
 
         <h3>Attribute</h3>
-        <p>Die Icons in Privacy Browser kommen aus dem <a href="https://material.io/icons/">Android Material Icon Set</a>, welches unter der <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache-Lizenz 2.0</a> veröffentlicht wird.</p>
+        <p>The list of ad servers used by the ad blocker comes from <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
+            Because a list of domain names is a list of facts, it <a href="https://www.copyright.gov/help/faq/faq-protect.html">cannot be copyrighted</a>.</p>
         <p><img class="left" src="../en/images/privacy_browser.png">
             <img class="left" src="../en/images/privacy_browser_free.png">
             <img class="left" src="../en/images/warning.png">
             <img class="left" src="../en/images/javascript_enabled.png">
-            sind bezogen aus ic_security und ic_language. Bearbeitungen wurden von Soren Stoutner in 2016 vorgenommen.</p>
+            are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+            The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
+            2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/cookie.png"> cookie was created by Google.
+            It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. It is unchanged except for layout
+            information like color and size.</p>
+        <p>The following icons come from the <a href="https://material.io/icons/">Android Material icon set</a>, which is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. They are unchanged except for layout
+            information like color and size. Some of them have been renamed to match their use in the code. The original icons and names are shown below.</p>
         <p><img class="icon" src="../en/images/ic_add.png"> ic_add.</p>
         <p><img class="icon" src="../en/images/ic_arrow_back.png"> ic_arrow_back.</p>
         <p><img class="icon" src="../en/images/ic_arrow_forward.png"> ic_arrow_forward.</p>
@@ -74,36 +83,34 @@
         <p><img class="icon" src="../en/images/ic_expand_less.png"> ic_expand_less.</p>
         <p><img class="icon" src="../en/images/ic_expand_more.png"> ic_expand_more.</p>
         <p><img class="icon" src="../en/images/ic_file_download.png"> ic_file_download.</p>
+        <p><img class="icon" src="../en/images/ic_find_in_page.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder.png"> ic_folder.</p>
         <p><img class="icon" src="../en/images/ic_folder_special.png"> ic_folder_special.</p>
         <p><img class="icon" src="../en/images/ic_home.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_import_contacts.png"> ic_import_contacts.</p>
+        <p><img class="icon" src="../en/images/ic_important_devices.png"> ic_important_devices.</p>
         <p><img class="icon" src="../en/images/ic_info_outline.png"> ic_info_outline.</p>
         <p><img class="icon" src="../en/images/ic_language.png"> ic_language.</p>
         <p><img class="icon" src="../en/images/ic_list.png"> ic_list.</p>
+        <p><img class="icon" src="../en/images/ic_local_activity.png"> ic_local_activity.</p>
         <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
         <p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
         <p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
+        <p><img class="icon" src="../en/images/ic_search.png"> ic_search.</p>
         <p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="../en/images/ic_settings.png"> ic_settings.</p>
         <p><img class="icon" src="../en/images/ic_subtitles.png"> ic_subtitles.</p>
         <p><img class="icon" src="../en/images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_top.png"> ic_vertical_align_top.</p>
+        <p><img class="icon" src="../en/images/ic_visibility_off.png"> ic_visibility_off.</p>
         <p><img class="icon" src="../en/images/ic_web.png"> ic_web.</p>
 
-        <br/>
-
-        <p><img class="left" src="../en/images/cookie.png"> Cookie wurde von Google erstellt.
-            Er ist unter der <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache-Lizenz 2.0</a> veröffentlicht und kann unter <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a> heruntergeladen werden.</p>
-
         <hr/>
 
         <h3>GNU General Public License</h3>
         <p><a href="http://www.gnu.de/documents/gpl.de.html">Offizielle deutsche Übersetzung der GNU General Public License</a></p>
 
-        <p></p>
-
         <p>Version 3, 29 June 2007</p>
 
         <p>Copyright © 2007 Free Software Foundation, Inc.
@@ -732,5 +739,318 @@
             copy of the Program in return for a fee.</p>
 
         <p>END OF TERMS AND CONDITIONS</p>
+
+        <h3>How to Apply These Terms to Your New Programs</h3>
+
+        <p>If you develop a new program, and you want it to be of the greatest
+            possible use to the public, the best way to achieve this is to make it
+            free software which everyone can redistribute and change under these terms.</p>
+
+        <p>To do so, attach the following notices to the program.  It is safest
+            to attach them to the start of each source file to most effectively
+            state the exclusion of warranty; and each file should have at least
+            the “copyright” line and a pointer to where the full notice is found.</p>
+
+        <pre>&lt;one line to give the program’s name
+and a brief idea of what it does.&gt;
+Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+
+This program is free software: you can
+redistribute it and/or modify
+it under the terms of the GNU General
+Public License as published by the Free
+Software Foundation, either version 3
+of the License, or(at your option)
+any later version.
+
+This program is distributed in the hope
+that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the
+GNU General Public License along with
+this program.  If not, see
+&lt;http://www.gnu.org/licenses/&gt;.</pre>
+
+        <p>Also add information on how to contact you by electronic and paper mail.</p>
+
+        <p>If the program does terminal interaction, make it output a short
+            notice like this when it starts in an interactive mode:</p>
+
+        <pre>&lt;program&gt;  Copyright (C) &lt;year&gt;
+&lt;name of author&gt;
+This program comes with ABSOLUTELY NO
+WARRANTY; for details type `show w'.
+This is free software, and you are
+welcome to redistribute it under
+certain conditions; type `show c'
+for details.</pre>
+
+        <p>The hypothetical commands `show w' and `show c' should show the appropriate
+            parts of the General Public License.  Of course, your program's commands
+            might be different; for a GUI interface, you would use an “about box”.</p>
+
+        <p>You should also get your employer (if you work as a programmer) or school,
+            if any, to sign a “copyright disclaimer” for the program, if necessary.
+            For more information on this, and how to apply and follow the GNU GPL, see
+            <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>.</p>
+
+        <p>The GNU General Public License does not permit incorporating your program
+            into proprietary programs.  If your program is a subroutine library, you
+            may consider it more useful to permit linking proprietary applications with
+            the library.  If this is what you want to do, use the GNU Lesser General
+            Public License instead of this License.  But first, please read
+            <<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>>.</p>
+
+        <hr/>
+
+        <h3>Apache License</h3>
+        <p>Version 2.0, January 2004</p>
+        <p><a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a></p>
+
+        <h3>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</h3>
+
+        <h4>1. Definitions.</h4>
+
+        <p>“License” shall mean the terms and conditions for use, reproduction, and
+            distribution as defined by Sections 1 through 9 of this document.</p>
+
+        <p>“Licensor” shall mean the copyright owner or entity authorized by the
+            copyright owner that is granting the License.</p>
+
+        <p>“Legal Entity” shall mean the union of the acting entity and all other
+            entities that control, are controlled by, or are under common control with
+            that entity. For the purposes of this definition, “control” means (i) the
+            power, direct or indirect, to cause the direction or management of such
+            entity, whether by contract or otherwise, or (ii) ownership of fifty
+            percent (50%) or more of the outstanding shares, or (iii) beneficial
+            ownership of such entity.</p>
+
+        <p>“You” (or “Your”) shall mean an individual or Legal Entity exercising
+            permissions granted by this License.</p>
+
+        <p>“Source” form shall mean the preferred form for making modifications,
+            including but not limited to software source code, documentation source,
+            and configuration files.</p>
+
+        <p>“Object” form shall mean any form resulting from mechanical transformation
+            or translation of a Source form, including but not limited to compiled
+            object code, generated documentation, and conversions to other media types.</p>
+
+        <p>“Work” shall mean the work of authorship, whether in Source or Object form,
+            made available under the License, as indicated by a copyright notice that
+            is included in or attached to the work (an example is provided in the
+            Appendix below).</p>
+
+        <p>“Derivative Works” shall mean any work, whether in Source or Object form,
+            that is based on (or derived from) the Work and for which the editorial
+            revisions, annotations, elaborations, or other modifications represent, as
+            a whole, an original work of authorship. For the purposes of this License,
+            Derivative Works shall not include works that remain separable from, or
+            merely link (or bind by name) to the interfaces of, the Work and Derivative
+            Works thereof.</p>
+
+        <p>“Contribution” shall mean any work of authorship, including the original
+            version of the Work and any modifications or additions to that Work or
+            Derivative Works thereof, that is intentionally submitted to Licensor for
+            inclusion in the Work by the copyright owner or by an individual or Legal
+            Entity authorized to submit on behalf of the copyright owner. For the
+            purposes of this definition, “submitted” means any form of electronic,
+            verbal, or written communication sent to the Licensor or its
+            representatives, including but not limited to communication on electronic
+            mailing lists, source code control systems, and issue tracking systems that
+            are managed by, or on behalf of, the Licensor for the purpose of discussing
+            and improving the Work, but excluding communication that is conspicuously
+            marked or otherwise designated in writing by the copyright owner as “Not a
+            Contribution.”</p>
+
+        <p>“Contributor” shall mean Licensor and any individual or Legal Entity on
+            behalf of whom a Contribution has been received by Licensor and
+            subsequently incorporated within the Work.</p>
+
+        <h4>2. Grant of Copyright License.</h4>
+
+        <p>Subject to the terms and conditions of this License, each Contributor hereby
+            grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+            irrevocable copyright license to reproduce, prepare Derivative Works of, publicly
+            display, publicly perform, sublicense, and distribute the Work and such
+            Derivative Works in Source or Object form.</p>
+
+        <h4>3. Grant of Patent License.</h4>
+
+        <p>Subject to the terms and conditions of this License, each Contributor hereby grants
+            to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+            (except as stated in this section) patent license to make, have made, use,
+            offer to sell, sell, import, and otherwise transfer the Work, where such
+            license applies only to those patent claims licensable by such Contributor
+            that are necessarily infringed by their Contribution(s) alone or by
+            combination of their Contribution(s) with the Work to which such
+            Contribution(s) was submitted. If You institute patent litigation against
+            any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+            that the Work or a Contribution incorporated within the Work constitutes
+            direct or contributory patent infringement, then any patent licenses
+            granted to You under this License for that Work shall terminate as of the
+            date such litigation is filed.</p>
+
+        <h4>4. Redistribution.</h4>
+
+        <p>You may reproduce and distribute copies of the Work or Derivative Works thereof
+            in any medium, with or without modifications, and in Source or Object form, provided
+            that You meet the following conditions:</p>
+
+        <ol>
+            <li>You must give any other recipients of the Work or Derivative Works a
+                copy of this License; and</li>
+
+            <li>You must cause any modified files to carry prominent notices stating
+                that You changed the files; and</li>
+
+            <li>You must retain, in the Source form of any Derivative Works that You
+                distribute, all copyright, patent, trademark, and attribution notices from
+                the Source form of the Work, excluding those notices that do not pertain to
+                any part of the Derivative Works; and</li>
+
+            <li>If the Work includes a “NOTICE” text file as part of its distribution,
+                then any Derivative Works that You distribute must include a readable copy
+                of the attribution notices contained within such NOTICE file, excluding
+                those notices that do not pertain to any part of the Derivative Works, in
+                at least one of the following places: within a NOTICE text file distributed
+                as part of the Derivative Works; within the Source form or documentation,
+                if provided along with the Derivative Works; or, within a display generated
+                by the Derivative Works, if and wherever such third-party notices normally
+                appear. The contents of the NOTICE file are for informational purposes only
+                and do not modify the License. You may add Your own attribution notices
+                within Derivative Works that You distribute, alongside or as an addendum to
+                the NOTICE text from the Work, provided that such additional attribution
+                notices cannot be construed as modifying the License.
+                <br/>
+                <br/>
+                You may add Your own copyright statement to Your modifications and may
+                provide additional or different license terms and conditions for use,
+                reproduction, or distribution of Your modifications, or for any such
+                Derivative Works as a whole, provided Your use, reproduction, and
+                distribution of the Work otherwise complies with the conditions stated in
+                this License.</li>
+        </ol>
+
+        <h4>5. Submission of Contributions.</h4>
+
+        <p>Unless You explicitly state otherwise, any Contribution intentionally submitted for
+            inclusion in the Work by You to the Licensor shall be under the terms and
+            conditions of this License, without any additional terms or conditions.
+            Notwithstanding the above, nothing herein shall supersede or modify the
+            terms of any separate license agreement you may have executed with Licensor
+            regarding such Contributions.</p>
+
+        <h4>6. Trademarks.</h4>
+
+        <p>This License does not grant permission to use the trade names, trademarks, service marks,
+            or product names of the Licensor, except as required for reasonable and customary use
+            in describing the origin of the Work and reproducing the content of the
+            NOTICE file.</p>
+
+        <h4>7. Disclaimer of Warranty.</h4>
+
+        <p>Unless required by applicable law or agreed to in writing, Licensor provides the Work
+            (and each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT
+            WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
+            without limitation, any warranties or conditions of TITLE,
+            NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+            are solely responsible for determining the appropriateness of using or
+            redistributing the Work and assume any risks associated with Your exercise
+            of permissions under this License.</p>
+
+        <h4>8. Limitation of Liability.</h4>
+
+        <p>In no event and under no legal theory, whether in tort (including negligence), contract,
+            or otherwise, unless required by applicable law (such as deliberate and
+            grossly negligent acts) or agreed to in writing, shall any Contributor be
+            liable to You for damages, including any direct, indirect, special,
+            incidental, or consequential damages of any character arising as a result
+            of this License or out of the use or inability to use the Work (including
+            but not limited to damages for loss of goodwill, work stoppage, computer
+            failure or malfunction, or any and all other commercial damages or losses),
+            even if such Contributor has been advised of the possibility of such
+            damages.</p>
+
+        <h4>9. Accepting Warranty or Additional Liability.</h4>
+
+        <p>While redistributing the Work or Derivative Works thereof, You may choose
+            to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+            or other liability obligations and/or rights consistent with this License.
+            However, in accepting such obligations, You may act only on Your own behalf
+            and on Your sole responsibility, not on behalf of any other Contributor,
+            and only if You agree to indemnify, defend, and hold each Contributor
+            harmless for any liability incurred by, or claims asserted against, such
+            Contributor by reason of your accepting any such warranty or additional
+            liability.</p>
+
+        <p>END OF TERMS AND CONDITIONS</p>
+
+        <h3>APPENDIX: How to apply the Apache License to your work</h3>
+
+        <p>To apply the Apache License to your work, attach the following boilerplate
+            notice, with the fields enclosed by brackets “[]” replaced with your own
+            identifying information. (Don’t include the brackets!) The text should be
+            enclosed in the appropriate comment syntax for the file format. We also
+            recommend that a file or class name and description of purpose be included
+            on the same “printed page” as the copyright notice for easier
+            identification within third-party archives.</p>
+        <pre>Copyright [yyyy] [name of copyright owner]
+
+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.</pre>
+
+        <hr/>
+
+        <h3>3-Clause BSD License</h3>
+
+        <p>Redistribution and use in source and binary forms, with or without
+            modification, are permitted provided that the following conditions are
+            met:</p>
+
+        <ul>
+            <li>Redistributions of source code must retain the above copyright
+                notice, this list of conditions and the following disclaimer.</li>
+
+            <li>Redistributions in binary form must reproduce the above
+                copyright notice, this list of conditions and the following disclaimer
+                in the documentation and/or other materials provided with the
+                distribution.</li>
+
+            <li>Neither the names of the copyright owners nor the names of its
+                contributors may be used to endorse or promote products derived from
+                this software without specific prior written permission.</li>
+        </ul>
+
+        <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+            “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+            LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+            A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+            OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+            SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+            LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+            DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+            THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+            (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+            OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/de/about_links.html b/app/src/main/assets/de/about_links.html
index 33c6a59e..0af5b45e 100644
--- a/app/src/main/assets/de/about_links.html
+++ b/app/src/main/assets/de/about_links.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/de/about_permissions.html b/app/src/main/assets/de/about_permissions.html
index cdc8d081..6672f922 100644
--- a/app/src/main/assets/de/about_permissions.html
+++ b/app/src/main/assets/de/about_permissions.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/de/about_privacy_policy.html b/app/src/main/assets/de/about_privacy_policy.html
index a9b5a688..9c1158b5 100644
--- a/app/src/main/assets/de/about_privacy_policy.html
+++ b/app/src/main/assets/de/about_privacy_policy.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/de/guide_clear_and_exit.html b/app/src/main/assets/de/guide_clear_and_exit.html
index 7b441111..4e521324 100644
--- a/app/src/main/assets/de/guide_clear_and_exit.html
+++ b/app/src/main/assets/de/guide_clear_and_exit.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/de/guide_domain_settings.html b/app/src/main/assets/de/guide_domain_settings.html
index b0be232a..cf35fb2b 100644
--- a/app/src/main/assets/de/guide_domain_settings.html
+++ b/app/src/main/assets/de/guide_domain_settings.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Diese Datei ist Teil von Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/de/guide_javascript.html b/app/src/main/assets/de/guide_javascript.html
index ba49a11c..a8c5d9cb 100644
--- a/app/src/main/assets/de/guide_javascript.html
+++ b/app/src/main/assets/de/guide_javascript.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/de/guide_local_storage.html b/app/src/main/assets/de/guide_local_storage.html
index 58ebe24b..508e7404 100644
--- a/app/src/main/assets/de/guide_local_storage.html
+++ b/app/src/main/assets/de/guide_local_storage.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/de/guide_overview.html b/app/src/main/assets/de/guide_overview.html
index 0306258d..61ac36dc 100644
--- a/app/src/main/assets/de/guide_overview.html
+++ b/app/src/main/assets/de/guide_overview.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/de/guide_planned_features.html b/app/src/main/assets/de/guide_planned_features.html
index b31d9c4f..5c235759 100644
--- a/app/src/main/assets/de/guide_planned_features.html
+++ b/app/src/main/assets/de/guide_planned_features.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/de/guide_tor.html b/app/src/main/assets/de/guide_tor.html
index e852e0b3..779b4a7e 100644
--- a/app/src/main/assets/de/guide_tor.html
+++ b/app/src/main/assets/de/guide_tor.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/de/guide_tracking_ids.html b/app/src/main/assets/de/guide_tracking_ids.html
index ba97ef34..2a88fc6c 100644
--- a/app/src/main/assets/de/guide_tracking_ids.html
+++ b/app/src/main/assets/de/guide_tracking_ids.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/de/guide_user_agent.html b/app/src/main/assets/de/guide_user_agent.html
index 0a7ae1a2..72de603f 100644
--- a/app/src/main/assets/de/guide_user_agent.html
+++ b/app/src/main/assets/de/guide_user_agent.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/en/about_changelog.html b/app/src/main/assets/en/about_changelog.html
index 7e1c18e9..4f402621 100644
--- a/app/src/main/assets/en/about_changelog.html
+++ b/app/src/main/assets/en/about_changelog.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/about_contributors.html b/app/src/main/assets/en/about_contributors.html
index 07528200..9ff18a2b 100644
--- a/app/src/main/assets/en/about_contributors.html
+++ b/app/src/main/assets/en/about_contributors.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html
index f655a94c..ed4aa4d5 100644
--- a/app/src/main/assets/en/about_licenses.html
+++ b/app/src/main/assets/en/about_licenses.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -43,19 +43,24 @@
         <p>Privacy Browser copyright © 2015-2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.</p>
 
         <h3>License</h3>
-        <p>Privacy Browser is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.
-            The full text of the license is at the bottom of this document.</p>
+        <p>Privacy Browser is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>. The full text of the license is below.</p>
 
         <h3>Attributions</h3>
         <p>The list of ad servers used by the ad blocker comes from <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
             Because a list of domain names is a list of facts, it <a href="https://www.copyright.gov/help/faq/faq-protect.html">cannot be copyrighted</a>.</p>
-        <p>Most of the icons in Privacy Browser come from the <a href="https://material.io/icons/">Android Material icon set</a>, which is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.</p>
         <p><img class="left" src="images/privacy_browser.png">
             <img class="left" src="images/privacy_browser_free.png">
             <img class="left" src="images/warning.png">
             <img class="left" src="images/javascript_enabled.png">
-            are derived from ic_security and ic_language. Modifications were made by Soren Stoutner in 2016.</p>
-        <p>The following icons are unchanged except for layout information like color and size. Some of them have been renamed to match their use in the code. The original icons and names are shown below.</p>
+            are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+            The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
+            2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="images/cookie.png"> cookie was created by Google. It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
+            and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. It is unchanged except for layout information like color and size.</p>
+        <p>The following icons come from the <a href="https://material.io/icons/">Android Material icon set</a>, which is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. They are unchanged except for layout
+            information like color and size. Some of them have been renamed to match their use in the code. The original icons and names are shown below.</p>
         <p><img class="icon" src="images/ic_add.png"> ic_add.</p>
         <p><img class="icon" src="images/ic_arrow_back.png"> ic_arrow_back.</p>
         <p><img class="icon" src="images/ic_arrow_forward.png"> ic_arrow_forward.</p>
@@ -72,29 +77,29 @@
         <p><img class="icon" src="images/ic_expand_less.png"> ic_expand_less.</p>
         <p><img class="icon" src="images/ic_expand_more.png"> ic_expand_more.</p>
         <p><img class="icon" src="images/ic_file_download.png"> ic_file_download.</p>
+        <p><img class="icon" src="images/ic_find_in_page.png"> ic_find_in_page.</p>
         <p><img class="icon" src="images/ic_folder.png"> ic_folder.</p>
         <p><img class="icon" src="images/ic_folder_special.png"> ic_folder_special.</p>
         <p><img class="icon" src="images/ic_home.png"> ic_home.</p>
         <p><img class="icon" src="images/ic_import_contacts.png"> ic_import_contacts.</p>
+        <p><img class="icon" src="images/ic_important_devices.png"> ic_important_devices.</p>
         <p><img class="icon" src="images/ic_info_outline.png"> ic_info_outline.</p>
         <p><img class="icon" src="images/ic_language.png"> ic_language.</p>
         <p><img class="icon" src="images/ic_list.png"> ic_list.</p>
+        <p><img class="icon" src="images/ic_local_activity.png"> ic_local_activity.</p>
         <p><img class="icon" src="images/ic_location_off.png"> ic_location_off.</p>
         <p><img class="icon" src="images/ic_more.png"> ic_more.</p>
         <p><img class="icon" src="images/ic_question_answer.png"> ic_question_answer.</p>
+        <p><img class="icon" src="images/ic_search.png"> ic_search.</p>
         <p><img class="icon" src="images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="images/ic_settings.png"> ic_settings.</p>
         <p><img class="icon" src="images/ic_subtitles.png"> ic_subtitles.</p>
         <p><img class="icon" src="images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p><img class="icon" src="images/ic_vertical_align_top.png"> ic_vertical_align_top.</p>
+        <p><img class="icon" src="images/ic_visibility_off.png"> ic_visibility_off.</p>
         <p><img class="icon" src="images/ic_web.png"> ic_web.</p>
 
-        <br/>
-
-        <p><img class="left" src="images/cookie.png"> cookie was created by Google.
-            It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>.</p>
-
         <hr/>
 
         <h3>GNU General Public License</h3>
@@ -726,5 +731,318 @@
             copy of the Program in return for a fee.</p>
 
         <p>END OF TERMS AND CONDITIONS</p>
+
+        <h3>How to Apply These Terms to Your New Programs</h3>
+
+        <p>If you develop a new program, and you want it to be of the greatest
+            possible use to the public, the best way to achieve this is to make it
+            free software which everyone can redistribute and change under these terms.</p>
+
+        <p>To do so, attach the following notices to the program.  It is safest
+            to attach them to the start of each source file to most effectively
+            state the exclusion of warranty; and each file should have at least
+            the “copyright” line and a pointer to where the full notice is found.</p>
+
+        <pre>&lt;one line to give the program’s name
+and a brief idea of what it does.&gt;
+Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+
+This program is free software: you can
+redistribute it and/or modify
+it under the terms of the GNU General
+Public License as published by the Free
+Software Foundation, either version 3
+of the License, or(at your option)
+any later version.
+
+This program is distributed in the hope
+that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the
+GNU General Public License along with
+this program.  If not, see
+&lt;http://www.gnu.org/licenses/&gt;.</pre>
+
+        <p>Also add information on how to contact you by electronic and paper mail.</p>
+
+        <p>If the program does terminal interaction, make it output a short
+            notice like this when it starts in an interactive mode:</p>
+
+        <pre>&lt;program&gt;  Copyright (C) &lt;year&gt;
+&lt;name of author&gt;
+This program comes with ABSOLUTELY NO
+WARRANTY; for details type `show w'.
+This is free software, and you are
+welcome to redistribute it under
+certain conditions; type `show c'
+for details.</pre>
+
+        <p>The hypothetical commands `show w' and `show c' should show the appropriate
+            parts of the General Public License.  Of course, your program's commands
+            might be different; for a GUI interface, you would use an “about box”.</p>
+
+        <p>You should also get your employer (if you work as a programmer) or school,
+            if any, to sign a “copyright disclaimer” for the program, if necessary.
+            For more information on this, and how to apply and follow the GNU GPL, see
+            <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>.</p>
+
+        <p>The GNU General Public License does not permit incorporating your program
+            into proprietary programs.  If your program is a subroutine library, you
+            may consider it more useful to permit linking proprietary applications with
+            the library.  If this is what you want to do, use the GNU Lesser General
+            Public License instead of this License.  But first, please read
+            <<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>>.</p>
+
+        <hr/>
+
+        <h3>Apache License</h3>
+        <p>Version 2.0, January 2004</p>
+        <p><a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a></p>
+
+        <h3>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</h3>
+
+        <h4>1. Definitions.</h4>
+
+        <p>“License” shall mean the terms and conditions for use, reproduction, and
+            distribution as defined by Sections 1 through 9 of this document.</p>
+
+        <p>“Licensor” shall mean the copyright owner or entity authorized by the
+            copyright owner that is granting the License.</p>
+
+        <p>“Legal Entity” shall mean the union of the acting entity and all other
+            entities that control, are controlled by, or are under common control with
+            that entity. For the purposes of this definition, “control” means (i) the
+            power, direct or indirect, to cause the direction or management of such
+            entity, whether by contract or otherwise, or (ii) ownership of fifty
+            percent (50%) or more of the outstanding shares, or (iii) beneficial
+            ownership of such entity.</p>
+
+        <p>“You” (or “Your”) shall mean an individual or Legal Entity exercising
+            permissions granted by this License.</p>
+
+        <p>“Source” form shall mean the preferred form for making modifications,
+            including but not limited to software source code, documentation source,
+            and configuration files.</p>
+
+        <p>“Object” form shall mean any form resulting from mechanical transformation
+            or translation of a Source form, including but not limited to compiled
+            object code, generated documentation, and conversions to other media types.</p>
+
+        <p>“Work” shall mean the work of authorship, whether in Source or Object form,
+            made available under the License, as indicated by a copyright notice that
+            is included in or attached to the work (an example is provided in the
+            Appendix below).</p>
+
+        <p>“Derivative Works” shall mean any work, whether in Source or Object form,
+            that is based on (or derived from) the Work and for which the editorial
+            revisions, annotations, elaborations, or other modifications represent, as
+            a whole, an original work of authorship. For the purposes of this License,
+            Derivative Works shall not include works that remain separable from, or
+            merely link (or bind by name) to the interfaces of, the Work and Derivative
+            Works thereof.</p>
+
+        <p>“Contribution” shall mean any work of authorship, including the original
+            version of the Work and any modifications or additions to that Work or
+            Derivative Works thereof, that is intentionally submitted to Licensor for
+            inclusion in the Work by the copyright owner or by an individual or Legal
+            Entity authorized to submit on behalf of the copyright owner. For the
+            purposes of this definition, “submitted” means any form of electronic,
+            verbal, or written communication sent to the Licensor or its
+            representatives, including but not limited to communication on electronic
+            mailing lists, source code control systems, and issue tracking systems that
+            are managed by, or on behalf of, the Licensor for the purpose of discussing
+            and improving the Work, but excluding communication that is conspicuously
+            marked or otherwise designated in writing by the copyright owner as “Not a
+            Contribution.”</p>
+
+        <p>“Contributor” shall mean Licensor and any individual or Legal Entity on
+            behalf of whom a Contribution has been received by Licensor and
+            subsequently incorporated within the Work.</p>
+
+        <h4>2. Grant of Copyright License.</h4>
+
+        <p>Subject to the terms and conditions of this License, each Contributor hereby
+            grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+            irrevocable copyright license to reproduce, prepare Derivative Works of, publicly
+            display, publicly perform, sublicense, and distribute the Work and such
+            Derivative Works in Source or Object form.</p>
+
+        <h4>3. Grant of Patent License.</h4>
+
+        <p>Subject to the terms and conditions of this License, each Contributor hereby grants
+            to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+            (except as stated in this section) patent license to make, have made, use,
+            offer to sell, sell, import, and otherwise transfer the Work, where such
+            license applies only to those patent claims licensable by such Contributor
+            that are necessarily infringed by their Contribution(s) alone or by
+            combination of their Contribution(s) with the Work to which such
+            Contribution(s) was submitted. If You institute patent litigation against
+            any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+            that the Work or a Contribution incorporated within the Work constitutes
+            direct or contributory patent infringement, then any patent licenses
+            granted to You under this License for that Work shall terminate as of the
+            date such litigation is filed.</p>
+
+        <h4>4. Redistribution.</h4>
+
+        <p>You may reproduce and distribute copies of the Work or Derivative Works thereof
+            in any medium, with or without modifications, and in Source or Object form, provided
+            that You meet the following conditions:</p>
+
+        <ol>
+            <li>You must give any other recipients of the Work or Derivative Works a
+                copy of this License; and</li>
+
+            <li>You must cause any modified files to carry prominent notices stating
+                that You changed the files; and</li>
+
+            <li>You must retain, in the Source form of any Derivative Works that You
+                distribute, all copyright, patent, trademark, and attribution notices from
+                the Source form of the Work, excluding those notices that do not pertain to
+                any part of the Derivative Works; and</li>
+
+            <li>If the Work includes a “NOTICE” text file as part of its distribution,
+                then any Derivative Works that You distribute must include a readable copy
+                of the attribution notices contained within such NOTICE file, excluding
+                those notices that do not pertain to any part of the Derivative Works, in
+                at least one of the following places: within a NOTICE text file distributed
+                as part of the Derivative Works; within the Source form or documentation,
+                if provided along with the Derivative Works; or, within a display generated
+                by the Derivative Works, if and wherever such third-party notices normally
+                appear. The contents of the NOTICE file are for informational purposes only
+                and do not modify the License. You may add Your own attribution notices
+                within Derivative Works that You distribute, alongside or as an addendum to
+                the NOTICE text from the Work, provided that such additional attribution
+                notices cannot be construed as modifying the License.
+                <br/>
+                <br/>
+                You may add Your own copyright statement to Your modifications and may
+                provide additional or different license terms and conditions for use,
+                reproduction, or distribution of Your modifications, or for any such
+                Derivative Works as a whole, provided Your use, reproduction, and
+                distribution of the Work otherwise complies with the conditions stated in
+                this License.</li>
+        </ol>
+
+        <h4>5. Submission of Contributions.</h4>
+
+        <p>Unless You explicitly state otherwise, any Contribution intentionally submitted for
+            inclusion in the Work by You to the Licensor shall be under the terms and
+            conditions of this License, without any additional terms or conditions.
+            Notwithstanding the above, nothing herein shall supersede or modify the
+            terms of any separate license agreement you may have executed with Licensor
+            regarding such Contributions.</p>
+
+        <h4>6. Trademarks.</h4>
+
+        <p>This License does not grant permission to use the trade names, trademarks, service marks,
+            or product names of the Licensor, except as required for reasonable and customary use
+            in describing the origin of the Work and reproducing the content of the
+            NOTICE file.</p>
+
+        <h4>7. Disclaimer of Warranty.</h4>
+
+        <p>Unless required by applicable law or agreed to in writing, Licensor provides the Work
+            (and each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT
+            WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
+            without limitation, any warranties or conditions of TITLE,
+            NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+            are solely responsible for determining the appropriateness of using or
+            redistributing the Work and assume any risks associated with Your exercise
+            of permissions under this License.</p>
+
+        <h4>8. Limitation of Liability.</h4>
+
+        <p>In no event and under no legal theory, whether in tort (including negligence), contract,
+            or otherwise, unless required by applicable law (such as deliberate and
+            grossly negligent acts) or agreed to in writing, shall any Contributor be
+            liable to You for damages, including any direct, indirect, special,
+            incidental, or consequential damages of any character arising as a result
+            of this License or out of the use or inability to use the Work (including
+            but not limited to damages for loss of goodwill, work stoppage, computer
+            failure or malfunction, or any and all other commercial damages or losses),
+            even if such Contributor has been advised of the possibility of such
+            damages.</p>
+
+        <h4>9. Accepting Warranty or Additional Liability.</h4>
+
+        <p>While redistributing the Work or Derivative Works thereof, You may choose
+            to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+            or other liability obligations and/or rights consistent with this License.
+            However, in accepting such obligations, You may act only on Your own behalf
+            and on Your sole responsibility, not on behalf of any other Contributor,
+            and only if You agree to indemnify, defend, and hold each Contributor
+            harmless for any liability incurred by, or claims asserted against, such
+            Contributor by reason of your accepting any such warranty or additional
+            liability.</p>
+
+        <p>END OF TERMS AND CONDITIONS</p>
+
+        <h3>APPENDIX: How to apply the Apache License to your work</h3>
+
+        <p>To apply the Apache License to your work, attach the following boilerplate
+            notice, with the fields enclosed by brackets “[]” replaced with your own
+            identifying information. (Don’t include the brackets!) The text should be
+            enclosed in the appropriate comment syntax for the file format. We also
+            recommend that a file or class name and description of purpose be included
+            on the same “printed page” as the copyright notice for easier
+            identification within third-party archives.</p>
+        <pre>Copyright [yyyy] [name of copyright owner]
+
+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.</pre>
+
+        <hr/>
+
+        <h3>3-Clause BSD License</h3>
+
+        <p>Redistribution and use in source and binary forms, with or without
+            modification, are permitted provided that the following conditions are
+            met:</p>
+
+        <ul>
+            <li>Redistributions of source code must retain the above copyright
+            notice, this list of conditions and the following disclaimer.</li>
+
+            <li>Redistributions in binary form must reproduce the above
+            copyright notice, this list of conditions and the following disclaimer
+            in the documentation and/or other materials provided with the
+            distribution.</li>
+
+            <li>Neither the names of the copyright owners nor the names of its
+            contributors may be used to endorse or promote products derived from
+            this software without specific prior written permission.</li>
+        </ul>
+
+        <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+            “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+            LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+            A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+            OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+            SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+            LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+            DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+            THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+            (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+            OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/en/about_links.html b/app/src/main/assets/en/about_links.html
index c5d31738..253a36bc 100644
--- a/app/src/main/assets/en/about_links.html
+++ b/app/src/main/assets/en/about_links.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/about_permissions.html b/app/src/main/assets/en/about_permissions.html
index 242f72f0..4fda4bac 100644
--- a/app/src/main/assets/en/about_permissions.html
+++ b/app/src/main/assets/en/about_permissions.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/about_privacy_policy.html b/app/src/main/assets/en/about_privacy_policy.html
index 6368bbdc..5fdcce18 100644
--- a/app/src/main/assets/en/about_privacy_policy.html
+++ b/app/src/main/assets/en/about_privacy_policy.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/guide_clear_and_exit.html b/app/src/main/assets/en/guide_clear_and_exit.html
index 58a0883e..a0fdcf54 100644
--- a/app/src/main/assets/en/guide_clear_and_exit.html
+++ b/app/src/main/assets/en/guide_clear_and_exit.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/guide_domain_settings.html b/app/src/main/assets/en/guide_domain_settings.html
index 7b6bb053..d9bb63c8 100644
--- a/app/src/main/assets/en/guide_domain_settings.html
+++ b/app/src/main/assets/en/guide_domain_settings.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/guide_javascript.html b/app/src/main/assets/en/guide_javascript.html
index 626b2df6..d7c3757f 100644
--- a/app/src/main/assets/en/guide_javascript.html
+++ b/app/src/main/assets/en/guide_javascript.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/guide_local_storage.html b/app/src/main/assets/en/guide_local_storage.html
index 3ddd6ca1..22bd49e0 100644
--- a/app/src/main/assets/en/guide_local_storage.html
+++ b/app/src/main/assets/en/guide_local_storage.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/guide_overview.html b/app/src/main/assets/en/guide_overview.html
index 673b8497..e2d37864 100644
--- a/app/src/main/assets/en/guide_overview.html
+++ b/app/src/main/assets/en/guide_overview.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/guide_planned_features.html b/app/src/main/assets/en/guide_planned_features.html
index 49e73802..b1d81245 100644
--- a/app/src/main/assets/en/guide_planned_features.html
+++ b/app/src/main/assets/en/guide_planned_features.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/guide_tor.html b/app/src/main/assets/en/guide_tor.html
index 35410bb9..96a208c2 100644
--- a/app/src/main/assets/en/guide_tor.html
+++ b/app/src/main/assets/en/guide_tor.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/guide_tracking_ids.html b/app/src/main/assets/en/guide_tracking_ids.html
index f3ddb69e..ecd5ad01 100644
--- a/app/src/main/assets/en/guide_tracking_ids.html
+++ b/app/src/main/assets/en/guide_tracking_ids.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/guide_user_agent.html b/app/src/main/assets/en/guide_user_agent.html
index d628937d..a8c6238c 100644
--- a/app/src/main/assets/en/guide_user_agent.html
+++ b/app/src/main/assets/en/guide_user_agent.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/en/images/ic_find_in_page.png b/app/src/main/assets/en/images/ic_find_in_page.png
new file mode 100644
index 00000000..4246a16d
Binary files /dev/null and b/app/src/main/assets/en/images/ic_find_in_page.png differ
diff --git a/app/src/main/assets/en/images/ic_important_devices.png b/app/src/main/assets/en/images/ic_important_devices.png
new file mode 100644
index 00000000..f85e4fc2
Binary files /dev/null and b/app/src/main/assets/en/images/ic_important_devices.png differ
diff --git a/app/src/main/assets/en/images/ic_local_activity.png b/app/src/main/assets/en/images/ic_local_activity.png
new file mode 100644
index 00000000..4e0a1539
Binary files /dev/null and b/app/src/main/assets/en/images/ic_local_activity.png differ
diff --git a/app/src/main/assets/en/images/ic_search.png b/app/src/main/assets/en/images/ic_search.png
new file mode 100644
index 00000000..e49d7545
Binary files /dev/null and b/app/src/main/assets/en/images/ic_search.png differ
diff --git a/app/src/main/assets/en/images/ic_visibility_off.png b/app/src/main/assets/en/images/ic_visibility_off.png
new file mode 100644
index 00000000..a4bcb6ac
Binary files /dev/null and b/app/src/main/assets/en/images/ic_visibility_off.png differ
diff --git a/app/src/main/assets/en/images/orbot.png b/app/src/main/assets/en/images/orbot.png
new file mode 100644
index 00000000..a85c25b5
Binary files /dev/null and b/app/src/main/assets/en/images/orbot.png differ
diff --git a/app/src/main/assets/es/about_changelog.html b/app/src/main/assets/es/about_changelog.html
index 4967370d..3031bded 100644
--- a/app/src/main/assets/es/about_changelog.html
+++ b/app/src/main/assets/es/about_changelog.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/es/about_contributors.html b/app/src/main/assets/es/about_contributors.html
index b8ccde22..717a91f7 100644
--- a/app/src/main/assets/es/about_contributors.html
+++ b/app/src/main/assets/es/about_contributors.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/es/about_licenses.html b/app/src/main/assets/es/about_licenses.html
index b1e6b16a..3eff9190 100644
--- a/app/src/main/assets/es/about_licenses.html
+++ b/app/src/main/assets/es/about_licenses.html
@@ -1,5 +1,7 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+
+  Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -48,14 +50,19 @@
         <h3>Atribuciones</h3>
         <p>La lista de servidores publicitarios usados por el bloqueador de anuncios procede de <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
             Ya que una lista de nombres de dominio es una lista de hechos, no puede tener <a href="https://www.copyright.gov/help/faq/faq-protect.html">derechos de autor</a>.</p>
-        <p>La mayoría de los iconos de Navegador Privado proceden de <a href="https://material.io/icons/">Android Material icon set</a>, el cual es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">licencia Apache 2.0</a>.</p>
         <p><img class="left" src="../en/images/privacy_browser.png">
             <img class="left" src="../en/images/privacy_browser_free.png">
             <img class="left" src="../en/images/warning.png">
             <img class="left" src="../en/images/javascript_enabled.png">
-            derivan de ic_security y de ic_language. Soren Stoutner hizo las modificaciones en 2016.</p>
-        <p>Los siguientes iconos están sin cambios, excepto por la información de diseño como el color y el tamaño. Algunos de ellos se han renombrado para que coincida con su uso en el código.
-            Los iconos originales y los nombres se muestran a continuación.</p>
+            derivan de ic_security y de ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+            The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
+            2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/cookie.png"> cookie fue creado por Google. Es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">licencia Apache 2.0</a> y puede ser descargado desde
+            <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. Está sin cambios, excepto por la información de diseño como el color y el tamaño.</p>
+        <p>Los siguientes iconos proceden de <a href="https://material.io/icons/">Android Material icon set</a>, el cual es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">licencia Apache 2.0</a>.
+            Están sin cambios, excepto por la información de diseño como el color y el tamaño. Algunos de ellos se han renombrado para que coincida con su uso en el código. Los iconos originales y los nombres se muestran a continuación.</p>
         <p><img class="icon" src="../en/images/ic_add.png"> ic_add.</p>
         <p><img class="icon" src="../en/images/ic_arrow_back.png"> ic_arrow_back.</p>
         <p><img class="icon" src="../en/images/ic_arrow_forward.png"> ic_arrow_forward.</p>
@@ -72,29 +79,29 @@
         <p><img class="icon" src="../en/images/ic_expand_less.png"> ic_expand_less.</p>
         <p><img class="icon" src="../en/images/ic_expand_more.png"> ic_expand_more.</p>
         <p><img class="icon" src="../en/images/ic_file_download.png"> ic_file_download.</p>
+        <p><img class="icon" src="../en/images/ic_find_in_page.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder.png"> ic_folder.</p>
         <p><img class="icon" src="../en/images/ic_folder_special.png"> ic_folder_special.</p>
         <p><img class="icon" src="../en/images/ic_home.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_import_contacts.png"> ic_import_contacts.</p>
+        <p><img class="icon" src="../en/images/ic_important_devices.png"> ic_important_devices.</p>
         <p><img class="icon" src="../en/images/ic_info_outline.png"> ic_info_outline.</p>
         <p><img class="icon" src="../en/images/ic_language.png"> ic_language.</p>
         <p><img class="icon" src="../en/images/ic_list.png"> ic_list.</p>
+        <p><img class="icon" src="../en/images/ic_local_activity.png"> ic_local_activity.</p>
         <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
         <p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
         <p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
+        <p><img class="icon" src="../en/images/ic_search.png"> ic_search.</p>
         <p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="../en/images/ic_settings.png"> ic_settings.</p>
         <p><img class="icon" src="../en/images/ic_subtitles.png"> ic_subtitles.</p>
         <p><img class="icon" src="../en/images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_top.png"> ic_vertical_align_top.</p>
+        <p><img class="icon" src="../en/images/ic_visibility_off.png"> ic_visibility_off.</p>
         <p><img class="icon" src="../en/images/ic_web.png"> ic_web.</p>
 
-        <br/>
-
-        <p><img class="left" src="../en/images/cookie.png"> cookie fue creado por Google.
-            Es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">licencia Apache 2.0</a> y puede ser descargado desde <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>.</p>
-
         <hr/>
 
         <h3>GNU General Public License</h3>
@@ -726,5 +733,318 @@
             copy of the Program in return for a fee.</p>
 
         <p>END OF TERMS AND CONDITIONS</p>
+
+        <h3>How to Apply These Terms to Your New Programs</h3>
+
+        <p>If you develop a new program, and you want it to be of the greatest
+            possible use to the public, the best way to achieve this is to make it
+            free software which everyone can redistribute and change under these terms.</p>
+
+        <p>To do so, attach the following notices to the program.  It is safest
+            to attach them to the start of each source file to most effectively
+            state the exclusion of warranty; and each file should have at least
+            the “copyright” line and a pointer to where the full notice is found.</p>
+
+        <pre>&lt;one line to give the program’s name
+and a brief idea of what it does.&gt;
+Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+
+This program is free software: you can
+redistribute it and/or modify
+it under the terms of the GNU General
+Public License as published by the Free
+Software Foundation, either version 3
+of the License, or(at your option)
+any later version.
+
+This program is distributed in the hope
+that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the
+GNU General Public License along with
+this program.  If not, see
+&lt;http://www.gnu.org/licenses/&gt;.</pre>
+
+        <p>Also add information on how to contact you by electronic and paper mail.</p>
+
+        <p>If the program does terminal interaction, make it output a short
+            notice like this when it starts in an interactive mode:</p>
+
+        <pre>&lt;program&gt;  Copyright (C) &lt;year&gt;
+&lt;name of author&gt;
+This program comes with ABSOLUTELY NO
+WARRANTY; for details type `show w'.
+This is free software, and you are
+welcome to redistribute it under
+certain conditions; type `show c'
+for details.</pre>
+
+        <p>The hypothetical commands `show w' and `show c' should show the appropriate
+            parts of the General Public License.  Of course, your program's commands
+            might be different; for a GUI interface, you would use an “about box”.</p>
+
+        <p>You should also get your employer (if you work as a programmer) or school,
+            if any, to sign a “copyright disclaimer” for the program, if necessary.
+            For more information on this, and how to apply and follow the GNU GPL, see
+            <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>.</p>
+
+        <p>The GNU General Public License does not permit incorporating your program
+            into proprietary programs.  If your program is a subroutine library, you
+            may consider it more useful to permit linking proprietary applications with
+            the library.  If this is what you want to do, use the GNU Lesser General
+            Public License instead of this License.  But first, please read
+            <<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>>.</p>
+
+        <hr/>
+
+        <h3>Apache License</h3>
+        <p>Version 2.0, January 2004</p>
+        <p><a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a></p>
+
+        <h3>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</h3>
+
+        <h4>1. Definitions.</h4>
+
+        <p>“License” shall mean the terms and conditions for use, reproduction, and
+            distribution as defined by Sections 1 through 9 of this document.</p>
+
+        <p>“Licensor” shall mean the copyright owner or entity authorized by the
+            copyright owner that is granting the License.</p>
+
+        <p>“Legal Entity” shall mean the union of the acting entity and all other
+            entities that control, are controlled by, or are under common control with
+            that entity. For the purposes of this definition, “control” means (i) the
+            power, direct or indirect, to cause the direction or management of such
+            entity, whether by contract or otherwise, or (ii) ownership of fifty
+            percent (50%) or more of the outstanding shares, or (iii) beneficial
+            ownership of such entity.</p>
+
+        <p>“You” (or “Your”) shall mean an individual or Legal Entity exercising
+            permissions granted by this License.</p>
+
+        <p>“Source” form shall mean the preferred form for making modifications,
+            including but not limited to software source code, documentation source,
+            and configuration files.</p>
+
+        <p>“Object” form shall mean any form resulting from mechanical transformation
+            or translation of a Source form, including but not limited to compiled
+            object code, generated documentation, and conversions to other media types.</p>
+
+        <p>“Work” shall mean the work of authorship, whether in Source or Object form,
+            made available under the License, as indicated by a copyright notice that
+            is included in or attached to the work (an example is provided in the
+            Appendix below).</p>
+
+        <p>“Derivative Works” shall mean any work, whether in Source or Object form,
+            that is based on (or derived from) the Work and for which the editorial
+            revisions, annotations, elaborations, or other modifications represent, as
+            a whole, an original work of authorship. For the purposes of this License,
+            Derivative Works shall not include works that remain separable from, or
+            merely link (or bind by name) to the interfaces of, the Work and Derivative
+            Works thereof.</p>
+
+        <p>“Contribution” shall mean any work of authorship, including the original
+            version of the Work and any modifications or additions to that Work or
+            Derivative Works thereof, that is intentionally submitted to Licensor for
+            inclusion in the Work by the copyright owner or by an individual or Legal
+            Entity authorized to submit on behalf of the copyright owner. For the
+            purposes of this definition, “submitted” means any form of electronic,
+            verbal, or written communication sent to the Licensor or its
+            representatives, including but not limited to communication on electronic
+            mailing lists, source code control systems, and issue tracking systems that
+            are managed by, or on behalf of, the Licensor for the purpose of discussing
+            and improving the Work, but excluding communication that is conspicuously
+            marked or otherwise designated in writing by the copyright owner as “Not a
+            Contribution.”</p>
+
+        <p>“Contributor” shall mean Licensor and any individual or Legal Entity on
+            behalf of whom a Contribution has been received by Licensor and
+            subsequently incorporated within the Work.</p>
+
+        <h4>2. Grant of Copyright License.</h4>
+
+        <p>Subject to the terms and conditions of this License, each Contributor hereby
+            grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+            irrevocable copyright license to reproduce, prepare Derivative Works of, publicly
+            display, publicly perform, sublicense, and distribute the Work and such
+            Derivative Works in Source or Object form.</p>
+
+        <h4>3. Grant of Patent License.</h4>
+
+        <p>Subject to the terms and conditions of this License, each Contributor hereby grants
+            to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+            (except as stated in this section) patent license to make, have made, use,
+            offer to sell, sell, import, and otherwise transfer the Work, where such
+            license applies only to those patent claims licensable by such Contributor
+            that are necessarily infringed by their Contribution(s) alone or by
+            combination of their Contribution(s) with the Work to which such
+            Contribution(s) was submitted. If You institute patent litigation against
+            any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+            that the Work or a Contribution incorporated within the Work constitutes
+            direct or contributory patent infringement, then any patent licenses
+            granted to You under this License for that Work shall terminate as of the
+            date such litigation is filed.</p>
+
+        <h4>4. Redistribution.</h4>
+
+        <p>You may reproduce and distribute copies of the Work or Derivative Works thereof
+            in any medium, with or without modifications, and in Source or Object form, provided
+            that You meet the following conditions:</p>
+
+        <ol>
+            <li>You must give any other recipients of the Work or Derivative Works a
+                copy of this License; and</li>
+
+            <li>You must cause any modified files to carry prominent notices stating
+                that You changed the files; and</li>
+
+            <li>You must retain, in the Source form of any Derivative Works that You
+                distribute, all copyright, patent, trademark, and attribution notices from
+                the Source form of the Work, excluding those notices that do not pertain to
+                any part of the Derivative Works; and</li>
+
+            <li>If the Work includes a “NOTICE” text file as part of its distribution,
+                then any Derivative Works that You distribute must include a readable copy
+                of the attribution notices contained within such NOTICE file, excluding
+                those notices that do not pertain to any part of the Derivative Works, in
+                at least one of the following places: within a NOTICE text file distributed
+                as part of the Derivative Works; within the Source form or documentation,
+                if provided along with the Derivative Works; or, within a display generated
+                by the Derivative Works, if and wherever such third-party notices normally
+                appear. The contents of the NOTICE file are for informational purposes only
+                and do not modify the License. You may add Your own attribution notices
+                within Derivative Works that You distribute, alongside or as an addendum to
+                the NOTICE text from the Work, provided that such additional attribution
+                notices cannot be construed as modifying the License.
+                <br/>
+                <br/>
+                You may add Your own copyright statement to Your modifications and may
+                provide additional or different license terms and conditions for use,
+                reproduction, or distribution of Your modifications, or for any such
+                Derivative Works as a whole, provided Your use, reproduction, and
+                distribution of the Work otherwise complies with the conditions stated in
+                this License.</li>
+        </ol>
+
+        <h4>5. Submission of Contributions.</h4>
+
+        <p>Unless You explicitly state otherwise, any Contribution intentionally submitted for
+            inclusion in the Work by You to the Licensor shall be under the terms and
+            conditions of this License, without any additional terms or conditions.
+            Notwithstanding the above, nothing herein shall supersede or modify the
+            terms of any separate license agreement you may have executed with Licensor
+            regarding such Contributions.</p>
+
+        <h4>6. Trademarks.</h4>
+
+        <p>This License does not grant permission to use the trade names, trademarks, service marks,
+            or product names of the Licensor, except as required for reasonable and customary use
+            in describing the origin of the Work and reproducing the content of the
+            NOTICE file.</p>
+
+        <h4>7. Disclaimer of Warranty.</h4>
+
+        <p>Unless required by applicable law or agreed to in writing, Licensor provides the Work
+            (and each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT
+            WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
+            without limitation, any warranties or conditions of TITLE,
+            NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+            are solely responsible for determining the appropriateness of using or
+            redistributing the Work and assume any risks associated with Your exercise
+            of permissions under this License.</p>
+
+        <h4>8. Limitation of Liability.</h4>
+
+        <p>In no event and under no legal theory, whether in tort (including negligence), contract,
+            or otherwise, unless required by applicable law (such as deliberate and
+            grossly negligent acts) or agreed to in writing, shall any Contributor be
+            liable to You for damages, including any direct, indirect, special,
+            incidental, or consequential damages of any character arising as a result
+            of this License or out of the use or inability to use the Work (including
+            but not limited to damages for loss of goodwill, work stoppage, computer
+            failure or malfunction, or any and all other commercial damages or losses),
+            even if such Contributor has been advised of the possibility of such
+            damages.</p>
+
+        <h4>9. Accepting Warranty or Additional Liability.</h4>
+
+        <p>While redistributing the Work or Derivative Works thereof, You may choose
+            to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+            or other liability obligations and/or rights consistent with this License.
+            However, in accepting such obligations, You may act only on Your own behalf
+            and on Your sole responsibility, not on behalf of any other Contributor,
+            and only if You agree to indemnify, defend, and hold each Contributor
+            harmless for any liability incurred by, or claims asserted against, such
+            Contributor by reason of your accepting any such warranty or additional
+            liability.</p>
+
+        <p>END OF TERMS AND CONDITIONS</p>
+
+        <h3>APPENDIX: How to apply the Apache License to your work</h3>
+
+        <p>To apply the Apache License to your work, attach the following boilerplate
+            notice, with the fields enclosed by brackets “[]” replaced with your own
+            identifying information. (Don’t include the brackets!) The text should be
+            enclosed in the appropriate comment syntax for the file format. We also
+            recommend that a file or class name and description of purpose be included
+            on the same “printed page” as the copyright notice for easier
+            identification within third-party archives.</p>
+        <pre>Copyright [yyyy] [name of copyright owner]
+
+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.</pre>
+
+        <hr/>
+
+        <h3>3-Clause BSD License</h3>
+
+        <p>Redistribution and use in source and binary forms, with or without
+            modification, are permitted provided that the following conditions are
+            met:</p>
+
+        <ul>
+            <li>Redistributions of source code must retain the above copyright
+                notice, this list of conditions and the following disclaimer.</li>
+
+            <li>Redistributions in binary form must reproduce the above
+                copyright notice, this list of conditions and the following disclaimer
+                in the documentation and/or other materials provided with the
+                distribution.</li>
+
+            <li>Neither the names of the copyright owners nor the names of its
+                contributors may be used to endorse or promote products derived from
+                this software without specific prior written permission.</li>
+        </ul>
+
+        <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+            “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+            LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+            A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+            OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+            SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+            LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+            DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+            THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+            (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+            OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/es/about_links.html b/app/src/main/assets/es/about_links.html
index af473974..5ff494ae 100644
--- a/app/src/main/assets/es/about_links.html
+++ b/app/src/main/assets/es/about_links.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/es/about_permissions.html b/app/src/main/assets/es/about_permissions.html
index 523c2feb..5d29a6b8 100644
--- a/app/src/main/assets/es/about_permissions.html
+++ b/app/src/main/assets/es/about_permissions.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/es/about_privacy_policy.html b/app/src/main/assets/es/about_privacy_policy.html
index 36586a51..4bfc599e 100644
--- a/app/src/main/assets/es/about_privacy_policy.html
+++ b/app/src/main/assets/es/about_privacy_policy.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/es/guide_clear_and_exit.html b/app/src/main/assets/es/guide_clear_and_exit.html
index 7c8bfaa5..187ceef8 100644
--- a/app/src/main/assets/es/guide_clear_and_exit.html
+++ b/app/src/main/assets/es/guide_clear_and_exit.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/es/guide_domain_settings.html b/app/src/main/assets/es/guide_domain_settings.html
index 0c9478f1..b5f15d8c 100644
--- a/app/src/main/assets/es/guide_domain_settings.html
+++ b/app/src/main/assets/es/guide_domain_settings.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/es/guide_javascript.html b/app/src/main/assets/es/guide_javascript.html
index 1acd2428..0dad0931 100644
--- a/app/src/main/assets/es/guide_javascript.html
+++ b/app/src/main/assets/es/guide_javascript.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/es/guide_local_storage.html b/app/src/main/assets/es/guide_local_storage.html
index 330660db..de3270c1 100644
--- a/app/src/main/assets/es/guide_local_storage.html
+++ b/app/src/main/assets/es/guide_local_storage.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/es/guide_overview.html b/app/src/main/assets/es/guide_overview.html
index 3b4e2dd7..03628f1d 100644
--- a/app/src/main/assets/es/guide_overview.html
+++ b/app/src/main/assets/es/guide_overview.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/es/guide_planned_features.html b/app/src/main/assets/es/guide_planned_features.html
index 6d92e93f..18e1fc95 100644
--- a/app/src/main/assets/es/guide_planned_features.html
+++ b/app/src/main/assets/es/guide_planned_features.html
@@ -1,7 +1,7 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
- Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
+  Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
   Este archivo es parte de Navegador Privado (Privacy Browser) <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/es/guide_tor.html b/app/src/main/assets/es/guide_tor.html
index 1513c554..c104a0b3 100644
--- a/app/src/main/assets/es/guide_tor.html
+++ b/app/src/main/assets/es/guide_tor.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/es/guide_tracking_ids.html b/app/src/main/assets/es/guide_tracking_ids.html
index 73e5e8ef..6bd8f3c3 100644
--- a/app/src/main/assets/es/guide_tracking_ids.html
+++ b/app/src/main/assets/es/guide_tracking_ids.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/es/guide_user_agent.html b/app/src/main/assets/es/guide_user_agent.html
index 62aebd9b..f3cdca19 100644
--- a/app/src/main/assets/es/guide_user_agent.html
+++ b/app/src/main/assets/es/guide_user_agent.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/it/about_changelog.html b/app/src/main/assets/it/about_changelog.html
index 6e491b0f..6fd276d6 100644
--- a/app/src/main/assets/it/about_changelog.html
+++ b/app/src/main/assets/it/about_changelog.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/it/about_contributors.html b/app/src/main/assets/it/about_contributors.html
index cc252ee7..61de0cd4 100644
--- a/app/src/main/assets/it/about_contributors.html
+++ b/app/src/main/assets/it/about_contributors.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/it/about_licenses.html b/app/src/main/assets/it/about_licenses.html
index c7ad171f..2c5c24c8 100644
--- a/app/src/main/assets/it/about_licenses.html
+++ b/app/src/main/assets/it/about_licenses.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
@@ -54,14 +54,19 @@
         <h3>Attribuzioni</h3>
         <p>La lista dei server utilizzata dalla funzionalità di blocco degli annunci è tratta da <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
             Dal momento che si tratta di una lista di domini <a href="https://www.copyright.gov/help/faq/faq-protect.html">non può essere coperta da Copyright</a>.</p>
-        <p>La maggior parte delle icone utilizzate da Privacy Browser è tratta dall'<a href="https://material.io/icons/">Android Material icon set</a>,
-            che è stato rilasciato con <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.</p>
         <p><img class="left" src="../en/images/privacy_browser.png">
             <img class="left" src="../en/images/privacy_browser_free.png">
             <img class="left" src="../en/images/warning.png">
             <img class="left" src="../en/images/javascript_enabled.png">
-            sono derivate da ic_security and ic_language. Le modifiche sono state implementate da Soren Stoutner nel 2016.</p>
-        <p>Le seguenti icone non sono state modificate, se non per quanto riguarda colore e dimensione. Alcune sono state rinominate per coerenza con il tipo di utilizzo all'interno del codice. Le icone con i loro nomi originali sono riportate di seguito.</p>
+            are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+            The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
+            2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="images/cookie.png"> cookie was created by Google. It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
+            and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. It is unchanged except for layout information like color and size.</p>
+        <p>The following icons come from the <a href="https://material.io/icons/">Android Material icon set</a>, which is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. They are unchanged except for layout
+            information like color and size. Some of them have been renamed to match their use in the code. The original icons and names are shown below.</p>
         <p><img class="icon" src="../en/images/ic_add.png"> ic_add.</p>
         <p><img class="icon" src="../en/images/ic_arrow_back.png"> ic_arrow_back.</p>
         <p><img class="icon" src="../en/images/ic_arrow_forward.png"> ic_arrow_forward.</p>
@@ -78,29 +83,29 @@
         <p><img class="icon" src="../en/images/ic_expand_less.png"> ic_expand_less.</p>
         <p><img class="icon" src="../en/images/ic_expand_more.png"> ic_expand_more.</p>
         <p><img class="icon" src="../en/images/ic_file_download.png"> ic_file_download.</p>
+        <p><img class="icon" src="../en/images/ic_find_in_page.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder.png"> ic_folder.</p>
         <p><img class="icon" src="../en/images/ic_folder_special.png"> ic_folder_special.</p>
         <p><img class="icon" src="../en/images/ic_home.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_import_contacts.png"> ic_import_contacts.</p>
+        <p><img class="icon" src="../en/images/ic_important_devices.png"> ic_important_devices.</p>
         <p><img class="icon" src="../en/images/ic_info_outline.png"> ic_info_outline.</p>
         <p><img class="icon" src="../en/images/ic_language.png"> ic_language.</p>
         <p><img class="icon" src="../en/images/ic_list.png"> ic_list.</p>
+        <p><img class="icon" src="../en/images/ic_local_activity.png"> ic_local_activity.</p>
         <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
         <p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
         <p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
+        <p><img class="icon" src="../en/images/ic_search.png"> ic_search.</p>
         <p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="../en/images/ic_settings.png"> ic_settings.</p>
         <p><img class="icon" src="../en/images/ic_subtitles.png"> ic_subtitles.</p>
         <p><img class="icon" src="../en/images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_top.png"> ic_vertical_align_top.</p>
+        <p><img class="icon" src="../en/images/ic_visibility_off.png"> ic_visibility_off.</p>
         <p><img class="icon" src="../en/images/ic_web.png"> ic_web.</p>
 
-        <br/>
-
-        <p><img class="left" src="../en/images/cookie.png"> cookie è stata creata da Google.
-            E' stata rilasciata con <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a> e può essere scaricata dirattamente dal <a href="https://materialdesignicons.com/icon/cookie">Material Design Icon Set</a>.</p>
-
         <hr/>
 
         <h3>GNU General Public License</h3>
@@ -824,5 +829,318 @@
             programma ottenuta dietro pagamento.</p>
 
         <p>FINE DEI TERMINI E DELLE CONDIZIONI</p>
+
+        <h3>How to Apply These Terms to Your New Programs</h3>
+
+        <p>If you develop a new program, and you want it to be of the greatest
+            possible use to the public, the best way to achieve this is to make it
+            free software which everyone can redistribute and change under these terms.</p>
+
+        <p>To do so, attach the following notices to the program.  It is safest
+            to attach them to the start of each source file to most effectively
+            state the exclusion of warranty; and each file should have at least
+            the “copyright” line and a pointer to where the full notice is found.</p>
+
+        <pre>&lt;one line to give the program’s name
+and a brief idea of what it does.&gt;
+Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+
+This program is free software: you can
+redistribute it and/or modify
+it under the terms of the GNU General
+Public License as published by the Free
+Software Foundation, either version 3
+of the License, or(at your option)
+any later version.
+
+This program is distributed in the hope
+that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the
+GNU General Public License along with
+this program.  If not, see
+&lt;http://www.gnu.org/licenses/&gt;.</pre>
+
+        <p>Also add information on how to contact you by electronic and paper mail.</p>
+
+        <p>If the program does terminal interaction, make it output a short
+            notice like this when it starts in an interactive mode:</p>
+
+        <pre>&lt;program&gt;  Copyright (C) &lt;year&gt;
+&lt;name of author&gt;
+This program comes with ABSOLUTELY NO
+WARRANTY; for details type `show w'.
+This is free software, and you are
+welcome to redistribute it under
+certain conditions; type `show c'
+for details.</pre>
+
+        <p>The hypothetical commands `show w' and `show c' should show the appropriate
+            parts of the General Public License.  Of course, your program's commands
+            might be different; for a GUI interface, you would use an “about box”.</p>
+
+        <p>You should also get your employer (if you work as a programmer) or school,
+            if any, to sign a “copyright disclaimer” for the program, if necessary.
+            For more information on this, and how to apply and follow the GNU GPL, see
+            <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>.</p>
+
+        <p>The GNU General Public License does not permit incorporating your program
+            into proprietary programs.  If your program is a subroutine library, you
+            may consider it more useful to permit linking proprietary applications with
+            the library.  If this is what you want to do, use the GNU Lesser General
+            Public License instead of this License.  But first, please read
+            <<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>>.</p>
+
+        <hr/>
+
+        <h3>Apache License</h3>
+        <p>Version 2.0, January 2004</p>
+        <p><a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a></p>
+
+        <h3>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</h3>
+
+        <h4>1. Definitions.</h4>
+
+        <p>“License” shall mean the terms and conditions for use, reproduction, and
+            distribution as defined by Sections 1 through 9 of this document.</p>
+
+        <p>“Licensor” shall mean the copyright owner or entity authorized by the
+            copyright owner that is granting the License.</p>
+
+        <p>“Legal Entity” shall mean the union of the acting entity and all other
+            entities that control, are controlled by, or are under common control with
+            that entity. For the purposes of this definition, “control” means (i) the
+            power, direct or indirect, to cause the direction or management of such
+            entity, whether by contract or otherwise, or (ii) ownership of fifty
+            percent (50%) or more of the outstanding shares, or (iii) beneficial
+            ownership of such entity.</p>
+
+        <p>“You” (or “Your”) shall mean an individual or Legal Entity exercising
+            permissions granted by this License.</p>
+
+        <p>“Source” form shall mean the preferred form for making modifications,
+            including but not limited to software source code, documentation source,
+            and configuration files.</p>
+
+        <p>“Object” form shall mean any form resulting from mechanical transformation
+            or translation of a Source form, including but not limited to compiled
+            object code, generated documentation, and conversions to other media types.</p>
+
+        <p>“Work” shall mean the work of authorship, whether in Source or Object form,
+            made available under the License, as indicated by a copyright notice that
+            is included in or attached to the work (an example is provided in the
+            Appendix below).</p>
+
+        <p>“Derivative Works” shall mean any work, whether in Source or Object form,
+            that is based on (or derived from) the Work and for which the editorial
+            revisions, annotations, elaborations, or other modifications represent, as
+            a whole, an original work of authorship. For the purposes of this License,
+            Derivative Works shall not include works that remain separable from, or
+            merely link (or bind by name) to the interfaces of, the Work and Derivative
+            Works thereof.</p>
+
+        <p>“Contribution” shall mean any work of authorship, including the original
+            version of the Work and any modifications or additions to that Work or
+            Derivative Works thereof, that is intentionally submitted to Licensor for
+            inclusion in the Work by the copyright owner or by an individual or Legal
+            Entity authorized to submit on behalf of the copyright owner. For the
+            purposes of this definition, “submitted” means any form of electronic,
+            verbal, or written communication sent to the Licensor or its
+            representatives, including but not limited to communication on electronic
+            mailing lists, source code control systems, and issue tracking systems that
+            are managed by, or on behalf of, the Licensor for the purpose of discussing
+            and improving the Work, but excluding communication that is conspicuously
+            marked or otherwise designated in writing by the copyright owner as “Not a
+            Contribution.”</p>
+
+        <p>“Contributor” shall mean Licensor and any individual or Legal Entity on
+            behalf of whom a Contribution has been received by Licensor and
+            subsequently incorporated within the Work.</p>
+
+        <h4>2. Grant of Copyright License.</h4>
+
+        <p>Subject to the terms and conditions of this License, each Contributor hereby
+            grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+            irrevocable copyright license to reproduce, prepare Derivative Works of, publicly
+            display, publicly perform, sublicense, and distribute the Work and such
+            Derivative Works in Source or Object form.</p>
+
+        <h4>3. Grant of Patent License.</h4>
+
+        <p>Subject to the terms and conditions of this License, each Contributor hereby grants
+            to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+            (except as stated in this section) patent license to make, have made, use,
+            offer to sell, sell, import, and otherwise transfer the Work, where such
+            license applies only to those patent claims licensable by such Contributor
+            that are necessarily infringed by their Contribution(s) alone or by
+            combination of their Contribution(s) with the Work to which such
+            Contribution(s) was submitted. If You institute patent litigation against
+            any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+            that the Work or a Contribution incorporated within the Work constitutes
+            direct or contributory patent infringement, then any patent licenses
+            granted to You under this License for that Work shall terminate as of the
+            date such litigation is filed.</p>
+
+        <h4>4. Redistribution.</h4>
+
+        <p>You may reproduce and distribute copies of the Work or Derivative Works thereof
+            in any medium, with or without modifications, and in Source or Object form, provided
+            that You meet the following conditions:</p>
+
+        <ol>
+            <li>You must give any other recipients of the Work or Derivative Works a
+                copy of this License; and</li>
+
+            <li>You must cause any modified files to carry prominent notices stating
+                that You changed the files; and</li>
+
+            <li>You must retain, in the Source form of any Derivative Works that You
+                distribute, all copyright, patent, trademark, and attribution notices from
+                the Source form of the Work, excluding those notices that do not pertain to
+                any part of the Derivative Works; and</li>
+
+            <li>If the Work includes a “NOTICE” text file as part of its distribution,
+                then any Derivative Works that You distribute must include a readable copy
+                of the attribution notices contained within such NOTICE file, excluding
+                those notices that do not pertain to any part of the Derivative Works, in
+                at least one of the following places: within a NOTICE text file distributed
+                as part of the Derivative Works; within the Source form or documentation,
+                if provided along with the Derivative Works; or, within a display generated
+                by the Derivative Works, if and wherever such third-party notices normally
+                appear. The contents of the NOTICE file are for informational purposes only
+                and do not modify the License. You may add Your own attribution notices
+                within Derivative Works that You distribute, alongside or as an addendum to
+                the NOTICE text from the Work, provided that such additional attribution
+                notices cannot be construed as modifying the License.
+                <br/>
+                <br/>
+                You may add Your own copyright statement to Your modifications and may
+                provide additional or different license terms and conditions for use,
+                reproduction, or distribution of Your modifications, or for any such
+                Derivative Works as a whole, provided Your use, reproduction, and
+                distribution of the Work otherwise complies with the conditions stated in
+                this License.</li>
+        </ol>
+
+        <h4>5. Submission of Contributions.</h4>
+
+        <p>Unless You explicitly state otherwise, any Contribution intentionally submitted for
+            inclusion in the Work by You to the Licensor shall be under the terms and
+            conditions of this License, without any additional terms or conditions.
+            Notwithstanding the above, nothing herein shall supersede or modify the
+            terms of any separate license agreement you may have executed with Licensor
+            regarding such Contributions.</p>
+
+        <h4>6. Trademarks.</h4>
+
+        <p>This License does not grant permission to use the trade names, trademarks, service marks,
+            or product names of the Licensor, except as required for reasonable and customary use
+            in describing the origin of the Work and reproducing the content of the
+            NOTICE file.</p>
+
+        <h4>7. Disclaimer of Warranty.</h4>
+
+        <p>Unless required by applicable law or agreed to in writing, Licensor provides the Work
+            (and each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT
+            WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
+            without limitation, any warranties or conditions of TITLE,
+            NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+            are solely responsible for determining the appropriateness of using or
+            redistributing the Work and assume any risks associated with Your exercise
+            of permissions under this License.</p>
+
+        <h4>8. Limitation of Liability.</h4>
+
+        <p>In no event and under no legal theory, whether in tort (including negligence), contract,
+            or otherwise, unless required by applicable law (such as deliberate and
+            grossly negligent acts) or agreed to in writing, shall any Contributor be
+            liable to You for damages, including any direct, indirect, special,
+            incidental, or consequential damages of any character arising as a result
+            of this License or out of the use or inability to use the Work (including
+            but not limited to damages for loss of goodwill, work stoppage, computer
+            failure or malfunction, or any and all other commercial damages or losses),
+            even if such Contributor has been advised of the possibility of such
+            damages.</p>
+
+        <h4>9. Accepting Warranty or Additional Liability.</h4>
+
+        <p>While redistributing the Work or Derivative Works thereof, You may choose
+            to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+            or other liability obligations and/or rights consistent with this License.
+            However, in accepting such obligations, You may act only on Your own behalf
+            and on Your sole responsibility, not on behalf of any other Contributor,
+            and only if You agree to indemnify, defend, and hold each Contributor
+            harmless for any liability incurred by, or claims asserted against, such
+            Contributor by reason of your accepting any such warranty or additional
+            liability.</p>
+
+        <p>END OF TERMS AND CONDITIONS</p>
+
+        <h3>APPENDIX: How to apply the Apache License to your work</h3>
+
+        <p>To apply the Apache License to your work, attach the following boilerplate
+            notice, with the fields enclosed by brackets “[]” replaced with your own
+            identifying information. (Don’t include the brackets!) The text should be
+            enclosed in the appropriate comment syntax for the file format. We also
+            recommend that a file or class name and description of purpose be included
+            on the same “printed page” as the copyright notice for easier
+            identification within third-party archives.</p>
+        <pre>Copyright [yyyy] [name of copyright owner]
+
+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.</pre>
+
+        <hr/>
+
+        <h3>3-Clause BSD License</h3>
+
+        <p>Redistribution and use in source and binary forms, with or without
+            modification, are permitted provided that the following conditions are
+            met:</p>
+
+        <ul>
+            <li>Redistributions of source code must retain the above copyright
+                notice, this list of conditions and the following disclaimer.</li>
+
+            <li>Redistributions in binary form must reproduce the above
+                copyright notice, this list of conditions and the following disclaimer
+                in the documentation and/or other materials provided with the
+                distribution.</li>
+
+            <li>Neither the names of the copyright owners nor the names of its
+                contributors may be used to endorse or promote products derived from
+                this software without specific prior written permission.</li>
+        </ul>
+
+        <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+            “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+            LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+            A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+            OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+            SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+            LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+            DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+            THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+            (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+            OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/it/about_links.html b/app/src/main/assets/it/about_links.html
index a340b0c2..b8be2347 100644
--- a/app/src/main/assets/it/about_links.html
+++ b/app/src/main/assets/it/about_links.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/it/about_permissions.html b/app/src/main/assets/it/about_permissions.html
index ae3c2374..ec408e23 100644
--- a/app/src/main/assets/it/about_permissions.html
+++ b/app/src/main/assets/it/about_permissions.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/it/about_privacy_policy.html b/app/src/main/assets/it/about_privacy_policy.html
index 7d40d4f3..b5541687 100644
--- a/app/src/main/assets/it/about_privacy_policy.html
+++ b/app/src/main/assets/it/about_privacy_policy.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/it/guide_clear_and_exit.html b/app/src/main/assets/it/guide_clear_and_exit.html
index 352eb689..b473cbe0 100644
--- a/app/src/main/assets/it/guide_clear_and_exit.html
+++ b/app/src/main/assets/it/guide_clear_and_exit.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/it/guide_domain_settings.html b/app/src/main/assets/it/guide_domain_settings.html
index 720026f7..1ece1fd5 100644
--- a/app/src/main/assets/it/guide_domain_settings.html
+++ b/app/src/main/assets/it/guide_domain_settings.html
@@ -1,5 +1,7 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+
+  Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/it/guide_javascript.html b/app/src/main/assets/it/guide_javascript.html
index a57f9035..135e27f2 100644
--- a/app/src/main/assets/it/guide_javascript.html
+++ b/app/src/main/assets/it/guide_javascript.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/it/guide_local_storage.html b/app/src/main/assets/it/guide_local_storage.html
index 9d59cef5..06fb74c0 100644
--- a/app/src/main/assets/it/guide_local_storage.html
+++ b/app/src/main/assets/it/guide_local_storage.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/it/guide_overview.html b/app/src/main/assets/it/guide_overview.html
index 86885889..3755564d 100644
--- a/app/src/main/assets/it/guide_overview.html
+++ b/app/src/main/assets/it/guide_overview.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/it/guide_planned_features.html b/app/src/main/assets/it/guide_planned_features.html
index a1ce9a22..9b73574e 100644
--- a/app/src/main/assets/it/guide_planned_features.html
+++ b/app/src/main/assets/it/guide_planned_features.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/it/guide_tor.html b/app/src/main/assets/it/guide_tor.html
index b62b7710..e9f0a284 100644
--- a/app/src/main/assets/it/guide_tor.html
+++ b/app/src/main/assets/it/guide_tor.html
@@ -1,5 +1,7 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+
+  Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/it/guide_tracking_ids.html b/app/src/main/assets/it/guide_tracking_ids.html
index 32ce7c66..28903d1d 100644
--- a/app/src/main/assets/it/guide_tracking_ids.html
+++ b/app/src/main/assets/it/guide_tracking_ids.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/it/guide_user_agent.html b/app/src/main/assets/it/guide_user_agent.html
index f1ae13a3..be408e72 100644
--- a/app/src/main/assets/it/guide_user_agent.html
+++ b/app/src/main/assets/it/guide_user_agent.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/assets/zh-rTW/about_changelog.html b/app/src/main/assets/zh-rTW/about_changelog.html
index 7e1c18e9..4f402621 100644
--- a/app/src/main/assets/zh-rTW/about_changelog.html
+++ b/app/src/main/assets/zh-rTW/about_changelog.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/about_contributors.html b/app/src/main/assets/zh-rTW/about_contributors.html
index 07528200..9ff18a2b 100644
--- a/app/src/main/assets/zh-rTW/about_contributors.html
+++ b/app/src/main/assets/zh-rTW/about_contributors.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/about_licenses.html b/app/src/main/assets/zh-rTW/about_licenses.html
index 741f8db7..d3fb878c 100644
--- a/app/src/main/assets/zh-rTW/about_licenses.html
+++ b/app/src/main/assets/zh-rTW/about_licenses.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -43,19 +43,24 @@
         <p>Privacy Browser copyright © 2015-2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.</p>
 
         <h3>License</h3>
-        <p>Privacy Browser is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.
-            The full text of the license is at the bottom of this document.</p>
+        <p>Privacy Browser is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>. The full text of the license is below.</p>
 
         <h3>Attributions</h3>
         <p>The list of ad servers used by the ad blocker comes from <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
             Because a list of domain names is a list of facts, it <a href="https://www.copyright.gov/help/faq/faq-protect.html">cannot be copyrighted</a>.</p>
-        <p>Most of the icons in Privacy Browser come from the <a href="https://material.io/icons/">Android Material icon set</a>, which is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.</p>
         <p><img class="left" src="../en/images/privacy_browser.png">
             <img class="left" src="../en/images/privacy_browser_free.png">
             <img class="left" src="../en/images/warning.png">
             <img class="left" src="../en/images/javascript_enabled.png">
-            are derived from ic_security and ic_language. Modifications were made by Soren Stoutner in 2016.</p>
-        <p>The following icons are unchanged except for layout information like color and size. Some of them have been renamed to match their use in the code. The original icons and names are shown below.</p>
+            are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+            The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
+            2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/cookie.png"> cookie was created by Google. It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
+            and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. It is unchanged except for layout information like color and size.</p>
+        <p>The following icons come from the <a href="https://material.io/icons/">Android Material icon set</a>, which is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. They are unchanged except for layout
+            information like color and size. Some of them have been renamed to match their use in the code. The original icons and names are shown below.</p>
         <p><img class="icon" src="../en/images/ic_add.png"> ic_add.</p>
         <p><img class="icon" src="../en/images/ic_arrow_back.png"> ic_arrow_back.</p>
         <p><img class="icon" src="../en/images/ic_arrow_forward.png"> ic_arrow_forward.</p>
@@ -72,29 +77,29 @@
         <p><img class="icon" src="../en/images/ic_expand_less.png"> ic_expand_less.</p>
         <p><img class="icon" src="../en/images/ic_expand_more.png"> ic_expand_more.</p>
         <p><img class="icon" src="../en/images/ic_file_download.png"> ic_file_download.</p>
+        <p><img class="icon" src="../en/images/ic_find_in_page.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder.png"> ic_folder.</p>
         <p><img class="icon" src="../en/images/ic_folder_special.png"> ic_folder_special.</p>
         <p><img class="icon" src="../en/images/ic_home.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_import_contacts.png"> ic_import_contacts.</p>
+        <p><img class="icon" src="../en/images/ic_important_devices.png"> ic_important_devices.</p>
         <p><img class="icon" src="../en/images/ic_info_outline.png"> ic_info_outline.</p>
         <p><img class="icon" src="../en/images/ic_language.png"> ic_language.</p>
         <p><img class="icon" src="../en/images/ic_list.png"> ic_list.</p>
+        <p><img class="icon" src="../en/images/ic_local_activity.png"> ic_local_activity.</p>
         <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
         <p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
         <p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
+        <p><img class="icon" src="../en/images/ic_search.png"> ic_search.</p>
         <p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="../en/images/ic_settings.png"> ic_settings.</p>
         <p><img class="icon" src="../en/images/ic_subtitles.png"> ic_subtitles.</p>
         <p><img class="icon" src="../en/images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_top.png"> ic_vertical_align_top.</p>
+        <p><img class="icon" src="../en/images/ic_visibility_off.png"> ic_visibility_off.</p>
         <p><img class="icon" src="../en/images/ic_web.png"> ic_web.</p>
 
-        <br/>
-
-        <p><img class="left" src="../en/images/cookie.png"> cookie was created by Google.
-            It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>.</p>
-
         <hr/>
 
         <h3>GNU General Public License</h3>
@@ -726,5 +731,318 @@
             copy of the Program in return for a fee.</p>
 
         <p>END OF TERMS AND CONDITIONS</p>
+
+        <h3>How to Apply These Terms to Your New Programs</h3>
+
+        <p>If you develop a new program, and you want it to be of the greatest
+            possible use to the public, the best way to achieve this is to make it
+            free software which everyone can redistribute and change under these terms.</p>
+
+        <p>To do so, attach the following notices to the program.  It is safest
+            to attach them to the start of each source file to most effectively
+            state the exclusion of warranty; and each file should have at least
+            the “copyright” line and a pointer to where the full notice is found.</p>
+
+        <pre>&lt;one line to give the program’s name
+and a brief idea of what it does.&gt;
+Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+
+This program is free software: you can
+redistribute it and/or modify
+it under the terms of the GNU General
+Public License as published by the Free
+Software Foundation, either version 3
+of the License, or(at your option)
+any later version.
+
+This program is distributed in the hope
+that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the
+GNU General Public License along with
+this program.  If not, see
+&lt;http://www.gnu.org/licenses/&gt;.</pre>
+
+        <p>Also add information on how to contact you by electronic and paper mail.</p>
+
+        <p>If the program does terminal interaction, make it output a short
+            notice like this when it starts in an interactive mode:</p>
+
+        <pre>&lt;program&gt;  Copyright (C) &lt;year&gt;
+&lt;name of author&gt;
+This program comes with ABSOLUTELY NO
+WARRANTY; for details type `show w'.
+This is free software, and you are
+welcome to redistribute it under
+certain conditions; type `show c'
+for details.</pre>
+
+        <p>The hypothetical commands `show w' and `show c' should show the appropriate
+            parts of the General Public License.  Of course, your program's commands
+            might be different; for a GUI interface, you would use an “about box”.</p>
+
+        <p>You should also get your employer (if you work as a programmer) or school,
+            if any, to sign a “copyright disclaimer” for the program, if necessary.
+            For more information on this, and how to apply and follow the GNU GPL, see
+            <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>.</p>
+
+        <p>The GNU General Public License does not permit incorporating your program
+            into proprietary programs.  If your program is a subroutine library, you
+            may consider it more useful to permit linking proprietary applications with
+            the library.  If this is what you want to do, use the GNU Lesser General
+            Public License instead of this License.  But first, please read
+            <<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>>.</p>
+
+        <hr/>
+
+        <h3>Apache License</h3>
+        <p>Version 2.0, January 2004</p>
+        <p><a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a></p>
+
+        <h3>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</h3>
+
+        <h4>1. Definitions.</h4>
+
+        <p>“License” shall mean the terms and conditions for use, reproduction, and
+            distribution as defined by Sections 1 through 9 of this document.</p>
+
+        <p>“Licensor” shall mean the copyright owner or entity authorized by the
+            copyright owner that is granting the License.</p>
+
+        <p>“Legal Entity” shall mean the union of the acting entity and all other
+            entities that control, are controlled by, or are under common control with
+            that entity. For the purposes of this definition, “control” means (i) the
+            power, direct or indirect, to cause the direction or management of such
+            entity, whether by contract or otherwise, or (ii) ownership of fifty
+            percent (50%) or more of the outstanding shares, or (iii) beneficial
+            ownership of such entity.</p>
+
+        <p>“You” (or “Your”) shall mean an individual or Legal Entity exercising
+            permissions granted by this License.</p>
+
+        <p>“Source” form shall mean the preferred form for making modifications,
+            including but not limited to software source code, documentation source,
+            and configuration files.</p>
+
+        <p>“Object” form shall mean any form resulting from mechanical transformation
+            or translation of a Source form, including but not limited to compiled
+            object code, generated documentation, and conversions to other media types.</p>
+
+        <p>“Work” shall mean the work of authorship, whether in Source or Object form,
+            made available under the License, as indicated by a copyright notice that
+            is included in or attached to the work (an example is provided in the
+            Appendix below).</p>
+
+        <p>“Derivative Works” shall mean any work, whether in Source or Object form,
+            that is based on (or derived from) the Work and for which the editorial
+            revisions, annotations, elaborations, or other modifications represent, as
+            a whole, an original work of authorship. For the purposes of this License,
+            Derivative Works shall not include works that remain separable from, or
+            merely link (or bind by name) to the interfaces of, the Work and Derivative
+            Works thereof.</p>
+
+        <p>“Contribution” shall mean any work of authorship, including the original
+            version of the Work and any modifications or additions to that Work or
+            Derivative Works thereof, that is intentionally submitted to Licensor for
+            inclusion in the Work by the copyright owner or by an individual or Legal
+            Entity authorized to submit on behalf of the copyright owner. For the
+            purposes of this definition, “submitted” means any form of electronic,
+            verbal, or written communication sent to the Licensor or its
+            representatives, including but not limited to communication on electronic
+            mailing lists, source code control systems, and issue tracking systems that
+            are managed by, or on behalf of, the Licensor for the purpose of discussing
+            and improving the Work, but excluding communication that is conspicuously
+            marked or otherwise designated in writing by the copyright owner as “Not a
+            Contribution.”</p>
+
+        <p>“Contributor” shall mean Licensor and any individual or Legal Entity on
+            behalf of whom a Contribution has been received by Licensor and
+            subsequently incorporated within the Work.</p>
+
+        <h4>2. Grant of Copyright License.</h4>
+
+        <p>Subject to the terms and conditions of this License, each Contributor hereby
+            grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+            irrevocable copyright license to reproduce, prepare Derivative Works of, publicly
+            display, publicly perform, sublicense, and distribute the Work and such
+            Derivative Works in Source or Object form.</p>
+
+        <h4>3. Grant of Patent License.</h4>
+
+        <p>Subject to the terms and conditions of this License, each Contributor hereby grants
+            to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+            (except as stated in this section) patent license to make, have made, use,
+            offer to sell, sell, import, and otherwise transfer the Work, where such
+            license applies only to those patent claims licensable by such Contributor
+            that are necessarily infringed by their Contribution(s) alone or by
+            combination of their Contribution(s) with the Work to which such
+            Contribution(s) was submitted. If You institute patent litigation against
+            any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+            that the Work or a Contribution incorporated within the Work constitutes
+            direct or contributory patent infringement, then any patent licenses
+            granted to You under this License for that Work shall terminate as of the
+            date such litigation is filed.</p>
+
+        <h4>4. Redistribution.</h4>
+
+        <p>You may reproduce and distribute copies of the Work or Derivative Works thereof
+            in any medium, with or without modifications, and in Source or Object form, provided
+            that You meet the following conditions:</p>
+
+        <ol>
+            <li>You must give any other recipients of the Work or Derivative Works a
+                copy of this License; and</li>
+
+            <li>You must cause any modified files to carry prominent notices stating
+                that You changed the files; and</li>
+
+            <li>You must retain, in the Source form of any Derivative Works that You
+                distribute, all copyright, patent, trademark, and attribution notices from
+                the Source form of the Work, excluding those notices that do not pertain to
+                any part of the Derivative Works; and</li>
+
+            <li>If the Work includes a “NOTICE” text file as part of its distribution,
+                then any Derivative Works that You distribute must include a readable copy
+                of the attribution notices contained within such NOTICE file, excluding
+                those notices that do not pertain to any part of the Derivative Works, in
+                at least one of the following places: within a NOTICE text file distributed
+                as part of the Derivative Works; within the Source form or documentation,
+                if provided along with the Derivative Works; or, within a display generated
+                by the Derivative Works, if and wherever such third-party notices normally
+                appear. The contents of the NOTICE file are for informational purposes only
+                and do not modify the License. You may add Your own attribution notices
+                within Derivative Works that You distribute, alongside or as an addendum to
+                the NOTICE text from the Work, provided that such additional attribution
+                notices cannot be construed as modifying the License.
+                <br/>
+                <br/>
+                You may add Your own copyright statement to Your modifications and may
+                provide additional or different license terms and conditions for use,
+                reproduction, or distribution of Your modifications, or for any such
+                Derivative Works as a whole, provided Your use, reproduction, and
+                distribution of the Work otherwise complies with the conditions stated in
+                this License.</li>
+        </ol>
+
+        <h4>5. Submission of Contributions.</h4>
+
+        <p>Unless You explicitly state otherwise, any Contribution intentionally submitted for
+            inclusion in the Work by You to the Licensor shall be under the terms and
+            conditions of this License, without any additional terms or conditions.
+            Notwithstanding the above, nothing herein shall supersede or modify the
+            terms of any separate license agreement you may have executed with Licensor
+            regarding such Contributions.</p>
+
+        <h4>6. Trademarks.</h4>
+
+        <p>This License does not grant permission to use the trade names, trademarks, service marks,
+            or product names of the Licensor, except as required for reasonable and customary use
+            in describing the origin of the Work and reproducing the content of the
+            NOTICE file.</p>
+
+        <h4>7. Disclaimer of Warranty.</h4>
+
+        <p>Unless required by applicable law or agreed to in writing, Licensor provides the Work
+            (and each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT
+            WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
+            without limitation, any warranties or conditions of TITLE,
+            NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+            are solely responsible for determining the appropriateness of using or
+            redistributing the Work and assume any risks associated with Your exercise
+            of permissions under this License.</p>
+
+        <h4>8. Limitation of Liability.</h4>
+
+        <p>In no event and under no legal theory, whether in tort (including negligence), contract,
+            or otherwise, unless required by applicable law (such as deliberate and
+            grossly negligent acts) or agreed to in writing, shall any Contributor be
+            liable to You for damages, including any direct, indirect, special,
+            incidental, or consequential damages of any character arising as a result
+            of this License or out of the use or inability to use the Work (including
+            but not limited to damages for loss of goodwill, work stoppage, computer
+            failure or malfunction, or any and all other commercial damages or losses),
+            even if such Contributor has been advised of the possibility of such
+            damages.</p>
+
+        <h4>9. Accepting Warranty or Additional Liability.</h4>
+
+        <p>While redistributing the Work or Derivative Works thereof, You may choose
+            to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+            or other liability obligations and/or rights consistent with this License.
+            However, in accepting such obligations, You may act only on Your own behalf
+            and on Your sole responsibility, not on behalf of any other Contributor,
+            and only if You agree to indemnify, defend, and hold each Contributor
+            harmless for any liability incurred by, or claims asserted against, such
+            Contributor by reason of your accepting any such warranty or additional
+            liability.</p>
+
+        <p>END OF TERMS AND CONDITIONS</p>
+
+        <h3>APPENDIX: How to apply the Apache License to your work</h3>
+
+        <p>To apply the Apache License to your work, attach the following boilerplate
+            notice, with the fields enclosed by brackets “[]” replaced with your own
+            identifying information. (Don’t include the brackets!) The text should be
+            enclosed in the appropriate comment syntax for the file format. We also
+            recommend that a file or class name and description of purpose be included
+            on the same “printed page” as the copyright notice for easier
+            identification within third-party archives.</p>
+        <pre>Copyright [yyyy] [name of copyright owner]
+
+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.</pre>
+
+        <hr/>
+
+        <h3>3-Clause BSD License</h3>
+
+        <p>Redistribution and use in source and binary forms, with or without
+            modification, are permitted provided that the following conditions are
+            met:</p>
+
+        <ul>
+            <li>Redistributions of source code must retain the above copyright
+                notice, this list of conditions and the following disclaimer.</li>
+
+            <li>Redistributions in binary form must reproduce the above
+                copyright notice, this list of conditions and the following disclaimer
+                in the documentation and/or other materials provided with the
+                distribution.</li>
+
+            <li>Neither the names of the copyright owners nor the names of its
+                contributors may be used to endorse or promote products derived from
+                this software without specific prior written permission.</li>
+        </ul>
+
+        <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+            “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+            LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+            A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+            OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+            SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+            LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+            DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+            THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+            (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+            OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/zh-rTW/about_links.html b/app/src/main/assets/zh-rTW/about_links.html
index b47b1b5d..1cce9061 100644
--- a/app/src/main/assets/zh-rTW/about_links.html
+++ b/app/src/main/assets/zh-rTW/about_links.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/about_permissions.html b/app/src/main/assets/zh-rTW/about_permissions.html
index 242f72f0..4fda4bac 100644
--- a/app/src/main/assets/zh-rTW/about_permissions.html
+++ b/app/src/main/assets/zh-rTW/about_permissions.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/about_privacy_policy.html b/app/src/main/assets/zh-rTW/about_privacy_policy.html
index 6368bbdc..5fdcce18 100644
--- a/app/src/main/assets/zh-rTW/about_privacy_policy.html
+++ b/app/src/main/assets/zh-rTW/about_privacy_policy.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/guide_clear_and_exit.html b/app/src/main/assets/zh-rTW/guide_clear_and_exit.html
index 58a0883e..a0fdcf54 100644
--- a/app/src/main/assets/zh-rTW/guide_clear_and_exit.html
+++ b/app/src/main/assets/zh-rTW/guide_clear_and_exit.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/guide_domain_settings.html b/app/src/main/assets/zh-rTW/guide_domain_settings.html
index de6e4632..5c69fbae 100644
--- a/app/src/main/assets/zh-rTW/guide_domain_settings.html
+++ b/app/src/main/assets/zh-rTW/guide_domain_settings.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/guide_javascript.html b/app/src/main/assets/zh-rTW/guide_javascript.html
index 734934d3..ab132415 100644
--- a/app/src/main/assets/zh-rTW/guide_javascript.html
+++ b/app/src/main/assets/zh-rTW/guide_javascript.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/guide_local_storage.html b/app/src/main/assets/zh-rTW/guide_local_storage.html
index 165c279d..49254abb 100644
--- a/app/src/main/assets/zh-rTW/guide_local_storage.html
+++ b/app/src/main/assets/zh-rTW/guide_local_storage.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/guide_overview.html b/app/src/main/assets/zh-rTW/guide_overview.html
index 673b8497..e2d37864 100644
--- a/app/src/main/assets/zh-rTW/guide_overview.html
+++ b/app/src/main/assets/zh-rTW/guide_overview.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/guide_planned_features.html b/app/src/main/assets/zh-rTW/guide_planned_features.html
index 49e73802..b1d81245 100644
--- a/app/src/main/assets/zh-rTW/guide_planned_features.html
+++ b/app/src/main/assets/zh-rTW/guide_planned_features.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/guide_tor.html b/app/src/main/assets/zh-rTW/guide_tor.html
index d8bd26f7..be99b0b6 100644
--- a/app/src/main/assets/zh-rTW/guide_tor.html
+++ b/app/src/main/assets/zh-rTW/guide_tor.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/guide_tracking_ids.html b/app/src/main/assets/zh-rTW/guide_tracking_ids.html
index cca3e37a..25358a94 100644
--- a/app/src/main/assets/zh-rTW/guide_tracking_ids.html
+++ b/app/src/main/assets/zh-rTW/guide_tracking_ids.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/assets/zh-rTW/guide_user_agent.html b/app/src/main/assets/zh-rTW/guide_user_agent.html
index 2ee7574c..d1be2ba4 100644
--- a/app/src/main/assets/zh-rTW/guide_user_agent.html
+++ b/app/src/main/assets/zh-rTW/guide_user_agent.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.java
index bc5c7fb6..2251736b 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java
index f49c502e..8775cc20 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java
index 323c1099..c996a677 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainSettingsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainSettingsActivity.java
index 43bc7c70..ccb444a7 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainSettingsActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainSettingsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java
index e748a796..2500fe9e 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
index c929757b..ca7756e9 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
index 9551b16c..353a8d16 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * Download cookie code contributed 2017 Hendrik Knackstedt.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java
index ddeb7b7b..9c82f070 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/adapters/HistoryArrayAdapter.java b/app/src/main/java/com/stoutner/privacybrowser/adapters/HistoryArrayAdapter.java
index 1135638c..a606e83d 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/adapters/HistoryArrayAdapter.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/adapters/HistoryArrayAdapter.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+/*
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/definitions/History.java b/app/src/main/java/com/stoutner/privacybrowser/definitions/History.java
index 180d4cce..9d54cd9e 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/definitions/History.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/definitions/History.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java
index 5b18fe4d..4d99a206 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.java
index 199ee8d3..e6efc707 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java
index d841bf7e..d703a394 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.java
index 37d007a4..89e27f54 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/DownloadFileDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/DownloadFileDialog.java
index aa788678..a348fb90 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/DownloadFileDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/DownloadFileDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/DownloadImageDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/DownloadImageDialog.java
index eb45dd1b..7a0aeccd 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/DownloadImageDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/DownloadImageDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.java
index 60571580..6e868ee7 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.java
index a33e9820..bccd8006 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.java
index a8012a4e..4e5b7f36 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.java
index 8e140d28..78108d0a 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/UrlHistoryDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/UrlHistoryDialog.java
index 708101f1..3c418d39 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/UrlHistoryDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/UrlHistoryDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.java
index 1c493d2b..597a20f1 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
index ee36de63..955dca25 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
index 0d35ead6..bdd0302d 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java
index 7b3b450a..5925f8c9 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
index 06fd18ec..f64a9b5d 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -51,7 +51,10 @@ public class SettingsFragment extends PreferenceFragment {
         final Preference saveFormDataPreference = findPreference("save_form_data_enabled");
         final Preference userAgentPreference = findPreference("user_agent");
         final Preference customUserAgentPreference = findPreference("custom_user_agent");
+        final Preference blockAdsPreference = findPreference("block_ads");
+        final Preference incognitoModePreference = findPreference("incognito_mode");
         final Preference doNotTrackPreference = findPreference("do_not_track");
+        final Preference proxyThroughOrbotPreference = findPreference("proxy_through_orbot");
         final Preference torHomepagePreference = findPreference("tor_homepage");
         final Preference torSearchPreference = findPreference("tor_search");
         final Preference torSearchCustomURLPreference = findPreference("tor_search_custom_url");
@@ -76,6 +79,7 @@ public class SettingsFragment extends PreferenceFragment {
         boolean javaScriptEnabledBoolean = savedPreferences.getBoolean("javascript_enabled", false);
         boolean firstPartyCookiesEnabledBoolean = savedPreferences.getBoolean("first_party_cookies_enabled", false);
         boolean thirdPartyCookiesEnabledBoolean = savedPreferences.getBoolean("third_party_cookies_enabled", false);
+        boolean proxyThroughOrbotBoolean = savedPreferences.getBoolean("proxy_through_orbot", false);
 
         // Only enable `thirdPartyCookiesPreference` if `firstPartyCookiesEnabledBoolean` is `true` and API >= 21.
         thirdPartyCookiesPreference.setEnabled(firstPartyCookiesEnabledBoolean && (Build.VERSION.SDK_INT >= 21));
@@ -126,7 +130,7 @@ public class SettingsFragment extends PreferenceFragment {
         torSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_search_custom_url", ""));
 
         // Enable the Tor custom URL search options only if proxying through Orbot and the search is set to `Custom URL`.
-        torSearchCustomURLPreference.setEnabled(savedPreferences.getBoolean("proxy_through_orbot", false) && torSearchString.equals("Custom URL"));
+        torSearchCustomURLPreference.setEnabled(proxyThroughOrbotBoolean && torSearchString.equals("Custom URL"));
 
 
         // Set the search URL as the summary text for the search preference when the preference screen is loaded.  The default is `https://duckduckgo.com/html/?q=`.
@@ -199,9 +203,23 @@ public class SettingsFragment extends PreferenceFragment {
 
         // Set the `customUserAgentPreference` icon.
         if (customUserAgentPreference.isEnabled()) {
-            customUserAgentPreference.setIcon(R.drawable.user_agent_enabled);
+            customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled);
         } else {
-            customUserAgentPreference.setIcon(R.drawable.user_agent_ghosted);
+            customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted);
+        }
+
+        // Set the `blockAdsPreference` icon.
+        if (savedPreferences.getBoolean("block_ads", true)) {
+            blockAdsPreference.setIcon(R.drawable.block_ads_enabled);
+        } else {
+            blockAdsPreference.setIcon(R.drawable.block_ads_disabled);
+        }
+
+        // Set the `incognitoModePreference` icon.
+        if (savedPreferences.getBoolean("incognito_mode", false)) {
+            incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled);
+        } else {
+            incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled);
         }
 
         // Set the `doNotTrackPreference` icon.
@@ -211,6 +229,21 @@ public class SettingsFragment extends PreferenceFragment {
             doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled);
         }
 
+        // Set the `proxyThroughOrbotPreference` icon.
+        if (proxyThroughOrbotBoolean) {
+            proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled);
+        } else {
+            proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled);
+        }
+
+        // Set the `searchCustomURLPreference` icon.
+        if (searchCustomURLPreference.isEnabled()) {
+            searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled);
+        } else {
+            searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted);
+        }
+
+
         // Listen for preference changes.
         preferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
@@ -304,7 +337,7 @@ public class SettingsFragment extends PreferenceFragment {
 
                                 // Update `customUserAgentPreference`.
                                 customUserAgentPreference.setEnabled(false);
-                                customUserAgentPreference.setIcon(R.drawable.user_agent_ghosted);
+                                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted);
                                 break;
 
                             case "Custom user agent":
@@ -313,7 +346,7 @@ public class SettingsFragment extends PreferenceFragment {
 
                                 // Update `customUserAgentPreference`.
                                 customUserAgentPreference.setEnabled(true);
-                                customUserAgentPreference.setIcon(R.drawable.user_agent_enabled);
+                                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled);
                                 break;
 
                             default:
@@ -322,7 +355,7 @@ public class SettingsFragment extends PreferenceFragment {
 
                                 // Update `customUserAgentPreference`.
                                 customUserAgentPreference.setEnabled(false);
-                                customUserAgentPreference.setIcon(R.drawable.user_agent_ghosted);
+                                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted);
                                 break;
                         }
                         break;
@@ -332,6 +365,24 @@ public class SettingsFragment extends PreferenceFragment {
                         customUserAgentPreference.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
                         break;
 
+                    case "block_ads":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("block_ads", true)) {
+                            blockAdsPreference.setIcon(R.drawable.block_ads_enabled);
+                        } else {
+                            blockAdsPreference.setIcon(R.drawable.block_ads_disabled);
+                        }
+                        break;
+
+                    case "incognito_mode":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("incognito_mode", false)) {
+                            incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled);
+                        } else {
+                            incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled);
+                        }
+                        break;
+
                     case "do_not_track":
                         // Update the icon.
                         if (sharedPreferences.getBoolean("do_not_track", false)) {
@@ -349,6 +400,13 @@ public class SettingsFragment extends PreferenceFragment {
 
                         // Enable the Tor custom URL search option only if `currentProxyThroughOrbot` is true and the search is set to `Custom URL`.
                         torSearchCustomURLPreference.setEnabled(currentProxyThroughOrbot && currentTorSearchString.equals("Custom URL"));
+
+                        // Update the icon.
+                        if (currentProxyThroughOrbot) {
+                            proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled);
+                        } else {
+                            proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled);
+                        }
                         break;
 
                     case "tor_homepage":
@@ -379,15 +437,25 @@ public class SettingsFragment extends PreferenceFragment {
                         break;
 
                     case "search":
+                        // Store the new search string.
                         String newSearchString = sharedPreferences.getString("search", "https://duckduckgo.com/html/?q=");
-                        if (newSearchString.equals("Custom URL")) {  // Set the summary text to `R.string.custom_url`, which is translated.
+
+                        // Update `searchPreference` and `searchCustomURLPreference`.
+                        if (newSearchString.equals("Custom URL")) {  // `Custom URL` is selected.
+                            // Set the summary text to `R.string.custom_url`, which is translated.
                             searchPreference.setSummary(R.string.custom_url);
-                        } else {  // Set the new search URL as the summary text for the JavaScript-disabled search preference.
+
+                            // Update `searchCustomURLPreference`.
+                            searchCustomURLPreference.setEnabled(true);
+                            searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled);
+                        } else {  // `Custom URL` is not selected.
+                            // Set the summary text to `newSearchString`.
                             searchPreference.setSummary(newSearchString);
-                        }
 
-                        // Enable or disable `searchCustomURLPreference`.
-                        searchCustomURLPreference.setEnabled(newSearchString.equals("Custom URL"));
+                            // Update `searchCustomURLPreference`.
+                            searchCustomURLPreference.setEnabled(false);
+                            searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted);
+                        }
                         break;
 
                     case "search_custom_url":
diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/BookmarksDatabaseHelper.java b/app/src/main/java/com/stoutner/privacybrowser/helpers/BookmarksDatabaseHelper.java
index a743010c..0cd2b683 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/helpers/BookmarksDatabaseHelper.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/BookmarksDatabaseHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java
index 24ceaba5..0e1448b4 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java b/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
index 154e6d10..696bd504 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
diff --git a/app/src/main/res/drawable/about.xml b/app/src/main/res/drawable/about.xml
index 1057e2c4..b61f8172 100644
--- a/app/src/main/res/drawable/about.xml
+++ b/app/src/main/res/drawable/about.xml
@@ -1,5 +1,4 @@
 <!-- `about.xml` comes from the Android Material icon set, where it is called `ic_info_outline`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/add.xml b/app/src/main/res/drawable/add.xml
index e49e3354..752e75c9 100644
--- a/app/src/main/res/drawable/add.xml
+++ b/app/src/main/res/drawable/add.xml
@@ -1,5 +1,4 @@
 <!-- `add.xml` comes from the Android Material icon set, where it is called `ic_add`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/back.xml b/app/src/main/res/drawable/back.xml
index 0c007ff5..b8581cf3 100644
--- a/app/src/main/res/drawable/back.xml
+++ b/app/src/main/res/drawable/back.xml
@@ -1,6 +1,6 @@
 <!-- `back.xml` comes from the Android Material icon set, where it is called `ic_arrow_back`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/block_ads_disabled.xml b/app/src/main/res/drawable/block_ads_disabled.xml
new file mode 100644
index 00000000..90199e1f
--- /dev/null
+++ b/app/src/main/res/drawable/block_ads_disabled.xml
@@ -0,0 +1,12 @@
+<!-- `block_ads_disabled.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M20,12c0,-1.1 0.9,-2 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2zM15.58,16.8L12,14.5l-3.58,2.3 1.08,-4.12 -3.29,-2.69 4.24,-0.25L12,5.8l1.54,3.95 4.24,0.25 -3.29,2.69 1.09,4.11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/block_ads_enabled.xml b/app/src/main/res/drawable/block_ads_enabled.xml
new file mode 100644
index 00000000..de1efc61
--- /dev/null
+++ b/app/src/main/res/drawable/block_ads_enabled.xml
@@ -0,0 +1,12 @@
+<!-- `block_ads_enabled.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M20,12c0,-1.1 0.9,-2 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2zM15.58,16.8L12,14.5l-3.58,2.3 1.08,-4.12 -3.29,-2.69 4.24,-0.25L12,5.8l1.54,3.95 4.24,0.25 -3.29,2.69 1.09,4.11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/bookmarks.xml b/app/src/main/res/drawable/bookmarks.xml
index 29b2648d..995775bc 100644
--- a/app/src/main/res/drawable/bookmarks.xml
+++ b/app/src/main/res/drawable/bookmarks.xml
@@ -1,5 +1,4 @@
 <!-- `bookmarks.xml` comes from the Android Material icon set, where it is called `ic_bookmark_border`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/close.xml b/app/src/main/res/drawable/close.xml
index d6f6fcc8..c0dff6b8 100644
--- a/app/src/main/res/drawable/close.xml
+++ b/app/src/main/res/drawable/close.xml
@@ -1,5 +1,4 @@
 <!-- `close.xml` comes from the Android Material icon set, where it is called `ic_close`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/cookies_disabled.xml b/app/src/main/res/drawable/cookies_disabled.xml
index b9b52ea3..df2fe2ae 100644
--- a/app/src/main/res/drawable/cookies_disabled.xml
+++ b/app/src/main/res/drawable/cookies_disabled.xml
@@ -1,6 +1,6 @@
 <!-- `cookies_disabled.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/cookies_enabled.xml b/app/src/main/res/drawable/cookies_enabled.xml
index 7fef4cdf..383573d6 100644
--- a/app/src/main/res/drawable/cookies_enabled.xml
+++ b/app/src/main/res/drawable/cookies_enabled.xml
@@ -1,6 +1,6 @@
 <!-- `cookies_enabled.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/cookies_ghosted.xml b/app/src/main/res/drawable/cookies_ghosted.xml
index 1c7184f3..aa265522 100644
--- a/app/src/main/res/drawable/cookies_ghosted.xml
+++ b/app/src/main/res/drawable/cookies_ghosted.xml
@@ -1,6 +1,6 @@
 <!-- `cookies_warning.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/cookies_warning.xml b/app/src/main/res/drawable/cookies_warning.xml
index 51239adc..d8efc4d0 100644
--- a/app/src/main/res/drawable/cookies_warning.xml
+++ b/app/src/main/res/drawable/cookies_warning.xml
@@ -1,6 +1,6 @@
 <!-- `cookies_warning.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/create_folder.xml b/app/src/main/res/drawable/create_folder.xml
index 957a261c..7d060b8c 100644
--- a/app/src/main/res/drawable/create_folder.xml
+++ b/app/src/main/res/drawable/create_folder.xml
@@ -1,6 +1,6 @@
 <!-- `create_folder.xml` comes from the Android Material icon set, where it is called `ic_create_new_folder`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/custom_user_agent_enabled.xml b/app/src/main/res/drawable/custom_user_agent_enabled.xml
new file mode 100644
index 00000000..817d6233
--- /dev/null
+++ b/app/src/main/res/drawable/custom_user_agent_enabled.xml
@@ -0,0 +1,18 @@
+<!-- `custom_user_agent_enabled.xml` comes from the Android Material icon set, where it is called `ic_important_devices_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M23,11.01L18,11c-0.55,0 -1,0.45 -1,1v9c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1v-9c0,-0.55 -0.45,-0.99 -1,-0.99zM23,20h-5v-7h5v7zM20,2L2,2C0.89,2 0,2.89 0,4v12c0,1.1 0.89,2 2,2h7v2L7,20v2h8v-2h-2v-2h2v-2L2,16L2,4h18v5h2L22,4c0,-1.11 -0.9,-2 -2,-2zM11.97,9L11,6l-0.97,3L7,9l2.47,1.76 -0.94,2.91 2.47,-1.8 2.47,1.8 -0.94,-2.91L15,9h-3.03z"/>
+</vector>
diff --git a/app/src/main/res/drawable/custom_user_agent_ghosted.xml b/app/src/main/res/drawable/custom_user_agent_ghosted.xml
new file mode 100644
index 00000000..86bdf912
--- /dev/null
+++ b/app/src/main/res/drawable/custom_user_agent_ghosted.xml
@@ -0,0 +1,18 @@
+<!-- `custom_user_agent_ghosted.xml` comes from the Android Material icon set, where it is called `ic_important_devices_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M23,11.01L18,11c-0.55,0 -1,0.45 -1,1v9c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1v-9c0,-0.55 -0.45,-0.99 -1,-0.99zM23,20h-5v-7h5v7zM20,2L2,2C0.89,2 0,2.89 0,4v12c0,1.1 0.89,2 2,2h7v2L7,20v2h8v-2h-2v-2h2v-2L2,16L2,4h18v5h2L22,4c0,-1.11 -0.9,-2 -2,-2zM11.97,9L11,6l-0.97,3L7,9l2.47,1.76 -0.94,2.91 2.47,-1.8 2.47,1.8 -0.94,-2.91L15,9h-3.03z"/>
+</vector>
diff --git a/app/src/main/res/drawable/delete.xml b/app/src/main/res/drawable/delete.xml
index 15b276bd..853d272c 100644
--- a/app/src/main/res/drawable/delete.xml
+++ b/app/src/main/res/drawable/delete.xml
@@ -1,5 +1,4 @@
 <!-- `delete.xml` comes from the Android Material icon set, where it is called `ic_delete`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/delete_blue.xml b/app/src/main/res/drawable/delete_blue.xml
index 9c35972a..83e524cf 100644
--- a/app/src/main/res/drawable/delete_blue.xml
+++ b/app/src/main/res/drawable/delete_blue.xml
@@ -1,5 +1,4 @@
 <!-- `delete_blue.xml` comes from the Android Material icon set, where it is called `ic_delete`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/do_not_track_disabled.xml b/app/src/main/res/drawable/do_not_track_disabled.xml
index 77ba07e1..7303b01e 100644
--- a/app/src/main/res/drawable/do_not_track_disabled.xml
+++ b/app/src/main/res/drawable/do_not_track_disabled.xml
@@ -1,6 +1,6 @@
 <!-- `do_not_track_disabled.xml` comes from the Android Material icon set, where it is called `ic_location_off`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -11,6 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
diff --git a/app/src/main/res/drawable/do_not_track_enabled.xml b/app/src/main/res/drawable/do_not_track_enabled.xml
index c60ecc1b..dafb11e6 100644
--- a/app/src/main/res/drawable/do_not_track_enabled.xml
+++ b/app/src/main/res/drawable/do_not_track_enabled.xml
@@ -1,6 +1,6 @@
 <!-- `do_not_track_enabled.xml` comes from the Android Material icon set, where it is called `ic_location_off`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -11,6 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
diff --git a/app/src/main/res/drawable/dom_storage_disabled.xml b/app/src/main/res/drawable/dom_storage_disabled.xml
index b6a8d83f..d6180570 100644
--- a/app/src/main/res/drawable/dom_storage_disabled.xml
+++ b/app/src/main/res/drawable/dom_storage_disabled.xml
@@ -1,6 +1,6 @@
 <!-- `dom_storage_disabled.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/dom_storage_enabled.xml b/app/src/main/res/drawable/dom_storage_enabled.xml
index 5d8914e4..0c297bda 100644
--- a/app/src/main/res/drawable/dom_storage_enabled.xml
+++ b/app/src/main/res/drawable/dom_storage_enabled.xml
@@ -1,6 +1,6 @@
 <!-- `dom_storage_enabled.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/dom_storage_ghosted.xml b/app/src/main/res/drawable/dom_storage_ghosted.xml
index a0cc7557..6ae15e56 100644
--- a/app/src/main/res/drawable/dom_storage_ghosted.xml
+++ b/app/src/main/res/drawable/dom_storage_ghosted.xml
@@ -1,6 +1,6 @@
 <!-- `dom_storage_ghosted.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/domains.xml b/app/src/main/res/drawable/domains.xml
index 5b09eb38..3d756b69 100644
--- a/app/src/main/res/drawable/domains.xml
+++ b/app/src/main/res/drawable/domains.xml
@@ -1,6 +1,6 @@
 <!-- `domains.xml` comes from the Android Material icon set, where it is called `ic_import_contacts`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/downloads.xml b/app/src/main/res/drawable/downloads.xml
index 9e493251..f43a105f 100644
--- a/app/src/main/res/drawable/downloads.xml
+++ b/app/src/main/res/drawable/downloads.xml
@@ -1,5 +1,4 @@
 <!-- `downloads.xml` comes from the Android Material icon set, where it is called `ic_file_download`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/edit.xml b/app/src/main/res/drawable/edit.xml
index 48ebff80..115d4bfd 100644
--- a/app/src/main/res/drawable/edit.xml
+++ b/app/src/main/res/drawable/edit.xml
@@ -1,6 +1,6 @@
 <!-- `edit.xml` comes from the Android Material icon set, where it is called `ic_edit`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/exit.xml b/app/src/main/res/drawable/exit.xml
index 71516f41..9adf3d84 100644
--- a/app/src/main/res/drawable/exit.xml
+++ b/app/src/main/res/drawable/exit.xml
@@ -1,6 +1,6 @@
 <!-- `exit.xml` comes from the Android Material icon set, where it is called `ic_exit_to_app`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/folder_dark_blue.xml b/app/src/main/res/drawable/folder_dark_blue.xml
index 87036016..501733d9 100644
--- a/app/src/main/res/drawable/folder_dark_blue.xml
+++ b/app/src/main/res/drawable/folder_dark_blue.xml
@@ -1,5 +1,4 @@
 <!-- `folder_dark_blue.xml` comes from the Android Material icon set, where it is called `ic_folder`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/folder_gray.xml b/app/src/main/res/drawable/folder_gray.xml
index 1df998da..18dfc195 100644
--- a/app/src/main/res/drawable/folder_gray.xml
+++ b/app/src/main/res/drawable/folder_gray.xml
@@ -1,5 +1,4 @@
 <!-- `folder_gray.xml` comes from the Android Material icon set, where it is called `ic_folder`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/font_size.xml b/app/src/main/res/drawable/font_size.xml
index 5b6bf635..c8d11837 100644
--- a/app/src/main/res/drawable/font_size.xml
+++ b/app/src/main/res/drawable/font_size.xml
@@ -1,6 +1,6 @@
 <!-- `font_size.xml` comes from the Android Material icon set, where it is called `ic_text_fields`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/form_data_disabled.xml b/app/src/main/res/drawable/form_data_disabled.xml
index 7f44621f..57cf70a6 100644
--- a/app/src/main/res/drawable/form_data_disabled.xml
+++ b/app/src/main/res/drawable/form_data_disabled.xml
@@ -1,6 +1,6 @@
 <!-- `form_data_disabled.xml` comes from the Android Material icon set, where it is called `ic_subtitles`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/form_data_enabled.xml b/app/src/main/res/drawable/form_data_enabled.xml
index 7518407d..53546ce6 100644
--- a/app/src/main/res/drawable/form_data_enabled.xml
+++ b/app/src/main/res/drawable/form_data_enabled.xml
@@ -1,6 +1,6 @@
 <!-- `form_data_enabled.xml` comes from the Android Material icon set, where it is called `ic_subtitles`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/forward.xml b/app/src/main/res/drawable/forward.xml
index 5cdce49e..593cd840 100644
--- a/app/src/main/res/drawable/forward.xml
+++ b/app/src/main/res/drawable/forward.xml
@@ -1,6 +1,6 @@
 <!-- `forward.xml` comes from the Android Material icon set, where it is called `ic_arrow_forward`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/guide.xml b/app/src/main/res/drawable/guide.xml
index b914018d..daa8d2ed 100644
--- a/app/src/main/res/drawable/guide.xml
+++ b/app/src/main/res/drawable/guide.xml
@@ -1,6 +1,6 @@
 <!-- `guide.xml` comes from the Android Material icon set, where it is called `ic_import_contacts`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/history.xml b/app/src/main/res/drawable/history.xml
index f7eb1de7..17118dd4 100644
--- a/app/src/main/res/drawable/history.xml
+++ b/app/src/main/res/drawable/history.xml
@@ -1,6 +1,6 @@
 <!-- `history.xml` comes from the Android Material icon set, where it is called `ic_list`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/home.xml b/app/src/main/res/drawable/home.xml
index 6edf7a1e..a87c3b75 100644
--- a/app/src/main/res/drawable/home.xml
+++ b/app/src/main/res/drawable/home.xml
@@ -1,5 +1,4 @@
 <!-- `home.xml` comes from the Android Material icon set, where it is called `ic_home`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/incognito_mode_disabled.xml b/app/src/main/res/drawable/incognito_mode_disabled.xml
new file mode 100644
index 00000000..277149c9
--- /dev/null
+++ b/app/src/main/res/drawable/incognito_mode_disabled.xml
@@ -0,0 +1,18 @@
+<!-- `incognito_mode_disabled.xml` comes from the Android Material icon set, where it is called `ic_visibility_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/incognito_mode_enabled.xml b/app/src/main/res/drawable/incognito_mode_enabled.xml
new file mode 100644
index 00000000..a8fee863
--- /dev/null
+++ b/app/src/main/res/drawable/incognito_mode_enabled.xml
@@ -0,0 +1,18 @@
+<!-- `incognito_mode_enabled.xml` comes from the Android Material icon set, where it is called `ic_visibility_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/javascript_enabled.xml b/app/src/main/res/drawable/javascript_enabled.xml
index 3af89ca6..02c9b168 100644
--- a/app/src/main/res/drawable/javascript_enabled.xml
+++ b/app/src/main/res/drawable/javascript_enabled.xml
@@ -1,5 +1,5 @@
 <!-- `javascript_enabled.xml` is derived from `ic_security` and `ic_language`, which are part of the Android Material icon set.  They are released under the Apache License 2.0.
-    Modifications were made by Soren Stoutner <soren@stoutner.com> in 2016 and are released under the GPLv3+ license. -->
+    Modifications copyright Soren Stoutner <soren@stoutner.com> 2016.  The resulting image is released under the GPLv3+ license. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/move_bookmark_down_disabled.xml b/app/src/main/res/drawable/move_bookmark_down_disabled.xml
index 17be8698..e6217f08 100644
--- a/app/src/main/res/drawable/move_bookmark_down_disabled.xml
+++ b/app/src/main/res/drawable/move_bookmark_down_disabled.xml
@@ -1,5 +1,4 @@
 <!-- `move_bookmark_down_disabled.xml` comes from the Android Material icon set, where it is called `ic_vertical_align_bottom`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/move_bookmark_down_enabled.xml b/app/src/main/res/drawable/move_bookmark_down_enabled.xml
index c8cfc24d..0b86a9ca 100644
--- a/app/src/main/res/drawable/move_bookmark_down_enabled.xml
+++ b/app/src/main/res/drawable/move_bookmark_down_enabled.xml
@@ -1,5 +1,4 @@
 <!-- `move_bookmark_down_enabled.xml` comes from the Android Material icon set, where it is called `ic_vertical_align_bottom`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/move_bookmark_up_disabled.xml b/app/src/main/res/drawable/move_bookmark_up_disabled.xml
index b109d40c..3245337a 100644
--- a/app/src/main/res/drawable/move_bookmark_up_disabled.xml
+++ b/app/src/main/res/drawable/move_bookmark_up_disabled.xml
@@ -1,5 +1,4 @@
 <!-- `move_bookmark_up_disabled.xml` comes from the Android Material icon set, where it is called `ic_vertical_align_top`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/move_bookmark_up_enabled.xml b/app/src/main/res/drawable/move_bookmark_up_enabled.xml
index eb22338d..74609253 100644
--- a/app/src/main/res/drawable/move_bookmark_up_enabled.xml
+++ b/app/src/main/res/drawable/move_bookmark_up_enabled.xml
@@ -1,5 +1,4 @@
 <!-- `move_bookmark_up_enabled.xml` comes from the Android Material icon set, where it is called `ic_vertical_align_top`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/move_to_folder.xml b/app/src/main/res/drawable/move_to_folder.xml
index 14f3f448..6fb70c2e 100644
--- a/app/src/main/res/drawable/move_to_folder.xml
+++ b/app/src/main/res/drawable/move_to_folder.xml
@@ -1,6 +1,6 @@
 <!-- `move_to_folder.xml` comes from the Android Material icon set, where it is called `ic_folder_special`.  It is released under the Apache License 2.0. -->
 
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable/next.xml b/app/src/main/res/drawable/next.xml
index 4933c9d7..42f665ca 100644
--- a/app/src/main/res/drawable/next.xml
+++ b/app/src/main/res/drawable/next.xml
@@ -1,5 +1,4 @@
 <!-- `next.xml` comes from the Android Material icon set, where it is called `ic_expand_more`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/orbot_disabled.xml b/app/src/main/res/drawable/orbot_disabled.xml
new file mode 100644
index 00000000..f52197c1
--- /dev/null
+++ b/app/src/main/res/drawable/orbot_disabled.xml
@@ -0,0 +1,19 @@
+<!-- `orbot_enabled.xml` comes from the Orbot project.  It is a modified version of <https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png>, which is released under the 3-clause BSD license.
+    Modifications copyright Soren Stoutner <soren@stoutner.com> 2017.  The resulting image is released under the GPLv3+ license. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="33.86667"
+    android:viewportWidth="33.866665"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="m12.18,32.04c-4.14,-1.92 -6.77,-6.03 -6.77,-10.58 0,-4.35 1.64,-7.16 5.91,-10.12 1.46,-1.01 2.25,-1.97 2.45,-2.98 0.21,-1.03 0.52,-1.41 1.02,-1.22 0.4,0.15 1.72,0.28 2.93,0.28 1.94,0 2.24,0.15 2.52,1.27 0.18,0.7 1.25,1.92 2.39,2.7 4.22,2.92 5.84,5.75 5.82,10.17 -0.02,4.59 -2.89,8.88 -7.12,10.64 -2.51,1.05 -6.7,0.97 -9.17,-0.18zM14.95,5.83c-1.05,-1.13 -1.48,-4.92 -0.56,-4.92 0.96,0 2.54,2.69 2.54,4.33 0,1.96 -0.56,2.13 -1.99,0.59zM17.44,6.25c0,-0.68 1.54,-2.33 2.17,-2.33 0.68,0 0.31,1.37 -0.58,2.18 -1.11,1.01 -1.59,1.05 -1.59,0.16z" android:strokeWidth="0.50134861"/>
+</vector>
diff --git a/app/src/main/res/drawable/orbot_enabled.xml b/app/src/main/res/drawable/orbot_enabled.xml
new file mode 100644
index 00000000..1b3c2cc7
--- /dev/null
+++ b/app/src/main/res/drawable/orbot_enabled.xml
@@ -0,0 +1,19 @@
+<!-- `orbot_enabled.xml` comes from the Orbot project.  It is a modified version of <https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png>, which is released under the 3-clause BSD license.
+    Modifications copyright Soren Stoutner <soren@stoutner.com> 2017.  The resulting image is released under the GPLv3+ license. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="33.86667"
+    android:viewportWidth="33.866665"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="m12.18,32.04c-4.14,-1.92 -6.77,-6.03 -6.77,-10.58 0,-4.35 1.64,-7.16 5.91,-10.12 1.46,-1.01 2.25,-1.97 2.45,-2.98 0.21,-1.03 0.52,-1.41 1.02,-1.22 0.4,0.15 1.72,0.28 2.93,0.28 1.94,0 2.24,0.15 2.52,1.27 0.18,0.7 1.25,1.92 2.39,2.7 4.22,2.92 5.84,5.75 5.82,10.17 -0.02,4.59 -2.89,8.88 -7.12,10.64 -2.51,1.05 -6.7,0.97 -9.17,-0.18zM14.95,5.83c-1.05,-1.13 -1.48,-4.92 -0.56,-4.92 0.96,0 2.54,2.69 2.54,4.33 0,1.96 -0.56,2.13 -1.99,0.59zM17.44,6.25c0,-0.68 1.54,-2.33 2.17,-2.33 0.68,0 0.31,1.37 -0.58,2.18 -1.11,1.01 -1.59,1.05 -1.59,0.16z" android:strokeWidth="0.50134861"/>
+</vector>
diff --git a/app/src/main/res/drawable/previous.xml b/app/src/main/res/drawable/previous.xml
index 2b0eb08f..c10bb3d4 100644
--- a/app/src/main/res/drawable/previous.xml
+++ b/app/src/main/res/drawable/previous.xml
@@ -1,5 +1,4 @@
 <!-- `previous.xml` comes from the Android Material icon set, where it is called `ic_expand_less`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/privacy_mode.xml b/app/src/main/res/drawable/privacy_mode.xml
index 0f33a676..30fdd776 100644
--- a/app/src/main/res/drawable/privacy_mode.xml
+++ b/app/src/main/res/drawable/privacy_mode.xml
@@ -1,5 +1,5 @@
 <!-- `privacy_mode.xml` is derived from `ic_security` and `ic_language`, which are part of the Android Material icon set.  They are released under the Apache License 2.0.
-    Modifications were made by Soren Stoutner <soren@stoutner.com> in 2016 and are released under the GPLv3+ license. -->
+    Modifications copyright Soren Stoutner <soren@stoutner.com> 2016.  The resulting image is released under the GPLv3+ license. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/search_custom_url_enabled.xml b/app/src/main/res/drawable/search_custom_url_enabled.xml
new file mode 100644
index 00000000..5ecb30d7
--- /dev/null
+++ b/app/src/main/res/drawable/search_custom_url_enabled.xml
@@ -0,0 +1,18 @@
+<!-- `search_custom_url_enabled.xml` comes from the Android Material icon set, where it is called `ic_find_in_page`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/search_custom_url_ghosted.xml b/app/src/main/res/drawable/search_custom_url_ghosted.xml
new file mode 100644
index 00000000..c2cc1177
--- /dev/null
+++ b/app/src/main/res/drawable/search_custom_url_ghosted.xml
@@ -0,0 +1,18 @@
+<!-- `search_custom_url_ghosted.xml` comes from the Android Material icon set, where it is called `ic_find_in_page`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/search_enabled.xml b/app/src/main/res/drawable/search_enabled.xml
new file mode 100644
index 00000000..7f4a880e
--- /dev/null
+++ b/app/src/main/res/drawable/search_enabled.xml
@@ -0,0 +1,18 @@
+<!-- `search_enabled.xml` comes from the Android Material icon set, where it is called `ic_search`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/select_all.xml b/app/src/main/res/drawable/select_all.xml
index 216677e3..c27e108e 100644
--- a/app/src/main/res/drawable/select_all.xml
+++ b/app/src/main/res/drawable/select_all.xml
@@ -1,5 +1,4 @@
 <!-- `select_all.xml` comes from the Android Material icon set, where it is called `ic_select_all`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml
index 3837ce86..ba3e1e43 100644
--- a/app/src/main/res/drawable/settings.xml
+++ b/app/src/main/res/drawable/settings.xml
@@ -1,5 +1,4 @@
 <!-- `settings.xml` comes from the Android Material icon set, where it is called `ic_settings`.  It is released under the Apache License 2.0. -->
-
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/user_agent.xml b/app/src/main/res/drawable/user_agent.xml
new file mode 100644
index 00000000..6ba66b99
--- /dev/null
+++ b/app/src/main/res/drawable/user_agent.xml
@@ -0,0 +1,18 @@
+<!-- `user_agent_enabled.xml` comes from the Android Material icon set, where it is called `ic_devices_other`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/user_agent_ghosted.xml b/app/src/main/res/drawable/user_agent_ghosted.xml
deleted file mode 100644
index 1077eed3..00000000
--- a/app/src/main/res/drawable/user_agent_ghosted.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `user_agent_ghosted.xml` comes from the Android Material icon set, where it is called `ic_devices_other`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#44000000"
-        android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/warning.xml b/app/src/main/res/drawable/warning.xml
index 863c1262..6225884c 100644
--- a/app/src/main/res/drawable/warning.xml
+++ b/app/src/main/res/drawable/warning.xml
@@ -1,5 +1,5 @@
 <!-- `warning.xml` is derived from `ic_security` and `ic_language`, which are part of the Android Material icon set.  They are released under the Apache License 2.0.
-    Modifications were made by Soren Stoutner <soren@stoutner.com> in 2016 and are released under the GPLv3+ license. -->
+    Modifications copyright © 2016 Soren Stoutner <soren@stoutner.com>.  The resulting image is released under the GPLv3+ license. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout-w900dp/domains_list.xml b/app/src/main/res/layout-w900dp/domains_list.xml
index 801d7ccc..455045e4 100644
--- a/app/src/main/res/layout-w900dp/domains_list.xml
+++ b/app/src/main/res/layout-w900dp/domains_list.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/about_coordinatorlayout.xml b/app/src/main/res/layout/about_coordinatorlayout.xml
index 6821c446..56ebc941 100644
--- a/app/src/main/res/layout/about_coordinatorlayout.xml
+++ b/app/src/main/res/layout/about_coordinatorlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/about_tab_version.xml b/app/src/main/res/layout/about_tab_version.xml
index 172d74d4..b64e7640 100644
--- a/app/src/main/res/layout/about_tab_version.xml
+++ b/app/src/main/res/layout/about_tab_version.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/add_domain_dialog.xml b/app/src/main/res/layout/add_domain_dialog.xml
index b4b7b6c7..82f24dff 100644
--- a/app/src/main/res/layout/add_domain_dialog.xml
+++ b/app/src/main/res/layout/add_domain_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/bare_webview.xml b/app/src/main/res/layout/bare_webview.xml
index 7960ca5e..3fd34af3 100644
--- a/app/src/main/res/layout/bare_webview.xml
+++ b/app/src/main/res/layout/bare_webview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/bookmarks_coordinatorlayout.xml b/app/src/main/res/layout/bookmarks_coordinatorlayout.xml
index 8b8116b8..b01868f4 100644
--- a/app/src/main/res/layout/bookmarks_coordinatorlayout.xml
+++ b/app/src/main/res/layout/bookmarks_coordinatorlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/bookmarks_database_view_coordinatorlayout.xml b/app/src/main/res/layout/bookmarks_database_view_coordinatorlayout.xml
index b1aa243d..35c9139c 100644
--- a/app/src/main/res/layout/bookmarks_database_view_coordinatorlayout.xml
+++ b/app/src/main/res/layout/bookmarks_database_view_coordinatorlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/bookmarks_database_view_item_linearlayout.xml b/app/src/main/res/layout/bookmarks_database_view_item_linearlayout.xml
index dfbf0868..07f45a99 100644
--- a/app/src/main/res/layout/bookmarks_database_view_item_linearlayout.xml
+++ b/app/src/main/res/layout/bookmarks_database_view_item_linearlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/bookmarks_item_linearlayout.xml b/app/src/main/res/layout/bookmarks_item_linearlayout.xml
index 73e797ac..4b9e9c29 100644
--- a/app/src/main/res/layout/bookmarks_item_linearlayout.xml
+++ b/app/src/main/res/layout/bookmarks_item_linearlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/create_bookmark_dialog.xml b/app/src/main/res/layout/create_bookmark_dialog.xml
index 52334076..c088193a 100644
--- a/app/src/main/res/layout/create_bookmark_dialog.xml
+++ b/app/src/main/res/layout/create_bookmark_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/create_bookmark_folder_dialog.xml b/app/src/main/res/layout/create_bookmark_folder_dialog.xml
index 4233839a..1a51f34c 100644
--- a/app/src/main/res/layout/create_bookmark_folder_dialog.xml
+++ b/app/src/main/res/layout/create_bookmark_folder_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml b/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml
index 1e5b6cfc..0d930951 100644
--- a/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml
+++ b/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/domain_name_linearlayout.xml b/app/src/main/res/layout/domain_name_linearlayout.xml
index 5a63377b..a821d448 100644
--- a/app/src/main/res/layout/domain_name_linearlayout.xml
+++ b/app/src/main/res/layout/domain_name_linearlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/domain_settings.xml b/app/src/main/res/layout/domain_settings.xml
index ec020546..6878c15f 100644
--- a/app/src/main/res/layout/domain_settings.xml
+++ b/app/src/main/res/layout/domain_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -236,7 +236,7 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
-                    android:src="@drawable/user_agent_enabled"
+                    android:src="@drawable/user_agent"
                     android:contentDescription="@string/user_agent" />
 
                 <Spinner
diff --git a/app/src/main/res/layout/domain_settings_coordinatorlayout.xml b/app/src/main/res/layout/domain_settings_coordinatorlayout.xml
index da60754f..49aba2df 100644
--- a/app/src/main/res/layout/domain_settings_coordinatorlayout.xml
+++ b/app/src/main/res/layout/domain_settings_coordinatorlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/domains_coordinatorlayout.xml b/app/src/main/res/layout/domains_coordinatorlayout.xml
index aef0d67b..b7572dfc 100644
--- a/app/src/main/res/layout/domains_coordinatorlayout.xml
+++ b/app/src/main/res/layout/domains_coordinatorlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/domains_list.xml b/app/src/main/res/layout/domains_list.xml
index 4f5ad03a..cd76c68b 100644
--- a/app/src/main/res/layout/domains_list.xml
+++ b/app/src/main/res/layout/domains_list.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/download_file_dialog.xml b/app/src/main/res/layout/download_file_dialog.xml
index 9218ffbc..01eddd96 100644
--- a/app/src/main/res/layout/download_file_dialog.xml
+++ b/app/src/main/res/layout/download_file_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/download_image_dialog.xml b/app/src/main/res/layout/download_image_dialog.xml
index 26560c4e..c37dc7a0 100644
--- a/app/src/main/res/layout/download_image_dialog.xml
+++ b/app/src/main/res/layout/download_image_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/edit_bookmark_dialog.xml b/app/src/main/res/layout/edit_bookmark_dialog.xml
index 039ba40d..67762629 100644
--- a/app/src/main/res/layout/edit_bookmark_dialog.xml
+++ b/app/src/main/res/layout/edit_bookmark_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/edit_bookmark_folder_dialog.xml b/app/src/main/res/layout/edit_bookmark_folder_dialog.xml
index 2286cbdf..469cb2e3 100644
--- a/app/src/main/res/layout/edit_bookmark_folder_dialog.xml
+++ b/app/src/main/res/layout/edit_bookmark_folder_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/find_on_page_app_bar.xml b/app/src/main/res/layout/find_on_page_app_bar.xml
index ea8cdd81..30b5ae0a 100644
--- a/app/src/main/res/layout/find_on_page_app_bar.xml
+++ b/app/src/main/res/layout/find_on_page_app_bar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/guide_coordinatorlayout.xml b/app/src/main/res/layout/guide_coordinatorlayout.xml
index 2cdcc95d..223f5086 100644
--- a/app/src/main/res/layout/guide_coordinatorlayout.xml
+++ b/app/src/main/res/layout/guide_coordinatorlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/guide_tab_webview.xml b/app/src/main/res/layout/guide_tab_webview.xml
index 1d2ce45b..e5447fb9 100644
--- a/app/src/main/res/layout/guide_tab_webview.xml
+++ b/app/src/main/res/layout/guide_tab_webview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/main_drawerlayout.xml b/app/src/main/res/layout/main_drawerlayout.xml
index c616f68e..d2835157 100644
--- a/app/src/main/res/layout/main_drawerlayout.xml
+++ b/app/src/main/res/layout/main_drawerlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>>.
 
diff --git a/app/src/main/res/layout/main_webview.xml b/app/src/main/res/layout/main_webview.xml
index 1269da69..6f1d3b07 100644
--- a/app/src/main/res/layout/main_webview.xml
+++ b/app/src/main/res/layout/main_webview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/move_to_folder_dialog.xml b/app/src/main/res/layout/move_to_folder_dialog.xml
index a0cfd984..ea277cb8 100644
--- a/app/src/main/res/layout/move_to_folder_dialog.xml
+++ b/app/src/main/res/layout/move_to_folder_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/move_to_folder_item_linearlayout.xml b/app/src/main/res/layout/move_to_folder_item_linearlayout.xml
index ed93447d..54982446 100644
--- a/app/src/main/res/layout/move_to_folder_item_linearlayout.xml
+++ b/app/src/main/res/layout/move_to_folder_item_linearlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/navigation_header.xml b/app/src/main/res/layout/navigation_header.xml
index dbe3190a..38751010 100644
--- a/app/src/main/res/layout/navigation_header.xml
+++ b/app/src/main/res/layout/navigation_header.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/ssl_certificate_error.xml b/app/src/main/res/layout/ssl_certificate_error.xml
index dacea4eb..d94e8da9 100644
--- a/app/src/main/res/layout/ssl_certificate_error.xml
+++ b/app/src/main/res/layout/ssl_certificate_error.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/unencrypted_website.xml b/app/src/main/res/layout/unencrypted_website.xml
index 88b2709f..9e5759d4 100644
--- a/app/src/main/res/layout/unencrypted_website.xml
+++ b/app/src/main/res/layout/unencrypted_website.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/url_app_bar.xml b/app/src/main/res/layout/url_app_bar.xml
index a07c39e9..3a1dfc4e 100644
--- a/app/src/main/res/layout/url_app_bar.xml
+++ b/app/src/main/res/layout/url_app_bar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/url_history_dialog.xml b/app/src/main/res/layout/url_history_dialog.xml
index b5e14f70..1efcfacc 100644
--- a/app/src/main/res/layout/url_history_dialog.xml
+++ b/app/src/main/res/layout/url_history_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/url_history_item_linearlayout.xml b/app/src/main/res/layout/url_history_item_linearlayout.xml
index 3c284ac9..be848173 100644
--- a/app/src/main/res/layout/url_history_item_linearlayout.xml
+++ b/app/src/main/res/layout/url_history_item_linearlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/layout/view_ssl_certificate.xml b/app/src/main/res/layout/view_ssl_certificate.xml
index ccef2701..09676380 100644
--- a/app/src/main/res/layout/view_ssl_certificate.xml
+++ b/app/src/main/res/layout/view_ssl_certificate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/menu/bookmarks_context_menu.xml b/app/src/main/res/menu/bookmarks_context_menu.xml
index 1f880e39..0b7ce4ef 100644
--- a/app/src/main/res/menu/bookmarks_context_menu.xml
+++ b/app/src/main/res/menu/bookmarks_context_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/menu/bookmarks_options_menu.xml b/app/src/main/res/menu/bookmarks_options_menu.xml
index 41b7b86f..b16acf57 100644
--- a/app/src/main/res/menu/bookmarks_options_menu.xml
+++ b/app/src/main/res/menu/bookmarks_options_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/menu/domains_options_menu.xml b/app/src/main/res/menu/domains_options_menu.xml
index 20b00249..36958f50 100644
--- a/app/src/main/res/menu/domains_options_menu.xml
+++ b/app/src/main/res/menu/domains_options_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/menu/webview_navigation_menu.xml b/app/src/main/res/menu/webview_navigation_menu.xml
index f8ebc9ff..8cac40c3 100644
--- a/app/src/main/res/menu/webview_navigation_menu.xml
+++ b/app/src/main/res/menu/webview_navigation_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml
index c1348515..c1fc680a 100644
--- a/app/src/main/res/menu/webview_options_menu.xml
+++ b/app/src/main/res/menu/webview_options_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b3ffa323..0ab6a131 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2016 Aaron Gerlach <aaron@gerlach.com>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 96e1b807..f948e1da 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Jose A. León Becerra <emails@joseleon.me>.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 366ef227..3d6e76fc 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   Translation 2017 Francesco Buratti.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
 
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 00c107a7..02f96f0d 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d2f59dda..cd1d60d8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f726be63..3552849b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ef87e8d0..7a226038 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index da445d14..2263b0c4 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -59,7 +59,7 @@
             android:entries="@array/user_agent_entries"
             android:entryValues="@array/user_agent_entry_values"
             android:defaultValue="PrivacyBrowser/1.0"
-            android:icon="@drawable/user_agent_enabled" />
+            android:icon="@drawable/user_agent" />
 
         <!-- android:inputType="textVisiblePassword" sets the keyboard to have a dedicated number row.-->
         <EditTextPreference
@@ -126,7 +126,8 @@
             android:title="@string/search"
             android:entries="@array/search_entries"
             android:entryValues="@array/search_entry_values"
-            android:defaultValue="https://duckduckgo.com/html/?q=" />
+            android:defaultValue="https://duckduckgo.com/html/?q="
+            android:icon="@drawable/search_enabled" />
 
         <EditTextPreference
             android:key="search_custom_url"
diff --git a/app/src/standard/java/com/stoutner/privacybrowser/BannerAd.java b/app/src/standard/java/com/stoutner/privacybrowser/BannerAd.java
index caf6e623..32b03783 100644
--- a/app/src/standard/java/com/stoutner/privacybrowser/BannerAd.java
+++ b/app/src/standard/java/com/stoutner/privacybrowser/BannerAd.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+/*
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *