diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py
index 38aaa00f312..b6d6a097d6d 100755
--- a/contrib/devtools/optimize-pngs.py
+++ b/contrib/devtools/optimize-pngs.py
@@ -1,5 +1,8 @@
#!/usr/bin/env python
-
+'''
+Run this scrip every time you change one of the png files. Using pngcrush, it will optimize the png files, remove various color profiles, remove ancillary chunks (alla) and text chunks (text).
+#pngcrush -brute -ow -rem gAMA -rem cHRM -rem iCCP -rem sRGB -rem alla -rem text
+'''
import os
import sys
import subprocess
@@ -18,14 +21,12 @@ def content_hash(filename):
data = i.tostring()
return hashlib.sha256(data).hexdigest()
-#optimize png, remove various color profiles, remove ancillary chunks (alla) and text chunks (text)
-#pngcrush -brute -ow -rem gAMA -rem cHRM -rem iCCP -rem sRGB -rem alla -rem text
-
pngcrush = 'pngcrush'
git = 'git'
-folders = ["src/qt/res/movies", "src/qt/res/icons", "src/qt/res/images"]
+folders = ["src/qt/res/movies", "src/qt/res/icons"]
basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel']).rstrip('\n')
totalSaveBytes = 0
+noHashChange = True
outputArray = []
for folder in folders:
@@ -68,6 +69,7 @@ for fileDict in outputArray:
oldHash = fileDict['sha256Old']
newHash = fileDict['sha256New']
totalSaveBytes += fileDict['osize'] - fileDict['psize']
+ noHashChange = noHashChange and (oldHash == newHash)
print fileDict['file']+"\n size diff from: "+str(fileDict['osize'])+" to: "+str(fileDict['psize'])+"\n old sha256: "+oldHash+"\n new sha256: "+newHash+"\n"
-print "completed. Total reduction: "+str(totalSaveBytes)+" bytes"
+print "completed. Checksum stable: "+str(noHashChange)+". Total reduction: "+str(totalSaveBytes)+" bytes"
diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md
index c6da1a4586e..b5a033dd79a 100644
--- a/doc/assets-attribution.md
+++ b/doc/assets-attribution.md
@@ -10,37 +10,58 @@ The following is a list of assets used in the bitcoin source and their proper at
* Site: [https://github.com/stephenhutchings/typicons.font](https://github.com/stephenhutchings/typicons.font)
### Assets Used
- src/qt/res/icons/add.png, src/qt/res/icons/address-book.png,
- src/qt/res/icons/configure.png, src/qt/res/icons/connect4.png,
- src/qt/res/icons/debugwindow.png, src/qt/res/icons/edit.png,
- src/qt/res/icons/exitcopy.png, src/qt/res/icons/editpaste.png,
- src/qt/res/icons/export.png, src/qt/res/icons/eye.png,
- src/qt/res/icons/filesave.png, src/qt/res/icons/history.png,
- src/qt/res/icons/info.png, src/qt/res/icons/key.png,
- src/qt/res/icons/lock_*.png, src/qt/res/icons/open.png,
- src/qt/res/icons/overview.png, src/qt/res/icons/quit.png,
- src/qt/res/icons/receive.png, src/qt/res/icons/remove.png,
- src/qt/res/icons/send.png, src/qt/res/icons/synced.png,
- src/qt/res/icons/transaction*.png, src/qt/res/icons/tx_output.png,
+ src/qt/res/icons/add.png
+ src/qt/res/icons/address-book.png,
+ src/qt/res/icons/configure.png
+ src/qt/res/icons/debugwindow.png
+ src/qt/res/icons/edit.png,
+ src/qt/res/icons/exitcopy.png
+ src/qt/res/icons/editpaste.png,
+ src/qt/res/icons/export.png
+ src/qt/res/icons/eye.png,
+ src/qt/res/icons/filesave.png
+ src/qt/res/icons/history.png,
+ src/qt/res/icons/info.png
+ src/qt/res/icons/key.png,
+ src/qt/res/icons/lock_*.png
+ src/qt/res/icons/open.png,
+ src/qt/res/icons/overview.png
+ src/qt/res/icons/quit.png,
+ src/qt/res/icons/receive.png
+ src/qt/res/icons/remove.png,
+ src/qt/res/icons/send.png
+ src/qt/res/icons/synced.png,
+ src/qt/res/icons/transaction*.png
+ src/qt/res/icons/tx_output.png,
src/qt/res/icons/warning.png
-Jonas Schnelli
+Other
-----------------------
### Info
-* Designer: Jonas Schnelli
-* Bitcoin Icon: (based on the original bitcoin logo from Bitboy)
+* Designer: Jonas Schnelli, Bitboy, Stephen Hutchings, Marco Falke
+* Bitcoin Icon: Based on the original bitcoin logo from Bitboy
+* Network connection icon: Inspired by flow-merge.svg from Stephen Hutchings
* Some icons are based on Stephan Hutchings Typicons
* License: MIT
### Assets Used
- src/qt/res/icons/about.png, src/qt/res/icons/about_qt.png,
- src/qt/res/icons/bitcoin.icns, src/qt/res/icons/bitcoin.ico,
- src/qt/res/icons/bitcoin.png, src/qt/res/icons/clock*.png,
- src/qt/res/icons/connect[0-3].png, src/qt/res/icons/eye_minus.png,
- src/qt/res/icons/eye_plus.png, src/qt/res/icons/verify.png,
- src/qt/res/icons/tx_inout.png, src/qt/res/icons/tx_input.png,
- src/qt/res/src/verify.svg, src/qt/res/src/bitcoin.svg,
- src/qt/res/src/clock*.svg, src/qt/res/src/connect*.svg,
- src/qt/res/src/mine.svg, src/qt/res/src/qt.svg, src/qt/res/src/tx*.svg,
- src/qt/res/src/verify.svg,
+ src/qt/res/icons/about.png
+ src/qt/res/icons/about_qt.png,
+ src/qt/res/icons/bitcoin.icns
+ src/qt/res/icons/bitcoin.ico,
+ src/qt/res/icons/bitcoin.png
+ src/qt/res/icons/clock*.png,
+ src/qt/res/icons/connect*.png
+ src/qt/res/icons/eye_minus.png,
+ src/qt/res/icons/eye_plus.png
+ src/qt/res/icons/verify.png,
+ src/qt/res/icons/tx_inout.png
+ src/qt/res/icons/tx_input.png,
+ src/qt/res/src/bitcoin.svg,
+ src/qt/res/src/clock*.svg
+ src/qt/res/src/connect*.svg,
+ src/qt/res/src/mine.svg
+ src/qt/res/src/qt.svg
+ src/qt/res/src/tx*.svg,
+ src/qt/res/src/verify.svg
diff --git a/src/qt/res/icons/about_qt.png b/src/qt/res/icons/about_qt.png
index dd27a99d0a7..c40abfd3a6c 100644
Binary files a/src/qt/res/icons/about_qt.png and b/src/qt/res/icons/about_qt.png differ
diff --git a/src/qt/res/icons/clock1.png b/src/qt/res/icons/clock1.png
index ceae5ed0d9f..162204d1bba 100644
Binary files a/src/qt/res/icons/clock1.png and b/src/qt/res/icons/clock1.png differ
diff --git a/src/qt/res/icons/clock2.png b/src/qt/res/icons/clock2.png
index 159f69a8fce..8f4263a31cc 100644
Binary files a/src/qt/res/icons/clock2.png and b/src/qt/res/icons/clock2.png differ
diff --git a/src/qt/res/icons/clock3.png b/src/qt/res/icons/clock3.png
index d668e35ffc0..7f11a7566c1 100644
Binary files a/src/qt/res/icons/clock3.png and b/src/qt/res/icons/clock3.png differ
diff --git a/src/qt/res/icons/clock4.png b/src/qt/res/icons/clock4.png
index 5ebf8ed7ac7..fdd1a0fce34 100644
Binary files a/src/qt/res/icons/clock4.png and b/src/qt/res/icons/clock4.png differ
diff --git a/src/qt/res/icons/clock5.png b/src/qt/res/icons/clock5.png
index 96f15ef7d95..7d6556c6cf7 100644
Binary files a/src/qt/res/icons/clock5.png and b/src/qt/res/icons/clock5.png differ
diff --git a/src/qt/res/icons/connect0.png b/src/qt/res/icons/connect0.png
index 58e2c3e965a..ef708d81fb2 100644
Binary files a/src/qt/res/icons/connect0.png and b/src/qt/res/icons/connect0.png differ
diff --git a/src/qt/res/icons/connect1.png b/src/qt/res/icons/connect1.png
index 949e7a922d5..ed358e6f8ef 100644
Binary files a/src/qt/res/icons/connect1.png and b/src/qt/res/icons/connect1.png differ
diff --git a/src/qt/res/icons/connect2.png b/src/qt/res/icons/connect2.png
index 143b2054fb6..3bbb0d395c5 100644
Binary files a/src/qt/res/icons/connect2.png and b/src/qt/res/icons/connect2.png differ
diff --git a/src/qt/res/icons/connect3.png b/src/qt/res/icons/connect3.png
index 143b2054fb6..0db99ad8d30 100644
Binary files a/src/qt/res/icons/connect3.png and b/src/qt/res/icons/connect3.png differ
diff --git a/src/qt/res/icons/connect4.png b/src/qt/res/icons/connect4.png
index f96e3455cee..9dd19fc2bd6 100644
Binary files a/src/qt/res/icons/connect4.png and b/src/qt/res/icons/connect4.png differ
diff --git a/src/qt/res/icons/transaction0.png b/src/qt/res/icons/transaction0.png
index 1091b86e688..72c44565ec3 100644
Binary files a/src/qt/res/icons/transaction0.png and b/src/qt/res/icons/transaction0.png differ
diff --git a/src/qt/res/icons/warning.png b/src/qt/res/icons/warning.png
index 723a30a658a..6bc5ac78952 100644
Binary files a/src/qt/res/icons/warning.png and b/src/qt/res/icons/warning.png differ
diff --git a/src/qt/res/src/clock_1.svg b/src/qt/res/src/clock_1.svg
index 4e49772d26a..2a3d84c2d04 100644
--- a/src/qt/res/src/clock_1.svg
+++ b/src/qt/res/src/clock_1.svg
@@ -9,5 +9,7 @@
c-57.8,0-112.1,22.5-153,63.4c-40.9,40.9-63.4,95.2-63.4,153c0,57.8,22.5,112.1,63.4,153c40.9,40.9,95.2,63.4,153,63.4
c57.8,0,112.1-22.5,153-63.4c40.9-40.9,63.4-95.2,63.4-153c0-57.8-22.5-112.1-63.4-153C409.8,227.1,355.4,204.6,297.6,204.6z"/>
-
+
diff --git a/src/qt/res/src/clock_2.svg b/src/qt/res/src/clock_2.svg
index 995446e46e3..2de8d467b75 100644
--- a/src/qt/res/src/clock_2.svg
+++ b/src/qt/res/src/clock_2.svg
@@ -9,6 +9,5 @@
c-57.8,0-112.1,22.5-153,63.4c-40.9,40.9-63.4,95.2-63.4,153c0,57.8,22.5,112.1,63.4,153c40.9,40.9,95.2,63.4,153,63.4
c57.8,0,112.1-22.5,153-63.4c40.9-40.9,63.4-95.2,63.4-153c0-57.8-22.5-112.1-63.4-153C409.8,227.1,355.4,204.6,297.6,204.6z"/>
-
-
+
diff --git a/src/qt/res/src/clock_3.svg b/src/qt/res/src/clock_3.svg
index ea47a847300..b691043e3e7 100644
--- a/src/qt/res/src/clock_3.svg
+++ b/src/qt/res/src/clock_3.svg
@@ -9,7 +9,7 @@
c-57.8,0-112.1,22.5-153,63.4c-40.9,40.9-63.4,95.2-63.4,153c0,57.8,22.5,112.1,63.4,153c40.9,40.9,95.2,63.4,153,63.4
c57.8,0,112.1-22.5,153-63.4c40.9-40.9,63.4-95.2,63.4-153c0-57.8-22.5-112.1-63.4-153C409.8,227.1,355.4,204.6,297.6,204.6z"/>
-
-
-
+
diff --git a/src/qt/res/src/clock_4.svg b/src/qt/res/src/clock_4.svg
index 43160288d8a..ea311f31e82 100644
--- a/src/qt/res/src/clock_4.svg
+++ b/src/qt/res/src/clock_4.svg
@@ -1,18 +1,23 @@
-
-
-
-
+
+
\ No newline at end of file
diff --git a/src/qt/res/src/connect-0.svg b/src/qt/res/src/connect-0.svg
index bedbec77776..7d2afac6227 100644
--- a/src/qt/res/src/connect-0.svg
+++ b/src/qt/res/src/connect-0.svg
@@ -1,11 +1,66 @@
-
-
-
-
+
+
diff --git a/src/qt/res/src/connect-1.svg b/src/qt/res/src/connect-1.svg
index d3d4e46a419..d17928c97d0 100644
--- a/src/qt/res/src/connect-1.svg
+++ b/src/qt/res/src/connect-1.svg
@@ -1,21 +1,69 @@
-
-
-
-
+
+
diff --git a/src/qt/res/src/connect-2.svg b/src/qt/res/src/connect-2.svg
index d5becc52b79..841ca6071dd 100644
--- a/src/qt/res/src/connect-2.svg
+++ b/src/qt/res/src/connect-2.svg
@@ -1,22 +1,59 @@
-
-
-
-
+
+
diff --git a/src/qt/res/src/connect-3.svg b/src/qt/res/src/connect-3.svg
index 9bfa04721f9..b06e67daf87 100644
--- a/src/qt/res/src/connect-3.svg
+++ b/src/qt/res/src/connect-3.svg
@@ -1,16 +1,72 @@
-
-
-
-
+
+
diff --git a/src/qt/res/src/connect-4.svg b/src/qt/res/src/connect-4.svg
new file mode 100644
index 00000000000..0abc7955fdb
--- /dev/null
+++ b/src/qt/res/src/connect-4.svg
@@ -0,0 +1,65 @@
+
+
diff --git a/src/qt/res/src/qt.svg b/src/qt/res/src/qt.svg
index 9ef54f493cd..373c91f0c6c 100644
--- a/src/qt/res/src/qt.svg
+++ b/src/qt/res/src/qt.svg
@@ -1,25 +1,26 @@
-
-
-
-
+
+
\ No newline at end of file
diff --git a/src/qt/res/src/transaction0.svg b/src/qt/res/src/transaction0.svg
new file mode 100644
index 00000000000..e7fcd8214cb
--- /dev/null
+++ b/src/qt/res/src/transaction0.svg
@@ -0,0 +1,35 @@
+
+