diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn b/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn
index ac514037a5c02d0bb397405e40a378591751eefe..dad37a0c9e382f5ada75aece1921a8c13c565d1a 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn
@@ -13,8 +13,8 @@ JavaScript]], [[!wikipedia Adobe_Flash]], [[!wikipedia HTTP_cookie
 desc="cookies"]] and other services which have been shown to be able to defeat
 the anonymity provided by the Tor network.
 
-In <span class="application">Tor Browser</span> all such features are handled from inside the browser by an extension
-called [Torbutton](https://www.torproject.org/docs/torbutton/) which does all sorts
+<span class="application">Tor Browser</span>
+does all sorts
 of things to prevent the above type of attacks. But that comes at a price: since
 this will disable some functionalities and some sites might not work as
 intended.
@@ -158,16 +158,16 @@ refer to the <a href="https://www.torproject.org/projects/torbrowser/design/">
 Security slider
 ===============
 
-You can use the security slider of <span class="application">Torbutton</span>
+You can use the security slider of <span class="application">Tor Browser</span>
 to disable browser features as a trade-off between security and usability.
 For example, you can use the security slider to disable JavaScript completely.
 
 The security slider is set to *low* by default. This value provides the
-default level of protection of <span class="application">Torbutton</span>
+default level of protection
 and the most usable experience.
 
 To change the value of the security slider, click on the [[!img torbutton.png link=no class=symbolic alt="green onion"]] button
-and choose **Privacy and Security Settings**.
+and choose **Security Settings&hellip;**
 
 [[!img security_slider.png link="no" alt="Security slider in its default value (low)"]]
 
@@ -176,10 +176,12 @@ and choose **Privacy and Security Settings**.
 
 <span class="guilabel">Circuit view</span> feature
 ==================================================
+
 [[!img circuit_view.png link=no]]
 
-The <span class="guilabel">Circuit view</span> feature of
-<span class="application">Torbutton</span>
+Click on the
+[[!img i.png link="no" class="symbolic" alt="Show site information"]]
+button in the address bar to
 shows you the three Tor relays used for the website in the current tab,
 including the corresponding IP addresses and the countries they're located
 in.
@@ -189,8 +191,8 @@ The node immediately above the
 country it is located in might determine how the website is presented
 to you.
 
-You can use
-<span class="guilabel">[[New Tor Circuit for this Site|Tor_Browser#new_circuit]]</span>
+Click on the
+<span class="guilabel">[[New Circuit for this Site|Tor_Browser#new_circuit]]</span> button
 to change to another country.
 
 You can use
@@ -203,7 +205,7 @@ to get more detailed information about the circuits being used.
 ==================================================
 
 The <span class="guilabel">New Identity</span> feature of
-<span class="application">Torbutton</span>:
+<span class="application">Tor Browser</span>:
 
   - Closes all open tabs.
   - Clears the session state including cache, history, and cookies
@@ -239,8 +241,8 @@ completely on some websites, <span class="application">Tor Browser</span> includ
 extension.
 
 By default, <span class="application">NoScript</span> is disabled and some
-JavaScript is allowed by the <span
-class="application">[[Torbutton|Tor_Browser#javascript]]</span> extension as
+JavaScript is allowed by <span
+class="application">[[Tor Browser|Tor_Browser#javascript]]</span> as
 explained above.
 
 For more information you can refer to the NoScript
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser/i.png b/wiki/src/doc/anonymous_internet/Tor_Browser/i.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d14ce112e437bc17c08f18d3ccf45bff4d9bdce
Binary files /dev/null and b/wiki/src/doc/anonymous_internet/Tor_Browser/i.png differ
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser/riseup.png b/wiki/src/doc/anonymous_internet/Tor_Browser/riseup.png
index ac896c69bb22f6e00cbebb0364d57817bf41e9fb..264db03a1b41b4a16848b6d8889a530621f8067d 100644
Binary files a/wiki/src/doc/anonymous_internet/Tor_Browser/riseup.png and b/wiki/src/doc/anonymous_internet/Tor_Browser/riseup.png differ
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser/security_slider.png b/wiki/src/doc/anonymous_internet/Tor_Browser/security_slider.png
index 8832bc55c55ee028ab4b3fc5026888e4e29436b7..7e837c583242f25c113c974de5b26cc24b138e53 100644
Binary files a/wiki/src/doc/anonymous_internet/Tor_Browser/security_slider.png and b/wiki/src/doc/anonymous_internet/Tor_Browser/security_slider.png differ
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser/torbutton.png b/wiki/src/doc/anonymous_internet/Tor_Browser/torbutton.png
index ee3c3afea3f97842f6799358efb74573981855df..d4d5951bdf07237dc56a9a793bf095d4e7893c8f 100644
Binary files a/wiki/src/doc/anonymous_internet/Tor_Browser/torbutton.png and b/wiki/src/doc/anonymous_internet/Tor_Browser/torbutton.png differ