Replace the distro icons with those from dr|z3d. Update the image paths

and names in the right places in the download pages.

en/download-unix.wml

@@ -27,7 +27,7 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </tr> </thead>
 
 <tr>
-<td align="center"><img src="images/debian.png" width="45" height="45" alt="Debian" /> <img src="images/ubuntu.png" width="45" height="45" alt="Ubuntu" /> <img src="images/knoppix.png" width="45" height="45" alt="Knoppix" /></td>
+<td align="center"><img src="images/distros/debian.png" alt="Debian" /> <img src="images/distros/ubuntu.png" alt="Ubuntu" /> <img src="images/distros/knoppix.png" alt="Knoppix" /></td>
 <td>Debian, Ubuntu, Knoppix</td>
 <td colspan="2"><a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorOnDebian">noreply.org packages</a>
     </td>
@@ -37,7 +37,7 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </tr>
 
 <tr bgcolor="e5e5e5">
-<td align="center"><img src="images/centos.png" width="45" height="45" alt="CentOS 4" /></td>
+<td align="center"><img src="images/distros/centos.png" alt="CentOS 4" /></td>
 <td>CentOS 4 binary</td>
 <td>
 <a href="<package-rpm4-stable>"><version-rpm4-stable> RPM</a>
@@ -53,7 +53,7 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </tr>
 
 <tr>
-<td align="center"><img src="images/centos.png" width="45" height="45" alt="CentOS 4" /></td>
+<td align="center"><img src="images/distros/centos.png" alt="CentOS 4" /></td>
 <td>CentOS 4, source</td>
 <td>
 <a href="<package-srpm4-stable>"><version-rpm4-stable> SRPM</a>
@@ -69,7 +69,7 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </tr>
 
 <tr bgcolor="e5e5e5">
-<td align="center"><img src="images/centos.png" width="45" height="45" alt="CentOS 5" /></td>
+<td align="center"><img src="images/distros/centos.png" alt="CentOS 5" /></td>
 <td>CentOS 5 binary</td>
 <td>
 <a href="<package-rpm5-stable>"><version-rpm5-stable> RPM</a>
@@ -85,7 +85,7 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </tr>
 
 <tr>
-<td align="center"><img src="images/centos.png" width="45" height="45" alt="CentOS 5" /></td>
+<td align="center"><img src="images/distros/centos.png" alt="CentOS 5" /></td>
 <td>CentOS 5 source</td>
 <td>
 <a href="<package-srpm5-stable>"><version-rpm5-stable> SRPM</a>
@@ -101,7 +101,7 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </tr>
 
 <tr bgcolor="e5e5e5">
-<td align="center"><img src="images/fedora.png" width="45" height="45" alt="Fedora Core 10" /></td>
+<td align="center"><img src="images/distros/fedora.png" alt="Fedora Core 10" /></td>
 <td>Fedora Core 10 binary</td>
 <td>
 <a href="<package-rpmfc-stable>"><version-rpmfc-stable> RPM</a>
@@ -117,7 +117,7 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </tr>
 
 <tr>
-<td align="center"><img src="images/fedora.png" width="45" height="45" alt="Fedora Core 10" /></td>
+<td align="center"><img src="images/distros/fedora.png" alt="Fedora Core 10" /></td>
 <td>Fedora Core 10 source</td>
 <td>
 <a href="<package-srpmfc-stable>"><version-rpmfc-stable> SRPM</a>
@@ -133,7 +133,7 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </tr>
 
 <tr bgcolor="e5e5e5">
-<td align="center"><img src="images/suse.png" width="45" height="45" alt="openSUSE 11" /></td>
+<td align="center"><img src="images/distros/suse.png" alt="openSUSE 11" /></td>
 <td>openSUSE 11 binary</td>
 <td>
 <a href="<package-rpmsuse-stable>"><version-rpmsuse-stable> RPM</a>
@@ -149,7 +149,7 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </tr>
 
 <tr>
-<td align="center"><img src="images/suse.png" width="45" height="45" alt="openSUSE 11" /></td>
+<td align="center"><img src="images/distros/suse.png" alt="openSUSE 11" /></td>
 <td>openSUSE 11 source</td>
 <td>
 <a href="<package-srpmsuse-stable>"><version-rpmsuse-stable> SRPM</a>
@@ -165,7 +165,7 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </tr>
 
 <tr bgcolor="e5e5e5">
-<td align="center"><img src="images/gentoo.png" width="45" height="45" alt="Gentoo Linux" /></td>
+<td align="center"><img src="images/distros/gentoo.png" alt="Gentoo Linux" /></td>
 <td>Gentoo Linux</td>
 <td colspan="2"><kbd>emerge tor</kbd></td>
 <td>
@@ -175,14 +175,14 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </tr>
 
 <tr>
-<td align="center"><img src="images/freebsd.png" width="45" height="45" alt="FreeBSD" /></td>
+<td align="center"><img src="images/distros/freebsd.png" alt="FreeBSD" /></td>
 <td>FreeBSD</td>
 <td colspan="2"><kbd>portinstall -s security/tor</kbd></td>
 <td><a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a></td>
 </tr>
 
 <tr bgcolor="e5e5e5">
-<td align="center"><img src="images/openbsd.png" width="45" height="45" alt="OpenBSD" /></td>
+<td align="center"><img src="images/distros/openbsd.png" alt="OpenBSD" /></td>
 <td>OpenBSD</td>
 <td colspan="2"><kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd></td>
 <td>
@@ -192,15 +192,15 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </tr>
 
 <tr>
-<td align="center"><img src="images/netbsd.png" width="45" height="45" alt="NetBSD" /></td>
+<td align="center"><img src="images/distros/netbsd.png" alt="NetBSD" /></td>
 <td>NetBSD</td>
 <td colspan="2"><kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd></td>
 <td><a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a></td>
 </tr>
 
 <tr bgcolor="e5e5e5">
+<td align="center"><img src="images/distros/generic.png" alt="User Contributed" /></td>
 <td>User Contributed rpms</td>
-<td></td>
 <td colspan="2">
 <a href="http://mirror.noreply.org/pub/devil.homelinux.org/Tor/">Contrib RPMs including development snapshots</a>
 </td>
@@ -210,8 +210,8 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>
 </td>
 </tr>
 <tr>
+<td align="center"><img src="images/distros/terminal.png" alt="Source code" /></td>
 <td>Source tarballs</td>
-<td></td>
 <td>
 <a href="<package-source-stable>"><version-stable></a> (<a href="<package-source-stable-sig>">sig</a>)
 </td>

en/download.wml

@@ -30,7 +30,7 @@ Please take time to read the <a href="<page download>#Warning">warning</a> to fa
 
 <tr>
   <td>
-    <img src="images/ico-win.png" /> Windows<br />
+    <img src="images/distros/windows.png" /> Windows<br />
     <small><em>Vista, XP, 2000, 2003 Server, Millenium, 98SE</em></small>
   </td>
   <td>
@@ -48,7 +48,7 @@ Please take time to read the <a href="<page download>#Warning">warning</a> to fa
 
 <tr bgcolor="#e5e5e5">
   <td>
-    <img src="images/ico-win.png" /> Tor Browser Bundle for Windows <br /> (Contains Tor, Vidalia, Torbutton, Polipo, and Firefox)
+    <img src="images/distros/windows.png" /> Tor Browser Bundle for Windows <br /> (Contains Tor, Vidalia, Torbutton, Polipo, and Firefox)
   </td>
   <td>
   </td>
@@ -63,9 +63,9 @@ Please take time to read the <a href="<page download>#Warning">warning</a> to fa
   </td>
 </tr>
 
-<tr bgcolor="#e5e5e5">
+<tr>
   <td>
-    <img src="images/ico-win.png" /> Tor IM Browser Bundle for Windows <br />(Contains Tor, Vidalia, Torbutton, Polipo, Firefox, and Pidgin)
+    <img src="images/distros/windows.png" /> Tor IM Browser Bundle for Windows <br />(Contains Tor, Vidalia, Torbutton, Polipo, Firefox, and Pidgin)
   </td>
   <td>
   </td>
@@ -80,9 +80,9 @@ Please take time to read the <a href="<page download>#Warning">warning</a> to fa
   </td>
 </tr>
 
-<tr>
+<tr bgcolor="#e5e5e5">
   <td>
-    <img src="images/ico-osx-uni.png" /> Mac<br />
+    <img src="images/distros/apple.png" /> Mac<br />
     <small><em>Universal Binary (OSX 10.4 &amp; 10.5)</em></small>
   </td>
   <td>
@@ -97,10 +97,10 @@ Please take time to read the <a href="<page download>#Warning">warning</a> to fa
   </td>
 </tr>
 
-<tr bgcolor="#e5e5e5">
+<tr>
   <td>
-    Mac<br />
-    <small><em>PowerPC Only (OSX 10.3)</em></small>
+   <img src="images/distros/apple.png" /> Mac<br />
+   <small><em>PowerPC Only (OSX 10.3)</em></small>
   </td>
   <td>
     <a href="<package-oldosx-bundle-stable>"><version-oldosx-bundle-stable></a> 
@@ -115,9 +115,9 @@ Please take time to read the <a href="<page download>#Warning">warning</a> to fa
   </td>
 </tr>
 
-<tr>
+<tr bgcolor="#e5e5e5">
   <td>
-    <img src="images/ico-tux.png" /> Linux/Unix packages<br />
+    <img src="images/distros/generic.png" /> Linux/Unix packages<br />
     <small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>
   </td>
   <td colspan="2">
@@ -128,6 +128,7 @@ Please take time to read the <a href="<page download>#Warning">warning</a> to fa
   </td>
 </tr>
 </table>
+
 <div class="underline"></div>
 <div class="nb">
 <a id="packagediff"></a>
@@ -143,6 +144,7 @@ than the stable versions listed above, there is a much higher chance of
 serious reliability and security bugs in these downloads.  Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.
 </p>
 </div>
+
 <div class="underline"></div>
 <div class="nb">
 <p>
@@ -158,6 +160,7 @@ if you want Tor to become faster and more usable please consider
 <a href="<page donate>">making a tax-deductible donation to The Tor Project</a>.
 </p>
 </div>
+
 <div class="underline"></div>
 <div class="nb">
 <p>

en/easy-download.wml

@@ -13,7 +13,7 @@
 <th bgcolor="#e5e5e5" align="center" width="25%"><img src="images/logo.windows-header.gif"></th>
 <th align="center" width="25%"><img src="images/ref_leopard_box.jpg"></th>
 <th bgcolor="#e5e5e5" align="center" width="25%"><img src="images/logo.windows-header.gif"></th>
-<th align="center" width="25%"><img src="images/debian.png" width="45" height="45" alt="Debian" /> <img src="images/ubuntu.png" width="45" height="45" alt="Ubuntu" /> <img src="images/knoppix.png" width="45" height="45" alt="Knoppix" /><img src="images/centos.png" width="45" height="45" alt="CentOS 4" /><img src="images/fedora.png" width="45" height="45" alt="Fedora Core 10" /><img src="images/suse.png" width="45" height="45" alt="openSUSE 11" /><img src="images/gentoo.png" width="45" height="45" alt="Gentoo Linux" /><img src="images/freebsd.png" width="45" height="45" alt="FreeBSD" /><img src="images/openbsd.png" width="45" height="45" alt="OpenBSD" /><img src="images/netbsd.png" width="45" height="45" alt="NetBSD" /></th>
+<th align="center" width="25%"><img src="images/distros/generic.png"><img src="images/distros/freebsd.png"><img src="images/distros/package.png"><img src="images/distros/src.png"></th>
 </tr>
 <tr>
 <td bgcolor="#e5e5e5" align="center">