37 files changed, 465 insertions, 484 deletions

diff --git a/icon/18_blocked_unix.go b/icon/18_blocked_unix.go
new file mode 100644
index 0000000..d1b9211
--- /dev/null
+++ b/icon/18_blocked_unix.go
@@ -0,0 +1,57 @@
+//+build linux darwin
+
+// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
+
+package icon
+
+var Blocked []byte = []byte {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
+	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x12, 
+	0x08, 0x03, 0x00, 0x00, 0x00, 0x61, 0x10, 0x7e, 0x65, 0x00, 0x00, 0x00, 
+	0x03, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0xdb, 0xe1, 0x4f, 0xe0, 
+	0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x07, 0x62, 
+	0x00, 0x00, 0x07, 0x62, 0x01, 0x38, 0x7a, 0x99, 0xdb, 0x00, 0x00, 0x00, 
+	0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 
+	0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 
+	0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 
+	0x00, 0xdb, 0x50, 0x4c, 0x54, 0x45, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf6, 0xf5, 
+	0xfe, 0xf5, 0xf4, 0xff, 0xf5, 0xf4, 0xff, 0xf5, 0xf5, 0xfe, 0xf4, 0xf4, 
+	0xff, 0xf5, 0xf4, 0xfe, 0xf4, 0xf4, 0xfe, 0xf5, 0xf4, 0xfe, 0xf4, 0xf4, 
+	0xfe, 0xf4, 0xf3, 0xfb, 0xb4, 0xb0, 0xfb, 0xbb, 0xb5, 0xfb, 0xb8, 0xb3, 
+	0xfb, 0xb8, 0xb4, 0xfb, 0xba, 0xb5, 0xfb, 0xb4, 0xaf, 0xff, 0xfe, 0xfe, 
+	0xff, 0xff, 0xff, 0xf4, 0x43, 0x36, 0xf4, 0x44, 0x37, 0xf4, 0x44, 0x38, 
+	0xf4, 0x45, 0x38, 0xf4, 0x46, 0x39, 0xf4, 0x47, 0x3a, 0xf4, 0x49, 0x3c, 
+	0xf4, 0x4b, 0x3f, 0xf5, 0x4c, 0x3f, 0xf5, 0x4e, 0x42, 0xf5, 0x53, 0x47, 
+	0xf5, 0x54, 0x48, 0xf6, 0x5e, 0x52, 0xf6, 0x66, 0x5b, 0xf7, 0x74, 0x6a, 
+	0xf7, 0x74, 0x6b, 0xf7, 0x7d, 0x73, 0xf8, 0x82, 0x79, 0xf8, 0x8b, 0x83, 
+	0xf8, 0x8d, 0x86, 0xf9, 0x99, 0x92, 0xf9, 0x9c, 0x95, 0xf9, 0x9f, 0x99, 
+	0xfa, 0xa1, 0x9b, 0xfa, 0xa4, 0x9e, 0xfa, 0xac, 0xa6, 0xfa, 0xac, 0xa7, 
+	0xfa, 0xae, 0xa8, 0xfa, 0xaf, 0xaa, 0xfa, 0xb0, 0xab, 0xfb, 0xb4, 0xaf, 
+	0xfb, 0xbd, 0xb8, 0xfc, 0xbf, 0xba, 0xfc, 0xcd, 0xc9, 0xfc, 0xd3, 0xd0, 
+	0xfc, 0xd6, 0xd3, 0xfd, 0xd3, 0xd1, 0xfd, 0xd6, 0xd4, 0xfd, 0xdf, 0xdc, 
+	0xfd, 0xe1, 0xdf, 0xfd, 0xe3, 0xe1, 0xfe, 0xe0, 0xde, 0xfe, 0xe7, 0xe6, 
+	0xfe, 0xed, 0xeb, 0xfe, 0xf2, 0xf1, 0xff, 0xfb, 0xfb, 0xff, 0xfc, 0xfc, 
+	0xff, 0xfd, 0xfd, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x8f, 0x25, 0xed, 
+	0x97, 0x00, 0x00, 0x00, 0x17, 0x74, 0x52, 0x4e, 0x53, 0x00, 0x0a, 0x0b, 
+	0x0c, 0x0d, 0xc8, 0xc9, 0xc9, 0xc9, 0xca, 0xca, 0xcb, 0xcf, 0xd0, 0xd1, 
+	0xf6, 0xf6, 0xf7, 0xf7, 0xf7, 0xf8, 0xfe, 0xfe, 0x8c, 0x76, 0xc4, 0xe1, 
+	0x00, 0x00, 0x00, 0xb4, 0x49, 0x44, 0x41, 0x54, 0x18, 0xd3, 0x75, 0xd0, 
+	0xd7, 0x12, 0x82, 0x40, 0x0c, 0x05, 0x50, 0x11, 0x14, 0xc4, 0x0a, 0x0a, 
+	0x59, 0xec, 0xd8, 0x15, 0x7b, 0xef, 0x0d, 0xcb, 0xfe, 0xff, 0x17, 0x19, 
+	0x5c, 0x16, 0x5e, 0xf4, 0x3e, 0x9e, 0xc9, 0x64, 0x72, 0x13, 0x89, 0xfc, 
+	0x8e, 0x18, 0xa7, 0xdf, 0xa8, 0x22, 0x97, 0x68, 0x22, 0x6f, 0x01, 0x86, 
+	0x14, 0x32, 0x92, 0x2f, 0x49, 0x94, 0xd6, 0xa6, 0xd1, 0x44, 0x4b, 0x4b, 
+	0x5c, 0xaa, 0xd7, 0xf1, 0x6b, 0xbd, 0x07, 0x6e, 0x8a, 0x46, 0xc0, 0xa6, 
+	0xf3, 0xe7, 0x62, 0x7b, 0x70, 0x80, 0xe8, 0x32, 0x92, 0x51, 0x04, 0xa4, 
+	0x19, 0xd2, 0x65, 0x82, 0x73, 0x14, 0xc9, 0x24, 0x9c, 0x4e, 0x23, 0x24, 
+	0x13, 0x89, 0x42, 0xbd, 0x6d, 0x53, 0x97, 0xba, 0xe7, 0x7b, 0x48, 0x7d, 
+	0xea, 0xb0, 0xbb, 0x42, 0xaa, 0xdd, 0x1e, 0x01, 0x59, 0x86, 0x47, 0x04, 
+	0x3a, 0x6f, 0x46, 0x43, 0x80, 0xa2, 0x47, 0xb2, 0x4e, 0x60, 0xc5, 0xa8, 
+	0x0b, 0x44, 0x53, 0x90, 0x84, 0x58, 0xce, 0xaa, 0xee, 0x3c, 0x39, 0x96, 
+	0xf8, 0xf9, 0x02, 0x56, 0x2c, 0xf7, 0xa6, 0xcb, 0x41, 0x85, 0x64, 0x53, 
+	0x7e, 0x49, 0x21, 0xe9, 0xd7, 0x0e, 0x04, 0x9f, 0xa3, 0xb2, 0x5d, 0x71, 
+	0xf1, 0xcf, 0xf7, 0x3e, 0x82, 0xd9, 0x22, 0x46, 0x2f, 0xfc, 0xe8, 0x18, 
+	0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
+}
+
diff --git a/icon/18_off_unix.go b/icon/18_off_unix.go
new file mode 100644
index 0000000..eabd220
--- /dev/null
+++ b/icon/18_off_unix.go
@@ -0,0 +1,58 @@
+//+build linux darwin
+
+// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
+
+package icon
+
+var Off []byte = []byte {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
+	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x12, 
+	0x08, 0x03, 0x00, 0x00, 0x00, 0x61, 0x10, 0x7e, 0x65, 0x00, 0x00, 0x00, 
+	0x03, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0xdb, 0xe1, 0x4f, 0xe0, 
+	0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x07, 0x62, 
+	0x00, 0x00, 0x07, 0x62, 0x01, 0x38, 0x7a, 0x99, 0xdb, 0x00, 0x00, 0x00, 
+	0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 
+	0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 
+	0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 
+	0x00, 0xdb, 0x50, 0x4c, 0x54, 0x45, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf9, 0xf9, 
+	0xfd, 0xfd, 0xfd, 0xf9, 0xf9, 0xf9, 0xfb, 0xfb, 0xfb, 0xf6, 0xf6, 0xf6, 
+	0xf5, 0xf5, 0xf5, 0xf7, 0xf7, 0xf7, 0xf5, 0xf5, 0xf5, 0xf4, 0xf4, 0xf4, 
+	0xf2, 0xf2, 0xf2, 0xf5, 0xf5, 0xf5, 0xf6, 0xf6, 0xf6, 0xf6, 0xf6, 0xf6, 
+	0xf5, 0xf5, 0xf5, 0xf5, 0xf5, 0xf5, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 
+	0xf8, 0xf8, 0xf8, 0xf9, 0xf9, 0xf9, 0xe3, 0xe3, 0xe3, 0xe4, 0xe4, 0xe4, 
+	0xe2, 0xe2, 0xe2, 0xe9, 0xe9, 0xe9, 0xdb, 0xdb, 0xdb, 0xf2, 0xf2, 0xf2, 
+	0xd2, 0xd2, 0xd2, 0xe4, 0xe4, 0xe4, 0xf9, 0xf9, 0xf9, 0xcb, 0xcb, 0xcb, 
+	0xc6, 0xc6, 0xc6, 0xfd, 0xfd, 0xfd, 0xfd, 0xfd, 0xfd, 0xba, 0xba, 0xba, 
+	0xbc, 0xbc, 0xbc, 0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd, 0xa4, 0xa4, 0xa4, 
+	0xa5, 0xa5, 0xa5, 0xff, 0xff, 0xff, 0x66, 0x66, 0x66, 0x67, 0x67, 0x67, 
+	0x69, 0x69, 0x69, 0x6a, 0x6a, 0x6a, 0x6b, 0x6b, 0x6b, 0x6c, 0x6c, 0x6c, 
+	0x70, 0x70, 0x70, 0x76, 0x76, 0x76, 0x77, 0x77, 0x77, 0x78, 0x78, 0x78, 
+	0x79, 0x79, 0x79, 0x7a, 0x7a, 0x7a, 0x82, 0x82, 0x82, 0x8b, 0x8b, 0x8b, 
+	0x91, 0x91, 0x91, 0x95, 0x95, 0x95, 0x96, 0x96, 0x96, 0xeb, 0xeb, 0xeb, 
+	0xec, 0xec, 0xec, 0xed, 0xed, 0xed, 0xff, 0xff, 0xff, 0x60, 0xa0, 0x95, 
+	0x2d, 0x00, 0x00, 0x00, 0x34, 0x74, 0x52, 0x4e, 0x53, 0x00, 0x01, 0x02, 
+	0x06, 0x07, 0x09, 0x0d, 0x29, 0x2a, 0x3a, 0x3c, 0x42, 0x55, 0x7a, 0x7a, 
+	0x7d, 0x7f, 0x94, 0xad, 0xb7, 0xb9, 0xc2, 0xc4, 0xcc, 0xcd, 0xce, 0xdf, 
+	0xe0, 0xe1, 0xe5, 0xee, 0xee, 0xf0, 0xf0, 0xf3, 0xf3, 0xf4, 0xf4, 0xf5, 
+	0xf5, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfa, 0xfa, 0xfb, 0xfd, 0xfd, 
+	0xfe, 0xd0, 0x01, 0x49, 0x62, 0x00, 0x00, 0x00, 0x9e, 0x49, 0x44, 0x41, 
+	0x54, 0x18, 0xd3, 0x63, 0x60, 0xc0, 0x06, 0x98, 0xb9, 0x04, 0xc4, 0xa4, 
+	0xe4, 0x0d, 0xf4, 0xe5, 0xa4, 0x45, 0xf9, 0x38, 0x99, 0xc1, 0x42, 0xda, 
+	0x0a, 0xba, 0xce, 0x0e, 0xd6, 0xe6, 0x96, 0x36, 0x0e, 0x2e, 0x7a, 0x8a, 
+	0x3a, 0x60, 0x21, 0x0f, 0x13, 0x24, 0xe0, 0x01, 0x17, 0xb2, 0xb3, 0x83, 
+	0x60, 0x84, 0x90, 0xad, 0xab, 0xbb, 0x3d, 0x08, 0x23, 0x09, 0xd9, 0xb9, 
+	0x79, 0xb8, 0x01, 0x91, 0x1d, 0xb2, 0x46, 0x5b, 0x57, 0x0f, 0x0f, 0x90, 
+	0x22, 0xdc, 0x42, 0xc6, 0xa6, 0x08, 0x8d, 0xa6, 0xc6, 0x60, 0x21, 0x59, 
+	0x47, 0x84, 0xf1, 0x4e, 0x32, 0x60, 0x21, 0x1e, 0x65, 0x33, 0x98, 0x23, 
+	0xac, 0x54, 0xb9, 0x21, 0x3e, 0x12, 0xd1, 0x34, 0x85, 0xb8, 0xd3, 0x5c, 
+	0x45, 0x10, 0xea, 0x49, 0x56, 0x09, 0x2d, 0x73, 0x90, 0x88, 0x85, 0x9a, 
+	0x30, 0x13, 0xcc, 0xe3, 0x6c, 0xc2, 0x4a, 0x36, 0x26, 0x26, 0x36, 0xea, 
+	0x42, 0x2c, 0x88, 0xc0, 0x60, 0xe4, 0xd7, 0x30, 0x34, 0xd2, 0xe0, 0x65, 
+	0x44, 0x09, 0x21, 0x0e, 0x49, 0x71, 0x76, 0x06, 0x9c, 0x00, 0x00, 0x80, 
+	0x05, 0x27, 0x57, 0x40, 0x43, 0xb1, 0x97, 0x00, 0x00, 0x00, 0x00, 0x49, 
+	0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
+}
+
diff --git a/icon/18_on_unix.go b/icon/18_on_unix.go
new file mode 100644
index 0000000..aa60572
--- /dev/null
+++ b/icon/18_on_unix.go
@@ -0,0 +1,59 @@
+//+build linux darwin
+
+// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
+
+package icon
+
+var On []byte = []byte {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
+	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x12, 
+	0x08, 0x03, 0x00, 0x00, 0x00, 0x61, 0x10, 0x7e, 0x65, 0x00, 0x00, 0x00, 
+	0x03, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0xdb, 0xe1, 0x4f, 0xe0, 
+	0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x07, 0x62, 
+	0x00, 0x00, 0x07, 0x62, 0x01, 0x38, 0x7a, 0x99, 0xdb, 0x00, 0x00, 0x00, 
+	0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 
+	0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 
+	0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 
+	0x00, 0xe1, 0x50, 0x4c, 0x54, 0x45, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xfb, 0xf7, 
+	0xfd, 0xfd, 0xfd, 0xf9, 0xfb, 0xf7, 0xfb, 0xfd, 0xfb, 0xf6, 0xfa, 0xf3, 
+	0xf5, 0xf8, 0xf2, 0xf7, 0xf9, 0xf4, 0xf5, 0xf8, 0xf3, 0xf3, 0xf8, 0xef, 
+	0xf2, 0xf6, 0xee, 0xf5, 0xf9, 0xf1, 0xf6, 0xf9, 0xf4, 0xf5, 0xf9, 0xf3, 
+	0xf4, 0xf8, 0xf0, 0xf4, 0xf8, 0xf0, 0xf6, 0xf9, 0xf4, 0xf6, 0xf9, 0xf4, 
+	0xf8, 0xfa, 0xf5, 0xf9, 0xfb, 0xf6, 0xe1, 0xec, 0xd9, 0xe2, 0xed, 0xda, 
+	0xe1, 0xeb, 0xd6, 0xe8, 0xf0, 0xe1, 0xd9, 0xe7, 0xce, 0xf1, 0xf7, 0xed, 
+	0xcf, 0xe1, 0xc1, 0xe2, 0xec, 0xd8, 0xf8, 0xfb, 0xf6, 0xc7, 0xdc, 0xb5, 
+	0xc3, 0xd9, 0xb1, 0xfd, 0xfe, 0xfc, 0xfd, 0xfe, 0xfc, 0xb6, 0xd0, 0x9e, 
+	0xb8, 0xd1, 0xa1, 0xfc, 0xfd, 0xfb, 0xfd, 0xfe, 0xfd, 0x9f, 0xc2, 0x81, 
+	0xa0, 0xc3, 0x82, 0xff, 0xff, 0xff, 0x5c, 0x97, 0x29, 0x5d, 0x97, 0x2a, 
+	0x5f, 0x99, 0x2d, 0x60, 0x99, 0x2e, 0x60, 0x9a, 0x2f, 0x62, 0x9b, 0x31, 
+	0x66, 0x9e, 0x36, 0x6d, 0xa2, 0x40, 0x6e, 0xa2, 0x40, 0x6f, 0xa3, 0x42, 
+	0x70, 0xa4, 0x44, 0x72, 0xa5, 0x46, 0x79, 0xaa, 0x50, 0x7a, 0xaa, 0x50, 
+	0x83, 0xb0, 0x5c, 0x8a, 0xb4, 0x65, 0x8e, 0xb7, 0x6b, 0x8f, 0xb8, 0x6c, 
+	0xd7, 0xe5, 0xca, 0xe9, 0xf1, 0xe2, 0xeb, 0xf2, 0xe4, 0xec, 0xf3, 0xe6, 
+	0xff, 0xff, 0xff, 0x8c, 0x5c, 0xc0, 0x29, 0x00, 0x00, 0x00, 0x34, 0x74, 
+	0x52, 0x4e, 0x53, 0x00, 0x01, 0x02, 0x06, 0x07, 0x09, 0x0d, 0x29, 0x2a, 
+	0x3a, 0x3c, 0x42, 0x55, 0x7a, 0x7a, 0x7d, 0x7f, 0x94, 0xad, 0xb7, 0xb9, 
+	0xc2, 0xc4, 0xcc, 0xcd, 0xce, 0xdf, 0xe0, 0xe1, 0xe5, 0xee, 0xee, 0xf0, 
+	0xf0, 0xf3, 0xf3, 0xf4, 0xf4, 0xf5, 0xf5, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 
+	0xfa, 0xfa, 0xfa, 0xfb, 0xfd, 0xfd, 0xfe, 0xd0, 0x01, 0x49, 0x62, 0x00, 
+	0x00, 0x00, 0xa7, 0x49, 0x44, 0x41, 0x54, 0x18, 0xd3, 0x63, 0x60, 0xc0, 
+	0x06, 0x98, 0xb9, 0x04, 0xc4, 0xa4, 0xe4, 0x0d, 0xf4, 0xe5, 0xa4, 0x45, 
+	0xf9, 0x38, 0x99, 0xc1, 0x42, 0xda, 0x0a, 0xba, 0x2e, 0x8e, 0xd6, 0x16, 
+	0x96, 0x36, 0x0e, 0xae, 0x7a, 0x8a, 0x3a, 0x60, 0x21, 0x2f, 0x13, 0x24, 
+	0xe0, 0x45, 0x48, 0xc8, 0xd6, 0xcd, 0x1e, 0x4d, 0xc8, 0xce, 0xc3, 0xcb, 
+	0x0d, 0x49, 0x08, 0xa8, 0xc0, 0xd6, 0xdd, 0xcb, 0x13, 0x59, 0x95, 0x9b, 
+	0x97, 0x87, 0x87, 0x97, 0x87, 0x1d, 0xdc, 0x2c, 0x63, 0x53, 0x13, 0xa0, 
+	0x12, 0xb0, 0x1a, 0x13, 0x53, 0x63, 0xb0, 0x90, 0xac, 0x13, 0x50, 0xa7, 
+	0x3b, 0x58, 0xc4, 0xc4, 0x59, 0x06, 0x2c, 0xc4, 0xa3, 0x6c, 0x06, 0x34, 
+	0x1c, 0xa4, 0xcb, 0xc4, 0x4a, 0x95, 0x1b, 0xe2, 0x23, 0x11, 0x4d, 0x53, 
+	0x88, 0xa5, 0xe6, 0x2a, 0x82, 0x50, 0x4f, 0xb2, 0x4a, 0x68, 0x99, 0x83, 
+	0x44, 0x2c, 0xd5, 0x84, 0x99, 0x60, 0x1e, 0x67, 0x13, 0x56, 0xb2, 0x31, 
+	0x31, 0xb1, 0x51, 0x17, 0x62, 0x41, 0x04, 0x06, 0x23, 0xbf, 0x86, 0xa1, 
+	0x91, 0x06, 0x2f, 0x23, 0x4a, 0x08, 0x71, 0x48, 0x8a, 0xb3, 0x33, 0xe0, 
+	0x04, 0x00, 0xed, 0x9b, 0x26, 0x9e, 0x1e, 0x2c, 0xde, 0x0f, 0x00, 0x00, 
+	0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
+}
+
diff --git a/icon/18_wait_0_unix.go b/icon/18_wait_0_unix.go
new file mode 100644
index 0000000..fa8888b
--- /dev/null
+++ b/icon/18_wait_0_unix.go
@@ -0,0 +1,70 @@
+//+build linux darwin
+
+// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
+
+package icon
+
+var Wait0 []byte = []byte {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
+	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x12, 
+	0x08, 0x06, 0x00, 0x00, 0x00, 0x56, 0xce, 0x8e, 0x57, 0x00, 0x00, 0x00, 
+	0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, 
+	0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x07, 
+	0x62, 0x00, 0x00, 0x07, 0x62, 0x01, 0x38, 0x7a, 0x99, 0xdb, 0x00, 0x00, 
+	0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 
+	0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 
+	0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 
+	0x00, 0x02, 0x58, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xad, 0x91, 0xcf, 
+	0x4b, 0x54, 0x51, 0x14, 0xc7, 0xbf, 0xe7, 0xbd, 0x37, 0xf3, 0x66, 0x94, 
+	0xd1, 0x49, 0x08, 0xd2, 0x21, 0x42, 0x45, 0x4a, 0x2b, 0x28, 0x04, 0x6b, 
+	0x33, 0xfd, 0xa4, 0x45, 0xb4, 0x16, 0x6c, 0xe1, 0x2e, 0xfa, 0x07, 0x42, 
+	0x30, 0xa2, 0x4d, 0x88, 0xb4, 0x0c, 0x6a, 0xd3, 0x2e, 0x68, 0x63, 0x58, 
+	0x6e, 0x6d, 0x93, 0xa5, 0xe5, 0x22, 0xb0, 0x88, 0xa8, 0x01, 0x85, 0x09, 
+	0xd4, 0xa6, 0x49, 0xb0, 0xc1, 0x71, 0xde, 0x9b, 0x37, 0xe3, 0x9b, 0x7b, 
+	0xbf, 0x2d, 0xa6, 0xd4, 0x99, 0x37, 0x21, 0x45, 0x67, 0x75, 0x39, 0xf7, 
+	0x7e, 0x3f, 0xe7, 0xfb, 0x3d, 0x17, 0xf8, 0x4f, 0x25, 0xbf, 0x0f, 0x24, 
+	0xc3, 0x00, 0x06, 0xa0, 0x2b, 0x17, 0xe9, 0x6f, 0x5c, 0x82, 0x61, 0x25, 
+	0xc4, 0x0c, 0xb7, 0x42, 0xec, 0x18, 0xa9, 0x29, 0xdc, 0x72, 0xa8, 0xfd, 
+	0x4d, 0x11, 0xae, 0xc0, 0x8a, 0x3d, 0x07, 0xac, 0x57, 0x00, 0x16, 0x44, 
+	0x64, 0xab, 0x16, 0xa4, 0x2b, 0x25, 0xed, 0x2e, 0x95, 0x74, 0x6e, 0xae, 
+	0x49, 0xe7, 0xdf, 0x86, 0x58, 0x5a, 0x05, 0xfd, 0x1c, 0xe8, 0xe7, 0x00, 
+	0x31, 0x21, 0x56, 0x1c, 0x12, 0x8a, 0x43, 0x22, 0x87, 0x60, 0xc4, 0x4f, 
+	0xfb, 0xc6, 0xbe, 0x64, 0x51, 0x9a, 0x7b, 0xa2, 0x86, 0x61, 0xd9, 0xf5, 
+	0x8e, 0xe8, 0xbd, 0x4c, 0xd4, 0xda, 0xb5, 0x5a, 0x20, 0xcd, 0x87, 0x01, 
+	0x31, 0xa1, 0x0b, 0x1f, 0x01, 0x55, 0xac, 0xb9, 0x8f, 0x9e, 0xcf, 0x40, 
+	0x44, 0x04, 0x00, 0xac, 0xc6, 0x81, 0x4d, 0x84, 0x3a, 0x47, 0x60, 0x1d, 
+	0xbc, 0x0e, 0x18, 0x76, 0xb5, 0xa7, 0x5c, 0xf8, 0xcb, 0xf7, 0x01, 0xb1, 
+	0xc0, 0x72, 0x16, 0x2a, 0x3b, 0x51, 0x23, 0x69, 0x08, 0x0a, 0xf5, 0x8c, 
+	0xc1, 0x4a, 0x0c, 0x43, 0x65, 0x27, 0x50, 0x59, 0x9b, 0x82, 0x18, 0x51, 
+	0x98, 0xed, 0x57, 0x11, 0xea, 0x1a, 0x05, 0x00, 0xf8, 0xe9, 0xb1, 0x80, 
+	0x26, 0x00, 0x92, 0xa6, 0x6e, 0x58, 0x89, 0x61, 0x54, 0x96, 0x1f, 0xc0, 
+	0xff, 0x72, 0x77, 0xa7, 0x1f, 0x3b, 0x0e, 0x73, 0xff, 0xe5, 0x86, 0x01, 
+	0x1a, 0x83, 0x0c, 0x1b, 0x7e, 0x7a, 0x1c, 0x95, 0x6f, 0x8f, 0x6b, 0xfa, 
+	0x2c, 0x67, 0xe1, 0xa7, 0xc7, 0xab, 0x29, 0x7f, 0xbc, 0xd8, 0x1b, 0xa4, 
+	0xdd, 0x25, 0xb0, 0x94, 0x81, 0xc0, 0x00, 0x0d, 0x1b, 0xd0, 0xe5, 0xaa, 
+	0x38, 0xfb, 0xa4, 0x3a, 0xc8, 0x6a, 0x05, 0x95, 0x13, 0x00, 0x19, 0xbb, 
+	0x87, 0x02, 0x82, 0x50, 0xe7, 0x0d, 0x44, 0x92, 0x29, 0x44, 0x92, 0x29, 
+	0x84, 0x7b, 0xef, 0xd5, 0x3c, 0x36, 0x0f, 0x0c, 0x22, 0x92, 0x4c, 0x41, 
+	0x9a, 0xba, 0xf1, 0xeb, 0xc3, 0x19, 0x00, 0x51, 0x39, 0x59, 0x23, 0x3e, 
+	0x00, 0x48, 0x78, 0x9b, 0xab, 0xbe, 0x4f, 0xee, 0x4c, 0x6c, 0x3b, 0x8b, 
+	0x50, 0xcf, 0x1d, 0xe8, 0xdc, 0x2c, 0xe8, 0x2e, 0xc1, 0x6c, 0x3b, 0x07, 
+	0x28, 0x67, 0x35, 0x60, 0x8d, 0xe4, 0xa0, 0x2e, 0xa6, 0x0b, 0xfe, 0xca, 
+	0x43, 0xaa, 0xfc, 0x3b, 0xea, 0x52, 0x86, 0x24, 0xa9, 0x4b, 0x19, 0x6a, 
+	0xef, 0x2b, 0x49, 0x52, 0x15, 0x52, 0xf4, 0x5e, 0x1f, 0xa3, 0x37, 0x77, 
+	0x84, 0x7a, 0x6b, 0xdd, 0x21, 0x79, 0x21, 0xb0, 0x23, 0x11, 0x99, 0xd4, 
+	0x7e, 0xfe, 0x9a, 0x11, 0xed, 0x3a, 0x53, 0xfe, 0x30, 0x14, 0x01, 0x04, 
+	0x56, 0xfb, 0x10, 0x8c, 0x96, 0x93, 0xa0, 0x72, 0xa1, 0xf3, 0x0b, 0x50, 
+	0x6b, 0x53, 0x80, 0x08, 0xec, 0x13, 0x4f, 0x5d, 0x1a, 0xf6, 0x23, 0x43, 
+	0x64, 0x66, 0x5b, 0x5f, 0xe7, 0x2a, 0x8a, 0x8a, 0xf3, 0x46, 0xad, 0x4f, 
+	0xf7, 0x6d, 0x2d, 0x8e, 0x44, 0xa0, 0xfd, 0xba, 0x8d, 0x46, 0x10, 0x3e, 
+	0xfa, 0xd0, 0x33, 0xe3, 0xa7, 0x66, 0x61, 0xc5, 0xae, 0x88, 0x88, 0x0e, 
+	0x44, 0xdb, 0x05, 0x8b, 0xb1, 0xe2, 0x4c, 0xab, 0xcd, 0x4f, 0x05, 0x6f, 
+	0xbe, 0x9f, 0xc5, 0x99, 0x0e, 0x16, 0x67, 0x3a, 0xe8, 0xcd, 0xf7, 0x53, 
+	0x39, 0x9f, 0x5d, 0xed, 0x6f, 0x3c, 0x23, 0x69, 0xff, 0x11, 0x50, 0x07, 
+	0x13, 0x2a, 0xef, 0x36, 0x95, 0xeb, 0x96, 0x17, 0x47, 0x55, 0x79, 0xf1, 
+	0xa6, 0xa2, 0x72, 0x5d, 0x2a, 0xef, 0x16, 0x49, 0xd9, 0x9b, 0x10, 0x04, 
+	0xf6, 0xd1, 0xcf, 0xbf, 0xa7, 0x9f, 0x5f, 0x20, 0xd9, 0xfb, 0xd7, 0x80, 
+	0x7f, 0xa9, 0x9f, 0x50, 0xea, 0x2d, 0x11, 0xa7, 0xcf, 0xa5, 0xe3, 0x00, 
+	0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
+}
+
diff --git a/icon/18_wait_1_unix.go b/icon/18_wait_1_unix.go
new file mode 100644
index 0000000..807be88
--- /dev/null
+++ b/icon/18_wait_1_unix.go
@@ -0,0 +1,73 @@
+//+build linux darwin
+
+// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
+
+package icon
+
+var Wait1 []byte = []byte {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
+	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x12, 
+	0x08, 0x06, 0x00, 0x00, 0x00, 0x56, 0xce, 0x8e, 0x57, 0x00, 0x00, 0x00, 
+	0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, 
+	0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x07, 
+	0x62, 0x00, 0x00, 0x07, 0x62, 0x01, 0x38, 0x7a, 0x99, 0xdb, 0x00, 0x00, 
+	0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 
+	0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 
+	0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 
+	0x00, 0x02, 0x75, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xad, 0x90, 0xcd, 
+	0x4b, 0x54, 0x51, 0x18, 0xc6, 0x9f, 0x73, 0xee, 0xbd, 0x33, 0x8e, 0xe3, 
+	0xd8, 0xd8, 0x27, 0x2a, 0x18, 0x84, 0xa1, 0x29, 0x84, 0x20, 0x58, 0x8b, 
+	0x84, 0xbe, 0x5b, 0x48, 0xd0, 0xa6, 0x8d, 0xd0, 0x3f, 0x50, 0x6e, 0x83, 
+	0x3e, 0x10, 0xda, 0x95, 0xd0, 0xa6, 0x45, 0x85, 0xd4, 0xa2, 0x88, 0x5a, 
+	0x44, 0x6d, 0xda, 0xd8, 0x07, 0xa8, 0x23, 0xb9, 0x30, 0x44, 0x28, 0xca, 
+	0xd0, 0x48, 0x4d, 0xb1, 0x44, 0x74, 0x70, 0xf4, 0xce, 0xdc, 0x99, 0x7b, 
+	0xef, 0x39, 0x4f, 0x8b, 0xc9, 0x9a, 0xeb, 0x64, 0x52, 0xf4, 0xae, 0xce, 
+	0x39, 0xef, 0xfb, 0xfe, 0x9e, 0xe7, 0x39, 0xc0, 0x7f, 0x2a, 0xb1, 0x7a, 
+	0x20, 0x19, 0x02, 0xd0, 0x02, 0xed, 0x1f, 0xa1, 0xb7, 0x74, 0x0c, 0xd2, 
+	0xac, 0x16, 0x46, 0x68, 0x13, 0x44, 0x38, 0x46, 0x6a, 0x0a, 0xba, 0x36, 
+	0xb5, 0xb7, 0x2c, 0x04, 0xa7, 0x61, 0xc6, 0x9e, 0x03, 0x66, 0x3f, 0x80, 
+	0x61, 0x21, 0x84, 0x1b, 0x04, 0x69, 0x3f, 0xab, 0xd3, 0xe3, 0x59, 0x9d, 
+	0x1c, 0x28, 0xd5, 0xa9, 0x21, 0x8b, 0xd9, 0x19, 0xd0, 0x4b, 0x82, 0x5e, 
+	0x12, 0x10, 0x06, 0x84, 0x19, 0x87, 0xb0, 0xe2, 0x10, 0x25, 0x3b, 0x21, 
+	0xe3, 0xfb, 0x3d, 0x59, 0xd1, 0x9a, 0x11, 0xd1, 0xdd, 0x11, 0x29, 0xcd, 
+	0xf0, 0x5a, 0x47, 0x74, 0xfa, 0xaa, 0x83, 0x7e, 0xcd, 0x18, 0x64, 0xb4, 
+	0x0e, 0x80, 0x84, 0x5e, 0x79, 0x0b, 0xe8, 0x5c, 0xa0, 0x1d, 0x39, 0x34, 
+	0x0b, 0x21, 0x84, 0x00, 0x00, 0x73, 0xbd, 0xcc, 0xc6, 0x96, 0xa3, 0x08, 
+	0x35, 0xde, 0x04, 0x8c, 0xb2, 0xfc, 0x83, 0x72, 0xe0, 0x4d, 0x76, 0xc1, 
+	0x9f, 0xb9, 0x0b, 0x80, 0x45, 0xf3, 0xc5, 0x20, 0x69, 0x41, 0x84, 0xab, 
+	0xa1, 0x92, 0xfd, 0xf0, 0x26, 0xaf, 0x43, 0xdb, 0x1f, 0x01, 0x61, 0xc0, 
+	0xac, 0x6c, 0x87, 0x55, 0x7b, 0x05, 0xc2, 0xda, 0x0c, 0x6f, 0xa2, 0x6b, 
+	0x03, 0x90, 0xb4, 0x10, 0x6a, 0xec, 0x86, 0x51, 0x71, 0x00, 0xb9, 0x77, 
+	0x67, 0xe0, 0xcf, 0xdc, 0xf9, 0xd9, 0x72, 0x93, 0x09, 0x84, 0xf4, 0x0d, 
+	0x98, 0x35, 0x67, 0xe1, 0xcf, 0xde, 0x07, 0x73, 0x73, 0xc1, 0xd5, 0xc2, 
+	0x4b, 0xa8, 0xe1, 0x16, 0x8c, 0xad, 0x27, 0x00, 0x23, 0x8a, 0xf0, 0xde, 
+	0x07, 0x90, 0xe5, 0x4d, 0x81, 0x61, 0x7f, 0xfa, 0x36, 0x20, 0x4c, 0xc8, 
+	0x8a, 0xd6, 0x3f, 0x3b, 0x52, 0x5f, 0x1f, 0x02, 0x20, 0x8c, 0x6d, 0x6d, 
+	0x70, 0xc7, 0x2f, 0x05, 0x54, 0xcd, 0xca, 0x76, 0x98, 0xb5, 0x9d, 0x79, 
+	0xc1, 0xba, 0x6b, 0x50, 0xdb, 0x4f, 0xae, 0xeb, 0x88, 0x2a, 0x99, 0x80, 
+	0x9a, 0x7f, 0xf6, 0x43, 0xde, 0x0e, 0x80, 0xfc, 0xb9, 0xc7, 0xd0, 0xc9, 
+	0x44, 0x7e, 0xd0, 0x5d, 0x84, 0xf7, 0xa9, 0x13, 0x28, 0xf8, 0x75, 0xf3, 
+	0x17, 0xc5, 0xfe, 0x26, 0xe3, 0x2d, 0x55, 0x6a, 0xe1, 0x25, 0xe8, 0x4c, 
+	0xc1, 0xaa, 0xbb, 0x0a, 0xba, 0xf3, 0xd0, 0xcb, 0x23, 0x00, 0x00, 0x61, 
+	0x44, 0xe1, 0x8e, 0x76, 0xc0, 0x72, 0xbe, 0xc0, 0xff, 0xf6, 0x08, 0x32, 
+	0xb2, 0x0b, 0x50, 0xf6, 0x4c, 0x51, 0x46, 0x92, 0xa7, 0x75, 0xe6, 0xf3, 
+	0x4a, 0xa6, 0xaf, 0x86, 0xce, 0xd0, 0x41, 0xea, 0xcc, 0x04, 0x49, 0x52, 
+	0x67, 0xa6, 0xa8, 0xb3, 0xb3, 0xa4, 0x6f, 0x33, 0xfb, 0xe6, 0x38, 0x33, 
+	0xbd, 0x55, 0x74, 0x06, 0xea, 0xa9, 0xdd, 0x05, 0x9b, 0xe4, 0xe1, 0xd5, 
+	0x7d, 0x51, 0x08, 0xd3, 0x5e, 0xea, 0x85, 0x5e, 0xec, 0x6b, 0x75, 0x47, 
+	0xcf, 0x45, 0x60, 0x94, 0xc2, 0xdc, 0x71, 0x0a, 0xb2, 0xbc, 0x19, 0xd4, 
+	0x59, 0xe8, 0xe4, 0x00, 0xd4, 0xe2, 0x2b, 0x40, 0x48, 0x84, 0x9b, 0x9e, 
+	0xa4, 0x51, 0x56, 0x7f, 0xcf, 0x30, 0x63, 0x1d, 0xbf, 0x05, 0x91, 0x8c, 
+	0xc0, 0xb7, 0x5f, 0xab, 0x85, 0x9e, 0x06, 0x77, 0xec, 0x7c, 0x09, 0xb4, 
+	0x17, 0xb4, 0x2d, 0x4b, 0x10, 0x6a, 0xec, 0x76, 0x8c, 0xf8, 0xbe, 0x04, 
+	0xcc, 0x58, 0x9b, 0x10, 0x42, 0x17, 0x45, 0x2b, 0x80, 0xc5, 0xe8, 0xdb, 
+	0x3d, 0x6a, 0xf9, 0xfd, 0x8a, 0x33, 0xd8, 0xcc, 0x4c, 0x6f, 0x55, 0x3e, 
+	0xce, 0x60, 0x33, 0x95, 0xfd, 0x21, 0xad, 0xbd, 0xa5, 0xa7, 0x24, 0xc3, 
+	0xeb, 0x02, 0xd6, 0xc0, 0x04, 0x95, 0xd3, 0x49, 0x95, 0x4e, 0xe7, 0xc6, 
+	0x2e, 0xa8, 0xdc, 0xd8, 0x45, 0x45, 0x95, 0x4e, 0x53, 0x39, 0x97, 0x49, 
+	0x8a, 0x8d, 0x09, 0xc5, 0xc0, 0x06, 0x7a, 0xa9, 0x11, 0x7a, 0xa9, 0x61, 
+	0x92, 0x7b, 0xfe, 0x1a, 0xf0, 0x2f, 0xf5, 0x1d, 0x16, 0x03, 0x43, 0x97, 
+	0x56, 0x41, 0x74, 0xc4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 
+	0xae, 0x42, 0x60, 0x82, 
+}
+
diff --git a/icon/18_wait_2_unix.go b/icon/18_wait_2_unix.go
new file mode 100644
index 0000000..ea4a7a5
--- /dev/null
+++ b/icon/18_wait_2_unix.go
@@ -0,0 +1,70 @@
+//+build linux darwin
+
+// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
+
+package icon
+
+var Wait2 []byte = []byte {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
+	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x12, 
+	0x08, 0x06, 0x00, 0x00, 0x00, 0x56, 0xce, 0x8e, 0x57, 0x00, 0x00, 0x00, 
+	0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, 
+	0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x07, 
+	0x62, 0x00, 0x00, 0x07, 0x62, 0x01, 0x38, 0x7a, 0x99, 0xdb, 0x00, 0x00, 
+	0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 
+	0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 
+	0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 
+	0x00, 0x02, 0x56, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xad, 0x91, 0xcd, 
+	0x6f, 0x4c, 0x61, 0x14, 0xc6, 0x7f, 0xe7, 0x7e, 0xcc, 0xed, 0xe8, 0x0c, 
+	0x63, 0x42, 0x50, 0x92, 0x4a, 0x10, 0x6d, 0x25, 0x24, 0x2a, 0x65, 0x23, 
+	0x2a, 0xd2, 0x90, 0x58, 0xfa, 0x07, 0xd8, 0xd8, 0x20, 0x21, 0x22, 0x21, 
+	0xa2, 0xff, 0x80, 0x86, 0xb0, 0xeb, 0x4e, 0x62, 0x65, 0x61, 0x65, 0xe1, 
+	0x2b, 0x69, 0x11, 0x5d, 0x88, 0x21, 0x12, 0x6d, 0xb5, 0x16, 0x12, 0x1a, 
+	0x24, 0x52, 0xa3, 0x53, 0xf7, 0x76, 0x3e, 0xee, 0x7d, 0xdf, 0x63, 0x51, 
+	0x55, 0xd3, 0xf1, 0x1d, 0x67, 0x75, 0x72, 0xce, 0xc9, 0x2f, 0xcf, 0x73, 
+	0x1e, 0xf8, 0x4f, 0x25, 0x73, 0x8d, 0xaa, 0xa6, 0x80, 0x2e, 0x6c, 0xb2, 
+	0x47, 0xe3, 0xa9, 0x1e, 0x1c, 0x6f, 0xb5, 0xb8, 0xa9, 0x25, 0x48, 0x90, 
+	0x55, 0xb5, 0x2a, 0x5a, 0x0b, 0xd5, 0xc6, 0xd3, 0x22, 0xfa, 0x06, 0x2f, 
+	0x7b, 0x0b, 0xbc, 0x7b, 0x40, 0x41, 0x44, 0x6a, 0xf5, 0x20, 0x9b, 0x54, 
+	0x6c, 0xf4, 0xb2, 0x62, 0x8b, 0x0f, 0x16, 0xd9, 0xd2, 0x23, 0x5f, 0x2b, 
+	0x13, 0x68, 0x5c, 0x44, 0xe3, 0x22, 0x88, 0x8b, 0x78, 0x39, 0xc4, 0xcf, 
+	0x21, 0x4d, 0xad, 0x38, 0xb9, 0x1d, 0xb1, 0xb3, 0x74, 0xe7, 0x8c, 0x34, 
+	0x6f, 0x48, 0x3b, 0x8e, 0x17, 0x2c, 0x54, 0xa4, 0xe5, 0xc1, 0xd5, 0x20, 
+	0x1e, 0xee, 0xb2, 0x1e, 0x10, 0x17, 0xd4, 0x62, 0x3e, 0xde, 0x05, 0x09, 
+	0x40, 0x13, 0xb0, 0x95, 0x3a, 0x3b, 0xe9, 0xdd, 0x6f, 0x11, 0x11, 0x01, 
+	0xf0, 0x1a, 0xcc, 0x3a, 0x01, 0xde, 0xda, 0x93, 0x38, 0x99, 0x76, 0x00, 
+	0xaa, 0x85, 0x7d, 0x48, 0xb0, 0x0a, 0xbf, 0xed, 0x22, 0xc9, 0xeb, 0xcb, 
+	0x24, 0x13, 0xfd, 0x3f, 0xfc, 0x91, 0xd3, 0x30, 0x31, 0x11, 0x1a, 0x8d, 
+	0xd6, 0x8d, 0xec, 0xf4, 0x33, 0xec, 0xd4, 0x10, 0xfe, 0xfa, 0x5e, 0xbc, 
+	0xb5, 0x27, 0xfe, 0x0c, 0xe4, 0x64, 0x37, 0xe3, 0xae, 0x38, 0x40, 0xf2, 
+	0xee, 0x2a, 0x36, 0x7c, 0x01, 0x36, 0x46, 0x6b, 0x1f, 0xa8, 0x0d, 0x1f, 
+	0xc6, 0xbc, 0xbf, 0x86, 0xdf, 0x7a, 0x0c, 0x09, 0x56, 0xfe, 0x01, 0x28, 
+	0xdf, 0x0d, 0x40, 0xf2, 0xea, 0x3c, 0xd5, 0xc2, 0x5e, 0x6c, 0x34, 0xf6, 
+	0x6d, 0x97, 0x4c, 0xf4, 0x83, 0x13, 0xe0, 0x2c, 0xd9, 0xd6, 0x00, 0x6a, 
+	0xfc, 0x91, 0x78, 0xa0, 0x09, 0x9a, 0x7c, 0x02, 0xb5, 0x75, 0x2b, 0x35, 
+	0xe1, 0xec, 0x89, 0x9f, 0xff, 0x25, 0x48, 0x41, 0x44, 0xa3, 0xb1, 0xd9, 
+	0xe4, 0x96, 0xee, 0xc2, 0x14, 0x07, 0x67, 0x55, 0x36, 0x6f, 0x44, 0xb2, 
+	0x5b, 0x10, 0x37, 0x00, 0xc0, 0x86, 0x23, 0x7c, 0x0d, 0x5c, 0x1b, 0xac, 
+	0xa9, 0x09, 0xdf, 0x3b, 0xb9, 0x2e, 0xcc, 0xe4, 0x1d, 0x34, 0x7a, 0x89, 
+	0xdf, 0xd6, 0x87, 0xb3, 0x78, 0xeb, 0xac, 0x82, 0x74, 0x2b, 0xa9, 0xf6, 
+	0x0b, 0xf8, 0xeb, 0x7a, 0xb1, 0xa5, 0xc7, 0xd8, 0xd2, 0x13, 0xdc, 0x7c, 
+	0x37, 0x98, 0x70, 0xa2, 0x01, 0x24, 0x6e, 0xe6, 0x78, 0xaa, 0xad, 0x2f, 
+	0x04, 0xa8, 0x3e, 0x3f, 0x08, 0x26, 0x22, 0xe8, 0xbc, 0x81, 0xd3, 0xdc, 
+	0x36, 0x77, 0x01, 0xee, 0x22, 0x4c, 0x71, 0x10, 0xf1, 0x16, 0xe3, 0x77, 
+	0x5c, 0x8a, 0x70, 0x33, 0x87, 0x98, 0xdf, 0xce, 0x97, 0x8d, 0x4b, 0xb7, 
+	0xed, 0xc7, 0xc1, 0x9d, 0xb5, 0xd1, 0x23, 0x69, 0x1c, 0x1f, 0x77, 0xf9, 
+	0x7e, 0xec, 0xa7, 0x21, 0xc4, 0xcf, 0x7f, 0x17, 0xbb, 0x41, 0x82, 0x35, 
+	0x11, 0x99, 0x8d, 0x57, 0x5c, 0x2f, 0x7b, 0xf4, 0x87, 0x20, 0x55, 0x4d, 
+	0x93, 0x84, 0x0f, 0xcd, 0xe4, 0xcd, 0x8e, 0xda, 0xf8, 0xa9, 0x26, 0x6c, 
+	0x5c, 0xff, 0x51, 0xa7, 0x89, 0xd4, 0xa6, 0xfe, 0xb2, 0x9b, 0xdb, 0x7e, 
+	0x1f, 0x2f, 0xbb, 0x5f, 0x44, 0xea, 0xd3, 0x58, 0x00, 0xcb, 0x6a, 0x12, 
+	0xde, 0x34, 0xd3, 0xc3, 0x9f, 0xcb, 0x43, 0x9d, 0x3a, 0x33, 0xd0, 0xa2, 
+	0x33, 0x03, 0x2d, 0x5a, 0x1e, 0xea, 0x54, 0x13, 0x8e, 0x44, 0x36, 0x9e, 
+	0xba, 0xae, 0xaa, 0xc1, 0x4f, 0x01, 0x0b, 0x60, 0xa2, 0xa6, 0x7c, 0x4e, 
+	0x4d, 0x14, 0x55, 0xc7, 0x4f, 0x9b, 0xea, 0xf8, 0x19, 0xa3, 0x26, 0x8a, 
+	0xd4, 0x94, 0xcf, 0xaa, 0xaa, 0xfc, 0x9e, 0xd0, 0x08, 0xec, 0xd0, 0xb8, 
+	0xf4, 0x54, 0xe3, 0x52, 0x41, 0x55, 0xdb, 0xff, 0x1a, 0xf0, 0x2f, 0xf5, 
+	0x05, 0x3a, 0x5d, 0x11, 0x12, 0x76, 0xa9, 0xde, 0x4d, 0x00, 0x00, 0x00, 
+	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
+}
+
diff --git a/icon/18_wait_3_unix.go b/icon/18_wait_3_unix.go
new file mode 100644
index 0000000..100c3e9
--- /dev/null
+++ b/icon/18_wait_3_unix.go
@@ -0,0 +1,72 @@
+//+build linux darwin
+
+// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
+
+package icon
+
+var Wait3 []byte = []byte {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
+	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x12, 
+	0x08, 0x06, 0x00, 0x00, 0x00, 0x56, 0xce, 0x8e, 0x57, 0x00, 0x00, 0x00, 
+	0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, 
+	0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x07, 
+	0x62, 0x00, 0x00, 0x07, 0x62, 0x01, 0x38, 0x7a, 0x99, 0xdb, 0x00, 0x00, 
+	0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 
+	0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 
+	0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 
+	0x00, 0x02, 0x6e, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xad, 0x92, 0xcb, 
+	0x6b, 0x53, 0x41, 0x14, 0x87, 0x7f, 0x33, 0xf7, 0xde, 0xa4, 0xb5, 0x89, 
+	0x7d, 0xa4, 0x2e, 0x6c, 0xaa, 0x05, 0x6d, 0xa1, 0x11, 0x54, 0xb0, 0x58, 
+	0x74, 0x51, 0x51, 0x6b, 0x11, 0xff, 0x00, 0x17, 0xba, 0x51, 0x10, 0xff, 
+	0x02, 0x41, 0x2a, 0xbe, 0xc0, 0xad, 0x0b, 0x8b, 0x3b, 0x37, 0x2a, 0x88, 
+	0x08, 0x8a, 0xe0, 0xae, 0xda, 0x42, 0xfa, 0xd0, 0x5a, 0x94, 0x2a, 0x52, 
+	0x2d, 0x98, 0x8a, 0x58, 0x8c, 0x52, 0xb4, 0xe9, 0xf3, 0xde, 0xdc, 0x9b, 
+	0xe4, 0xde, 0x99, 0x9f, 0x8b, 0x56, 0x6d, 0x4d, 0xa8, 0x0f, 0x3c, 0x9b, 
+	0x19, 0xce, 0x39, 0xf3, 0xf1, 0x9d, 0x99, 0x01, 0xfe, 0x53, 0x88, 0xef, 
+	0x1b, 0x92, 0x21, 0x00, 0xad, 0xd0, 0x41, 0x3b, 0xfd, 0xb9, 0x0e, 0x48, 
+	0x33, 0x2e, 0x8c, 0x50, 0x25, 0x44, 0x38, 0x4a, 0x6a, 0x0a, 0x16, 0x1c, 
+	0x6a, 0x7f, 0x41, 0x08, 0x7e, 0x84, 0x19, 0x7d, 0x08, 0x98, 0xfd, 0x00, 
+	0x46, 0x84, 0x10, 0x85, 0x95, 0x20, 0x1d, 0xe4, 0x74, 0x76, 0x3c, 0xa7, 
+	0x67, 0x06, 0xd7, 0xe8, 0xf9, 0x67, 0x16, 0x73, 0x69, 0xd0, 0x9f, 0x01, 
+	0x84, 0x84, 0x59, 0x7f, 0x02, 0x41, 0xfa, 0x3a, 0x84, 0xb5, 0x16, 0xa2, 
+	0xac, 0x01, 0xb2, 0x6a, 0x97, 0x2f, 0xab, 0xdb, 0x5c, 0x51, 0xd1, 0x54, 
+	0x2e, 0xa5, 0x19, 0xfe, 0xd5, 0x88, 0x5e, 0x5f, 0x7c, 0xa5, 0xae, 0x55, 
+	0x05, 0x19, 0xeb, 0x40, 0x28, 0xd1, 0x05, 0x35, 0x79, 0x07, 0x85, 0xd4, 
+	0x69, 0x80, 0xfa, 0x47, 0xbd, 0x7c, 0xdf, 0x67, 0x08, 0x21, 0x04, 0x00, 
+	0x98, 0xa5, 0x07, 0x36, 0x61, 0x6d, 0x3e, 0x07, 0x33, 0x7e, 0x1c, 0x90, 
+	0x16, 0x00, 0xc0, 0x58, 0x7f, 0x04, 0x46, 0xa6, 0x07, 0x2a, 0xd3, 0x53, 
+	0xf2, 0x88, 0x2c, 0x95, 0xb4, 0x9a, 0x2e, 0xc1, 0xdc, 0x70, 0x12, 0xea, 
+	0xeb, 0x03, 0xf8, 0xe3, 0x9d, 0x00, 0x80, 0xe0, 0xd3, 0x0d, 0xa8, 0x4c, 
+	0x2f, 0x44, 0x59, 0x7d, 0x49, 0x50, 0x91, 0x91, 0x8c, 0x24, 0x60, 0xc6, 
+	0x8f, 0x21, 0x98, 0xe8, 0x82, 0xff, 0xe1, 0x32, 0x84, 0x15, 0x03, 0xac, 
+	0x5a, 0x04, 0x13, 0x5d, 0x90, 0x95, 0x2d, 0x08, 0x6f, 0xbf, 0x8d, 0xdc, 
+	0xf0, 0xee, 0xc5, 0xfb, 0x5b, 0xcd, 0x48, 0x56, 0xb7, 0x01, 0x20, 0x82, 
+	0xf4, 0x35, 0x00, 0x00, 0xfd, 0x69, 0x04, 0x13, 0x57, 0x00, 0x10, 0x08, 
+	0x6c, 0xc0, 0x88, 0x40, 0xd6, 0xec, 0xf9, 0x83, 0xd1, 0x84, 0x01, 0x50, 
+	0x81, 0xca, 0x29, 0x2a, 0xd1, 0x9f, 0x5d, 0x6a, 0x89, 0xac, 0x0a, 0x22, 
+	0x20, 0xa0, 0x9d, 0x31, 0x40, 0x98, 0x90, 0x91, 0xad, 0x8b, 0x0d, 0x15, 
+	0xcd, 0x3f, 0x9b, 0x63, 0xed, 0x00, 0x00, 0x6d, 0x8f, 0x62, 0xe9, 0xc1, 
+	0x59, 0x04, 0xa2, 0x72, 0x26, 0x65, 0x55, 0x2b, 0xf4, 0xcc, 0x63, 0xf8, 
+	0xef, 0x2e, 0x40, 0xdb, 0xa3, 0x30, 0xd6, 0x1d, 0x42, 0x78, 0xe7, 0x23, 
+	0xc0, 0x8c, 0xc2, 0x88, 0x1d, 0x80, 0xd5, 0x78, 0x11, 0x7a, 0x6e, 0x18, 
+	0xda, 0x7e, 0x0d, 0xa3, 0x66, 0x2f, 0xa0, 0x9c, 0x74, 0xb1, 0x36, 0x79, 
+	0x58, 0xbb, 0xef, 0x6d, 0xb7, 0x6f, 0x23, 0xdd, 0x64, 0x1d, 0xf3, 0xaf, 
+	0x8e, 0x92, 0xda, 0x27, 0x49, 0xea, 0xfc, 0xd4, 0xe2, 0xea, 0xa4, 0xe8, 
+	0x0d, 0xed, 0xa0, 0x37, 0xd8, 0x4c, 0x5d, 0xc8, 0x38, 0x24, 0xf7, 0x17, 
+	0x19, 0x09, 0x21, 0xee, 0xc1, 0xaa, 0x7d, 0x1a, 0x4a, 0x5c, 0xf5, 0x00, 
+	0x01, 0x16, 0xbe, 0x80, 0x81, 0xbd, 0x38, 0xca, 0xec, 0x13, 0x14, 0xde, 
+	0x9e, 0x42, 0x6e, 0xe4, 0x20, 0xe8, 0x4f, 0x23, 0xb4, 0xed, 0x56, 0x96, 
+	0x32, 0x7c, 0x53, 0x08, 0x91, 0x2c, 0x32, 0x5a, 0xb2, 0x2a, 0xa7, 0x6f, 
+	0xbf, 0x08, 0x26, 0xef, 0x7a, 0x6e, 0x7f, 0x03, 0x73, 0xcf, 0x3b, 0xa8, 
+	0x0b, 0xd3, 0x74, 0x07, 0x9a, 0xe8, 0x26, 0xeb, 0xe8, 0xf6, 0x6f, 0x62, 
+	0x30, 0xd5, 0xeb, 0xd2, 0x5f, 0xe8, 0x26, 0x59, 0xf2, 0x0f, 0x2e, 0x87, 
+	0x45, 0x19, 0x38, 0xdd, 0x6a, 0xe1, 0x8d, 0xed, 0x0d, 0xb5, 0xd0, 0x1d, 
+	0x68, 0xa4, 0x9b, 0xac, 0xa3, 0x37, 0xd4, 0x42, 0xe5, 0x8c, 0x65, 0xb5, 
+	0x3f, 0x77, 0x9f, 0x64, 0x78, 0x55, 0xc8, 0x32, 0x98, 0xa0, 0xf2, 0xce, 
+	0x53, 0x65, 0xb3, 0xf9, 0x54, 0xa7, 0xca, 0xa7, 0xce, 0x28, 0xaa, 0x6c, 
+	0x96, 0xca, 0x3b, 0x4b, 0x52, 0xfc, 0x9e, 0x50, 0x0c, 0xdc, 0x42, 0x7f, 
+	0xfe, 0x25, 0xfd, 0xf9, 0x11, 0x92, 0x89, 0xbf, 0x06, 0xfc, 0x4b, 0x7c, 
+	0x03, 0x3c, 0x11, 0x4b, 0xa3, 0x65, 0xf9, 0xf2, 0xf0, 0x00, 0x00, 0x00, 
+	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
+}
+
diff --git a/icon/Makefile b/icon/Makefile
index 6ea29fd..07dcd3c 100644
--- a/icon/Makefile
+++ b/icon/Makefile
@@ -1,11 +1,13 @@
 .PHONY: all clean
 
-all: on_unix.go off_unix.go error_unix.go wait0_unix.go wait1_unix.go wait2_unix.go wait3_unix.go
+all: 18_on_unix.go 18_off_unix.go 18_blocked_unix.go 18_wait_0_unix.go 18_wait_1_unix.go 18_wait_2_unix.go 18_wait_3_unix.go
 
-%_unix.go: %.png
+go_array_name = "$(shell echo $(@) | sed -e 's/18_\(.*\)_unix\.go/\u\1/' -e 's/_//')"
+
+18_%_unix.go: png/18/vpn_%.png
 	echo "//+build linux darwin" > $@
 	echo "" >> $@
-	cat $< | 2goarray `echo ${<} | python -c "print raw_input().capitalize()[:-4]"` icon >> $@
+	cat $< | 2goarray $(go_array_name) icon >> $@
 
 clean:
 	rm *_unix.go
diff --git a/icon/error.png b/icon/error.png
deleted file mode 100644
index 7f481b6..0000000
--- a/icon/error.png
+++ /dev/null
diff --git a/icon/error_unix.go b/icon/error_unix.go
deleted file mode 100644
index 2f9d373..0000000
--- a/icon/error_unix.go
+++ /dev/null
@@ -1,62 +0,0 @@
-//+build linux darwin
-
-// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
-
-package icon
-
-var Error []byte = []byte {
-	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
-	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 
-	0x08, 0x03, 0x00, 0x00, 0x00, 0xf3, 0x6a, 0x9c, 0x09, 0x00, 0x00, 0x00, 
-	0x03, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0xdb, 0xe1, 0x4f, 0xe0, 
-	0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x06, 0xc4, 
-	0x00, 0x00, 0x06, 0xc4, 0x01, 0xa8, 0xd7, 0x11, 0xc4, 0x00, 0x00, 0x00, 
-	0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 
-	0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 
-	0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 
-	0x00, 0xf6, 0x50, 0x4c, 0x54, 0x45, 0x00, 0x00, 0x00, 0xf3, 0x44, 0x38, 
-	0xf4, 0x43, 0x37, 0xf4, 0x41, 0x36, 0xf5, 0x41, 0x37, 0xf2, 0x41, 0x34, 
-	0xf2, 0x44, 0x37, 0xf2, 0x43, 0x36, 0xf3, 0x42, 0x35, 0xf3, 0x45, 0x35, 
-	0xf3, 0x43, 0x37, 0xf3, 0x43, 0x35, 0xf4, 0x42, 0x36, 0xf4, 0x44, 0x36, 
-	0xf4, 0x43, 0x35, 0xf5, 0x44, 0x36, 0xf3, 0x43, 0x36, 0xf4, 0x43, 0x37, 
-	0xf4, 0x43, 0x36, 0xf4, 0x42, 0x36, 0xf4, 0x43, 0x36, 0xf4, 0x44, 0x36, 
-	0xf4, 0x43, 0x36, 0xf5, 0x43, 0x36, 0xf4, 0x43, 0x36, 0xf4, 0x43, 0x36, 
-	0xf4, 0x43, 0x36, 0xf4, 0x44, 0x37, 0xf4, 0x44, 0x38, 0xf4, 0x45, 0x38, 
-	0xf4, 0x46, 0x39, 0xf4, 0x49, 0x3c, 0xf4, 0x4a, 0x3e, 0xf5, 0x4d, 0x40, 
-	0xf5, 0x52, 0x47, 0xf5, 0x53, 0x47, 0xf6, 0x5f, 0x54, 0xf6, 0x61, 0x56, 
-	0xf6, 0x64, 0x59, 0xf6, 0x68, 0x5d, 0xf7, 0x6d, 0x63, 0xf7, 0x7d, 0x74, 
-	0xf8, 0x85, 0x7d, 0xf8, 0x86, 0x7e, 0xf8, 0x87, 0x7f, 0xf8, 0x88, 0x80, 
-	0xf9, 0x90, 0x89, 0xf9, 0x97, 0x90, 0xf9, 0x98, 0x91, 0xf9, 0x99, 0x92, 
-	0xf9, 0x9b, 0x95, 0xf9, 0xa0, 0x99, 0xfa, 0xa6, 0xa0, 0xfb, 0xae, 0xa9, 
-	0xfb, 0xc0, 0xbb, 0xfb, 0xc3, 0xbe, 0xfc, 0xc3, 0xbf, 0xfc, 0xc6, 0xc2, 
-	0xfc, 0xc7, 0xc3, 0xfc, 0xc8, 0xc4, 0xfc, 0xcb, 0xc7, 0xfc, 0xcd, 0xca, 
-	0xfc, 0xd2, 0xcf, 0xfc, 0xd3, 0xd0, 0xfd, 0xd5, 0xd2, 0xfd, 0xd9, 0xd7, 
-	0xfd, 0xe0, 0xde, 0xfe, 0xe6, 0xe4, 0xfe, 0xe7, 0xe6, 0xfe, 0xeb, 0xea, 
-	0xfe, 0xec, 0xeb, 0xfe, 0xf0, 0xef, 0xfe, 0xf5, 0xf4, 0xfe, 0xf6, 0xf6, 
-	0xff, 0xf4, 0xf3, 0xff, 0xfa, 0xf9, 0xff, 0xfb, 0xfa, 0xff, 0xfb, 0xfb, 
-	0xff, 0xfc, 0xfc, 0xff, 0xfd, 0xfd, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 
-	0xeb, 0xee, 0x29, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x74, 0x52, 0x4e, 0x53, 
-	0x00, 0x29, 0x2e, 0x2f, 0x33, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x41, 0x99, 
-	0xa5, 0xa6, 0xa7, 0xaa, 0xae, 0xbb, 0xe7, 0xea, 0xeb, 0xee, 0xf2, 0xf3, 
-	0xf4, 0xf5, 0x95, 0x9f, 0xc1, 0x00, 0x00, 0x00, 0x00, 0xcd, 0x49, 0x44, 
-	0x41, 0x54, 0x18, 0xd3, 0x7d, 0xd1, 0xd7, 0x56, 0xc2, 0x50, 0x14, 0x45, 
-	0xd1, 0x63, 0x54, 0xb0, 0x61, 0x8c, 0x25, 0xea, 0x02, 0x45, 0x10, 0xec, 
-	0x08, 0xc6, 0x42, 0x15, 0xb0, 0x80, 0x8d, 0xa8, 0xe7, 0xff, 0x7f, 0xc6, 
-	0x87, 0x1b, 0x4c, 0xb8, 0x83, 0xc1, 0x7a, 0x9c, 0x8f, 0x7b, 0x8b, 0xcc, 
-	0x2a, 0xed, 0x79, 0xde, 0x86, 0xeb, 0xba, 0xee, 0x72, 0x52, 0x17, 0x7d, 
-	0xa2, 0xf6, 0x57, 0x2c, 0x3d, 0x3e, 0xb1, 0x3c, 0xe5, 0x43, 0xb1, 0xf0, 
-	0xf8, 0x79, 0x5a, 0x3f, 0x4a, 0x78, 0xca, 0x07, 0x5e, 0xba, 0xed, 0xf0, 
-	0xfe, 0xfb, 0x2c, 0xf6, 0xa5, 0x3d, 0x80, 0xb7, 0xa7, 0xc6, 0x28, 0xd0, 
-	0xab, 0x9f, 0x4b, 0x60, 0x37, 0x2d, 0x22, 0x19, 0x00, 0x86, 0xdd, 0xc6, 
-	0x28, 0xd0, 0x1b, 0xad, 0x01, 0x64, 0x2c, 0xae, 0xea, 0xb5, 0xc5, 0xfd, 
-	0x66, 0x78, 0x9b, 0xe4, 0x75, 0x38, 0xaf, 0x30, 0x54, 0x55, 0xd5, 0xce, 
-	0x04, 0xbf, 0xea, 0x85, 0x61, 0x35, 0xbc, 0x66, 0xb8, 0xa6, 0xef, 0x1f, 
-	0x53, 0x38, 0xd7, 0x53, 0x9d, 0xc2, 0x94, 0xbf, 0xc6, 0x5c, 0x19, 0xf3, 
-	0xdc, 0x26, 0x10, 0x44, 0xfa, 0x5b, 0x02, 0x76, 0x16, 0x24, 0xf2, 0x83, 
-	0x96, 0xe1, 0x87, 0x7f, 0x15, 0x71, 0xb6, 0xe1, 0xb0, 0xfa, 0x1c, 0xea, 
-	0xe0, 0x2e, 0x1f, 0xab, 0x71, 0xc8, 0xe6, 0x01, 0xb6, 0x9c, 0x78, 0x70, 
-	0xe3, 0xb6, 0x8a, 0xcc, 0xaf, 0x46, 0x39, 0x33, 0xbf, 0xfd, 0x03, 0xef, 
-	0xae, 0x34, 0x5c, 0xea, 0x6c, 0xb3, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x49, 
-	0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
-}
-
diff --git a/icon/off.png b/icon/off.png
deleted file mode 100644
index 6d0c10a..0000000
--- a/icon/off.png
+++ /dev/null
diff --git a/icon/off_unix.go b/icon/off_unix.go
deleted file mode 100644
index 03f66cd..0000000
--- a/icon/off_unix.go
+++ /dev/null
@@ -1,77 +0,0 @@
-//+build linux darwin
-
-// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
-
-package icon
-
-var Off []byte = []byte {
-	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
-	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 
-	0x08, 0x03, 0x00, 0x00, 0x00, 0xf3, 0x6a, 0x9c, 0x09, 0x00, 0x00, 0x00, 
-	0x03, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0xdb, 0xe1, 0x4f, 0xe0, 
-	0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x06, 0xc4, 
-	0x00, 0x00, 0x06, 0xc4, 0x01, 0xa8, 0xd7, 0x11, 0xc4, 0x00, 0x00, 0x00, 
-	0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 
-	0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 
-	0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 
-	0x01, 0x41, 0x50, 0x4c, 0x54, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x71, 0x71, 0x71, 0x62, 0x62, 0x62, 0x6d, 0x6d, 0x6d, 
-	0x66, 0x66, 0x66, 0xe1, 0xe1, 0xe1, 0xf9, 0xf9, 0xf9, 0xee, 0xee, 0xee, 
-	0x67, 0x67, 0x67, 0x65, 0x65, 0x65, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 
-	0x67, 0x67, 0x67, 0x66, 0x66, 0x66, 0x76, 0x76, 0x76, 0x67, 0x67, 0x67, 
-	0x66, 0x66, 0x66, 0x65, 0x65, 0x65, 0x65, 0x65, 0x65, 0x67, 0x67, 0x67, 
-	0x66, 0x66, 0x66, 0x65, 0x65, 0x65, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 
-	0x66, 0x66, 0x66, 0xc2, 0xc2, 0xc2, 0xd4, 0xd4, 0xd4, 0x66, 0x66, 0x66, 
-	0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 
-	0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xf9, 0xf9, 0xf9, 0x66, 0x66, 0x66, 
-	0x66, 0x66, 0x66, 0x67, 0x67, 0x67, 0x68, 0x68, 0x68, 0x69, 0x69, 0x69, 
-	0x6a, 0x6a, 0x6a, 0x6b, 0x6b, 0x6b, 0x6c, 0x6c, 0x6c, 0x6d, 0x6d, 0x6d, 
-	0x6e, 0x6e, 0x6e, 0x6f, 0x6f, 0x6f, 0x73, 0x73, 0x73, 0x74, 0x74, 0x74, 
-	0x78, 0x78, 0x78, 0x7a, 0x7a, 0x7a, 0x81, 0x81, 0x81, 0x82, 0x82, 0x82, 
-	0x87, 0x87, 0x87, 0x88, 0x88, 0x88, 0x8d, 0x8d, 0x8d, 0x8f, 0x8f, 0x8f, 
-	0x93, 0x93, 0x93, 0x95, 0x95, 0x95, 0x96, 0x96, 0x96, 0x98, 0x98, 0x98, 
-	0x9b, 0x9b, 0x9b, 0x9c, 0x9c, 0x9c, 0x9d, 0x9d, 0x9d, 0x9f, 0x9f, 0x9f, 
-	0xa1, 0xa1, 0xa1, 0xa2, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa5, 0xa5, 0xa5, 
-	0xaa, 0xaa, 0xaa, 0xab, 0xab, 0xab, 0xac, 0xac, 0xac, 0xad, 0xad, 0xad, 
-	0xaf, 0xaf, 0xaf, 0xb4, 0xb4, 0xb4, 0xb5, 0xb5, 0xb5, 0xbb, 0xbb, 0xbb, 
-	0xbc, 0xbc, 0xbc, 0xbf, 0xbf, 0xbf, 0xc5, 0xc5, 0xc5, 0xc6, 0xc6, 0xc6, 
-	0xc9, 0xc9, 0xc9, 0xca, 0xca, 0xca, 0xce, 0xce, 0xce, 0xd3, 0xd3, 0xd3, 
-	0xd4, 0xd4, 0xd4, 0xd6, 0xd6, 0xd6, 0xd7, 0xd7, 0xd7, 0xda, 0xda, 0xda, 
-	0xdc, 0xdc, 0xdc, 0xde, 0xde, 0xde, 0xdf, 0xdf, 0xdf, 0xeb, 0xeb, 0xeb, 
-	0xed, 0xed, 0xed, 0xf0, 0xf0, 0xf0, 0xf1, 0xf1, 0xf1, 0xf3, 0xf3, 0xf3, 
-	0xf5, 0xf5, 0xf5, 0xf6, 0xf6, 0xf6, 0xf8, 0xf8, 0xf8, 0xf9, 0xf9, 0xf9, 
-	0xfb, 0xfb, 0xfb, 0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd, 0xfe, 0xfe, 0xfe, 
-	0xff, 0xff, 0xff, 0x68, 0x44, 0x34, 0x79, 0x00, 0x00, 0x00, 0x26, 0x74, 
-	0x52, 0x4e, 0x53, 0x00, 0x01, 0x08, 0x09, 0x0d, 0x0e, 0x0f, 0x22, 0x2d, 
-	0x3c, 0x68, 0x6a, 0x6b, 0x6c, 0x6d, 0x70, 0x73, 0x74, 0xa5, 0xa6, 0xab, 
-	0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xcf, 0xd5, 0xdd, 0xe9, 0xea, 0xeb, 0xec, 
-	0xed, 0xee, 0xef, 0xfa, 0xfe, 0x3d, 0x74, 0xad, 0x30, 0x00, 0x00, 0x01, 
-	0x28, 0x49, 0x44, 0x41, 0x54, 0x18, 0xd3, 0x65, 0x91, 0x69, 0x33, 0x42, 
-	0x01, 0x14, 0x40, 0x6f, 0xa5, 0x2c, 0x95, 0x25, 0x4b, 0x65, 0x6b, 0xa1, 
-	0x53, 0xb2, 0x96, 0xc8, 0x43, 0x21, 0x6b, 0xd6, 0x10, 0x42, 0xb6, 0x90, 
-	0xde, 0xfd, 0xff, 0x3f, 0xc0, 0x87, 0xea, 0x4d, 0xc3, 0xf9, 0x78, 0xe6, 
-	0xce, 0x9d, 0xb9, 0xf7, 0x88, 0x58, 0xd8, 0xed, 0xf2, 0x17, 0x57, 0x7f, 
-	0x30, 0x0a, 0x91, 0x80, 0xd7, 0xd5, 0x21, 0x7b, 0x06, 0xc3, 0xb4, 0x08, 
-	0x79, 0x6c, 0x6d, 0xdb, 0x3d, 0x7b, 0x9f, 0xc4, 0x62, 0xb8, 0xb5, 0xcb, 
-	0x36, 0x6e, 0x68, 0x39, 0x7d, 0x54, 0x7e, 0xae, 0x96, 0x4f, 0xd2, 0xc0, 
-	0x48, 0x73, 0x7e, 0x00, 0x76, 0xd4, 0x7c, 0x3c, 0xdd, 0xfc, 0x51, 0x35, 
-	0xaf, 0x53, 0xe0, 0x16, 0x11, 0x71, 0x85, 0x81, 0x92, 0x9e, 0x43, 0x5d, 
-	0x55, 0xf5, 0x00, 0x42, 0x2e, 0x11, 0xe9, 0x07, 0x96, 0x13, 0x67, 0x7a, 
-	0x6c, 0x69, 0x3c, 0x22, 0x12, 0x04, 0xb6, 0x53, 0x5c, 0x99, 0x05, 0x4b, 
-	0xfb, 0x45, 0x64, 0x06, 0xc8, 0xdf, 0x10, 0xbf, 0x6d, 0x34, 0x54, 0x55, 
-	0xf7, 0x81, 0x88, 0x88, 0x03, 0x20, 0xff, 0x04, 0x89, 0x8a, 0xaa, 0xaa, 
-	0x16, 0x00, 0x1c, 0x62, 0x8f, 0x01, 0xb9, 0x2a, 0x30, 0xf7, 0xa6, 0xaa, 
-	0xba, 0x07, 0xc4, 0xec, 0x22, 0x51, 0x60, 0xbd, 0x96, 0x00, 0x32, 0x35, 
-	0x55, 0x35, 0x80, 0x90, 0x88, 0x04, 0x80, 0xf8, 0xeb, 0x2e, 0x10, 0xcf, 
-	0x7e, 0xe9, 0x67, 0x12, 0x18, 0x15, 0x11, 0x2f, 0xc0, 0xe1, 0xfb, 0x2a, 
-	0x5c, 0x62, 0xd4, 0x3f, 0x56, 0x68, 0xde, 0xd3, 0x35, 0x05, 0xc4, 0xef, 
-	0x5e, 0xd6, 0x30, 0x8b, 0x6c, 0x35, 0xaa, 0x8b, 0x4c, 0x3b, 0x45, 0x44, 
-	0x3c, 0x00, 0x0b, 0x0f, 0xdf, 0x45, 0xd3, 0xcc, 0x91, 0xd1, 0x4a, 0xb2, 
-	0xaf, 0xf9, 0x2a, 0x1f, 0xc0, 0xfc, 0x85, 0xa9, 0xa5, 0x25, 0xd8, 0xd0, 
-	0xc9, 0x76, 0x16, 0x1f, 0x00, 0x59, 0x03, 0x80, 0x89, 0xde, 0xf6, 0xc3, 
-	0x6d, 0xee, 0x90, 0x95, 0x61, 0xa8, 0x33, 0x9a, 0xd3, 0xed, 0x0f, 0x43, 
-	0x78, 0xcc, 0xed, 0xfc, 0xd7, 0xb3, 0x33, 0xf1, 0x2f, 0xc1, 0x26, 0x47, 
-	0x26, 0x5d, 0x2f, 0xfe, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 
-	0x44, 0xae, 0x42, 0x60, 0x82, 
-}
-
diff --git a/icon/on.png b/icon/on.png
deleted file mode 100644
index 21208b6..0000000
--- a/icon/on.png
+++ /dev/null
diff --git a/icon/on_unix.go b/icon/on_unix.go
deleted file mode 100644
index f0a2574..0000000
--- a/icon/on_unix.go
+++ /dev/null
@@ -1,67 +0,0 @@
-//+build linux darwin
-
-// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
-
-package icon
-
-var On []byte = []byte {
-	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
-	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 
-	0x08, 0x03, 0x00, 0x00, 0x00, 0xf3, 0x6a, 0x9c, 0x09, 0x00, 0x00, 0x00, 
-	0x03, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0xdb, 0xe1, 0x4f, 0xe0, 
-	0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x06, 0xc4, 
-	0x00, 0x00, 0x06, 0xc4, 0x01, 0xa8, 0xd7, 0x11, 0xc4, 0x00, 0x00, 0x00, 
-	0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 
-	0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 
-	0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 
-	0x01, 0x05, 0x50, 0x4c, 0x54, 0x45, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 
-	0x60, 0x9f, 0x40, 0x71, 0xaa, 0x39, 0x62, 0x9d, 0x3b, 0x6d, 0xa4, 0x37, 
-	0x66, 0x99, 0x33, 0x67, 0x9f, 0x38, 0x67, 0x9f, 0x37, 0x69, 0xa0, 0x37, 
-	0x68, 0x9e, 0x39, 0x67, 0x9f, 0x38, 0x67, 0xa0, 0x38, 0x68, 0x9f, 0x38, 
-	0x68, 0x9f, 0x38, 0x68, 0xa0, 0x37, 0x68, 0x9f, 0x38, 0x68, 0xa0, 0x39, 
-	0x68, 0x9f, 0x37, 0x67, 0x9f, 0x39, 0x68, 0x9f, 0x38, 0x68, 0xa0, 0x38, 
-	0x68, 0x9f, 0x38, 0x68, 0x9f, 0x38, 0x68, 0x9f, 0x38, 0x68, 0xa0, 0x38, 
-	0x68, 0x9f, 0x38, 0x68, 0x9f, 0x38, 0x68, 0x9f, 0x38, 0x67, 0x9f, 0x37, 
-	0x68, 0x9f, 0x38, 0x68, 0x9f, 0x38, 0x6a, 0x9f, 0x3a, 0x6a, 0xa1, 0x3c, 
-	0x6c, 0xa2, 0x3e, 0x6e, 0xa3, 0x40, 0x70, 0xa5, 0x42, 0x72, 0xa5, 0x44, 
-	0x72, 0xa5, 0x46, 0x77, 0xa9, 0x4c, 0x78, 0xa9, 0x4d, 0x79, 0xaa, 0x4f, 
-	0x7d, 0xad, 0x55, 0x85, 0xb2, 0x5e, 0x8a, 0xb4, 0x64, 0x8d, 0xb6, 0x68, 
-	0x93, 0xba, 0x70, 0xa9, 0xc9, 0x8e, 0xae, 0xcc, 0x94, 0xaf, 0xcc, 0x95, 
-	0xaf, 0xcc, 0x97, 0xb1, 0xcd, 0x98, 0xb2, 0xce, 0x9a, 0xc0, 0xd7, 0xac, 
-	0xc1, 0xd8, 0xae, 0xc2, 0xd8, 0xaf, 0xc3, 0xd8, 0xaf, 0xc3, 0xd9, 0xb1, 
-	0xc5, 0xda, 0xb3, 0xc6, 0xdb, 0xb3, 0xc7, 0xdb, 0xb4, 0xca, 0xdd, 0xb9, 
-	0xce, 0xe0, 0xbe, 0xcf, 0xe1, 0xc0, 0xd0, 0xe1, 0xc1, 0xd4, 0xe4, 0xc6, 
-	0xd9, 0xe7, 0xcd, 0xdf, 0xeb, 0xd4, 0xe5, 0xee, 0xdc, 0xe8, 0xf0, 0xe0, 
-	0xe8, 0xf1, 0xe1, 0xed, 0xf4, 0xe8, 0xf3, 0xf7, 0xf0, 0xf4, 0xf8, 0xf0, 
-	0xf5, 0xf9, 0xf2, 0xf6, 0xf9, 0xf3, 0xf7, 0xfa, 0xf5, 0xfb, 0xfc, 0xf9, 
-	0xfb, 0xfc, 0xfa, 0xfc, 0xfd, 0xfb, 0xfc, 0xfd, 0xfc, 0xfd, 0xfe, 0xfc, 
-	0xfd, 0xfe, 0xfd, 0xfe, 0xfe, 0xfd, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 
-	0xff, 0xff, 0xff, 0x0f, 0xa8, 0xb7, 0x45, 0x00, 0x00, 0x00, 0x1f, 0x74, 
-	0x52, 0x4e, 0x53, 0x00, 0x01, 0x08, 0x09, 0x0d, 0x0e, 0x0f, 0x68, 0x6a, 
-	0x6b, 0x6c, 0x6d, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xab, 0xb8, 0xb9, 0xba, 
-	0xbb, 0xbc, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfe, 0xcd, 0xc9, 
-	0x49, 0x32, 0x00, 0x00, 0x00, 0xf7, 0x49, 0x44, 0x41, 0x54, 0x18, 0x19, 
-	0x05, 0xc1, 0xd1, 0x4e, 0xdb, 0x30, 0x00, 0x00, 0xc0, 0xb3, 0xdd, 0xa4, 
-	0x2a, 0x19, 0xea, 0xca, 0x5a, 0x36, 0x09, 0x89, 0x97, 0xfd, 0xff, 0x1f, 
-	0xb1, 0x3d, 0x4c, 0xa0, 0x09, 0xa9, 0x74, 0x15, 0x6b, 0x43, 0x62, 0x27, 
-	0x31, 0x77, 0x00, 0x88, 0x11, 0x80, 0x00, 0xb4, 0x4d, 0xd7, 0x26, 0x53, 
-	0xbe, 0x4e, 0x19, 0x04, 0x08, 0x37, 0xdb, 0x06, 0x90, 0xcf, 0x43, 0x45, 
-	0x42, 0xdc, 0xde, 0x25, 0x80, 0xd4, 0xd5, 0x52, 0x09, 0x84, 0xdb, 0x1d, 
-	0x69, 0xbb, 0x4b, 0x61, 0x3a, 0x9f, 0x67, 0xde, 0xcf, 0x55, 0xa0, 0xdb, 
-	0x5b, 0x3d, 0x1c, 0x5c, 0xf2, 0x81, 0xf9, 0xf8, 0x3c, 0x79, 0x1d, 0xac, 
-	0xb4, 0x5b, 0xbe, 0xdd, 0xff, 0x7d, 0x2d, 0x0e, 0xa4, 0xef, 0xe5, 0xc5, 
-	0xee, 0x2d, 0xaf, 0x34, 0x0d, 0xf1, 0xf2, 0x0c, 0x10, 0x69, 0x93, 0xa8, 
-	0x83, 0x00, 0x00, 0x3a, 0xd1, 0x1a, 0x35, 0x00, 0xa8, 0x58, 0x8b, 0x29, 
-	0xa2, 0x06, 0x00, 0x0b, 0x56, 0x29, 0xd6, 0x8a, 0x1a, 0x00, 0x2c, 0xa8, 
-	0x35, 0x2e, 0x0b, 0x4a, 0x0b, 0x60, 0x46, 0x59, 0xa2, 0x11, 0x7d, 0xfa, 
-	0x0a, 0xf0, 0x1f, 0xa3, 0xe8, 0x8a, 0xf1, 0xf4, 0xb8, 0x11, 0xe0, 0x34, 
-	0xa0, 0x17, 0xe5, 0x01, 0x7f, 0xc2, 0xcf, 0x2e, 0xa0, 0xbc, 0x60, 0x9c, 
-	0x25, 0xcb, 0xd2, 0x31, 0xf7, 0xfb, 0x7d, 0xb9, 0x33, 0xfd, 0xba, 0xe0, 
-	0x98, 0x25, 0xe6, 0x65, 0x43, 0xbe, 0xdc, 0xfe, 0xd0, 0xff, 0x7e, 0xc7, 
-	0xdb, 0x07, 0x09, 0x65, 0xd9, 0x90, 0x8f, 0xf1, 0xe3, 0x69, 0xc0, 0xa9, 
-	0xaf, 0x04, 0x08, 0xeb, 0x5d, 0x0b, 0x18, 0xff, 0x8d, 0x10, 0x80, 0x26, 
-	0x7d, 0x69, 0x1b, 0x65, 0xbc, 0xce, 0x05, 0x00, 0x20, 0x46, 0x00, 0x3e, 
-	0x01, 0x32, 0x5c, 0x69, 0x5d, 0x7f, 0x4d, 0x1e, 0xd7, 0x00, 0x00, 0x00, 
-	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
-}
-
diff --git a/icon/png/18/vpn_blocked.png b/icon/png/18/vpn_blocked.png
new file mode 100644
index 0000000..1a8fb18
--- /dev/null
+++ b/icon/png/18/vpn_blocked.png
diff --git a/icon/png/18/vpn_off.png b/icon/png/18/vpn_off.png
new file mode 100644
index 0000000..c3edf1c
--- /dev/null
+++ b/icon/png/18/vpn_off.png
diff --git a/icon/png/18/vpn_on.png b/icon/png/18/vpn_on.png
new file mode 100644
index 0000000..4d1a09d
--- /dev/null
+++ b/icon/png/18/vpn_on.png
diff --git a/icon/png/18/vpn_wait_0.png b/icon/png/18/vpn_wait_0.png
new file mode 100644
index 0000000..5298535
--- /dev/null
+++ b/icon/png/18/vpn_wait_0.png
diff --git a/icon/png/18/vpn_wait_1.png b/icon/png/18/vpn_wait_1.png
new file mode 100644
index 0000000..b9223fc
--- /dev/null
+++ b/icon/png/18/vpn_wait_1.png
diff --git a/icon/png/18/vpn_wait_2.png b/icon/png/18/vpn_wait_2.png
new file mode 100644
index 0000000..f92039a
--- /dev/null
+++ b/icon/png/18/vpn_wait_2.png
diff --git a/icon/png/18/vpn_wait_3.png b/icon/png/18/vpn_wait_3.png
new file mode 100644
index 0000000..364b6f9
--- /dev/null
+++ b/icon/png/18/vpn_wait_3.png
diff --git a/icon/png/36/vpn_blocked.png b/icon/png/36/vpn_blocked.png
new file mode 100644
index 0000000..6c08d54
--- /dev/null
+++ b/icon/png/36/vpn_blocked.png
diff --git a/icon/png/36/vpn_off.png b/icon/png/36/vpn_off.png
new file mode 100644
index 0000000..2fd06ab
--- /dev/null
+++ b/icon/png/36/vpn_off.png
diff --git a/icon/png/36/vpn_on.png b/icon/png/36/vpn_on.png
new file mode 100644
index 0000000..4e94c64
--- /dev/null
+++ b/icon/png/36/vpn_on.png
diff --git a/icon/png/36/vpn_wait_0.png b/icon/png/36/vpn_wait_0.png
new file mode 100644
index 0000000..0ec4024
--- /dev/null
+++ b/icon/png/36/vpn_wait_0.png
diff --git a/icon/png/36/vpn_wait_1.png b/icon/png/36/vpn_wait_1.png
new file mode 100644
index 0000000..9dfded2
--- /dev/null
+++ b/icon/png/36/vpn_wait_1.png
diff --git a/icon/png/36/vpn_wait_2.png b/icon/png/36/vpn_wait_2.png
new file mode 100644
index 0000000..04a3e31
--- /dev/null
+++ b/icon/png/36/vpn_wait_2.png
diff --git a/icon/png/36/vpn_wait_3.png b/icon/png/36/vpn_wait_3.png
new file mode 100644
index 0000000..d2ad0a9
--- /dev/null
+++ b/icon/png/36/vpn_wait_3.png
diff --git a/icon/wait0.png b/icon/wait0.png
deleted file mode 100644
index 38ea040..0000000
--- a/icon/wait0.png
+++ /dev/null
diff --git a/icon/wait0_unix.go b/icon/wait0_unix.go
deleted file mode 100644
index 84170f7..0000000
--- a/icon/wait0_unix.go
+++ /dev/null
@@ -1,66 +0,0 @@
-//+build linux darwin
-
-// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
-
-package icon
-
-var Wait0 []byte = []byte {
-	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
-	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 
-	0x08, 0x03, 0x00, 0x00, 0x00, 0xf3, 0x6a, 0x9c, 0x09, 0x00, 0x00, 0x00, 
-	0x03, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0xdb, 0xe1, 0x4f, 0xe0, 
-	0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x06, 0xc4, 
-	0x00, 0x00, 0x06, 0xc4, 0x01, 0xa8, 0xd7, 0x11, 0xc4, 0x00, 0x00, 0x00, 
-	0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 
-	0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 
-	0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 
-	0x00, 0xf6, 0x50, 0x4c, 0x54, 0x45, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 
-	0xff, 0xbf, 0x20, 0xff, 0xc6, 0x1c, 0xff, 0xc4, 0x14, 0xff, 0xb6, 0x12, 
-	0xee, 0xbb, 0x22, 0xf5, 0xbd, 0x1b, 0xf5, 0xbe, 0x1a, 0xf5, 0xbf, 0x1a, 
-	0xf6, 0xbd, 0x1a, 0xf6, 0xbd, 0x1a, 0xf6, 0xbd, 0x1b, 0xf6, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbd, 0x1a, 0xf6, 0xbd, 0x19, 
-	0xf7, 0xbe, 0x1a, 0xf5, 0xbe, 0x1a, 0xf5, 0xbf, 0x1a, 0xf5, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbf, 0x1c, 0xf6, 0xbf, 0x1e, 
-	0xf6, 0xc0, 0x1f, 0xf6, 0xc0, 0x20, 0xf6, 0xc0, 0x21, 0xf6, 0xc2, 0x27, 
-	0xf7, 0xc2, 0x29, 0xf7, 0xc3, 0x2c, 0xf7, 0xc3, 0x2d, 0xf7, 0xc4, 0x2e, 
-	0xf7, 0xc5, 0x33, 0xf7, 0xc6, 0x36, 0xf8, 0xcc, 0x4a, 0xf8, 0xcf, 0x54, 
-	0xf9, 0xd1, 0x5c, 0xf9, 0xd3, 0x63, 0xf9, 0xd4, 0x67, 0xf9, 0xd7, 0x73, 
-	0xfa, 0xd8, 0x75, 0xfa, 0xd8, 0x76, 0xfa, 0xd9, 0x77, 0xfa, 0xda, 0x7b, 
-	0xfa, 0xdb, 0x80, 0xfa, 0xdb, 0x81, 0xfa, 0xdc, 0x85, 0xfa, 0xdd, 0x86, 
-	0xfa, 0xdd, 0x88, 0xfb, 0xe0, 0x91, 0xfb, 0xe0, 0x93, 0xfb, 0xe3, 0x9e, 
-	0xfb, 0xe4, 0xa1, 0xfb, 0xe5, 0xa2, 0xfb, 0xe5, 0xa4, 0xfb, 0xe6, 0xa5, 
-	0xfc, 0xe7, 0xab, 0xfc, 0xe8, 0xad, 0xfc, 0xe8, 0xaf, 0xfc, 0xe9, 0xb0, 
-	0xfc, 0xe9, 0xb3, 0xfc, 0xeb, 0xb7, 0xfc, 0xed, 0xbe, 0xfd, 0xf0, 0xcb, 
-	0xff, 0xfc, 0xf3, 0xff, 0xfc, 0xf5, 0xff, 0xfd, 0xf7, 0xff, 0xfd, 0xf8, 
-	0xff, 0xfd, 0xfa, 0xff, 0xfe, 0xfb, 0xff, 0xfe, 0xfc, 0xff, 0xff, 0xff, 
-	0x8d, 0x4d, 0xd0, 0x9f, 0x00, 0x00, 0x00, 0x1f, 0x74, 0x52, 0x4e, 0x53, 
-	0x00, 0x01, 0x08, 0x09, 0x0d, 0x0e, 0x0f, 0x68, 0x6a, 0x6b, 0x6c, 0x6d, 
-	0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xab, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xe9, 
-	0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfe, 0xcd, 0xc9, 0x49, 0x32, 0x00, 
-	0x00, 0x00, 0xfb, 0x49, 0x44, 0x41, 0x54, 0x18, 0x19, 0x65, 0xc1, 0x09, 
-	0x3b, 0x02, 0x61, 0x18, 0x86, 0xd1, 0x67, 0xbe, 0x94, 0x49, 0x64, 0x2b, 
-	0x54, 0x74, 0x67, 0x9b, 0xb2, 0xaf, 0xd9, 0x97, 0x08, 0x59, 0x42, 0xef, 
-	0xff, 0xff, 0x33, 0xbe, 0x61, 0x2e, 0x15, 0xe7, 0xa8, 0xcf, 0x39, 0xfd, 
-	0x95, 0xc9, 0xcd, 0x2d, 0x42, 0xa5, 0x38, 0x96, 0x51, 0x5f, 0x90, 0x2b, 
-	0x93, 0x28, 0x65, 0x03, 0x25, 0xdc, 0x14, 0x03, 0x26, 0x9d, 0xbe, 0x05, 
-	0x79, 0x86, 0x4c, 0x07, 0x8a, 0xe5, 0x88, 0x35, 0x9a, 0xb7, 0x37, 0xc7, 
-	0x75, 0x6a, 0xeb, 0x10, 0xca, 0xcb, 0x94, 0xf1, 0x0e, 0xde, 0xcc, 0x7b, 
-	0x3d, 0xbe, 0x7f, 0x82, 0x52, 0x46, 0x52, 0x0e, 0xef, 0xc0, 0x7a, 0x77, 
-	0x7b, 0xfb, 0xad, 0x9e, 0x59, 0x07, 0xc8, 0x4a, 0x9a, 0x03, 0xea, 0xaf, 
-	0x9f, 0xbb, 0x40, 0xed, 0xd9, 0xac, 0x03, 0x14, 0x24, 0x2d, 0x01, 0x47, 
-	0xd6, 0xc2, 0x6b, 0x9a, 0xd9, 0x23, 0x50, 0x91, 0x52, 0x78, 0xab, 0xd1, 
-	0x32, 0xde, 0x72, 0x14, 0x45, 0x2b, 0x78, 0x29, 0xb9, 0x2a, 0xff, 0x54, 
-	0x9d, 0xb4, 0x08, 0xdc, 0x98, 0xd9, 0x39, 0xde, 0xa5, 0x1d, 0x02, 0x25, 
-	0x49, 0x45, 0xa0, 0x6d, 0xf6, 0xb2, 0x06, 0x6c, 0x77, 0xdf, 0x1a, 0xc0, 
-	0x8c, 0xa4, 0x31, 0xa0, 0x6d, 0xf6, 0x79, 0xbd, 0xbb, 0x73, 0xd5, 0xb5, 
-	0x26, 0x5e, 0x28, 0x69, 0x64, 0x1e, 0xee, 0x9f, 0x4f, 0xde, 0xcd, 0xfb, 
-	0x38, 0xc5, 0x5b, 0x48, 0xcb, 0xcb, 0xc2, 0xc6, 0x0a, 0x9b, 0x67, 0xed, 
-	0x87, 0x8b, 0x2d, 0x62, 0xa3, 0x8a, 0x05, 0x79, 0x86, 0x8c, 0xeb, 0x87, 
-	0xcb, 0x33, 0x60, 0xc2, 0x29, 0x11, 0x84, 0x25, 0x12, 0x0b, 0xa3, 0x1a, 
-	0x90, 0x0e, 0x0b, 0x65, 0x28, 0xcf, 0x86, 0x69, 0xfd, 0xe5, 0x9c, 0x7e, 
-	0x7d, 0x01, 0xbe, 0x30, 0x32, 0x3f, 0x1f, 0x53, 0x95, 0xa4, 0x00, 0x00, 
-	0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
-}
-
diff --git a/icon/wait1.png b/icon/wait1.png
deleted file mode 100644
index 4bc355b..0000000
--- a/icon/wait1.png
+++ /dev/null
diff --git a/icon/wait1_unix.go b/icon/wait1_unix.go
deleted file mode 100644
index 5ddca4d..0000000
--- a/icon/wait1_unix.go
+++ /dev/null
@@ -1,69 +0,0 @@
-//+build linux darwin
-
-// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
-
-package icon
-
-var Wait1 []byte = []byte {
-	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
-	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 
-	0x08, 0x03, 0x00, 0x00, 0x00, 0xf3, 0x6a, 0x9c, 0x09, 0x00, 0x00, 0x00, 
-	0x03, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0xdb, 0xe1, 0x4f, 0xe0, 
-	0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x06, 0xc4, 
-	0x00, 0x00, 0x06, 0xc4, 0x01, 0xa8, 0xd7, 0x11, 0xc4, 0x00, 0x00, 0x00, 
-	0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 
-	0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 
-	0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 
-	0x01, 0x0e, 0x50, 0x4c, 0x54, 0x45, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 
-	0xff, 0xbf, 0x20, 0xff, 0xc6, 0x1c, 0xff, 0xc4, 0x14, 0xff, 0xb6, 0x12, 
-	0xee, 0xbb, 0x22, 0xf5, 0xbd, 0x1b, 0xf5, 0xbe, 0x1a, 0xf5, 0xbf, 0x1a, 
-	0xf6, 0xbd, 0x1a, 0xf6, 0xbd, 0x1a, 0xf6, 0xbd, 0x1b, 0xf6, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbd, 0x1a, 0xf6, 0xbd, 0x19, 
-	0xf7, 0xbe, 0x1a, 0xf5, 0xbe, 0x1a, 0xf5, 0xbf, 0x1a, 0xf5, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1b, 0xf6, 0xbf, 0x1e, 
-	0xf6, 0xc0, 0x20, 0xf6, 0xc0, 0x21, 0xf6, 0xc0, 0x22, 0xf7, 0xc2, 0x27, 
-	0xf7, 0xc2, 0x29, 0xf7, 0xc3, 0x2b, 0xf7, 0xc4, 0x2e, 0xf7, 0xc4, 0x30, 
-	0xf7, 0xc5, 0x31, 0xf7, 0xc5, 0x34, 0xf7, 0xc7, 0x39, 0xf8, 0xc9, 0x41, 
-	0xf8, 0xcb, 0x48, 0xf8, 0xcc, 0x4b, 0xf8, 0xcd, 0x4d, 0xf8, 0xce, 0x53, 
-	0xf8, 0xcf, 0x55, 0xf9, 0xd2, 0x5f, 0xf9, 0xd2, 0x62, 0xf9, 0xd3, 0x63, 
-	0xf9, 0xd6, 0x6e, 0xfa, 0xd8, 0x75, 0xfa, 0xd9, 0x78, 0xfa, 0xd9, 0x79, 
-	0xfa, 0xd9, 0x7a, 0xfa, 0xda, 0x7b, 0xfa, 0xda, 0x7c, 0xfa, 0xda, 0x7d, 
-	0xfa, 0xdb, 0x7f, 0xfa, 0xdc, 0x83, 0xfa, 0xdc, 0x84, 0xfa, 0xdd, 0x88, 
-	0xfb, 0xdf, 0x8e, 0xfb, 0xe1, 0x97, 0xfb, 0xe3, 0x9b, 0xfb, 0xe3, 0x9d, 
-	0xfb, 0xe4, 0x9f, 0xfb, 0xe4, 0xa1, 0xfb, 0xe4, 0xa2, 0xfb, 0xe5, 0xa2, 
-	0xfb, 0xe5, 0xa4, 0xfc, 0xe7, 0xaa, 0xfc, 0xe8, 0xae, 0xfc, 0xea, 0xb4, 
-	0xfc, 0xea, 0xb5, 0xfe, 0xf8, 0xe7, 0xfe, 0xf8, 0xe8, 0xfe, 0xfb, 0xf2, 
-	0xff, 0xfb, 0xf2, 0xff, 0xfc, 0xf5, 0xff, 0xfc, 0xf6, 0xff, 0xfd, 0xf8, 
-	0xff, 0xfd, 0xf9, 0xff, 0xfe, 0xfb, 0xff, 0xfe, 0xfc, 0xff, 0xff, 0xff, 
-	0x4f, 0x77, 0x82, 0x49, 0x00, 0x00, 0x00, 0x1f, 0x74, 0x52, 0x4e, 0x53, 
-	0x00, 0x01, 0x08, 0x09, 0x0d, 0x0e, 0x0f, 0x68, 0x6a, 0x6b, 0x6c, 0x6d, 
-	0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xab, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xe9, 
-	0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfe, 0xcd, 0xc9, 0x49, 0x32, 0x00, 
-	0x00, 0x01, 0x00, 0x49, 0x44, 0x41, 0x54, 0x18, 0x19, 0x5d, 0xc1, 0x85, 
-	0x5a, 0x02, 0x41, 0x00, 0x85, 0xd1, 0xbb, 0xa3, 0xe0, 0x02, 0x8a, 0x85, 
-	0xb1, 0x18, 0x3f, 0x82, 0x85, 0x05, 0x76, 0x83, 0xdd, 0x05, 0x16, 0xf3, 
-	0xfe, 0x2f, 0xe2, 0x8c, 0xee, 0xa7, 0xc8, 0x39, 0xfa, 0x63, 0x8c, 0x3a, 
-	0x25, 0x33, 0xa3, 0x93, 0x30, 0x31, 0x92, 0x4e, 0xea, 0x4f, 0x90, 0xc9, 
-	0x13, 0x8b, 0x52, 0x81, 0x62, 0x66, 0x80, 0x36, 0xfd, 0x46, 0xdf, 0x82, 
-	0x2c, 0xff, 0x0c, 0x06, 0xf2, 0x32, 0x78, 0x0b, 0x7b, 0xb7, 0x37, 0xb5, 
-	0x25, 0xbc, 0x50, 0x4e, 0x32, 0x8f, 0x53, 0x7a, 0xb6, 0xce, 0xdb, 0x01, 
-	0x4e, 0x94, 0x94, 0x94, 0xc1, 0x29, 0x52, 0xbd, 0xda, 0xde, 0xba, 0xfe, 
-	0xb4, 0xfb, 0x38, 0x29, 0x49, 0xa3, 0x40, 0xbd, 0x51, 0xc1, 0xdb, 0x68, 
-	0xbd, 0x96, 0x81, 0x9c, 0xa4, 0x29, 0xa8, 0x5b, 0xdb, 0xa8, 0xe0, 0x5d, 
-	0xda, 0x1a, 0x30, 0x21, 0x75, 0xc1, 0xa6, 0x75, 0x1a, 0x73, 0x40, 0x79, 
-	0xd7, 0x3e, 0xad, 0xcc, 0x40, 0x97, 0xcc, 0x34, 0xa5, 0xb5, 0x47, 0x7b, 
-	0xba, 0x0a, 0x14, 0x9b, 0xd6, 0xd9, 0x61, 0xda, 0x48, 0x93, 0xc0, 0xb1, 
-	0xbd, 0xc3, 0xab, 0x36, 0xad, 0xbd, 0x28, 0x10, 0x49, 0x1a, 0x01, 0xca, 
-	0x6f, 0xad, 0x75, 0xbc, 0x6a, 0xf3, 0xa2, 0x00, 0x43, 0x92, 0xd2, 0x38, 
-	0x87, 0xf6, 0xe3, 0x7c, 0x63, 0xfd, 0xac, 0xc2, 0x7c, 0x01, 0x08, 0x25, 
-	0x75, 0x8f, 0xe1, 0xd4, 0xde, 0xad, 0xf3, 0x32, 0x8b, 0x33, 0x9e, 0x90, 
-	0x93, 0xc2, 0x5b, 0x3e, 0x79, 0xb8, 0x3f, 0x5a, 0xc4, 0xeb, 0x91, 0x17, 
-	0x64, 0xf9, 0xa7, 0x57, 0x3f, 0x4c, 0x96, 0x36, 0x7d, 0x46, 0xb1, 0x20, 
-	0x8c, 0x88, 0x8d, 0xf7, 0xa8, 0x4d, 0x22, 0xcc, 0xe5, 0x21, 0x3f, 0x1c, 
-	0x26, 0xd4, 0xc9, 0x18, 0xfd, 0xfa, 0x02, 0x05, 0x77, 0x34, 0x8b, 0x99, 
-	0x60, 0x8b, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 
-	0x42, 0x60, 0x82, 
-}
-
diff --git a/icon/wait2.png b/icon/wait2.png
deleted file mode 100644
index 566a490..0000000
--- a/icon/wait2.png
+++ /dev/null
diff --git a/icon/wait2_unix.go b/icon/wait2_unix.go
deleted file mode 100644
index 7e1a558..0000000
--- a/icon/wait2_unix.go
+++ /dev/null
@@ -1,69 +0,0 @@
-//+build linux darwin
-
-// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
-
-package icon
-
-var Wait2 []byte = []byte {
-	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
-	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 
-	0x08, 0x03, 0x00, 0x00, 0x00, 0xf3, 0x6a, 0x9c, 0x09, 0x00, 0x00, 0x00, 
-	0x03, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0xdb, 0xe1, 0x4f, 0xe0, 
-	0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x06, 0xc4, 
-	0x00, 0x00, 0x06, 0xc4, 0x01, 0xa8, 0xd7, 0x11, 0xc4, 0x00, 0x00, 0x00, 
-	0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 
-	0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 
-	0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 
-	0x01, 0x0e, 0x50, 0x4c, 0x54, 0x45, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 
-	0xff, 0xbf, 0x20, 0xff, 0xc6, 0x1c, 0xff, 0xc4, 0x14, 0xff, 0xb6, 0x12, 
-	0xee, 0xbb, 0x22, 0xf5, 0xbd, 0x1b, 0xf5, 0xbe, 0x1a, 0xf5, 0xbf, 0x1a, 
-	0xf6, 0xbd, 0x1a, 0xf6, 0xbd, 0x1a, 0xf6, 0xbd, 0x1b, 0xf6, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbd, 0x1a, 0xf6, 0xbd, 0x19, 
-	0xf7, 0xbe, 0x1a, 0xf5, 0xbe, 0x1a, 0xf5, 0xbf, 0x1a, 0xf5, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1b, 0xf6, 0xbf, 0x1c, 
-	0xf6, 0xbf, 0x1d, 0xf6, 0xbf, 0x1e, 0xf6, 0xc0, 0x1f, 0xf6, 0xc1, 0x24, 
-	0xf7, 0xc2, 0x28, 0xf7, 0xc3, 0x2a, 0xf7, 0xc3, 0x2b, 0xf7, 0xc3, 0x2d, 
-	0xf7, 0xc4, 0x2e, 0xf7, 0xc4, 0x30, 0xf7, 0xc5, 0x31, 0xf7, 0xc5, 0x32, 
-	0xf8, 0xcd, 0x50, 0xf8, 0xcf, 0x55, 0xf9, 0xd0, 0x5a, 0xf9, 0xd1, 0x5c, 
-	0xf9, 0xd2, 0x5f, 0xf9, 0xd4, 0x67, 0xfa, 0xd8, 0x75, 0xfa, 0xd8, 0x76, 
-	0xfa, 0xd9, 0x77, 0xfa, 0xd9, 0x78, 0xfa, 0xd9, 0x79, 0xfa, 0xda, 0x7b, 
-	0xfa, 0xdb, 0x7f, 0xfa, 0xdb, 0x81, 0xfa, 0xdc, 0x83, 0xfa, 0xdd, 0x87, 
-	0xfb, 0xe1, 0x97, 0xfb, 0xe2, 0x9a, 0xfb, 0xe3, 0x9b, 0xfb, 0xe3, 0x9c, 
-	0xfb, 0xe4, 0x9f, 0xfb, 0xe6, 0xa5, 0xfc, 0xe6, 0xa6, 0xfc, 0xe6, 0xa7, 
-	0xfc, 0xe6, 0xa8, 0xfc, 0xe7, 0xaa, 0xfc, 0xe7, 0xab, 0xfc, 0xe8, 0xac, 
-	0xfc, 0xe9, 0xb1, 0xfc, 0xe9, 0xb2, 0xfc, 0xe9, 0xb3, 0xfc, 0xea, 0xb6, 
-	0xfd, 0xed, 0xc0, 0xfd, 0xf0, 0xca, 0xff, 0xfc, 0xf3, 0xff, 0xfc, 0xf4, 
-	0xff, 0xfc, 0xf5, 0xff, 0xfd, 0xf7, 0xff, 0xfd, 0xf8, 0xff, 0xfd, 0xf9, 
-	0xff, 0xfd, 0xfa, 0xff, 0xfe, 0xfb, 0xff, 0xfe, 0xfd, 0xff, 0xff, 0xff, 
-	0x07, 0x22, 0x62, 0x69, 0x00, 0x00, 0x00, 0x1f, 0x74, 0x52, 0x4e, 0x53, 
-	0x00, 0x01, 0x08, 0x09, 0x0d, 0x0e, 0x0f, 0x68, 0x6a, 0x6b, 0x6c, 0x6d, 
-	0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xab, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xe9, 
-	0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfe, 0xcd, 0xc9, 0x49, 0x32, 0x00, 
-	0x00, 0x01, 0x05, 0x49, 0x44, 0x41, 0x54, 0x18, 0x19, 0x5d, 0xc1, 0x85, 
-	0x56, 0x02, 0x51, 0x18, 0x46, 0xd1, 0x6f, 0xae, 0x02, 0x03, 0x28, 0x26, 
-	0x0a, 0x18, 0x47, 0x19, 0x11, 0xbb, 0x0b, 0xbb, 0x31, 0xb0, 0x03, 0xff, 
-	0xf7, 0x7f, 0x11, 0x2f, 0xc8, 0x12, 0x74, 0x6f, 0xb5, 0x39, 0xa7, 0xff, 
-	0xe2, 0xe9, 0x91, 0x71, 0x18, 0xcb, 0xa6, 0xe2, 0x6a, 0x0b, 0xd2, 0x05, 
-	0x5a, 0xf2, 0xc9, 0x40, 0x2d, 0xae, 0x9f, 0x0e, 0x7d, 0x4e, 0x4d, 0x41, 
-	0x86, 0x3f, 0x06, 0x02, 0x35, 0xa4, 0x61, 0xf6, 0xb6, 0x56, 0xbb, 0x8a, 
-	0xa2, 0x9d, 0x05, 0x1a, 0x42, 0x79, 0xf1, 0x02, 0x14, 0x1f, 0xcc, 0xac, 
-	0x5c, 0xb2, 0xd7, 0x5d, 0xbc, 0x7c, 0x5c, 0x52, 0x1a, 0x6f, 0xc7, 0xcc, 
-	0xca, 0xd3, 0xe7, 0x75, 0xab, 0xe0, 0x25, 0x25, 0x8d, 0x00, 0xf3, 0x2f, 
-	0x5f, 0x4f, 0x56, 0x86, 0xd5, 0xfa, 0xfb, 0x32, 0x30, 0x2c, 0x69, 0x02, 
-	0xa8, 0xd8, 0x75, 0x74, 0x14, 0x01, 0x67, 0x76, 0x08, 0x8c, 0x49, 0x5d, 
-	0x78, 0x17, 0xb6, 0x49, 0xd3, 0x9a, 0xdd, 0xe0, 0x75, 0xc9, 0x4d, 0x02, 
-	0x97, 0xb6, 0x4e, 0xd3, 0x86, 0x55, 0x81, 0x49, 0x27, 0x8d, 0x03, 0xfb, 
-	0x76, 0x0a, 0x4c, 0x55, 0xa2, 0x13, 0x3b, 0x00, 0xf2, 0x92, 0xb2, 0xc0, 
-	0xe2, 0xdb, 0xe7, 0x0a, 0x94, 0xec, 0xb1, 0xfe, 0xbe, 0x04, 0x0c, 0x4a, 
-	0x4a, 0xe1, 0xed, 0xd9, 0xc7, 0x71, 0xb1, 0x64, 0x66, 0x07, 0x78, 0xa1, 
-	0xa4, 0xee, 0x51, 0xbc, 0xed, 0x67, 0x2b, 0x97, 0xcc, 0xec, 0xbe, 0x08, 
-	0xb9, 0x98, 0xbc, 0x24, 0x0d, 0x73, 0x5b, 0x33, 0xc5, 0x6a, 0xad, 0x76, 
-	0x37, 0x0f, 0x09, 0x35, 0x04, 0x19, 0xfe, 0xe8, 0xd1, 0x0f, 0x97, 0xa1, 
-	0x43, 0xaf, 0x53, 0x4b, 0x10, 0xe6, 0x69, 0xc9, 0x25, 0xd4, 0x21, 0x16, 
-	0x0e, 0x17, 0xa0, 0x30, 0x14, 0xc6, 0xf4, 0x9f, 0x73, 0xfa, 0xf5, 0x0d, 
-	0xde, 0xd5, 0x34, 0x54, 0xfc, 0x3c, 0x12, 0x6c, 0x00, 0x00, 0x00, 0x00, 
-	0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
-}
-
diff --git a/icon/wait3.png b/icon/wait3.png
deleted file mode 100644
index f6a5cd6..0000000
--- a/icon/wait3.png
+++ /dev/null
diff --git a/icon/wait3_unix.go b/icon/wait3_unix.go
deleted file mode 100644
index 990183f..0000000
--- a/icon/wait3_unix.go
+++ /dev/null
@@ -1,70 +0,0 @@
-//+build linux darwin
-
-// File generated by 2goarray v0.1.0 (http://github.com/cratonica/2goarray)
-
-package icon
-
-var Wait3 []byte = []byte {
-	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
-	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 
-	0x08, 0x03, 0x00, 0x00, 0x00, 0xf3, 0x6a, 0x9c, 0x09, 0x00, 0x00, 0x00, 
-	0x03, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0xdb, 0xe1, 0x4f, 0xe0, 
-	0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x06, 0xc4, 
-	0x00, 0x00, 0x06, 0xc4, 0x01, 0xa8, 0xd7, 0x11, 0xc4, 0x00, 0x00, 0x00, 
-	0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 
-	0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 
-	0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 
-	0x01, 0x14, 0x50, 0x4c, 0x54, 0x45, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 
-	0xff, 0xbf, 0x20, 0xff, 0xc6, 0x1c, 0xff, 0xc4, 0x14, 0xff, 0xb6, 0x12, 
-	0xee, 0xbb, 0x22, 0xf5, 0xbd, 0x1b, 0xf5, 0xbe, 0x1a, 0xf5, 0xbf, 0x1a, 
-	0xf6, 0xbd, 0x1a, 0xf6, 0xbd, 0x1a, 0xf6, 0xbd, 0x1b, 0xf6, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbd, 0x1a, 0xf6, 0xbd, 0x19, 
-	0xf7, 0xbe, 0x1a, 0xf5, 0xbe, 0x1a, 0xf5, 0xbf, 0x1a, 0xf5, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 
-	0xf6, 0xbe, 0x1a, 0xf6, 0xbe, 0x1a, 0xf6, 0xbf, 0x1e, 0xf6, 0xc0, 0x1f, 
-	0xf6, 0xc0, 0x21, 0xf6, 0xc0, 0x22, 0xf6, 0xc1, 0x23, 0xf7, 0xc2, 0x27, 
-	0xf7, 0xc2, 0x28, 0xf7, 0xc3, 0x2d, 0xf7, 0xc4, 0x2f, 0xf7, 0xc4, 0x30, 
-	0xf7, 0xc5, 0x31, 0xf7, 0xc5, 0x33, 0xf7, 0xc6, 0x36, 0xf7, 0xc6, 0x37, 
-	0xf7, 0xc8, 0x3c, 0xf8, 0xcb, 0x47, 0xf8, 0xcd, 0x4e, 0xf8, 0xce, 0x52, 
-	0xf8, 0xce, 0x53, 0xf8, 0xd0, 0x58, 0xf9, 0xd0, 0x5a, 0xf9, 0xd1, 0x5c, 
-	0xf9, 0xd1, 0x5d, 0xf9, 0xd1, 0x5e, 0xf9, 0xd2, 0x62, 0xf9, 0xd5, 0x6c, 
-	0xf9, 0xd7, 0x73, 0xfa, 0xd7, 0x74, 0xfa, 0xd8, 0x75, 0xfa, 0xd9, 0x79, 
-	0xfa, 0xda, 0x7c, 0xfa, 0xda, 0x7e, 0xfa, 0xdb, 0x7f, 0xfa, 0xdb, 0x81, 
-	0xfa, 0xdc, 0x83, 0xfa, 0xdc, 0x84, 0xfa, 0xdd, 0x87, 0xfb, 0xdf, 0x8d, 
-	0xfb, 0xdf, 0x90, 0xfb, 0xe0, 0x92, 0xfb, 0xe1, 0x94, 0xfb, 0xe1, 0x96, 
-	0xfb, 0xe1, 0x97, 0xfb, 0xe2, 0x98, 0xfb, 0xe2, 0x99, 0xfb, 0xe4, 0xa1, 
-	0xfb, 0xe5, 0xa2, 0xfc, 0xe7, 0xa9, 0xfc, 0xe7, 0xab, 0xfc, 0xe8, 0xae, 
-	0xfc, 0xeb, 0xb8, 0xfe, 0xf8, 0xe7, 0xfe, 0xfa, 0xef, 0xff, 0xfc, 0xf3, 
-	0xff, 0xfc, 0xf5, 0xff, 0xfd, 0xf8, 0xff, 0xfd, 0xf9, 0xff, 0xfe, 0xfb, 
-	0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x34, 0x1c, 0x78, 0x92, 0x00, 0x00, 
-	0x00, 0x1f, 0x74, 0x52, 0x4e, 0x53, 0x00, 0x01, 0x08, 0x09, 0x0d, 0x0e, 
-	0x0f, 0x68, 0x6a, 0x6b, 0x6c, 0x6d, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xab, 
-	0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 
-	0xfe, 0xcd, 0xc9, 0x49, 0x32, 0x00, 0x00, 0x01, 0x05, 0x49, 0x44, 0x41, 
-	0x54, 0x18, 0x19, 0x5d, 0xc1, 0x85, 0x56, 0x02, 0x51, 0x18, 0x85, 0xd1, 
-	0x33, 0x57, 0x81, 0x41, 0x14, 0x3b, 0xc0, 0xf8, 0x14, 0x3b, 0xb1, 0xbb, 
-	0xbb, 0x13, 0x31, 0xfe, 0xf7, 0x7f, 0x0f, 0xef, 0x1d, 0x67, 0xa9, 0xcb, 
-	0xbd, 0xf5, 0xcb, 0x39, 0xfd, 0x97, 0x2d, 0xf4, 0x0c, 0x40, 0x7f, 0x77, 
-	0x53, 0x56, 0xbf, 0xa2, 0x42, 0x99, 0x54, 0x29, 0x1f, 0x29, 0xe5, 0xda, 
-	0x08, 0x86, 0x37, 0x09, 0x5a, 0x9d, 0x12, 0x51, 0x91, 0xc4, 0x9c, 0x5d, 
-	0x12, 0xb4, 0x47, 0x0a, 0x0a, 0x04, 0x93, 0x7b, 0x8f, 0x66, 0x67, 0x04, 
-	0xb1, 0xbc, 0x6c, 0x19, 0x6f, 0xfb, 0xd5, 0xbc, 0xfa, 0x38, 0x5e, 0x29, 
-	0x2b, 0xa9, 0x80, 0xb7, 0x6b, 0x9f, 0x0f, 0x07, 0x56, 0x5f, 0xa6, 0x82, 
-	0x97, 0x97, 0xd4, 0x03, 0x4c, 0xd5, 0x3f, 0xd6, 0x98, 0xa9, 0x2f, 0x53, 
-	0x7d, 0x99, 0x06, 0xba, 0x24, 0x0d, 0x02, 0xfb, 0x76, 0x07, 0x4c, 0xc0, 
-	0x95, 0x1d, 0x02, 0xfd, 0x52, 0x03, 0xde, 0xbd, 0x6d, 0x90, 0x58, 0xb5, 
-	0x47, 0xbc, 0x06, 0xb9, 0x21, 0xe0, 0xce, 0xd6, 0x49, 0xac, 0xd8, 0x13, 
-	0x30, 0xe4, 0xa4, 0x01, 0x60, 0xc7, 0x6e, 0x61, 0x04, 0xb8, 0xb6, 0x53, 
-	0xa0, 0x24, 0xa9, 0x1b, 0x98, 0x78, 0x59, 0xa2, 0x5a, 0x9b, 0x63, 0xf1, 
-	0xed, 0x7d, 0x1e, 0xe8, 0x90, 0xd4, 0x84, 0x37, 0x4a, 0xb5, 0x66, 0xbb, 
-	0x37, 0x1f, 0x76, 0x82, 0x17, 0x4b, 0x6a, 0xec, 0xc5, 0x1b, 0xab, 0x99, 
-	0xf7, 0x76, 0x84, 0xd7, 0x97, 0x91, 0x97, 0x27, 0xb8, 0x30, 0x7b, 0x3e, 
-	0x9e, 0x25, 0xc8, 0x29, 0x88, 0x8a, 0x04, 0xe7, 0xb6, 0x40, 0xa2, 0x59, 
-	0xdf, 0x5c, 0x91, 0x60, 0xab, 0x42, 0xd0, 0xe2, 0x94, 0x8a, 0xe2, 0x12, 
-	0xa9, 0xbe, 0x9c, 0xfe, 0xc8, 0xc4, 0x5d, 0x65, 0x28, 0x77, 0xc6, 0x19, 
-	0xfd, 0xe7, 0x9c, 0x7e, 0x7c, 0x01, 0xea, 0x9c, 0x35, 0x70, 0x80, 0x2d, 
-	0xea, 0x52, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 
-	0x60, 0x82, 
-}
-
diff --git a/systray.go b/systray.go
index d774146..0d37e03 100644
--- a/systray.go
+++ b/systray.go
@@ -196,7 +196,7 @@ func (bt *bmTray) changeStatus(status string) {
 		go bt.mCancel.Hide()
 
 	case "failed":
-		systray.SetIcon(icon.Error)
+		systray.SetIcon(icon.Blocked)
 		bt.mTurnOn.SetTitle("Retry")
 		go bt.mTurnOn.Show()
 		go bt.mTurnOff.Show()