diff --git a/LICENSE.txt b/LICENSE.txt
index 3b890d984c4a26a3bfcb66cda6ecd1c9e9577d52..0c8bd368b5deea95dc54634eca1c214994122c13 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -49,3 +49,5 @@ See https://creativecommons.org/licenses/by-sa/4.0/
- Guernsey and Isle of Man flags from the Open Clip Art Library, released into the public domain
- Curaçao, courtesy of David Benbennick, released into the public domain
- All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
+ OS icons (i2p2www/static/images/download/):
+ - Courtesy dakirby309 http://dakirby309.deviantart.com/art/Metro-UI-Icon-Set-725-Icons-280724102
diff --git a/i2p2www/pages/downloads/macros b/i2p2www/pages/downloads/macros
index 4c1560d739542daa2a1305377123773232f01c6f..e80c484b51e52ace30f9617c580e142879484b40 100644
--- a/i2p2www/pages/downloads/macros
+++ b/i2p2www/pages/downloads/macros
@@ -48,7 +48,7 @@
{%- set name = 'Mac OS X' -%}
{%- set icon = 'images/download/mac-osx.png' -%}
{%- elif type == 'unix' -%}
- {%- set name = 'GNU/Linux / BSD / Solaris' -%}
+ {%- set name = 'Linux / BSD / Solaris' -%}
{%- set icon = 'images/download/freebsd-tux.png' -%}
{%- endif -%}
{%- set filename = 'i2pinstall_%s.jar' -%}
diff --git a/i2p2www/pages/global/footer.html b/i2p2www/pages/global/footer.html
index b781efb44ad37067206d654f654135803e38bbd8..cd6d268eba07e5fcaec4a584b8fcc6dabc725d32 100644
--- a/i2p2www/pages/global/footer.html
+++ b/i2p2www/pages/global/footer.html
@@ -1,38 +1,17 @@
- <div class='aside first'>
- <h1>{{ _('Mirrors') }}</h1>
- <ul>
- <li><a rel="nofollow" href="http://i2pproject.net/">http://i2pproject.net</a></li>
- <li><a rel="nofollow" href="http://i2p-projekt.de/">http://i2p-projekt.de</a></li>
- <li><a rel="nofollow" href="http://www.i2p2.de/">http://www.i2p2.de</a></li>
- </ul>
- </div>
- <div class='aside second'>
- <h1>{{ _('Secure') }}</h1>
- <ul>
- <li><a rel="nofollow" href="https://geti2p.net/">https://geti2p.net</a></li>
- <!--<li><a rel="nofollow" href="https://geti2p.com/">http://geti2p.com</a></li> -->
- </ul>
- </div>
- <div class='aside third'>
- <h1>{{ _('Misc.') }}</h1>
- <ul>
- <li><a href="http://syndie.i2p2.de/">Syndie</a></li>
- <li><a href="{{ site_url('links') }}">{{ _('Links') }}</a></li>
- <li><a href="{{ site_url('impressum') }}">{{ _('Impressum') }}</a></li>
- </ul>
- </div>
- <div class='aside fourth'>
- <h1>{{ _('T-Shirts!') }}</h1>
- <ul>
- <li><a href="https://www.getdigital.eu/I2P-Fanshirt.html">{{ _('Europe') }}</a></li>
- <li><a href="https://i2pshop.spreadshirt.com/">{{ _('USA') }}</a></li>
- </ul>
- </div>
- <div class='aside fifth'>
- <a class='button' href="{{ site_url('get-involved/donate') }}">{{ _('Donate') }}</a>
- </div>
- <div class='aside sixth'>
- <ul>
- <li><a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="{{ url_for('static', filename='images/cc-by-sa-4.0.png') }}" /></a><br />Except where otherwise noted, content on this site is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.</li>
- </ul>
+{% macro footer_div(pos, url, name, icon) -%}
+ <div class='aside {{ pos }}'>
+ <a href="{{ url }}">
+ <img src="{{ url_for('static', filename=icon) }}" height="128px" alt="{{ name }}" title="{{ name }}" />
+ <h1>{{ name }}</h1>
+ </a>
</div>
+{%- endmacro %}
+{% macro footer_download(pos, type, name, icon) -%}
+{{ footer_div(pos, '%s#%s' % (get_url('downloads_list'), type), name, icon) }}
+{%- endmacro %}
+{{ footer_download('first', 'windows', 'Windows', 'images/download/windows.png') }}
+{{ footer_download('second', 'mac', 'Mac OS X', 'images/download/mac-osx.png') }}
+{{ footer_download('third', 'unix', 'Linux / BSD / Solaris', 'images/download/freebsd-tux.png') }}
+{{ footer_div('fourth', get_url('downloads_debian'), 'Debian / Ubuntu', 'images/download/debian-ubuntu.png') }}
+{{ footer_download('fifth', 'android', 'Android', 'images/download/android.png') }}
+{{ footer_div('sixth', site_url('get-involved/donate'), _('Donate'), 'images/itoopie.png') }}
diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index e50374ae9a29df7a8403f4dd78af47a581164229..f3a3893448ed3282d3185e2705a9bed5df596f8b 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -96,6 +96,8 @@
<li><a href="{{ site_url('about/i2pcon') }}"><div class="menuitem"><span>I2PCon</span></div></a></li>
<li><a href="{{ site_url('about/media') }}"><div class="menuitem"><span>{{ _('Presentations, tutorials and articles') }}</span></div></a></li>
<li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
+ <li><a href="{{ site_url('links') }}"><div class="menuitem"><span>{{ _('Links') }}</span></div></a></li>
+ <li><a href="{{ site_url('impressum') }}"><div class="menuitem"><span>{{ _('Impressum') }}</span></div></a></li>
</ul>
</li>
<li class="has-sub"><div class="menuitem"><span>{{ _('Help') }}</span></div>
diff --git a/i2p2www/pages/site/get-involved/develop/licenses.html b/i2p2www/pages/site/get-involved/develop/licenses.html
index a3b3fae09a805c29d6be80f41975d1afec22a8a7..90f1f946373051f749bec32c92f5b7f22637e78e 100644
--- a/i2p2www/pages/site/get-involved/develop/licenses.html
+++ b/i2p2www/pages/site/get-involved/develop/licenses.html
@@ -297,6 +297,14 @@ or source code in question for authoritative terms. Component source locations
resource packaging may be changed if the repository is reorganized.
{%- endtrans %}</p>
+<h2><a id="website">{{ _('Website content') }}</a></h2>
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="{{ url_for('static', filename='images/cc-by-sa-4.0.png') }}" /></a>
+
+<p>
+Except where otherwise noted, content on this site is licensed under a
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
+</p>
+
<h2><a id="commit">{{ _('Commit privileges') }}</a></h2>
<p>{% trans monotone=site_url('get-involved/guides/monotone') -%}
Developers may push changes to a distributed monotone repository if you
diff --git a/i2p2www/static/images/download/android.png b/i2p2www/static/images/download/android.png
index d808631e084d3c1d1191157c4184dca307467a68..ccc89af9849185e97bea43a5fe6208fe93166971 100644
Binary files a/i2p2www/static/images/download/android.png and b/i2p2www/static/images/download/android.png differ
diff --git a/i2p2www/static/images/download/debian-ubuntu.png b/i2p2www/static/images/download/debian-ubuntu.png
index 4350f6b86b8807293d0cc87b38a29296efb5b5aa..f47273f36b0a9094282b242833d41ef59478e9e2 100644
Binary files a/i2p2www/static/images/download/debian-ubuntu.png and b/i2p2www/static/images/download/debian-ubuntu.png differ
diff --git a/i2p2www/static/images/download/freebsd-tux.png b/i2p2www/static/images/download/freebsd-tux.png
index c36d0750cff6673f8a24d056b05d638ad6db27bc..9fc37e0247d5044fa03980c69504d219e10d9d52 100644
Binary files a/i2p2www/static/images/download/freebsd-tux.png and b/i2p2www/static/images/download/freebsd-tux.png differ
diff --git a/i2p2www/static/images/download/mac-osx.png b/i2p2www/static/images/download/mac-osx.png
index 677c324ed7ce02697d00a616ffd1a92b053d96ef..f5fb238b6731351c6c18631c964fc4eb6cae28f7 100644
Binary files a/i2p2www/static/images/download/mac-osx.png and b/i2p2www/static/images/download/mac-osx.png differ
diff --git a/i2p2www/static/images/download/source.png b/i2p2www/static/images/download/source.png
index 8e8caaaab872a868d144fc6da804e2ccc94604e3..90b7b1a9317fc067f30cb303a62c565e2ee5f965 100644
Binary files a/i2p2www/static/images/download/source.png and b/i2p2www/static/images/download/source.png differ
diff --git a/i2p2www/static/images/download/update-auto.png b/i2p2www/static/images/download/update-auto.png
index 1602cf62b2581e395bf3d3e4b8c856de397a50be..c5125a1122b3b6ae2dc161682acb0cbbff06987a 100644
Binary files a/i2p2www/static/images/download/update-auto.png and b/i2p2www/static/images/download/update-auto.png differ
diff --git a/i2p2www/static/images/download/update-manual.png b/i2p2www/static/images/download/update-manual.png
index e315a57fc87fb21d86731569d4dfa929f09876ed..5e7f709f845c8412563209946134daa81a32e280 100644
Binary files a/i2p2www/static/images/download/update-manual.png and b/i2p2www/static/images/download/update-manual.png differ
diff --git a/i2p2www/static/images/download/windows.png b/i2p2www/static/images/download/windows.png
index 336b22199ce3b9f56559f6e5fb40d0f7706a9252..028777cc592442620a9e23edefdd12fb2560555a 100644
Binary files a/i2p2www/static/images/download/windows.png and b/i2p2www/static/images/download/windows.png differ
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 60129146fae1ec36e27633ab3ff32b541241d34d..49d8052bf8f7fd0d14aaa81cc4d83da158eb1db6 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -468,22 +468,20 @@ pre.literal-block {
#global-footer {
width: auto;
- border-top: 3px solid #883333;
- background: #552222;
+ border-top: 2px solid #abcc71;
+ background: transparent;
font-size: 0.75rem;
padding: 1em 10%;
- background: -moz-linear-gradient(#883333, #772222);
}
#global-footer .aside {
display: inline-block;
+ text-align: center;
vertical-align: top;
}
#global-footer .aside h1 {
- color: #ffdd88;
font-size: 1.2em;
- text-shadow: -1px -1px 1px rgba(0,0,0,.2);
border-bottom: 1px solid #ccaa66;
margin: 1em 0;
line-height: 1.3em;