diff --git a/README.md b/README.md index 5738b6cb9..396bee943 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Compilation on Linux sudo zypper install gcc-c++ libqt4-devel libgnome-keyring-devel \ glib2-devel speex-devel libssh-devel protobuf-devel libcurl-devel \ libxml2-devel libxslt-devel sqlcipher-devel libmicrohttpd-devel \ - opencv-devel speexdsp-devel libupnp-devel + opencv-devel speexdsp-devel libupnp-devel libavcodec-devel ``` * Arch Linux ```bash diff --git a/TODO.txt b/TODO.txt index e4094860e..254deedfd 100644 --- a/TODO.txt +++ b/TODO.txt @@ -6,31 +6,34 @@ Legend: [ ] pending [/] half-done, someone's on it [-] cancelled + [?] needs discussion. Not sure we need this. [X] done PS: no tabs in this file,thx ;-) +---------------------------------------- TODO for RC --------------------------------------------- + + E [ ] Implement creation of a default (signed) gxs id in startup wizard. Needs to show to the user a proper separation between nodes (network layer) and GXS ids (service layer). + E [ ] add tooltips in in permission matrix when hovering over the top most button/service name explain what the service does and the dependencies + E [ ] finish pass of GXS network service + ----------------------------------------- TODO list ---------------------------------------------- GUI E [X] add a "Contact" list to help selecting peers in People/FriendChooser/messages/etc. - E [ ] Implement creation of a default (signed) gxs id in startup wizard. Needs to show to the - user a proper separation between nodes (network layer) and GXS ids (service layer). E [ ] fix posted GUI. Needs to be more handy and more appealing. E [ ] add RS links for GXS identities, so that they can be transferred easily between nodes in forums, etc E [ ] enable people dialog M [ ] Personal Page (Profile Page for GXS ID Users,view latest Posts, public forum/channels,posted posts, comments in all areas, Reputation Infos, Popularity and more) E [ ] fix RSButtonOnText::eventFilter, and fix all places where RSButtonOnText gets deleted - E [ ] find all places where the deprecated(in Qt5) Q_WS_WIN and other Q_WS* macros are - used, and replace with something else - E [ ] add tooltips in in permission matrix when hovering over the top most button/service name - explain what the service does and the dependencies + E [ ] find all places where the deprecated(in Qt5) Q_WS_WIN and other Q_WS* macros are used, and replace with something else E [ ] Make RS fully compatible with High DPI screens. M [ ] improve comments in channels. Comments should be more available, more visible, and easier to handle. + E [ ] make GRouter statistics less CPU greedy M [ ] Merge the various help systems. there's 3 of them now. Lots of duplicate code, etc. M [ ] New and consistent icon set (Purplehaze420 said he would provide a consistent set of icons. Is that still alive?) M [ ] add in options->Network a way to select which network interface is used to talk (choice between "auto" or selected from a list) - M [ ] add a RS link for encrypted messages (encrypt for multiple GXS ids at once). Messages will appear as a link when encrypted and + M [?] add a RS link for encrypted messages (encrypt for multiple GXS ids at once). Messages will appear as a link when encrypted and be automatically decrypted when a suitable GXS id is available for it. Could be a way to securely post something in a public place. File transfer (all 3 tasks are related) @@ -38,9 +41,10 @@ File transfer (all 3 tasks are related) H [ ] implement a new file list management, with new info such as access time,total upload, popularity, etc H [ ] implement a new file list sharing service based on auto-sync system M [ ] get rid of the old cache system (remove CacheStrapper, CacheSource,etc) + M [ ] implement end-to-end encryption using chacha20 and H(F), requesting file on H(H(F)). Make this optional and backward compatible. DHT - H [ ] improve DHT lookups to find masquerading peers using fake peers. First experiments (by cyril) do not prove very efficient. + H [-] improve DHT lookups to find masquerading peers using fake peers. First experiments (by cyril) do not prove very efficient. GXS M [X] create a tunnel service from distant chat code to make it (1) more generic (2) resistant to packet loss. @@ -60,11 +64,9 @@ VOIP M [ ] Video Messages (send a video greeting to multiple friends/coworkers/developers at once.) H [ ] Audio Conference H [ ] Video Conference - Messages - H [ ] make the mail system re-send failed emails notified by the global router. This is hard because it needs a proper - management of duplicate messages + H [X] make the mail system re-send failed emails notified by the global router. This is hard because it needs a proper management of duplicate messages E [X] add flags to allow distant messaging from contact list only / everyone / noone / only signed ids. Chat diff --git a/build_scripts/Debian+Ubuntu/changelog b/build_scripts/Debian+Ubuntu/changelog index b4495f405..e89d1c3ca 100644 --- a/build_scripts/Debian+Ubuntu/changelog +++ b/build_scripts/Debian+Ubuntu/changelog @@ -1,5 +1,23 @@ retroshare06 (0.6.0-1.XXXXXX~YYYYYY) YYYYYY; urgency=low + 4953324 electron128 Sat, 2 Jan 2016 14:53:24 +0100 Merge pull request #235 from PhenomRetroShare/Fix_MakeMACOS_PluginWorking + c5e6f62 Phenom Sat, 2 Jan 2016 14:19:53 +0100 Make Plugin working in Mac OSX. + b6b5f9c csoler Fri, 1 Jan 2016 22:36:07 -0500 fixed some of the issues reported by coverity scan (mainly uninitialised class members) + ab3939c csoler Fri, 1 Jan 2016 11:11:40 -0500 added missing update of mClientMsgUpdateMap, causing both a memory leak and an inconsistency in TS + 22c00fc electron128 Fri, 1 Jan 2016 14:07:15 +0100 fixed free() in UdpLayer::recv_loop + 58672e8 electron128 Fri, 1 Jan 2016 13:44:38 +0100 fix the logic to prevent using invalid iterators. First make a valid iterator, then dereference + 3b2eae4 electron128 Fri, 1 Jan 2016 12:17:08 +0100 fixed memory leak by using stack memory instead of heap memory + 9cb81f5 electron128 Fri, 1 Jan 2016 12:01:49 +0100 don't create wiki dataservice if wiki is not enabled for compile + 72812be electron128 Fri, 1 Jan 2016 11:54:59 +0100 added missing initialisation of integers in GxsForumThreadWidget + 55ea8a5 electron128 Fri, 1 Jan 2016 11:49:03 +0100 init pointer in RsServer + 7efb763 electron128 Fri, 1 Jan 2016 11:38:29 +0100 restore stream state of std::cerr after printing hex number + 640d71b electron128 Fri, 1 Jan 2016 11:09:49 +0100 removed delete of RsTemporaryMemory + d24ff5a csoler Thu, 31 Dec 2015 19:42:50 -0500 Merge pull request #232 from G10h4ck/master + 7895932 Gio Fri, 1 Jan 2016 00:45:01 +0100 print_stacktrace is OS specific + e872727 csoler Thu, 31 Dec 2015 17:37:05 -0500 updated dos->unix convertion script + b6b04dc csoler Thu, 31 Dec 2015 17:28:42 -0500 added script to convert files to unix format + 6392d65 csoler Thu, 31 Dec 2015 16:50:52 -0500 fixed [dos] LF in IdDialog.h + a6ee7cc csoler Thu, 31 Dec 2015 14:15:14 -0500 Merge pull request #230 from G10h4ck/ss_port_invalid_family fac1524 csoler Thu, 31 Dec 2015 13:58:13 -0500 updated todo list c5feafa Gio Thu, 31 Dec 2015 19:56:50 +0100 Add missing stacktrace.h @@ -2168,7 +2186,7 @@ retroshare (0.5.4-0.6546~precise) precise; urgency=low retroshare (0.5.4-0.6455~precise) precise; urgency=low * Improvements - - GUI + - GUI * added/enabled GUI for distant chat (Invitation handler in config->chat, handling of Distant chat links) * Localized Greek and Dutch (patch from Henry). Updated English. * Languages updates from transifex @@ -2217,7 +2235,7 @@ retroshare (0.5.4-0.6399~precise) precise; urgency=low - added columns for last used statistics on pgp keys in network dialog. * Bugs - - fixed display of names in file lists + - fixed display of names in file lists - fixed destination directory when downloading channel items in auto DL mode - improved time-stamp management for pgp keys - fixed translatable string with .arg (Req. From H. Morgan) diff --git a/libbitdht/src/bitdht/bdnode.cc b/libbitdht/src/bitdht/bdnode.cc index 9161c6991..a994db475 100644 --- a/libbitdht/src/bitdht/bdnode.cc +++ b/libbitdht/src/bitdht/bdnode.cc @@ -2399,6 +2399,13 @@ bdNodeNetMsg::bdNodeNetMsg(char *msg, int len, struct sockaddr_in *in_addr) :data(NULL), mSize(len), addr(*in_addr) { data = (char *) malloc(len); + + if(data == NULL) + { + std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len << " bytes." << std::endl; + return ; + } + memcpy(data, msg, len); //print(std::cerr); } diff --git a/libbitdht/src/bitdht/bencode.c b/libbitdht/src/bitdht/bencode.c index 2a486daca..4678677f7 100644 --- a/libbitdht/src/bitdht/bencode.c +++ b/libbitdht/src/bitdht/bencode.c @@ -20,6 +20,7 @@ */ #include +#include #include /* malloc() realloc() free() strtoll() */ #include /* memset() */ #include "util/bdstring.h" @@ -111,6 +112,13 @@ static char *_be_decode_str(const char **data, long long *data_len) if (**data == ':') { char *_ret = (char *) malloc(sizeof(sllen) + len + 1); + + if(_ret == NULL) + { + std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl; + return NULL; + } + memcpy(_ret, &sllen, sizeof(sllen)); ret = _ret + sizeof(sllen); memcpy(ret, *data + 1, len); @@ -500,6 +508,12 @@ be_node *be_create_str(const char *str) int len = strlen(str); long long int sllen = len; char *_ret = (char *) malloc(sizeof(sllen) + len + 1); + + if(_ret == NULL) + { + std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl; + return NULL; + } char *ret = NULL; memcpy(_ret, &sllen, sizeof(sllen)); @@ -519,6 +533,12 @@ be_node *be_create_str_wlen(const char *str, int len) /* not including \0 */ be_node *n = be_alloc(BE_STR); long long int sllen = len; char *_ret = (char *) malloc(sizeof(sllen) + len + 1); + + if(_ret == NULL) + { + std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl; + return NULL; + } char *ret = NULL; memcpy(_ret, &sllen, sizeof(sllen)); @@ -561,6 +581,12 @@ int be_add_keypair(be_node *dict, const char *str, be_node *node) int len = strlen(str); long long int sllen = len; char *_ret = (char *) malloc(sizeof(sllen) + len + 1); + + if(_ret == NULL) + { + std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl; + return 0; + } char *ret = NULL; //fprintf(stderr, "be_add_keypair() key len = %d\n",len); diff --git a/libbitdht/src/udp/udplayer.cc b/libbitdht/src/udp/udplayer.cc index 71dfd4f9a..db048b857 100644 --- a/libbitdht/src/udp/udplayer.cc +++ b/libbitdht/src/udp/udplayer.cc @@ -66,7 +66,11 @@ class udpPacket :raddr(*addr), len(dlen) { data = malloc(len); - memcpy(data, dta, len); + + if(data != NULL) + memcpy(data, dta, len); + else + std::cerr << "(EE) error in memory allocation in " << __PRETTY_FUNCTION__ << std::endl; } ~udpPacket() @@ -242,6 +246,12 @@ void UdpLayer::recv_loop() int maxsize = 16000; void *inbuf = malloc(maxsize); + if(inbuf == NULL) + { + std::cerr << "(EE) Error in memory allocation of size " << maxsize << " in " << __PRETTY_FUNCTION__ << std::endl; + return ; + } + int status; struct timeval timeout; diff --git a/libbitdht/src/util/bdbloom.cc b/libbitdht/src/util/bdbloom.cc index 1d6566d52..36f3a3bee 100644 --- a/libbitdht/src/util/bdbloom.cc +++ b/libbitdht/src/util/bdbloom.cc @@ -100,6 +100,13 @@ int bloomFilter::setFilterBits(const std::string &hex) // convert to binary array. uint8_t *tmparray = (uint8_t *) malloc(bytes); + + if(tmparray == NULL) + { + std::cerr << "(EE) Error. Cannot allocate memory for " << bytes << " bytes in " << __PRETTY_FUNCTION__ << std::endl; + return 0; + } + uint32_t i = 0; for(i = 0; i < bytes; i++) @@ -139,6 +146,13 @@ std::string bloomFilter::getFilter() // convert to binary array. uint8_t *tmparray = (uint8_t *) malloc(bytes); + + if(tmparray == NULL) + { + std::cerr << "(EE) Error. Cannot allocate memory for " << bytes << " bytes in " << __PRETTY_FUNCTION__ << std::endl; + return std::string(); + } + int i,j; for(i = 0; i < bytes; i++) diff --git a/libretroshare/src/chat/distributedchat.cc b/libretroshare/src/chat/distributedchat.cc index bced27d30..fb2a8a419 100644 --- a/libretroshare/src/chat/distributedchat.cc +++ b/libretroshare/src/chat/distributedchat.cc @@ -202,7 +202,7 @@ bool DistributedChatService::handleRecvChatLobbyMsgItem(RsChatMsgItem *ci) //name = cli->nick; //popupChatFlag = RS_POPUP_CHATLOBBY; - RsServer::notify()->AddPopupMessage(RS_POPUP_CHATLOBBY, virtual_peer_id.toStdString(), cli->signature.keyId.toStdString(), cli->message); /* notify private chat message */ + RsServer::notify()->AddPopupMessage(RS_POPUP_CHATLOBBY, ChatId(cli->lobby_id).toStdString(), cli->signature.keyId.toStdString(), cli->message); /* notify private chat message */ return true ; } @@ -319,11 +319,6 @@ void DistributedChatService::locked_printDebugInfo() const } - std::cerr << "Recorded lobby names: " << std::endl; - - for( std::map::const_iterator it(_lobby_ids.begin()) ;it!=_lobby_ids.end();++it) - std::cerr << " \"" << it->first << "\" id = " << std::hex << it->second << std::dec << std::endl; - std::cerr << "Visible public lobbies: " << std::endl; for( std::map::const_iterator it(_visible_lobbies.begin()) ;it!=_visible_lobbies.end();++it) @@ -339,21 +334,6 @@ void DistributedChatService::locked_printDebugInfo() const std::cerr << " \"" << std::hex << it->first << "\" flags = " << it->second << std::dec << std::endl; } -bool DistributedChatService::isLobbyId(const RsPeerId& virtual_peer_id,ChatLobbyId& lobby_id) -{ - RsStackMutex stack(mDistributedChatMtx); /********** STACK LOCKED MTX ******/ - - std::map::const_iterator it(_lobby_ids.find(virtual_peer_id)) ; - - if(it != _lobby_ids.end()) - { - lobby_id = it->second ; - return true ; - } - - lobby_id = 0; - return false ; -} bool DistributedChatService::locked_bouncingObjectCheck(RsChatLobbyBouncingObject *obj,const RsPeerId& peer_id,uint32_t lobby_count) { static std::map > message_counts ; @@ -1368,7 +1348,6 @@ bool DistributedChatService::acceptLobbyInvite(const ChatLobbyId& lobby_id,const entry.last_connexion_challenge_time = now ; entry.last_keep_alive_packet_time = now ; - _lobby_ids[entry.virtual_peer_id] = lobby_id ; _chat_lobbys[lobby_id] = entry ; _lobby_invites_queue.erase(it) ; // remove the invite from cache. @@ -1487,8 +1466,6 @@ bool DistributedChatService::joinVisibleChatLobby(const ChatLobbyId& lobby_id,co entry.last_connexion_challenge_time = now ; entry.last_keep_alive_packet_time = now ; - _lobby_ids[entry.virtual_peer_id] = lobby_id ; - for(std::set::const_iterator it2(it->second.participating_friends.begin());it2!=it->second.participating_friends.end();++it2) { invited_friends.push_back(*it2) ; @@ -1537,7 +1514,6 @@ ChatLobbyId DistributedChatService::createChatLobby(const std::string& lobby_nam entry.last_connexion_challenge_time = now ; entry.last_keep_alive_packet_time = now ; - _lobby_ids[entry.virtual_peer_id] = lobby_id ; _chat_lobbys[lobby_id] = entry ; } @@ -1619,13 +1595,6 @@ void DistributedChatService::unsubscribeChatLobby(const ChatLobbyId& id) // remove lobby information _chat_lobbys.erase(it) ; - - for(std::map::iterator it2(_lobby_ids.begin());it2!=_lobby_ids.end();++it2) - if(it2->second == id) - { - _lobby_ids.erase(it2) ; - break ; - } } RsServer::notify()->notifyListChange(NOTIFY_LIST_CHAT_LOBBY_LIST, NOTIFY_TYPE_DEL) ; diff --git a/libretroshare/src/chat/distributedchat.h b/libretroshare/src/chat/distributedchat.h index e77a3d802..c311727b1 100644 --- a/libretroshare/src/chat/distributedchat.h +++ b/libretroshare/src/chat/distributedchat.h @@ -60,7 +60,6 @@ class DistributedChatService // Interface part to communicate with // bool getVirtualPeerId(const ChatLobbyId& lobby_id, RsPeerId& virtual_peer_id) ; - bool isLobbyId(const RsPeerId& virtual_peer_id, ChatLobbyId& lobby_id) ; void getChatLobbyList(std::list& clids) ; bool getChatLobbyInfo(const ChatLobbyId& id,ChatLobbyInfo& clinfo) ; bool acceptLobbyInvite(const ChatLobbyId& id,const RsGxsId& identity) ; @@ -149,7 +148,6 @@ class DistributedChatService std::map _chat_lobbys ; std::map _lobby_invites_queue ; std::map _visible_lobbies ; - std::map _lobby_ids ; std::map _known_lobbies_flags ; // flags for all lobbies, including the ones that are not known. So we can't std::map > _pendingPartialLobbyMessages ; // store them in _chat_lobbies (subscribed lobbies) nor _visible_lobbies. // Known flags: diff --git a/libretroshare/src/dbase/fimonitor.cc b/libretroshare/src/dbase/fimonitor.cc index 91a8ffb9b..c4f60ee81 100644 --- a/libretroshare/src/dbase/fimonitor.cc +++ b/libretroshare/src/dbase/fimonitor.cc @@ -29,6 +29,7 @@ #include "rsserver/p3face.h" #include "dbase/fimonitor.h" #include "util/rsdir.h" +#include "util/rsmemory.h" #include "pqi/authssl.h" #include "serialiser/rsserviceids.h" #include "retroshare/rsiface.h" @@ -128,13 +129,11 @@ HashCache::HashCache(const std::string& path) // read the binary stream into memory. // - void *buffer = malloc(file_size) ; + void *buffer = rs_malloc(file_size) ; if(buffer == NULL) - { - std::cerr << "Cannot allocate memory for reading encrypted file cache, bytes=" << file_size << std::endl; return ; - } + FILE *F = fopen( (_path+".bin").c_str(),"rb") ; if (!F) { diff --git a/libretroshare/src/ft/ftcontroller.cc b/libretroshare/src/ft/ftcontroller.cc index b58650a1a..fc66c7f2a 100644 --- a/libretroshare/src/ft/ftcontroller.cc +++ b/libretroshare/src/ft/ftcontroller.cc @@ -39,6 +39,7 @@ #include "util/rsstring.h" #endif #include "util/rsdiscspace.h" +#include "util/rsmemory.h" #include "ft/ftcontroller.h" @@ -747,8 +748,14 @@ bool ftController::copyFile(const std::string& source,const std::string& dest) size_t T=0; static const int BUFF_SIZE = 10485760 ; // 10 MB buffer to speed things up. - void *buffer = malloc(BUFF_SIZE) ; + void *buffer = rs_malloc(BUFF_SIZE) ; + if(buffer == NULL) + { + fclose (in); + fclose (out); + return false ; + } bool bRet = true; while( (s = fread(buffer,1,BUFF_SIZE,in)) > 0) diff --git a/libretroshare/src/ft/ftdatamultiplex.cc b/libretroshare/src/ft/ftdatamultiplex.cc index 05c8265ef..a30545b38 100644 --- a/libretroshare/src/ft/ftdatamultiplex.cc +++ b/libretroshare/src/ft/ftdatamultiplex.cc @@ -35,6 +35,7 @@ #include "ft/ftfileprovider.h" #include "ft/ftsearch.h" #include "util/rsdir.h" +#include "util/rsmemory.h" #include #include @@ -878,13 +879,11 @@ bool ftDataMultiplex::locked_handleServerRequest(ftFileProvider *provider, const std::cerr << "Warning: peer " << peerId << " is asking a large chunk (s=" << chunksize << ") for hash " << hash << ", filesize=" << size << ". This is unexpected." << std::endl ; return false ; } - void *data = malloc(chunksize); + void *data = rs_malloc(chunksize); if(data == NULL) - { - std::cerr << "WARNING: Could not allocate data for a chunksize of " << chunksize << std::endl ; return false ; - } + #ifdef MPLEX_DEBUG std::cerr << "ftDataMultiplex::locked_handleServerRequest()"; std::cerr << "\t peer: " << peerId << " hash: " << hash; diff --git a/libretroshare/src/ft/ftserver.cc b/libretroshare/src/ft/ftserver.cc index ae0c8354a..2bcb53a5f 100644 --- a/libretroshare/src/ft/ftserver.cc +++ b/libretroshare/src/ft/ftserver.cc @@ -465,6 +465,8 @@ RsTurtleGenericTunnelItem *ftServer::deserialiseItem(void *data,uint32_t size) c return NULL; /* wrong type */ } + try + { switch(getRsItemSubType(rstype)) { case RS_TURTLE_SUBTYPE_FILE_REQUEST : return new RsTurtleFileRequestItem(data,size) ; @@ -477,6 +479,13 @@ RsTurtleGenericTunnelItem *ftServer::deserialiseItem(void *data,uint32_t size) c default: return NULL ; } + } + catch(std::exception& e) + { + std::cerr << "(EE) deserialisation error in " << __PRETTY_FUNCTION__ << ": " << e.what() << std::endl; + + return NULL ; + } } void ftServer::addVirtualPeer(const TurtleFileHash& hash,const TurtleVirtualPeerId& virtual_peer_id,RsTurtleGenericTunnelItem::Direction dir) @@ -1093,11 +1102,10 @@ bool ftServer::sendData(const RsPeerId& peerId, const RsFileHash& hash, uint64_t item->chunk_offset = offset+baseoffset ; item->chunk_size = chunk; - item->chunk_data = malloc(chunk) ; + item->chunk_data = rs_malloc(chunk) ; if(item->chunk_data == NULL) { - std::cerr << "p3turtle: Warning: failed malloc of " << chunk << " bytes for sending data packet." << std::endl ; delete item; return false; } diff --git a/libretroshare/src/ft/ftturtlefiletransferitem.cc b/libretroshare/src/ft/ftturtlefiletransferitem.cc index 938c76796..4ec1123cc 100644 --- a/libretroshare/src/ft/ftturtlefiletransferitem.cc +++ b/libretroshare/src/ft/ftturtlefiletransferitem.cc @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -422,14 +423,24 @@ RsTurtleFileDataItem::RsTurtleFileDataItem(void *data,uint32_t pktsize) uint32_t offset = 8; // skip the header uint32_t rssize = getRsItemSize(data); - /* add mandatory parts first */ - bool ok = true ; + + if(rssize > pktsize) + ok = false ; + + /* add mandatory parts first */ ok &= getRawUInt32(data, pktsize, &offset, &tunnel_id) ; ok &= getRawUInt64(data, pktsize, &offset, &chunk_offset); ok &= getRawUInt32(data, pktsize, &offset, &chunk_size); - chunk_data = (void*)malloc(chunk_size) ; + if(chunk_size > rssize || rssize - chunk_size < offset) + throw std::runtime_error("RsTurtleFileDataItem::() error while deserializing.") ; + + chunk_data = (void*)rs_malloc(chunk_size) ; + + if(chunk_data == NULL) + throw std::runtime_error("RsTurtleFileDataItem::() cannot allocate memory.") ; + memcpy(chunk_data,(void*)((unsigned char*)data+offset),chunk_size) ; offset += chunk_size ; diff --git a/libretroshare/src/grouter/grouteritems.cc b/libretroshare/src/grouter/grouteritems.cc index b67ed71e6..cab25c43e 100644 --- a/libretroshare/src/grouter/grouteritems.cc +++ b/libretroshare/src/grouter/grouteritems.cc @@ -66,6 +66,12 @@ RsGRouterTransactionChunkItem *RsGRouterSerialiser::deserialise_RsGRouterTransac uint32_t rssize = getRsItemSize(data); bool ok = true ; + if(tlvsize < rssize) + { + std::cerr << __PRETTY_FUNCTION__ << ": wrong encoding of item size. Serialisation error!" << std::endl; + return NULL ; + } + RsGRouterTransactionChunkItem *item = new RsGRouterTransactionChunkItem() ; /* add mandatory parts first */ @@ -74,15 +80,14 @@ RsGRouterTransactionChunkItem *RsGRouterSerialiser::deserialise_RsGRouterTransac ok &= getRawUInt32(data, tlvsize, &offset, &item->chunk_size); ok &= getRawUInt32(data, tlvsize, &offset, &item->total_size); - if( NULL == (item->chunk_data = (uint8_t*)malloc(item->chunk_size))) + if(item->chunk_size > rssize || offset > rssize - item->chunk_size) // better than if(item->chunk_size + offset > rssize) { - std::cerr << __PRETTY_FUNCTION__ << ": Cannot allocate memory for chunk " << item->chunk_size << std::endl; + std::cerr << __PRETTY_FUNCTION__ << ": Cannot read beyond item size. Serialisation error!" << std::endl; delete item; return NULL ; } - if(item->chunk_size + offset > rssize) + if( NULL == (item->chunk_data = (uint8_t*)rs_malloc(item->chunk_size))) { - std::cerr << __PRETTY_FUNCTION__ << ": Cannot read beyond item size. Serialisation error!" << std::endl; delete item; return NULL ; } @@ -125,36 +130,40 @@ RsGRouterGenericDataItem *RsGRouterSerialiser::deserialise_RsGRouterGenericDataI uint32_t rssize = getRsItemSize(data); bool ok = true ; + if(pktsize < rssize) + { + std::cerr << __PRETTY_FUNCTION__ << ": wrong encoding of item size. Serialisation error!" << std::endl; + return NULL ; + } RsGRouterGenericDataItem *item = new RsGRouterGenericDataItem() ; ok &= getRawUInt64(data, pktsize, &offset, &item->routing_id); ok &= item->destination_key.deserialise(data, pktsize, offset) ; - ok &= getRawUInt32(data, pktsize, &offset, &item->service_id); - ok &= getRawUInt32(data, pktsize, &offset, &item->data_size); + ok &= getRawUInt32(data, pktsize, &offset, &item->service_id); + ok &= getRawUInt32(data, pktsize, &offset, &item->data_size); - if( NULL == (item->data_bytes = (uint8_t*)malloc(item->data_size))) + if(item->data_size > rssize || offset > rssize - item->data_size) // better than if(item->data_size + offset > rssize) { - std::cerr << __PRETTY_FUNCTION__ << ": Cannot allocate memory for chunk " << item->data_size << std::endl; + std::cerr << __PRETTY_FUNCTION__ << ": Cannot read beyond item size. Serialisation error!" << std::endl; delete item; return NULL ; } - if(item->data_size + offset > rssize) - { - std::cerr << __PRETTY_FUNCTION__ << ": Cannot read beyond item size. Serialisation error!" << std::endl; - delete item; - return NULL ; - } + if( NULL == (item->data_bytes = (uint8_t*)rs_malloc(item->data_size))) + { + delete item; + return NULL ; + } - memcpy(item->data_bytes,&((uint8_t*)data)[offset],item->data_size) ; + memcpy(item->data_bytes,&((uint8_t*)data)[offset],item->data_size) ; offset += item->data_size ; - ok &= item->signature.GetTlv(data, pktsize, &offset) ; + ok &= item->signature.GetTlv(data, pktsize, &offset) ; - ok &= getRawUInt32(data, pktsize, &offset, &item->randomized_distance); - ok &= getRawUInt32(data, pktsize, &offset, &item->flags); + ok &= getRawUInt32(data, pktsize, &offset, &item->randomized_distance); + ok &= getRawUInt32(data, pktsize, &offset, &item->flags); - if (offset != rssize || !ok) + if (offset != rssize || !ok) { std::cerr << __PRETTY_FUNCTION__ << ": error while deserialising! Item will be dropped." << std::endl; delete item; @@ -337,8 +346,19 @@ RsGRouterGenericDataItem *RsGRouterGenericDataItem::duplicate() const // then duplicate the memory chunk - item->data_bytes = (uint8_t*)malloc(data_size) ; - memcpy(item->data_bytes,data_bytes,data_size) ; + if(data_size > 0) + { + item->data_bytes = (uint8_t*)rs_malloc(data_size) ; + + if(item->data_bytes == NULL) + { + delete item ; + return NULL ; + } + memcpy(item->data_bytes,data_bytes,data_size) ; + } + else + item->data_bytes = NULL ; return item ; } diff --git a/libretroshare/src/grouter/grouteritems.h b/libretroshare/src/grouter/grouteritems.h index 574c7b3c4..ad87d1051 100644 --- a/libretroshare/src/grouter/grouteritems.h +++ b/libretroshare/src/grouter/grouteritems.h @@ -25,6 +25,8 @@ #pragma once +#include "util/rsmemory.h" + #include "serialiser/rsserial.h" #include "serialiser/rstlvkeys.h" #include "serialiser/rsserviceids.h" @@ -194,7 +196,11 @@ class RsGRouterTransactionChunkItem: public RsGRouterTransactionItem, public RsG { RsGRouterTransactionChunkItem *item = new RsGRouterTransactionChunkItem ; *item = *this ; // copy all fields - item->chunk_data = (uint8_t*)malloc(chunk_size) ; // deep copy memory chunk + item->chunk_data = (uint8_t*)rs_malloc(chunk_size) ; // deep copy memory chunk + + if(item->chunk_data == NULL) + return NULL ; + memcpy(item->chunk_data,chunk_data,chunk_size) ; return item ; } diff --git a/libretroshare/src/grouter/p3grouter.cc b/libretroshare/src/grouter/p3grouter.cc index b4faf9ccb..e11358970 100644 --- a/libretroshare/src/grouter/p3grouter.cc +++ b/libretroshare/src/grouter/p3grouter.cc @@ -1121,13 +1121,11 @@ bool p3GRouter::locked_sendTransactionData(const RsPeerId& pid,const RsGRouterTr std::cerr << " sending to tunnel vpid " << pid << std::endl; #endif uint32_t turtle_data_size = trans_item.serial_size() ; - uint8_t *turtle_data = (uint8_t*)malloc(turtle_data_size) ; + uint8_t *turtle_data = (uint8_t*)rs_malloc(turtle_data_size) ; if(turtle_data == NULL) - { - std::cerr << " ERROR: Cannot allocate turtle data memory for size " << turtle_data_size << std::endl; return false ; - } + if(!trans_item.serialise(turtle_data,turtle_data_size)) { std::cerr << " ERROR: cannot serialise RsGRouterTransactionChunkItem." << std::endl; @@ -1184,16 +1182,18 @@ void p3GRouter::autoWash() #ifdef GROUTER_DEBUG grouter_debug() << " Removing cached item " << std::hex << it->first << std::dec << std::endl; #endif - GRouterClientService *client = NULL ; - GRouterServiceId service_id = 0; + //GRouterClientService *client = NULL ; + //GRouterServiceId service_id = 0; if( it->second.data_status != RS_GROUTER_DATA_STATUS_DONE ) - { - if(!locked_getClientAndServiceId(it->second.tunnel_hash,it->second.data_item->destination_key,client,service_id)) - std::cerr << " ERROR: cannot find client for cancelled message " << it->first << std::endl; - else - failed_msgs[it->first] = client; - } + { + GRouterClientService *client = NULL; + + if(locked_getLocallyRegisteredClientFromServiceId(it->second.client_id,client)) + failed_msgs[it->first] = client ; + else + std::cerr << " ERROR: client id " << it->second.client_id << " not registered. Consistency error." << std::endl; + } delete it->second.data_item ; @@ -1302,14 +1302,13 @@ bool p3GRouter::sliceDataItem(RsGRouterAbstractMsgItem *item,std::listtotal_size = size; chunk_item->chunk_start= offset; chunk_item->chunk_size = chunk_size ; - chunk_item->chunk_data = (uint8_t*)malloc(chunk_size) ; + chunk_item->chunk_data = (uint8_t*)rs_malloc(chunk_size) ; #ifdef GROUTER_DEBUG std::cerr << " preparing to send a chunk [" << offset << " -> " << offset + chunk_size << " / " << size << "]" << std::endl; #endif if(chunk_item->chunk_data == NULL) { - std::cerr << " ERROR: Cannot allocate memory for size " << chunk_size << std::endl; delete chunk_item; throw ; } @@ -1411,7 +1410,7 @@ void p3GRouter::handleIncomingReceiptItem(RsGRouterSignedReceiptItem *receipt_it #endif it->second.data_status = RS_GROUTER_DATA_STATUS_DONE; - if(locked_getClientAndServiceId(it->second.tunnel_hash,it->second.data_item->destination_key,client_service,service_id)) + if(locked_getLocallyRegisteredClientFromServiceId(it->second.client_id,client_service)) mid = it->first ; else { @@ -1604,6 +1603,7 @@ void p3GRouter::handleIncomingDataItem(RsGRouterGenericDataItem *data_item) info.receipt_item = receipt_item ; // inited before, or NULL. info.tunnel_status = RS_GROUTER_TUNNEL_STATUS_UNMANAGED ; info.last_sent_TS = 0 ; + info.client_id = data_item->service_id ; info.item_hash = item_hash ; info.last_tunnel_request_TS = 0 ; info.sending_attempts = 0 ; @@ -1680,26 +1680,10 @@ void p3GRouter::handleIncomingDataItem(RsGRouterGenericDataItem *data_item) IndicateConfigChanged() ; } -bool p3GRouter::locked_getClientAndServiceId(const TurtleFileHash& hash, const RsGxsId& destination_key, GRouterClientService *& client, GRouterServiceId& service_id) +bool p3GRouter::locked_getLocallyRegisteredClientFromServiceId(const GRouterServiceId& service_id,GRouterClientService *& client) { client = NULL ; - service_id = 0; - RsGxsId gxs_id ; - if(!locked_getGxsIdAndClientId(hash,gxs_id,service_id)) - { - std::cerr << " p3GRouter::ERROR: locked_getGxsIdAndClientId(): no key registered for hash " << hash << std::endl; - return false ; - } - - if(gxs_id != destination_key) - { - std::cerr << " ERROR: verification (destination) GXS key " << destination_key << " does not match key from hash " << gxs_id << std::endl; - return false; - } - - // now find the client given its id. - std::map::const_iterator its = _registered_services.find(service_id) ; if(its == _registered_services.end()) @@ -1934,7 +1918,11 @@ bool p3GRouter::sendData(const RsGxsId& destination,const GRouterServiceId& clie RsGRouterGenericDataItem *data_item = new RsGRouterGenericDataItem ; - data_item->data_bytes = (uint8_t*)malloc(data_size) ; + data_item->data_bytes = (uint8_t*)rs_malloc(data_size) ; + + if(data_item->data_bytes == NULL) + return false ; + memcpy(data_item->data_bytes,data,data_size) ; data_item->data_size = data_size ; @@ -1981,6 +1969,7 @@ bool p3GRouter::sendData(const RsGxsId& destination,const GRouterServiceId& clie info.data_status = RS_GROUTER_DATA_STATUS_PENDING ; info.tunnel_status = RS_GROUTER_TUNNEL_STATUS_UNMANAGED ; info.last_sent_TS = 0 ; + info.client_id = client_id ; info.last_tunnel_request_TS = 0 ; info.item_hash = computeDataItemHash(data_item) ; info.sending_attempts = 0 ; @@ -2029,7 +2018,8 @@ Sha1CheckSum p3GRouter::makeTunnelHash(const RsGxsId& destination,const GRouterS return RsDirUtil::sha1sum(bytes,20) ; } -bool p3GRouter::locked_getGxsIdAndClientId(const TurtleFileHash& sum,RsGxsId& gxs_id,GRouterServiceId& client_id) +#ifdef TO_REMOVE +bool p3GRouter::locked_getGxsOwnIdAndClientIdFromHash(const TurtleFileHash& sum,RsGxsId& gxs_id,GRouterServiceId& client_id) { assert( gxs_id.SIZE_IN_BYTES == 16) ; assert(Sha1CheckSum::SIZE_IN_BYTES == 20) ; @@ -2047,6 +2037,7 @@ bool p3GRouter::locked_getGxsIdAndClientId(const TurtleFileHash& sum,RsGxsId& gx return true ; } +#endif bool p3GRouter::loadList(std::list& items) { { @@ -2210,7 +2201,8 @@ void p3GRouter::debugDump() for(std::map::const_iterator it(_owned_key_ids.begin());it!=_owned_key_ids.end();++it) { - grouter_debug() << " Hash : " << it->first << std::endl; + grouter_debug() << " Hash : " << it->first << std::endl; + grouter_debug() << " Key : " << it->second.authentication_key << std::endl; grouter_debug() << " Service id : " << std::hex << it->second.service_id << std::dec << std::endl; grouter_debug() << " Description : " << it->second.description_string << std::endl; } @@ -2226,15 +2218,17 @@ void p3GRouter::debugDump() for(std::map::iterator it(_pending_messages.begin());it!=_pending_messages.end();++it) { - grouter_debug() << " Msg id : " << std::hex << it->first << std::dec ; - grouter_debug() << " data hash : " << it->second.item_hash ; - grouter_debug() << " Destination : " << it->second.data_item->destination_key ; - grouter_debug() << " Received : " << now - it->second.received_time_TS << " secs ago."; - grouter_debug() << " Last sent : " << now - it->second.last_sent_TS << " secs ago."; - grouter_debug() << " Transaction TS : " << now - it->second.data_transaction_TS << " secs ago."; - grouter_debug() << " Data Status : " << statusString[it->second.data_status] << std::endl; - grouter_debug() << " Tunl Status : " << statusString[it->second.tunnel_status] << std::endl; - grouter_debug() << " Receipt ok : " << (it->second.receipt_item != NULL) << std::endl; + grouter_debug() << " Msg id: " << std::hex << it->first << std::dec ; + grouter_debug() << " data hash: " << it->second.item_hash ; + grouter_debug() << " client id: " << std::hex << it->second.client_id << std::dec; + grouter_debug() << " Flags: " << std::hex << it->second.routing_flags << std::dec; + grouter_debug() << " Destination: " << it->second.data_item->destination_key ; + grouter_debug() << " Received: " << now - it->second.received_time_TS << " secs ago."; + grouter_debug() << " Last sent: " << now - it->second.last_sent_TS << " secs ago."; + grouter_debug() << " Transaction TS: " << now - it->second.data_transaction_TS << " secs ago."; + grouter_debug() << " Data Status: " << statusString[it->second.data_status] << std::endl; + grouter_debug() << " Tunl Status: " << statusString[it->second.tunnel_status] << std::endl; + grouter_debug() << " Receipt ok: " << (it->second.receipt_item != NULL) << std::endl; } grouter_debug() << " Tunnels: " << std::endl; diff --git a/libretroshare/src/grouter/p3grouter.h b/libretroshare/src/grouter/p3grouter.h index 6a73253cf..45072425f 100644 --- a/libretroshare/src/grouter/p3grouter.h +++ b/libretroshare/src/grouter/p3grouter.h @@ -252,8 +252,7 @@ private: void handleIncomingReceiptItem(RsGRouterSignedReceiptItem *receipt_item) ; void handleIncomingDataItem(RsGRouterGenericDataItem *data_item) ; - bool locked_getClientAndServiceId(const TurtleFileHash& hash, const RsGxsId& destination_key, GRouterClientService *& client, GRouterServiceId& service_id); - + bool locked_getLocallyRegisteredClientFromServiceId(const GRouterServiceId& service_id,GRouterClientService *& client); // utility functions // @@ -270,7 +269,7 @@ private: static Sha1CheckSum makeTunnelHash(const RsGxsId& destination,const GRouterServiceId& client); - bool locked_getGxsIdAndClientId(const TurtleFileHash &sum,RsGxsId& gxs_id,GRouterServiceId& client_id); + //bool locked_getGxsIdAndClientId(const TurtleFileHash &sum,RsGxsId& gxs_id,GRouterServiceId& client_id); bool locked_sendTransactionData(const RsPeerId& pid,const RsGRouterTransactionItem& item); void locked_collectAvailableFriends(const GRouterKeyId &gxs_id,std::list& friend_peers, const std::set& incoming_routes,bool is_origin); diff --git a/libretroshare/src/gxs/gxssecurity.cc b/libretroshare/src/gxs/gxssecurity.cc index 681e2459c..8b6230b1b 100644 --- a/libretroshare/src/gxs/gxssecurity.cc +++ b/libretroshare/src/gxs/gxssecurity.cc @@ -563,7 +563,11 @@ bool GxsSecurity::encrypt(uint8_t *& out, uint32_t &outlen, const uint8_t *in, u int out_offset = 0; int max_evp_key_size = EVP_PKEY_size(public_key); - ek = (unsigned char*)malloc(max_evp_key_size); + ek = (unsigned char*)rs_malloc(max_evp_key_size); + + if(ek == NULL) + return false ; + const EVP_CIPHER *cipher = EVP_aes_128_cbc(); int cipher_block_size = EVP_CIPHER_block_size(cipher); int size_net_ekl = sizeof(net_ekl); @@ -574,13 +578,10 @@ bool GxsSecurity::encrypt(uint8_t *& out, uint32_t &outlen, const uint8_t *in, u if(!EVP_SealInit(&ctx, EVP_aes_128_cbc(), &ek, &eklen, iv, &public_key, 1)) return false; // now assign memory to out accounting for data, and cipher block size, key length, and key length val - out = (uint8_t*)malloc(inlen + cipher_block_size + size_net_ekl + eklen + EVP_MAX_IV_LENGTH); + out = (uint8_t*)rs_malloc(inlen + cipher_block_size + size_net_ekl + eklen + EVP_MAX_IV_LENGTH); - if(out == NULL) - { - std::cerr << "gxssecurity::encrypt(): cnnot allocate memory of size " << inlen + cipher_block_size + size_net_ekl + eklen + EVP_MAX_IV_LENGTH << " to encrypt data." << std::endl; - return false ; - } + if(out == NULL) + return false ; net_ekl = htonl(eklen); memcpy((unsigned char*)out + out_offset, &net_ekl, size_net_ekl); @@ -750,7 +751,11 @@ bool GxsSecurity::decrypt(uint8_t *& out, uint32_t & outlen, const uint8_t *in, EVP_CIPHER_CTX ctx; int eklen = 0, net_ekl = 0; - unsigned char *ek = (unsigned char*)malloc(EVP_PKEY_size(privateKey)); + unsigned char *ek = (unsigned char*)rs_malloc(EVP_PKEY_size(privateKey)); + + if(ek == NULL) + return false ; + unsigned char iv[EVP_MAX_IV_LENGTH]; EVP_CIPHER_CTX_init(&ctx); @@ -788,13 +793,10 @@ bool GxsSecurity::decrypt(uint8_t *& out, uint32_t & outlen, const uint8_t *in, std::cerr << "Severe error in " << __PRETTY_FUNCTION__ << ": cannot encrypt. " << std::endl; return false ; } - out = (uint8_t*)malloc(inlen - in_offset); + out = (uint8_t*)rs_malloc(inlen - in_offset); if(out == NULL) - { - std::cerr << "gxssecurity::decrypt(): cannot allocate memory of size " << inlen - in_offset << " to decrypt data." << std::endl; return false; - } if(!EVP_OpenUpdate(&ctx, (unsigned char*) out, &out_currOffset, (unsigned char*)in + in_offset, inlen - in_offset)) { diff --git a/libretroshare/src/gxstunnel/p3gxstunnel.cc b/libretroshare/src/gxstunnel/p3gxstunnel.cc index bc96b0185..43ff5b0b3 100644 --- a/libretroshare/src/gxstunnel/p3gxstunnel.cc +++ b/libretroshare/src/gxstunnel/p3gxstunnel.cc @@ -856,7 +856,7 @@ void p3GxsTunnelService::handleRecvDHPublicKey(RsGxsTunnelDHPublicKeyItem *item) #endif uint32_t pubkey_size = BN_num_bytes(item->public_key) ; - unsigned char *data = (unsigned char *)malloc(pubkey_size) ; + RsTemporaryMemory data(pubkey_size) ; BN_bn2bin(item->public_key, data) ; RsTlvSecurityKey signature_key ; @@ -901,7 +901,7 @@ void p3GxsTunnelService::handleRecvDHPublicKey(RsGxsTunnelDHPublicKeyItem *item) signature_key = item->gxs_key ; } - if(!GxsSecurity::validateSignature((char*)data,pubkey_size,signature_key,item->signature)) + if(!GxsSecurity::validateSignature((char*)(unsigned char*)data,pubkey_size,signature_key,item->signature)) { std::cerr << "(SS) Signature was verified and it doesn't check! This is a security issue!" << std::endl; return ; @@ -939,7 +939,7 @@ void p3GxsTunnelService::handleRecvDHPublicKey(RsGxsTunnelDHPublicKeyItem *item) // Looks for the DH params. If not there yet, create them. // int size = DH_size(it->second.dh) ; - unsigned char *key_buff = new unsigned char[size] ; + RsTemporaryMemory key_buff(size) ; if(size != DH_compute_key(key_buff,item->public_key,it->second.dh)) { @@ -959,7 +959,6 @@ void p3GxsTunnelService::handleRecvDHPublicKey(RsGxsTunnelDHPublicKeyItem *item) assert(GXS_TUNNEL_AES_KEY_SIZE <= Sha1CheckSum::SIZE_IN_BYTES) ; memcpy(pinfo.aes_key, RsDirUtil::sha1sum(key_buff,size).toByteArray(),GXS_TUNNEL_AES_KEY_SIZE) ; - delete[] key_buff ; pinfo.last_contact = time(NULL) ; pinfo.last_keep_alive_sent = time(NULL) ; @@ -1036,7 +1035,15 @@ bool p3GxsTunnelService::locked_sendDHPublicKey(const DH *dh,const RsGxsId& own_ uint32_t error_status ; uint32_t size = BN_num_bytes(dhitem->public_key) ; - unsigned char *data = (unsigned char *)malloc(size) ; + + RsTemporaryMemory data(size) ; + + if(data == NULL) + { + delete(dhitem); + return false ; + } + BN_bn2bin(dhitem->public_key, data) ; if(!mGixs->signData((unsigned char*)data,size,own_gxs_id,signature,error_status)) @@ -1048,11 +1055,9 @@ bool p3GxsTunnelService::locked_sendDHPublicKey(const DH *dh,const RsGxsId& own_ default: std::cerr << "(EE) Unknown error when signing" << std::endl; break ; } - free(data) ; delete(dhitem); return false; } - free(data) ; if(!mGixs->getKey(own_gxs_id,signature_key_public)) { @@ -1136,8 +1141,13 @@ bool p3GxsTunnelService::locked_sendClearTunnelData(RsGxsTunnelDHPublicKeyItem * uint32_t rssize = item->serial_size() ; gitem->data_size = rssize + 8 ; - gitem->data_bytes = malloc(rssize+8) ; + gitem->data_bytes = rs_malloc(rssize+8) ; + if(gitem->data_bytes == NULL) + { + delete gitem ; + return NULL ; + } // by convention, we use a IV of 0 for unencrypted data. memset(gitem->data_bytes,0,8) ; @@ -1221,8 +1231,11 @@ bool p3GxsTunnelService::locked_sendEncryptedTunnelData(RsGxsTunnelItem *item) RsTurtleGenericDataItem *gitem = new RsTurtleGenericDataItem ; gitem->data_size = encrypted_size + GXS_TUNNEL_ENCRYPTION_IV_SIZE + GXS_TUNNEL_ENCRYPTION_HMAC_SIZE ; - gitem->data_bytes = malloc(gitem->data_size) ; + gitem->data_bytes = rs_malloc(gitem->data_size) ; + if(gitem->data_bytes == NULL) + return false ; + memcpy(& ((uint8_t*)gitem->data_bytes)[0] ,&IV,8) ; unsigned int md_len = GXS_TUNNEL_ENCRYPTION_HMAC_SIZE ; @@ -1316,7 +1329,11 @@ bool p3GxsTunnelService::sendData(const RsGxsTunnelId &tunnel_id, uint32_t servi item->flags = 0; // not used yet. item->service_id = service_id; item->data_size = size; // encrypted data size - item->data = (uint8_t*)malloc(size); // encrypted data + item->data = (uint8_t*)rs_malloc(size); // encrypted data + + if(item->data == NULL) + delete item ; + item->PeerId(RsPeerId(tunnel_id)) ; memcpy(item->data,data,size) ; @@ -1465,6 +1482,8 @@ bool p3GxsTunnelService::closeExistingTunnel(const RsGxsTunnelId& tunnel_id, uin if(it2 != _gxs_tunnel_virtual_peer_ids.end()) hash = it2->second.hash ; + else + hash = it->second.hash ; // check how many clients are used. If empty, close the tunnel diff --git a/libretroshare/src/gxstunnel/rsgxstunnelitems.cc b/libretroshare/src/gxstunnel/rsgxstunnelitems.cc index 414901df3..8898a352a 100644 --- a/libretroshare/src/gxstunnel/rsgxstunnelitems.cc +++ b/libretroshare/src/gxstunnel/rsgxstunnelitems.cc @@ -29,6 +29,7 @@ #include "serialiser/rsbaseserial.h" #include "serialiser/rstlvbase.h" #include "util/rsprint.h" +#include "util/rsmemory.h" #include "gxstunnel/rsgxstunnelitems.h" @@ -343,6 +344,13 @@ RsGxsTunnelDHPublicKeyItem *RsGxsTunnelSerialiser::deserialise_RsGxsTunnelDHPubl /* get mandatory parts first */ ok &= getRawUInt32(data, rssize, &offset, &s); + if(s > rssize || rssize - s < offset) + { + std::cerr << "RsGxsTunnelDHPublicKeyItem::() Size error while deserializing." << std::endl ; + delete item ; + return NULL ; + } + item->public_key = BN_bin2bn(&((unsigned char *)data)[offset],s,NULL) ; offset += s ; @@ -380,21 +388,22 @@ RsGxsTunnelDataItem *RsGxsTunnelSerialiser::deserialise_RsGxsTunnelDataItem(void ok &= getRawUInt32(dat, rssize, &offset, &item->service_id); ok &= getRawUInt32(dat, rssize, &offset, &item->data_size); - if(offset + item->data_size <= size) + if(item->data_size > rssize || rssize - item->data_size < offset) { - item->data = (unsigned char*)malloc(item->data_size) ; - - if(dat == NULL) - { - delete item ; - return NULL ; - } - - memcpy(item->data,&((uint8_t*)dat)[offset],item->data_size) ; - offset += item->data_size ; + std::cerr << "RsGxsTunnelDHPublicKeyItem::() Size error while deserializing." << std::endl ; + delete item ; + return NULL ; } - else - ok = false ; + item->data = (unsigned char*)rs_malloc(item->data_size) ; + + if(item->data == NULL) + { + delete item ; + return NULL ; + } + + memcpy(item->data,&((uint8_t*)dat)[offset],item->data_size) ; + offset += item->data_size ; if (offset != rssize) diff --git a/libretroshare/src/gxstunnel/rsgxstunnelitems.h b/libretroshare/src/gxstunnel/rsgxstunnelitems.h index d1abf8c20..dac8ab60a 100644 --- a/libretroshare/src/gxstunnel/rsgxstunnelitems.h +++ b/libretroshare/src/gxstunnel/rsgxstunnelitems.h @@ -73,7 +73,7 @@ class RsGxsTunnelItem: public RsItem class RsGxsTunnelDataItem: public RsGxsTunnelItem { public: - RsGxsTunnelDataItem() :RsGxsTunnelItem(RS_PKT_SUBTYPE_GXS_TUNNEL_DATA) { data=NULL ;data_size=0; } + RsGxsTunnelDataItem() :RsGxsTunnelItem(RS_PKT_SUBTYPE_GXS_TUNNEL_DATA) { data=NULL ;data_size=0;service_id=0;unique_item_counter=0; } RsGxsTunnelDataItem(uint8_t subtype) :RsGxsTunnelItem(subtype) { data=NULL ;data_size=0; } virtual ~RsGxsTunnelDataItem() {} @@ -96,7 +96,7 @@ public: class RsGxsTunnelStatusItem: public RsGxsTunnelItem { public: - RsGxsTunnelStatusItem() :RsGxsTunnelItem(RS_PKT_SUBTYPE_GXS_TUNNEL_STATUS) {} + RsGxsTunnelStatusItem() :RsGxsTunnelItem(RS_PKT_SUBTYPE_GXS_TUNNEL_STATUS) , status(0) {} RsGxsTunnelStatusItem(void *data,uint32_t size) ; // deserialization virtual ~RsGxsTunnelStatusItem() {} diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index c6e64cd7e..d01d4c9dd 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -361,7 +361,6 @@ HEADERS += chat/distantchat.h \ HEADERS += pqi/authssl.h \ pqi/authgpg.h \ - pqi/rsmemory.h \ pgp/pgphandler.h \ pgp/pgpkeyutil.h \ pgp/rsaes.h \ @@ -475,6 +474,7 @@ HEADERS += turtle/p3turtle.h \ HEADERS += util/folderiterator.h \ util/rsdebug.h \ + util/rsmemory.h \ util/rscompress.h \ util/smallobject.h \ util/rsdir.h \ @@ -631,6 +631,7 @@ SOURCES += util/folderiterator.cc \ util/rscompress.cc \ util/smallobject.cc \ util/rsdir.cc \ + util/rsmemory.cc \ util/rsdiscspace.cc \ util/rsnet.cc \ util/rsnet_ss.cc \ diff --git a/libretroshare/src/pgp/pgphandler.cc b/libretroshare/src/pgp/pgphandler.cc index 76850b4e6..22ce28a48 100644 --- a/libretroshare/src/pgp/pgphandler.cc +++ b/libretroshare/src/pgp/pgphandler.cc @@ -26,6 +26,7 @@ extern "C" { #include "retroshare/rspeers.h" // For rsicontrol. #include "util/rsdir.h" #include "util/rsdiscspace.h" +#include "util/rsmemory.h" #include "pgp/pgpkeyutil.h" static const uint32_t PGP_CERTIFICATE_LIMIT_MAX_NAME_SIZE = 64 ; @@ -39,7 +40,11 @@ PassphraseCallback PGPHandler::_passphrase_callback = NULL ; ops_keyring_t *PGPHandler::allocateOPSKeyring() { - ops_keyring_t *kr = (ops_keyring_t*)malloc(sizeof(ops_keyring_t)) ; + ops_keyring_t *kr = (ops_keyring_t*)rs_malloc(sizeof(ops_keyring_t)) ; + + if(kr == NULL) + return NULL ; + kr->nkeys = 0 ; kr->nkeys_allocated = 0 ; kr->keys = 0 ; diff --git a/libretroshare/src/plugins/pluginmanager.cc b/libretroshare/src/plugins/pluginmanager.cc index 84af1fc86..28c2f340f 100644 --- a/libretroshare/src/plugins/pluginmanager.cc +++ b/libretroshare/src/plugins/pluginmanager.cc @@ -82,6 +82,8 @@ bool RsPluginManager::acceptablePluginName(const std::string& name) // #ifdef WINDOWS_SYS return name.size() > 4 && name.substr(name.size() - 4) == ".dll"; +#elif defined(__MACH__) + return name.size() > 6 && !strcmp(name.c_str()+name.size()-6,".dylib") ; #else return name.size() > 3 && !strcmp(name.c_str()+name.size()-3,".so") ; #endif diff --git a/libretroshare/src/pqi/authssl.cc b/libretroshare/src/pqi/authssl.cc index 27cae90f6..f03847883 100644 --- a/libretroshare/src/pqi/authssl.cc +++ b/libretroshare/src/pqi/authssl.cc @@ -117,10 +117,10 @@ static struct CRYPTO_dynlock_value *dyn_create_function(const char */*file*/, in { struct CRYPTO_dynlock_value *value; - value = (struct CRYPTO_dynlock_value*) malloc(sizeof(struct CRYPTO_dynlock_value)); - if (!value) { + value = (struct CRYPTO_dynlock_value*) rs_malloc(sizeof(struct CRYPTO_dynlock_value)); + if (!value) return NULL; - } + pthread_mutex_init(&value->mutex, NULL); return value; @@ -166,10 +166,10 @@ static void dyn_destroy_function(struct CRYPTO_dynlock_value *l, const char */*f bool tls_init() { /* static locks area */ - mutex_buf = (pthread_mutex_t*) malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t)); - if (mutex_buf == NULL) { + mutex_buf = (pthread_mutex_t*) rs_malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t)); + if (mutex_buf == NULL) return false; - } + for (int i = 0; i < CRYPTO_num_locks(); i++) { pthread_mutex_init(&mutex_buf[i], NULL); } @@ -1259,7 +1259,11 @@ bool AuthSSLimpl::encrypt(void *&out, int &outlen, const void *in, int inlen, int out_offset = 0; int max_evp_key_size = EVP_PKEY_size(public_key); - ek = (unsigned char*)malloc(max_evp_key_size); + ek = (unsigned char*)rs_malloc(max_evp_key_size); + + if(ek == NULL) + return false ; + const EVP_CIPHER *cipher = EVP_aes_128_cbc(); int cipher_block_size = EVP_CIPHER_block_size(cipher); int size_net_ekl = sizeof(net_ekl); @@ -1273,8 +1277,13 @@ bool AuthSSLimpl::encrypt(void *&out, int &outlen, const void *in, int inlen, } // now assign memory to out accounting for data, and cipher block size, key length, and key length val - out = (unsigned char*)malloc(inlen + cipher_block_size + size_net_ekl + eklen + EVP_MAX_IV_LENGTH); + out = (unsigned char*)rs_malloc(inlen + cipher_block_size + size_net_ekl + eklen + EVP_MAX_IV_LENGTH); + if(out == NULL) + { + free(ek) ; + return false ; + } net_ekl = htonl(eklen); memcpy((unsigned char*)out + out_offset, &net_ekl, size_net_ekl); out_offset += size_net_ekl; @@ -1343,6 +1352,12 @@ bool AuthSSLimpl::decrypt(void *&out, int &outlen, const void *in, int inlen) unsigned char iv[EVP_MAX_IV_LENGTH]; int ek_mkl = EVP_PKEY_size(mOwnPrivateKey); ek = (unsigned char*)malloc(ek_mkl); + + if(ek == NULL) + { + std::cerr << "(EE) Cannot allocate memory for " << ek_mkl << " bytes in " << __PRETTY_FUNCTION__ << std::endl; + return false ; + } EVP_CIPHER_CTX_init(&ctx); int in_offset = 0, out_currOffset = 0; @@ -1380,8 +1395,13 @@ bool AuthSSLimpl::decrypt(void *&out, int &outlen, const void *in, int inlen) return false; } - out = (unsigned char*)malloc(inlen - in_offset); + out = (unsigned char*)rs_malloc(inlen - in_offset); + if(out == NULL) + { + free(ek) ; + return false ; + } if(!EVP_OpenUpdate(&ctx, (unsigned char*) out, &out_currOffset, (unsigned char*)in + in_offset, inlen - in_offset)) { free(ek); free(out) ; diff --git a/libretroshare/src/pqi/pqibin.cc b/libretroshare/src/pqi/pqibin.cc index 2aaa6e34a..dcc89b525 100644 --- a/libretroshare/src/pqi/pqibin.cc +++ b/libretroshare/src/pqi/pqibin.cc @@ -27,6 +27,7 @@ #include "pqi/authssl.h" #include "util/rsnet.h" #include "util/rsdir.h" +#include "util/rsmemory.h" // #define DEBUG_PQIBIN @@ -314,7 +315,13 @@ BinMemInterface::BinMemInterface(int defsize, int flags) :bin_flags(flags), buf(NULL), size(defsize), recvsize(0), readloc(0), hash(NULL), bcount(0) { - buf = malloc(defsize); + buf = rs_malloc(defsize); + + if(buf == NULL) + { + close() ; + return ; + } if (bin_flags & BIN_FLAGS_HASH_DATA) { hash = new pqihash(); @@ -326,7 +333,13 @@ BinMemInterface::BinMemInterface(const void *data, const int defsize, int flags) :bin_flags(flags), buf(NULL), size(defsize), recvsize(0), readloc(0), hash(NULL), bcount(0) { - buf = malloc(defsize); + buf = rs_malloc(defsize); + + if(buf == NULL) + { + close() ; + return ; + } if (bin_flags & BIN_FLAGS_HASH_DATA) { hash = new pqihash(); diff --git a/libretroshare/src/pqi/pqinetwork.cc b/libretroshare/src/pqi/pqinetwork.cc index 7f43068c9..bfbe001c3 100644 --- a/libretroshare/src/pqi/pqinetwork.cc +++ b/libretroshare/src/pqi/pqinetwork.cc @@ -290,7 +290,11 @@ bool getLocalAddresses(std::list & addrs) #ifdef WINDOWS_SYS // Seems strange to me but M$ documentation suggests to allocate this way... DWORD bf_size = 16000; - IP_ADAPTER_ADDRESSES* adapter_addresses = (IP_ADAPTER_ADDRESSES*) malloc(bf_size); + IP_ADAPTER_ADDRESSES* adapter_addresses = (IP_ADAPTER_ADDRESSES*) rs_malloc(bf_size); + + if(adapter_addresses == NULL) + return false ; + DWORD error = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | diff --git a/libretroshare/src/pqi/pqistore.cc b/libretroshare/src/pqi/pqistore.cc index 217ebdfb4..6dedbd5fc 100644 --- a/libretroshare/src/pqi/pqistore.cc +++ b/libretroshare/src/pqi/pqistore.cc @@ -46,6 +46,7 @@ #include #include "util/rsdebug.h" +#include "util/rsmemory.h" #include "util/rsstring.h" // @@ -194,7 +195,12 @@ int pqistore::writePkt(RsItem *pqi) #endif uint32_t pktsize = rsSerialiser->size(pqi); - void *ptr = malloc(pktsize); + + RsTemporaryMemory ptr(pktsize) ; + + if(ptr == NULL) + return 0 ; + if (!(rsSerialiser->serialise(pqi, ptr, &pktsize))) { #ifdef PQISTORE_DEBUG @@ -203,7 +209,6 @@ int pqistore::writePkt(RsItem *pqi) pqioutput(PQL_ALERT, pqistorezone, out); #endif - free(ptr); if (!(bio_flags & BIN_FLAGS_NO_DELETE)) delete pqi; return 0; @@ -218,7 +223,6 @@ int pqistore::writePkt(RsItem *pqi) pqi -> print_string(out); pqioutput(PQL_ALERT, pqistorezone, out); - free(ptr); if (!(bio_flags & BIN_FLAGS_NO_DELETE)) delete pqi; return 0; @@ -232,7 +236,6 @@ int pqistore::writePkt(RsItem *pqi) pqi -> print_string(out); pqioutput(PQL_ALERT, pqistorezone, out); - free(ptr); if (!(bio_flags & BIN_FLAGS_NO_DELETE)) delete pqi; @@ -250,7 +253,6 @@ int pqistore::writePkt(RsItem *pqi) pqioutput(PQL_ALERT, pqistorezone, out); #endif - free(ptr); if (!(bio_flags & BIN_FLAGS_NO_DELETE)) delete pqi; @@ -262,7 +264,6 @@ int pqistore::writePkt(RsItem *pqi) pqioutput(PQL_DEBUG_BASIC, pqistorezone, out); #endif - free(ptr); if (!(bio_flags & BIN_FLAGS_NO_DELETE)) delete pqi; @@ -288,7 +289,10 @@ int pqistore::readPkt(RsItem **item_out) // initial read size: basic packet. int blen = getRsPktBaseSize(); - void *block = malloc(blen); + void *block = rs_malloc(blen); + + if(block == NULL) + return false ; int tmplen; /* we have the header */ @@ -495,7 +499,10 @@ int pqiSSLstore::readPkt(RsItem **item_out) // initial read size: basic packet. int blen = getRsPktBaseSize(); - void *block = malloc(blen); + void *block = rs_malloc(blen); + + if(block == NULL) + return false ; int tmplen; /* we have the header */ diff --git a/libretroshare/src/pqi/pqistreamer.cc b/libretroshare/src/pqi/pqistreamer.cc index b083e023e..6f020a1ed 100644 --- a/libretroshare/src/pqi/pqistreamer.cc +++ b/libretroshare/src/pqi/pqistreamer.cc @@ -315,7 +315,11 @@ int pqistreamer::queue_outpqi_locked(RsItem *pqi,uint32_t& pktsize) /* decide which type of packet it is */ pktsize = mRsSerialiser->size(pqi); - void *ptr = malloc(pktsize); + void *ptr = rs_malloc(pktsize); + + if(ptr == NULL) + return 0 ; + #ifdef DEBUG_PQISTREAMER std::cerr << "pqistreamer::queue_outpqi() serializing packet with packet size : " << pktsize << std::endl; @@ -441,7 +445,6 @@ int pqistreamer::handleoutgoing_locked() mPkt_wpending_size = 0 ; } - outSentBytes_locked(sentbytes); return 0; } @@ -469,10 +472,10 @@ int pqistreamer::handleoutgoing_locked() } #endif - outSentBytes_locked(sentbytes); return 0; } #define GROUP_OUTGOING_PACKETS 1 +#define PACKET_GROUPING_SIZE_LIMIT 32768 // send a out_pkt., else send out_data. unless // there is a pending packet. if (!mPkt_wpending) @@ -482,7 +485,7 @@ int pqistreamer::handleoutgoing_locked() mPkt_wpending_size = 0 ; int k=0; - while(mPkt_wpending_size < maxbytes && (dta = locked_pop_out_data())!=NULL ) + while(mPkt_wpending_size < (uint32_t)maxbytes && mPkt_wpending_size < PACKET_GROUPING_SIZE_LIMIT && (dta = locked_pop_out_data())!=NULL ) { uint32_t s = getRsItemSize(dta); mPkt_wpending = realloc(mPkt_wpending,s+mPkt_wpending_size) ; @@ -524,12 +527,12 @@ int pqistreamer::handleoutgoing_locked() pqioutput(PQL_DEBUG_BASIC, pqistreamerzone, out); #endif - outSentBytes_locked(sentbytes); // pkt_wpending will kept til next time. // ensuring exactly the same data is written (openSSL requirement). return -1; } ++nsent; + outSentBytes_locked(mPkt_wpending_size); // this is the only time where we know exactly what was sent. #ifdef DEBUG_TRANSFERS std::cerr << "pqistreamer::handleoutgoing_locked() Sent Packet len: " << mPkt_wpending_size << " @ " << RsUtil::AccurateTimeString(); @@ -549,7 +552,6 @@ int pqistreamer::handleoutgoing_locked() if(nsent > 0) std::cerr << "nsent = " << nsent << ", total bytes=" << sentbytes << std::endl; #endif - outSentBytes_locked(sentbytes); return 1; } @@ -568,7 +570,6 @@ int pqistreamer::handleincoming_locked() if(!(mBio->isactive())) { mReading_state = reading_state_initial ; - inReadBytes_locked(readbytes); free_rpend_locked(); return 0; } @@ -606,8 +607,6 @@ start_packet_read: { pqioutput(PQL_DEBUG_BASIC, pqistreamerzone, "pqistreamer::handleincoming() Didn't read BasePkt!"); - inReadBytes_locked(readbytes); - // error.... (either blocked or failure) if (tmplen == 0) { @@ -652,7 +651,7 @@ start_packet_read: #endif readbytes += blen; - mReading_state = reading_state_packet_started ; + mReading_state = reading_state_packet_started ; mFailed_read_attempts = 0 ; // reset failed read, as the packet has been totally read. } continue_packet: @@ -805,7 +804,7 @@ continue_packet: mFailed_read_attempts = 0 ; readbytes += extralen; - } + } // create packet, based on header. #ifdef DEBUG_PQISTREAMER @@ -824,7 +823,9 @@ continue_packet: std::cerr << "[" << (void*)pthread_self() << "] " << "deserializing. Size=" << pktlen << std::endl ; #endif - RsItem *pkt = mRsSerialiser->deserialise(block, &pktlen); + inReadBytes_locked(pktlen); // only count deserialised packets, because that's what is actually been transfered. + + RsItem *pkt = mRsSerialiser->deserialise(block, &pktlen); if ((pkt != NULL) && (0 < handleincomingitem_locked(pkt,pktlen))) { @@ -854,7 +855,6 @@ continue_packet: } #endif - inReadBytes_locked(readbytes); return 0; } @@ -1045,7 +1045,10 @@ void pqistreamer::allocate_rpend_locked() return; mPkt_rpend_size = getRsPktMaxSize(); - mPkt_rpending = malloc(mPkt_rpend_size); + mPkt_rpending = rs_malloc(mPkt_rpend_size); + + if(mPkt_rpending == NULL) + return ; // avoid uninitialized (and random) memory read. memset(mPkt_rpending,0,mPkt_rpend_size) ; diff --git a/libretroshare/src/retroshare/rsidentity.h b/libretroshare/src/retroshare/rsidentity.h index b37af3845..c6c89e86b 100644 --- a/libretroshare/src/retroshare/rsidentity.h +++ b/libretroshare/src/retroshare/rsidentity.h @@ -87,7 +87,7 @@ class GxsReputation class RsGxsIdGroup { public: - RsGxsIdGroup(): mLastUsageTS(0), mPgpKnown(false) { return; } + RsGxsIdGroup(): mLastUsageTS(0), mPgpKnown(false),mIsAContact(false) { return; } ~RsGxsIdGroup() { return; } diff --git a/libretroshare/src/retroshare/rsmsgs.h b/libretroshare/src/retroshare/rsmsgs.h index 3d18a11ac..d60511f48 100644 --- a/libretroshare/src/retroshare/rsmsgs.h +++ b/libretroshare/src/retroshare/rsmsgs.h @@ -464,10 +464,11 @@ virtual void getOwnAvatarData(unsigned char *& data,int& size) = 0 ; /****************************************/ virtual bool joinVisibleChatLobby(const ChatLobbyId& lobby_id,const RsGxsId& own_id) = 0 ; -virtual bool isLobbyId(const RsPeerId& virtual_peer_id,ChatLobbyId& lobby_id) = 0; -virtual bool getVirtualPeerId(const ChatLobbyId& lobby_id,RsPeerId& vpid) = 0; +/// get ids of subscribed lobbies virtual void getChatLobbyList(std::list& cl_list) = 0; +/// get lobby info of a subscribed chat lobby. Returns true if lobby id is valid. virtual bool getChatLobbyInfo(const ChatLobbyId& id,ChatLobbyInfo& info) = 0 ; +/// get info about all lobbies, subscribed and unsubscribed virtual void getListOfNearbyChatLobbies(std::vector& public_lobbies) = 0 ; virtual void invitePeerToLobby(const ChatLobbyId& lobby_id,const RsPeerId& peer_id) = 0; virtual bool acceptLobbyInvite(const ChatLobbyId& id,const RsGxsId& identity) = 0 ; diff --git a/libretroshare/src/retroshare/rsplugin.h b/libretroshare/src/retroshare/rsplugin.h index 579b7694c..6b8363c37 100644 --- a/libretroshare/src/retroshare/rsplugin.h +++ b/libretroshare/src/retroshare/rsplugin.h @@ -160,7 +160,7 @@ class RsPlugin // creates a new resource api handler object. ownership is transferred to the caller. // the caller should supply a statetokenserver, and keep it valid until destruction // the plugin should return a entry point name. this is to make the entry point name independent from file names - virtual resource_api::ResourceRouter* new_resource_api_handler(const RsPlugInInterfaces& ifaces, resource_api::StateTokenServer* sts, std::string &entrypoint) const { return 0;} + virtual resource_api::ResourceRouter* new_resource_api_handler(const RsPlugInInterfaces& /* ifaces */, resource_api::StateTokenServer* /* sts */, std::string & /*entrypoint*/) const { return 0;} // Shutdown virtual void stop() {} diff --git a/libretroshare/src/retroshare/rsreputations.h b/libretroshare/src/retroshare/rsreputations.h index 807f45f40..484aabb30 100644 --- a/libretroshare/src/retroshare/rsreputations.h +++ b/libretroshare/src/retroshare/rsreputations.h @@ -41,6 +41,8 @@ public: struct ReputationInfo { + ReputationInfo() : mOwnOpinion(OPINION_NEUTRAL), mOverallReputationScore(REPUTATION_THRESHOLD_DEFAULT), mFriendAverage(REPUTATION_THRESHOLD_DEFAULT),mAssessment(ASSESSMENT_OK){} + RsReputations::Opinion mOwnOpinion ; float mOverallReputationScore ; float mFriendAverage ; diff --git a/libretroshare/src/rsserver/p3msgs.cc b/libretroshare/src/rsserver/p3msgs.cc index 64c5b0179..e54c0730d 100644 --- a/libretroshare/src/rsserver/p3msgs.cc +++ b/libretroshare/src/rsserver/p3msgs.cc @@ -444,15 +444,6 @@ void p3Msgs::setCustomStateString(const std::string& state_string) mChatSrv->setOwnCustomStateString(state_string) ; } -bool p3Msgs::getVirtualPeerId(const ChatLobbyId& id,RsPeerId& peer_id) -{ - return mChatSrv->getVirtualPeerId(id,peer_id) ; -} -bool p3Msgs::isLobbyId(const RsPeerId& peer_id,ChatLobbyId& id) -{ - return mChatSrv->isLobbyId(peer_id,id) ; -} - bool p3Msgs::getChatLobbyInfo(const ChatLobbyId& id,ChatLobbyInfo& linfo) { return mChatSrv->getChatLobbyInfo(id,linfo) ; diff --git a/libretroshare/src/rsserver/p3msgs.h b/libretroshare/src/rsserver/p3msgs.h index ecef61b30..691759bed 100644 --- a/libretroshare/src/rsserver/p3msgs.h +++ b/libretroshare/src/rsserver/p3msgs.h @@ -138,8 +138,6 @@ class p3Msgs: public RsMsgs virtual bool joinVisibleChatLobby(const ChatLobbyId& id, const RsGxsId &own_id) ; virtual void getListOfNearbyChatLobbies(std::vector& public_lobbies) ; - virtual bool getVirtualPeerId(const ChatLobbyId& id,RsPeerId& vpid) ; - virtual bool isLobbyId(const RsPeerId& virtual_peer_id,ChatLobbyId& lobby_id) ; virtual void getChatLobbyList(std::list& cl_list) ; virtual bool getChatLobbyInfo(const ChatLobbyId& id,ChatLobbyInfo& info) ; virtual void invitePeerToLobby(const ChatLobbyId&, const RsPeerId&) ; diff --git a/libretroshare/src/rsserver/rsloginhandler.cc b/libretroshare/src/rsserver/rsloginhandler.cc index 4236709d7..9298492cd 100644 --- a/libretroshare/src/rsserver/rsloginhandler.cc +++ b/libretroshare/src/rsserver/rsloginhandler.cc @@ -273,7 +273,13 @@ bool RsLoginHandler::tryAutoLogin(const RsPeerId& ssl_id,std::string& ssl_passwd fseek(fp, 0, SEEK_END); datalen = ftell(fp); fseek(fp, 0, SEEK_SET); - dataptr = (char *) malloc(datalen); + dataptr = (char *) rs_malloc(datalen); + + if(data_ptr == NULL) + { + fclose(fp); + return false; + } fread(dataptr, 1, datalen, fp); fclose(fp); diff --git a/libretroshare/src/serialiser/rsbaseserial.cc b/libretroshare/src/serialiser/rsbaseserial.cc index fd19461f1..e38dcb8e0 100644 --- a/libretroshare/src/serialiser/rsbaseserial.cc +++ b/libretroshare/src/serialiser/rsbaseserial.cc @@ -40,6 +40,7 @@ bool getRawUInt8(void *data, uint32_t size, uint32_t *offset, uint8_t *out) /* first check there is space */ if (size < *offset + 1) { + std::cerr << "(EE) Cannot deserialise uint8_t: not enough size." << std::endl; return false; } void *buf = (void *) &(((uint8_t *) data)[*offset]); @@ -56,6 +57,7 @@ bool setRawUInt8(void *data, uint32_t size, uint32_t *offset, uint8_t in) /* first check there is space */ if (size < *offset + 1) { + std::cerr << "(EE) Cannot serialise uint8_t: not enough size." << std::endl; return false; } @@ -74,6 +76,7 @@ bool getRawUInt16(void *data, uint32_t size, uint32_t *offset, uint16_t *out) /* first check there is space */ if (size < *offset + 2) { + std::cerr << "(EE) Cannot deserialise uint16_t: not enough size." << std::endl; return false; } void *buf = (void *) &(((uint8_t *) data)[*offset]); @@ -92,6 +95,7 @@ bool setRawUInt16(void *data, uint32_t size, uint32_t *offset, uint16_t in) /* first check there is space */ if (size < *offset + 2) { + std::cerr << "(EE) Cannot serialise uint16_t: not enough size." << std::endl; return false; } @@ -114,6 +118,7 @@ bool getRawUInt32(void *data, uint32_t size, uint32_t *offset, uint32_t *out) /* first check there is space */ if (size < *offset + 4) { + std::cerr << "(EE) Cannot deserialise uint32_t: not enough size." << std::endl; return false; } void *buf = (void *) &(((uint8_t *) data)[*offset]); @@ -132,6 +137,7 @@ bool setRawUInt32(void *data, uint32_t size, uint32_t *offset, uint32_t in) /* first check there is space */ if (size < *offset + 4) { + std::cerr << "(EE) Cannot serialise uint32_t: not enough size." << std::endl; return false; } @@ -154,6 +160,7 @@ bool getRawUInt64(void *data, uint32_t size, uint32_t *offset, uint64_t *out) /* first check there is space */ if (size < *offset + 8) { + std::cerr << "(EE) Cannot deserialise uint64_t: not enough size." << std::endl; return false; } void *buf = (void *) &(((uint8_t *) data)[*offset]); @@ -172,6 +179,7 @@ bool setRawUInt64(void *data, uint32_t size, uint32_t *offset, uint64_t in) /* first check there is space */ if (size < *offset + 8) { + std::cerr << "(EE) Cannot serialise uint64_t: not enough size." << std::endl; return false; } @@ -231,12 +239,13 @@ bool getRawString(void *data, uint32_t size, uint32_t *offset, std::string &outS } /* check there is space for string */ - if (size < *offset + len) + if(len > size || size-len < *offset) // better than if(size < *offset + len) because it avoids integer overflow { std::cerr << "getRawString() not enough size" << std::endl; return false; } uint8_t *buf = &(((uint8_t *) data)[*offset]); + for (uint32_t i = 0; i < len; i++) { outStr += buf[i]; @@ -250,11 +259,10 @@ bool setRawString(void *data, uint32_t size, uint32_t *offset, const std::string { uint32_t len = inStr.length(); /* first check there is space */ - if (size < *offset + 4 + len) + + if(size < 4 || len > size-4 || size-len-4 < *offset) // better than if(size < *offset + len + 4) because it avoids integer overflow { -//#ifdef RSSERIAL_DEBUG std::cerr << "setRawString() Not enough size" << std::endl; -//#endif return false; } diff --git a/libretroshare/src/serialiser/rsmsgitems.cc b/libretroshare/src/serialiser/rsmsgitems.cc index 42635fb11..69c1028ee 100644 --- a/libretroshare/src/serialiser/rsmsgitems.cc +++ b/libretroshare/src/serialiser/rsmsgitems.cc @@ -899,7 +899,144 @@ RsMsgGRouterMap* RsMsgSerialiser::deserialiseMsgGRouterMap(void* data, uint32_t* /************************* end of definition of msgGRouterMap serialisation functions ************************/ +/************************* definition of msgDistantMessageMap serialisation functions ************************/ +std::ostream& RsMsgDistantMessagesHashMap::print(std::ostream& out, uint16_t indent) +{ + printRsItemBase(out, "RsMsgDistantMessagesHashMap", indent); + uint16_t int_Indent = indent + 2; + + for(std::map::const_iterator it(hash_map.begin());it!=hash_map.end();++it) + { + printIndent(out, int_Indent); + out << " " << std::hex << it->first << std::dec << " : " << it->second << std::endl; + } + + printRsItemEnd(out, "RsMsgDistantMessagesHashMap", indent); + + return out; +} + +void RsMsgDistantMessagesHashMap::clear() +{ + hash_map.clear() ; + + return; +} + +uint32_t RsMsgDistantMessagesHashMap::serial_size(bool) +{ + uint32_t s = 8; /* header */ + + s += 4; // number of entries + s += (Sha1CheckSum::SIZE_IN_BYTES+4)*hash_map.size(); // entries + + return s; +} + +bool RsMsgDistantMessagesHashMap::serialise(void *data, uint32_t& pktsize,bool config) +{ + uint32_t tlvsize = serial_size(config) ; + uint32_t offset = 0; + + if (pktsize < tlvsize) + return false; /* not enough space */ + + pktsize = tlvsize; + + bool ok = true; + + ok &= setRsItemHeader(data, tlvsize, PacketId(), tlvsize); + +#ifdef RSSERIAL_DEBUG + std::cerr << "RsMsgSerialiser::serialiseMsgDistantMessagesHashMap() Header: " << ok << std::endl; + std::cerr << "RsMsgSerialiser::serialiseMsgDistantMessagesHashMap() Size: " << tlvsize << std::endl; +#endif + + /* skip the header */ + offset += 8; + + ok &= setRawUInt32(data, tlvsize, &offset, hash_map.size()); + + for(std::map::const_iterator it=hash_map.begin();ok && it!=hash_map.end();++it) + { + ok &= it->first.serialise(data, tlvsize, offset) ; + ok &= setRawUInt32(data, tlvsize, &offset, it->second); + } + + if (offset != tlvsize) + { + ok = false; + std::cerr << "RsMsgSerialiser::serialiseMsgDistantMessagesHashMap() Size Error! " << std::endl; + } + + return ok; +} + +RsMsgDistantMessagesHashMap* RsMsgSerialiser::deserialiseMsgDistantMessageHashMap(void* data, uint32_t* pktsize) +{ + /* get the type and size */ + uint32_t rstype = getRsItemId(data); + uint32_t rssize = getRsItemSize(data); + + uint32_t offset = 0; + + + if ((RS_PKT_VERSION_SERVICE != getRsItemVersion(rstype)) || + (RS_SERVICE_TYPE_MSG != getRsItemService(rstype)) || + (RS_PKT_SUBTYPE_MSG_DISTANT_MSG_MAP != getRsItemSubType(rstype))) + { + return NULL; /* wrong type */ + } + + if (*pktsize < rssize) /* check size */ + return NULL; /* not enough data */ + + /* set the packet length */ + *pktsize = rssize; + + bool ok = true; + + /* ready to load */ + RsMsgDistantMessagesHashMap *item = new RsMsgDistantMessagesHashMap(); + item->clear(); + + /* skip the header */ + offset += 8; + + uint32_t s=0 ; + + /* get mandatory parts first */ + ok &= getRawUInt32(data, rssize, &offset, &s); + + for(uint32_t i=0;ihash_map.insert(std::make_pair(s,tm)) ; + } + + if (offset != rssize) + { + /* error */ + std::cerr << "(EE) size error in packet deserialisation: p3MsgItem, subtype " << getRsItemSubType(rstype) << ". offset=" << offset << " != rssize=" << rssize << std::endl; + delete item; + return NULL; + } + + if (!ok) + { + std::cerr << "(EE) size error in packet deserialisation: p3MsgItem, subtype " << getRsItemSubType(rstype) << std::endl; + delete item; + return NULL; + } + + return item; +} /************************************** Message ParentId **********************/ std::ostream& RsMsgParentId::print(std::ostream& out, uint16_t indent) @@ -1042,27 +1179,14 @@ RsItem* RsMsgSerialiser::deserialise(void *data, uint32_t *pktsize) switch(getRsItemSubType(rstype)) { - case RS_PKT_SUBTYPE_DEFAULT: - return deserialiseMsgItem(data, pktsize); - break; - case RS_PKT_SUBTYPE_MSG_SRC_TAG: - return deserialiseMsgSrcIdItem(data, pktsize); - break; - case RS_PKT_SUBTYPE_MSG_PARENT_TAG: - return deserialiseMsgParentIdItem(data, pktsize); - break; - case RS_PKT_SUBTYPE_MSG_TAG_TYPE: - return deserialiseTagItem(data, pktsize); - break; - case RS_PKT_SUBTYPE_MSG_INVITE: - return deserialisePublicMsgInviteConfigItem(data, pktsize); - break; - case RS_PKT_SUBTYPE_MSG_TAGS: - return deserialiseMsgTagItem(data, pktsize); - break; - case RS_PKT_SUBTYPE_MSG_GROUTER_MAP: - return deserialiseMsgGRouterMap(data, pktsize); - break; + case RS_PKT_SUBTYPE_DEFAULT: return deserialiseMsgItem(data, pktsize); + case RS_PKT_SUBTYPE_MSG_SRC_TAG: return deserialiseMsgSrcIdItem(data, pktsize); + case RS_PKT_SUBTYPE_MSG_PARENT_TAG: return deserialiseMsgParentIdItem(data, pktsize); + case RS_PKT_SUBTYPE_MSG_TAG_TYPE: return deserialiseTagItem(data, pktsize); + case RS_PKT_SUBTYPE_MSG_INVITE: return deserialisePublicMsgInviteConfigItem(data, pktsize); + case RS_PKT_SUBTYPE_MSG_TAGS: return deserialiseMsgTagItem(data, pktsize); + case RS_PKT_SUBTYPE_MSG_GROUTER_MAP: return deserialiseMsgGRouterMap(data, pktsize); + case RS_PKT_SUBTYPE_MSG_DISTANT_MSG_MAP: return deserialiseMsgDistantMessageHashMap(data, pktsize); default: return NULL; break; diff --git a/libretroshare/src/serialiser/rsmsgitems.h b/libretroshare/src/serialiser/rsmsgitems.h index e32844f84..1a7e84cd0 100644 --- a/libretroshare/src/serialiser/rsmsgitems.h +++ b/libretroshare/src/serialiser/rsmsgitems.h @@ -45,12 +45,13 @@ /**************************************************************************/ // for defining tags themselves and msg tags -const uint8_t RS_PKT_SUBTYPE_MSG_TAG_TYPE = 0x03; -const uint8_t RS_PKT_SUBTYPE_MSG_TAGS = 0x04; -const uint8_t RS_PKT_SUBTYPE_MSG_SRC_TAG = 0x05; -const uint8_t RS_PKT_SUBTYPE_MSG_PARENT_TAG = 0x06; -const uint8_t RS_PKT_SUBTYPE_MSG_INVITE = 0x07; -const uint8_t RS_PKT_SUBTYPE_MSG_GROUTER_MAP = 0x08; +const uint8_t RS_PKT_SUBTYPE_MSG_TAG_TYPE = 0x03; +const uint8_t RS_PKT_SUBTYPE_MSG_TAGS = 0x04; +const uint8_t RS_PKT_SUBTYPE_MSG_SRC_TAG = 0x05; +const uint8_t RS_PKT_SUBTYPE_MSG_PARENT_TAG = 0x06; +const uint8_t RS_PKT_SUBTYPE_MSG_INVITE = 0x07; +const uint8_t RS_PKT_SUBTYPE_MSG_GROUTER_MAP = 0x08; +const uint8_t RS_PKT_SUBTYPE_MSG_DISTANT_MSG_MAP = 0x09; /**************************************************************************/ @@ -226,7 +227,23 @@ class RsMsgGRouterMap : public RsMessageItem // std::map ongoing_msgs ; }; +class RsMsgDistantMessagesHashMap : public RsMessageItem +{ + public: + RsMsgDistantMessagesHashMap() : RsMessageItem(RS_PKT_SUBTYPE_MSG_DISTANT_MSG_MAP) {} + std::ostream &print(std::ostream &out, uint16_t indent = 0); + + virtual bool serialise(void *data,uint32_t& size,bool config) ; + virtual uint32_t serial_size(bool config) ; + + virtual ~RsMsgDistantMessagesHashMap() {} + virtual void clear(); + + // ----------- Specific fields ------------- // + // + std::map hash_map ; +}; class RsMsgParentId : public RsMessageItem { public: @@ -275,7 +292,8 @@ class RsMsgSerialiser: public RsSerialType virtual RsMsgSrcId *deserialiseMsgSrcIdItem(void *data, uint32_t *size); virtual RsMsgParentId *deserialiseMsgParentIdItem(void *data, uint32_t *size); virtual RsPublicMsgInviteConfigItem *deserialisePublicMsgInviteConfigItem(void *data, uint32_t *size); - virtual RsMsgGRouterMap *deserialiseMsgGRouterMap(void *data, uint32_t *size); + virtual RsMsgGRouterMap *deserialiseMsgGRouterMap(void *data, uint32_t *size); + virtual RsMsgDistantMessagesHashMap *deserialiseMsgDistantMessageHashMap(void *data, uint32_t *size); bool m_bConfiguration; // is set to true for saving configuration (enables serialising msgId) }; diff --git a/libretroshare/src/serialiser/rsserial.h b/libretroshare/src/serialiser/rsserial.h index dadf9a3d6..47b0666fc 100644 --- a/libretroshare/src/serialiser/rsserial.h +++ b/libretroshare/src/serialiser/rsserial.h @@ -34,6 +34,7 @@ #include #include +#include "util/rsmemory.h" #include "retroshare/rstypes.h" /******************************************************************* @@ -181,7 +182,7 @@ class RsRawItem: public RsItem RsRawItem(uint32_t t, uint32_t size) :RsItem(t), len(size) { - data = malloc(len); + data = rs_malloc(len); } virtual ~RsRawItem() diff --git a/libretroshare/src/serialiser/rstlvbinary.cc b/libretroshare/src/serialiser/rstlvbinary.cc index bd2144c97..5b601a234 100644 --- a/libretroshare/src/serialiser/rstlvbinary.cc +++ b/libretroshare/src/serialiser/rstlvbinary.cc @@ -24,6 +24,7 @@ * */ +#include "util/rsmemory.h" #include "serialiser/rstlvbinary.h" #include "serialiser/rstlvbase.h" @@ -78,7 +79,11 @@ bool RsTlvBinaryData::setBinData(const void *data, uint32_t size) return true; } - bin_data = malloc(bin_len); + bin_data = rs_malloc(bin_len); + + if(bin_data == NULL) + return false ; + memcpy(bin_data, data, bin_len); return true; } diff --git a/libretroshare/src/services/p3gxschannels.cc b/libretroshare/src/services/p3gxschannels.cc index d25220662..a8b7224ef 100644 --- a/libretroshare/src/services/p3gxschannels.cc +++ b/libretroshare/src/services/p3gxschannels.cc @@ -916,6 +916,12 @@ bool SSGxsChannelGroup::load(const std::string &input) mAutoDownload = false; mDownloadDirectory.clear(); + if(input.empty()) + { + std::cerr << "(EE) SSGxsChannelGroup::load() asked to load a null string. Weird." << std::endl; + return false ; + } + RsTemporaryMemory tmpmem(input.length()); if (1 == sscanf(input.c_str(), "D:%d", &download_val)) diff --git a/libretroshare/src/services/p3gxscommon.cc b/libretroshare/src/services/p3gxscommon.cc index 1f98072fa..ad97f1eca 100644 --- a/libretroshare/src/services/p3gxscommon.cc +++ b/libretroshare/src/services/p3gxscommon.cc @@ -98,7 +98,8 @@ void RsGxsImage::take(uint8_t *data, uint32_t size) // NB Must make sure that we always use malloc/free for this data. uint8_t *RsGxsImage::allocate(uint32_t size) { - uint8_t *val = (uint8_t *) malloc(size); + uint8_t *val = (uint8_t *) rs_malloc(size); + #ifdef DEBUG_GXSCOMMON std::cerr << "RsGxsImage()::allocate(" << (void *) val << ")"; std::cerr << std::endl; diff --git a/libretroshare/src/services/p3msgservice.cc b/libretroshare/src/services/p3msgservice.cc index 2b5618595..a01e49340 100644 --- a/libretroshare/src/services/p3msgservice.cc +++ b/libretroshare/src/services/p3msgservice.cc @@ -51,7 +51,9 @@ #include "util/rsstring.h" #include "util/radix64.h" #include "util/rsrandom.h" +#include "util/rsmemory.h" #include "util/rsprint.h" +#include "util/rsthreads.h" #include #include @@ -67,6 +69,8 @@ using namespace Rs::Msgs; const int msgservicezone = 54319; +static const uint32_t RS_MSG_DISTANT_MESSAGE_HASH_KEEP_TIME = 2*30*86400 ; // keep msg hashes for 2 months to avoid re-sent msgs + /* Another little hack ..... unique message Ids * will be handled in this class..... * These are unique within this run of the server, @@ -78,20 +82,22 @@ const int msgservicezone = 54319; * (3) from storage... */ - p3MsgService::p3MsgService(p3ServiceControl *sc, p3IdService *id_serv) - :p3Service(), p3Config(), mIdService(id_serv), mServiceCtrl(sc), mMsgMtx("p3MsgService"), mMsgUniqueId(time(NULL)) + :p3Service(), p3Config(), mIdService(id_serv), mServiceCtrl(sc), mMsgMtx("p3MsgService"), mMsgUniqueId(0) { - _serialiser = new RsMsgSerialiser(); + _serialiser = new RsMsgSerialiser(); // this serialiser is used for services. It's not the same than the one returned by setupSerialiser(). We need both!! addSerialType(_serialiser); + mMsgUniqueId = 1 ; // MsgIds are not transmitted, but only used locally as a storage index. As such, thay do not need to be different + // at friends nodes. + mShouldEnableDistantMessaging = true ; mDistantMessagingEnabled = false ; mDistantMessagePermissions = RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_FILTER_NONE ; - /* Initialize standard tag types */ - if(sc) - initStandardTagTypes(); + /* Initialize standard tag types */ + if(sc) + initStandardTagTypes(); } @@ -114,7 +120,7 @@ RsServiceInfo p3MsgService::getServiceInfo() uint32_t p3MsgService::getNewUniqueMsgId() { - RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/ + RS_STACK_MUTEX(mMsgMtx); /********** STACK LOCKED MTX ******/ return mMsgUniqueId++; } @@ -136,6 +142,7 @@ int p3MsgService::tick() { manageDistantPeers() ; checkOutgoingMessages(); + cleanListOfReceivedMessageHashes(); last_management_time = now ; } @@ -143,6 +150,24 @@ int p3MsgService::tick() return 0; } +void p3MsgService::cleanListOfReceivedMessageHashes() +{ + RS_STACK_MUTEX(mMsgMtx); /********** STACK LOCKED MTX ******/ + + time_t now = time(NULL) ; + + for(std::map::iterator it(mRecentlyReceivedDistantMessageHashes.begin());it!=mRecentlyReceivedDistantMessageHashes.end();) + if(now > RS_MSG_DISTANT_MESSAGE_HASH_KEEP_TIME + it->second) + { + std::cerr << "p3MsgService(): cleanListOfReceivedMessageHashes(). Removing old hash " << it->first << ", aged " << now - it->second << " secs ago" << std::endl; + std::map::iterator tmp(it) ; + ++tmp ; + mRecentlyReceivedDistantMessageHashes.erase(it) ; + it=tmp ; + } + else + ++it ; +} int p3MsgService::status() { @@ -152,7 +177,7 @@ int p3MsgService::status() return 1; } -void p3MsgService::processMsg(RsMsgItem *mi, bool incoming) +void p3MsgService::processIncomingMsg(RsMsgItem *mi) { mi -> recvTime = time(NULL); mi -> msgId = getNewUniqueMsgId(); @@ -160,26 +185,19 @@ void p3MsgService::processMsg(RsMsgItem *mi, bool incoming) { RsStackMutex stack(mMsgMtx); /*** STACK LOCKED MTX ***/ - if (incoming) + /* from a peer */ + + mi->msgFlags &= (RS_MSG_FLAGS_DISTANT | RS_MSG_FLAGS_SYSTEM); // remove flags except those + mi->msgFlags |= RS_MSG_FLAGS_NEW; + + p3Notify *notify = RsServer::notify(); + if (notify) { - /* from a peer */ + notify->AddPopupMessage(RS_POPUP_MSG, mi->PeerId().toStdString(), mi->subject, mi->message); - mi->msgFlags &= (RS_MSG_FLAGS_DISTANT | RS_MSG_FLAGS_SYSTEM); // remove flags except those - mi->msgFlags |= RS_MSG_FLAGS_NEW; - - p3Notify *notify = RsServer::notify(); - if (notify) - { - notify->AddPopupMessage(RS_POPUP_MSG, mi->PeerId().toStdString(), mi->subject, mi->message); - - std::string out; - rs_sprintf(out, "%lu", mi->msgId); - notify->AddFeedItem(RS_FEED_ITEM_MESSAGE, out, "", ""); - } - } - else - { - mi->msgFlags |= RS_MSG_OUTGOING; + std::string out; + rs_sprintf(out, "%lu", mi->msgId); + notify->AddFeedItem(RS_FEED_ITEM_MESSAGE, out, "", ""); } imsg[mi->msgId] = mi; @@ -187,13 +205,12 @@ void p3MsgService::processMsg(RsMsgItem *mi, bool incoming) msi->msgId = mi->msgId; msi->srcId = mi->PeerId(); mSrcIds.insert(std::pair(msi->msgId, msi)); + IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ /**** STACK UNLOCKED ***/ } - if (incoming) - { // If the peer is allowed to push files, then auto-download the recommended files. if(rsPeers->servicePermissionFlags(mi->PeerId()) & RS_NODE_PERM_ALLOW_PUSH) { @@ -203,7 +220,6 @@ void p3MsgService::processMsg(RsMsgItem *mi, bool incoming) for(std::list::const_iterator it(mi->attachment.items.begin());it!=mi->attachment.items.end();++it) rsFiles->FileRequest((*it).name,(*it).hash,(*it).filesize,std::string(),RS_FILE_REQ_ANONYMOUS_ROUTING,srcIds) ; } - } RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_ADD); } @@ -271,7 +287,7 @@ void p3MsgService::handleIncomingItem(RsMsgItem *mi) if(checkAndRebuildPartialMessage(mi)) // only returns true when a msg is complete. { - processMsg(mi, true); + processIncomingMsg(mi); changed = true ; } if(changed) @@ -333,96 +349,106 @@ void p3MsgService::checkSizeAndSendMessage(RsMsgItem *msg) int p3MsgService::checkOutgoingMessages() { - /* iterate through the outgoing queue + /* iterate through the outgoing queue * * if online, send */ - bool changed = false ; - std::list output_queue ; + time_t now = time(NULL); + bool changed = false ; + std::list output_queue ; - { - const RsPeerId& ownId = mServiceCtrl->getOwnId(); + { + RS_STACK_MUTEX(mMsgMtx); /********** STACK LOCKED MTX ******/ + + const RsPeerId& ownId = mServiceCtrl->getOwnId(); - std::list::iterator it; - std::list toErase; - RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/ + std::list::iterator it; + std::list toErase; - std::map::iterator mit; - for(mit = msgOutgoing.begin(); mit != msgOutgoing.end(); ++mit) - { - if (mit->second->msgFlags & RS_MSG_FLAGS_TRASH) - continue; + std::map::iterator mit; + for(mit = msgOutgoing.begin(); mit != msgOutgoing.end(); ++mit) + { + if (mit->second->msgFlags & RS_MSG_FLAGS_TRASH) + continue; - /* find the certificate */ - RsPeerId pid = mit->second->PeerId(); + /* find the certificate */ + RsPeerId pid = mit->second->PeerId(); + bool should_send = false ; - if( pid == ownId - || ( (mit->second->msgFlags & RS_MSG_FLAGS_DISTANT) && (!(mit->second->msgFlags & RS_MSG_FLAGS_ROUTED))) - || mServiceCtrl->isPeerConnected(getServiceInfo().mServiceType, pid) ) /* FEEDBACK Msg to Ourselves */ - { - /* send msg */ - pqioutput(PQL_DEBUG_BASIC, msgservicezone, - "p3MsgService::checkOutGoingMessages() Sending out message"); - /* remove the pending flag */ + if( pid == ownId) + should_send = true ; - output_queue.push_back(mit->second) ; + if( mServiceCtrl->isPeerConnected(getServiceInfo().mServiceType, pid) ) /* FEEDBACK Msg to Ourselves */ + should_send = true ; - // When the message is a distant msg, dont remove it yet from the list. Only mark it as being sent, so that we don't send it again. - // - if(!(mit->second->msgFlags & RS_MSG_FLAGS_DISTANT)) - { - (mit->second)->msgFlags &= ~RS_MSG_FLAGS_PENDING; - toErase.push_back(mit->first); - changed = true ; - } - else - { + if((mit->second->msgFlags & RS_MSG_FLAGS_DISTANT) && !(mit->second->msgFlags & RS_MSG_FLAGS_ROUTED)) + should_send = true ; + + if(should_send) + { + /* send msg */ + pqioutput(PQL_DEBUG_BASIC, msgservicezone, + "p3MsgService::checkOutGoingMessages() Sending out message"); + /* remove the pending flag */ + + output_queue.push_back(mit->second) ; + + // When the message is a distant msg, dont remove it yet from the list. Only mark it as being sent, so that we don't send it again. + // + if(!(mit->second->msgFlags & RS_MSG_FLAGS_DISTANT)) + { + (mit->second)->msgFlags &= ~RS_MSG_FLAGS_PENDING; + toErase.push_back(mit->first); + changed = true ; + } + else + { #ifdef DEBUG_DISTANT_MSG - std::cerr << "Message id " << mit->first << " is distant: kept in outgoing, and marked as ROUTED" << std::endl; + std::cerr << "Message id " << mit->first << " is distant: kept in outgoing, and marked as ROUTED" << std::endl; #endif - mit->second->msgFlags |= RS_MSG_FLAGS_ROUTED ; - } - } - else - { - pqioutput(PQL_DEBUG_BASIC, msgservicezone, - "p3MsgService::checkOutGoingMessages() Delaying until available..."); - } - } + mit->second->msgFlags |= RS_MSG_FLAGS_ROUTED ; + } + } + else + { + pqioutput(PQL_DEBUG_BASIC, msgservicezone, + "p3MsgService::checkOutGoingMessages() Delaying until available..."); + } + } - /* clean up */ - for(it = toErase.begin(); it != toErase.end(); ++it) - { - mit = msgOutgoing.find(*it); - if (mit != msgOutgoing.end()) - { - msgOutgoing.erase(mit); - } + /* clean up */ + for(it = toErase.begin(); it != toErase.end(); ++it) + { + mit = msgOutgoing.find(*it); + if (mit != msgOutgoing.end()) + { + msgOutgoing.erase(mit); + } - std::map::iterator srcIt = mSrcIds.find(*it); - if (srcIt != mSrcIds.end()) { - delete (srcIt->second); - mSrcIds.erase(srcIt); - } - } + std::map::iterator srcIt = mSrcIds.find(*it); + if (srcIt != mSrcIds.end()) { + delete (srcIt->second); + mSrcIds.erase(srcIt); + } + } - if (toErase.size() > 0) - { - IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ - } - } + if (toErase.size() > 0) + { + IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ + } + } for(std::list::const_iterator it(output_queue.begin());it!=output_queue.end();++it) - if((*it)->msgFlags & RS_MSG_FLAGS_DISTANT) // don't split distant messages. The global router takes care of it. - sendDistantMsgItem(*it) ; - else - checkSizeAndSendMessage(*it) ; + if((*it)->msgFlags & RS_MSG_FLAGS_DISTANT) // don't split distant messages. The global router takes care of it. + sendDistantMsgItem(*it) ; + else + checkSizeAndSendMessage(*it) ; - if(changed) - RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_MOD); + if(changed) + RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_MOD); - return 0; + return 0; } bool p3MsgService::saveList(bool& cleanup, std::list& itemList) @@ -463,6 +489,10 @@ bool p3MsgService::saveList(bool& cleanup, std::list& itemList) grmap->ongoing_msgs = _ongoing_messages ; itemList.push_back(grmap) ; + + RsMsgDistantMessagesHashMap *ghm = new RsMsgDistantMessagesHashMap ; + ghm->hash_map = mRecentlyReceivedDistantMessageHashes ; + itemList.push_back(ghm) ; RsConfigKeyValueSet *vitem = new RsConfigKeyValueSet ; RsTlvKeyValue kv; @@ -485,7 +515,7 @@ void p3MsgService::saveDone() mMsgMtx.unlock(); } -RsSerialiser* p3MsgService::setupSerialiser() +RsSerialiser* p3MsgService::setupSerialiser() // this serialiser is used for config. So it adds somemore info in the serialised items { RsSerialiser *rss = new RsSerialiser ; @@ -544,7 +574,7 @@ bool p3MsgService::loadList(std::list& load) RsMsgSrcId* msi; RsMsgParentId* msp; RsMsgGRouterMap* grm; - // RsPublicMsgInviteConfigItem* msv; + RsMsgDistantMessagesHashMap *ghm; std::list items; std::list::iterator it; @@ -552,6 +582,8 @@ bool p3MsgService::loadList(std::list& load) std::map srcIdMsgMap; std::map::iterator srcIt; + uint32_t max_msg_id = 0 ; + // load items and calculate next unique msgId for(it = load.begin(); it != load.end(); ++it) { @@ -559,9 +591,9 @@ bool p3MsgService::loadList(std::list& load) if (NULL != (mitem = dynamic_cast(*it))) { /* STORE MsgID */ - if (mitem->msgId >= mMsgUniqueId) { - mMsgUniqueId = mitem->msgId + 1; - } + if (mitem->msgId > max_msg_id) + max_msg_id = mitem->msgId ; + items.push_back(mitem); } else if (NULL != (grm = dynamic_cast(*it))) @@ -570,6 +602,17 @@ bool p3MsgService::loadList(std::list& load) for(std::map::const_iterator it(grm->ongoing_msgs.begin());it!=grm->ongoing_msgs.end();++it) _ongoing_messages.insert(*it) ; } + else if(NULL != (ghm = dynamic_cast(*it))) + { + mRecentlyReceivedDistantMessageHashes = ghm->hash_map ; + +#ifdef DEBUG_DISTANT_MSG + std::cerr << " loaded recently received message map: " << std::endl; + + for(std::map::const_iterator it(mRecentlyReceivedDistantMessageHashes.begin());it!=mRecentlyReceivedDistantMessageHashes.end();++it) + std::cerr << " " << it->first << " received " << time(NULL)-it->second << " secs ago." << std::endl; +#endif + } else if(NULL != (mtt = dynamic_cast(*it))) { // delete standard tags as they are now save in config @@ -636,6 +679,7 @@ bool p3MsgService::loadList(std::list& load) continue ; } } + mMsgUniqueId = max_msg_id + 1; // make it unique with respect to what was loaded. Not totally safe, but works 99.9999% of the cases. load.clear() ; // sort items into lists @@ -1030,61 +1074,85 @@ bool p3MsgService::setMsgParentId(uint32_t msgId, uint32_t msgParentId) /****************************************/ /****************************************/ /* Message Items */ -uint32_t p3MsgService::sendMessage(RsMsgItem *item) +uint32_t p3MsgService::sendMessage(RsMsgItem *item) // no from field because it's implicitly our own PeerId { if(!item) - return 0 ; + return 0 ; - pqioutput(PQL_DEBUG_BASIC, msgservicezone, - "p3MsgService::sendMessage()"); + pqioutput(PQL_DEBUG_BASIC, msgservicezone, "p3MsgService::sendMessage()"); - item -> msgId = getNewUniqueMsgId(); /* grabs Mtx as well */ + item->msgId = getNewUniqueMsgId(); /* grabs Mtx as well */ + item->msgFlags |= (RS_MSG_FLAGS_OUTGOING | RS_MSG_FLAGS_PENDING); /* add pending flag */ + + { + RS_STACK_MUTEX(mMsgMtx) ; + + /* STORE MsgID */ + msgOutgoing[item->msgId] = item; + + if (item->PeerId() != mServiceCtrl->getOwnId()) + { + /* not to the loopback device */ + + RsMsgSrcId* msi = new RsMsgSrcId(); + msi->msgId = item->msgId; + msi->srcId = mServiceCtrl->getOwnId(); + mSrcIds.insert(std::pair(msi->msgId, msi)); + } + } + + IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ + + RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST, NOTIFY_TYPE_ADD); + + return item->msgId; +} +uint32_t p3MsgService::sendDistantMessage(RsMsgItem *item,const RsGxsId& from) +{ + if(!item) + return 0 ; + + item->msgId = getNewUniqueMsgId(); /* grabs Mtx as well */ + item->msgFlags |= (RS_MSG_FLAGS_DISTANT | RS_MSG_FLAGS_OUTGOING | RS_MSG_FLAGS_PENDING); /* add pending flag */ { - RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/ + RS_STACK_MUTEX(mMsgMtx) ; - /* add pending flag */ - item->msgFlags |= (RS_MSG_FLAGS_OUTGOING | RS_MSG_FLAGS_PENDING); /* STORE MsgID */ msgOutgoing[item->msgId] = item; + mDistantOutgoingMsgSigners[item->msgId] = from ; - if (item->PeerId() != mServiceCtrl->getOwnId()) { + if (item->PeerId() != mServiceCtrl->getOwnId()) + { /* not to the loopback device */ + RsMsgSrcId* msi = new RsMsgSrcId(); msi->msgId = item->msgId; - msi->srcId = item->PeerId(); + msi->srcId = RsPeerId(from) ; mSrcIds.insert(std::pair(msi->msgId, msi)); - } - + } } IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST, NOTIFY_TYPE_ADD); - return item->msgId; -} -uint32_t p3MsgService::sendDistantMessage(RsMsgItem *item,const RsGxsId& from) -{ - uint32_t msg_id = sendMessage(item) ; + return item->msgId; - RS_STACK_MUTEX(mMsgMtx) ; - mDistantOutgoingMsgSigners[msg_id] = from ; - - return msg_id ; } bool p3MsgService::MessageSend(MessageInfo &info) { - for(std::set::const_iterator pit = info.rspeerid_msgto.begin(); pit != info.rspeerid_msgto.end(); ++pit) sendMessage(initMIRsMsg(info, *pit)); - for(std::set::const_iterator pit = info.rspeerid_msgcc.begin(); pit != info.rspeerid_msgcc.end(); ++pit) sendMessage(initMIRsMsg(info, *pit)); - for(std::set::const_iterator pit = info.rspeerid_msgbcc.begin(); pit != info.rspeerid_msgbcc.end(); ++pit) sendMessage(initMIRsMsg(info, *pit)); + for(std::set::const_iterator pit = info.rspeerid_msgto.begin(); pit != info.rspeerid_msgto.end(); ++pit) sendMessage(initMIRsMsg(info, *pit)); + for(std::set::const_iterator pit = info.rspeerid_msgcc.begin(); pit != info.rspeerid_msgcc.end(); ++pit) sendMessage(initMIRsMsg(info, *pit)); + for(std::set::const_iterator pit = info.rspeerid_msgbcc.begin(); pit != info.rspeerid_msgbcc.end(); ++pit) sendMessage(initMIRsMsg(info, *pit)); - for(std::set::const_iterator pit = info.rsgxsid_msgto.begin(); pit != info.rsgxsid_msgto.end(); ++pit) sendDistantMessage(initMIRsMsg(info, *pit),info.rsgxsid_srcId); - for(std::set::const_iterator pit = info.rsgxsid_msgcc.begin(); pit != info.rsgxsid_msgcc.end(); ++pit) sendDistantMessage(initMIRsMsg(info, *pit),info.rsgxsid_srcId); - for(std::set::const_iterator pit = info.rsgxsid_msgbcc.begin(); pit != info.rsgxsid_msgbcc.end(); ++pit) sendDistantMessage(initMIRsMsg(info, *pit),info.rsgxsid_srcId); + for(std::set::const_iterator pit = info.rsgxsid_msgto.begin(); pit != info.rsgxsid_msgto.end(); ++pit) sendDistantMessage(initMIRsMsg(info, *pit),info.rsgxsid_srcId); + for(std::set::const_iterator pit = info.rsgxsid_msgcc.begin(); pit != info.rsgxsid_msgcc.end(); ++pit) sendDistantMessage(initMIRsMsg(info, *pit),info.rsgxsid_srcId); + for(std::set::const_iterator pit = info.rsgxsid_msgbcc.begin(); pit != info.rsgxsid_msgbcc.end(); ++pit) sendDistantMessage(initMIRsMsg(info, *pit),info.rsgxsid_srcId); + + // store message in outgoing list. In order to appear as sent the message needs to have the OUTGOING flg, but no pending flag on. - /* send to ourselves as well */ RsMsgItem *msg = initMIRsMsg(info, mServiceCtrl->getOwnId()); if (msg) @@ -1095,10 +1163,17 @@ bool p3MsgService::MessageSend(MessageInfo &info) msg->msgFlags |= RS_MSG_FLAGS_SIGNATURE_CHECKS; // this is always true, since we are sending the message /* use processMsg to get the new msgId */ - processMsg(msg, false); + msg->recvTime = time(NULL); + msg->msgId = getNewUniqueMsgId(); + + msg->msgFlags |= RS_MSG_OUTGOING; - // return new message id - rs_sprintf(info.msgId, "%lu", msg->msgId); + imsg[msg->msgId] = msg; + + RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_ADD); + // + // // return new message id + // rs_sprintf(info.msgId, "%lu", msg->msgId); } return true; @@ -1138,7 +1213,7 @@ bool p3MsgService::SystemMessage(const std::string &title, const std::string &me msg->rspeerid_msgto.ids.insert(ownId); - processMsg(msg, true); + processIncomingMsg(msg); return true; } @@ -1762,7 +1837,7 @@ void p3MsgService::manageDistantPeers() { #ifdef DEBUG_DISTANT_MSG for(std::list::const_iterator it(own_id_list.begin());it!=own_id_list.end();++it) - std::cerr << (b?"Enabling":"Disabling") << " distant messaging, with peer id = " << *it << std::endl; + std::cerr << (mShouldEnableDistantMessaging?"Enabling":"Disabling") << " distant messaging, with peer id = " << *it << std::endl; #endif for(std::list::const_iterator it(own_id_list.begin());it!=own_id_list.end();++it) @@ -1782,44 +1857,67 @@ void p3MsgService::notifyDataStatus(const GRouterMsgPropagationId& id,uint32_t d { if(data_status == GROUTER_CLIENT_SERVICE_DATA_STATUS_FAILED) { - std::cerr << __PRETTY_FUNCTION__ << ": Not fully implemented. The global router fails to send apacket, but we don't deal with it. Please remind the devs to do it" << std::endl; - return ; + RS_STACK_MUTEX(mMsgMtx); /********** STACK LOCKED MTX ******/ + + std::cerr << "(WW) p3MsgService::notifyDataStatus: Global router tells us that item ID " << id << " could not be delivered on time." ; + std::map::iterator it = _ongoing_messages.find(id) ; + + if(it == _ongoing_messages.end()) + { + std::cerr << " (EE) cannot find pending message to acknowledge. Weird. grouter id = " << id << std::endl; + return ; + } + uint32_t msg_id = it->second ; + std::cerr << " message id = " << msg_id << std::endl; + + std::map::iterator mit = msgOutgoing.find(msg_id) ; + + if(mit == msgOutgoing.end()) + { + std::cerr << " (EE) message has been notified as not delivered, but it not on outgoing list. Something's wrong!!" << std::endl; + return ; + } + std::cerr << " reseting the ROUTED flag so that the message is requested again" << std::endl; + + mit->second->msgFlags &= ~RS_MSG_FLAGS_ROUTED ; // clear the routed flag so that the message is requested again + return ; } - if(data_status != GROUTER_CLIENT_SERVICE_DATA_STATUS_RECEIVED) + + if(data_status == GROUTER_CLIENT_SERVICE_DATA_STATUS_RECEIVED) { - std::cerr << "p3MsgService: unhandled data status info from global router for msg ID " << id << ": this is a bug." << std::endl; - return ; - } - - RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/ + RS_STACK_MUTEX(mMsgMtx); /********** STACK LOCKED MTX ******/ #ifdef DEBUG_DISTANT_MSG - std::cerr << "p3MsgService::acknowledgeDataReceived(): acknowledging data received for msg propagation id " << id << std::endl; + std::cerr << "p3MsgService::acknowledgeDataReceived(): acknowledging data received for msg propagation id " << id << std::endl; #endif - std::map::iterator it = _ongoing_messages.find(id) ; + std::map::iterator it = _ongoing_messages.find(id) ; - if(it == _ongoing_messages.end()) - { - std::cerr << " (EE) cannot find pending message to acknowledge. Weird. grouter id = " << id << std::endl; - return ; - } + if(it == _ongoing_messages.end()) + { + std::cerr << " (EE) cannot find pending message to acknowledge. Weird. grouter id = " << id << std::endl; + return ; + } - uint32_t msg_id = it->second ; + uint32_t msg_id = it->second ; - // we should now remove the item from the msgOutgoing list. - - std::map::iterator it2 = msgOutgoing.find(msg_id) ; + // we should now remove the item from the msgOutgoing list. - if(it2 == msgOutgoing.end()) - { - std::cerr << "(EE) message has been ACKed, but is not in outgoing list. Something's wrong!!" << std::endl; - return ; - } + std::map::iterator it2 = msgOutgoing.find(msg_id) ; - delete it2->second ; - msgOutgoing.erase(it2) ; + if(it2 == msgOutgoing.end()) + { + std::cerr << "(EE) message has been ACKed, but is not in outgoing list. Something's wrong!!" << std::endl; + return ; + } - RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_ADD); - IndicateConfigChanged() ; + delete it2->second ; + msgOutgoing.erase(it2) ; + + RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_ADD); + IndicateConfigChanged() ; + + return ; + } + std::cerr << "p3MsgService: unhandled data status info from global router for msg ID " << id << ": this is a bug." << std::endl; } bool p3MsgService::acceptDataFromPeer(const RsGxsId& to_gxs_id) { @@ -1851,8 +1949,20 @@ void p3MsgService::receiveGRouterData(const RsGxsId& destination_key, const RsGx { std::cerr << "p3MsgService::receiveGRouterData(): received message item of size " << data_size << ", for key " << destination_key << std::endl; + // first make sure that we havn't already received the data. Since we allow to re-send messages, it's necessary to check. + + Sha1CheckSum hash = RsDirUtil::sha1sum(data,data_size) ; + + if(mRecentlyReceivedDistantMessageHashes.find(hash) != mRecentlyReceivedDistantMessageHashes.end()) + { + std::cerr << "(WW) receiving distant message of hash " << hash << " more than once. This is not a bug, unless it happens very often." << std::endl; + free(data) ; + return ; + } + mRecentlyReceivedDistantMessageHashes[hash] = time(NULL) ; + IndicateConfigChanged() ; + RsItem *item = _serialiser->deserialise(data,&data_size) ; - free(data) ; RsMsgItem *msg_item = dynamic_cast(item) ; @@ -1861,9 +1971,9 @@ void p3MsgService::receiveGRouterData(const RsGxsId& destination_key, const RsGx { std::cerr << " Encrypted item correctly deserialised. Passing on to incoming list." << std::endl; - msg_item->msgFlags |= RS_MSG_FLAGS_DISTANT ; - /* we expect complete msgs - remove partial flag just in case someone has funny ideas */ - msg_item->msgFlags &= ~RS_MSG_FLAGS_PARTIAL; + msg_item->msgFlags |= RS_MSG_FLAGS_DISTANT ; + /* we expect complete msgs - remove partial flag just in case someone has funny ideas */ + msg_item->msgFlags &= ~RS_MSG_FLAGS_PARTIAL; msg_item->PeerId(RsPeerId(signing_key)) ; // hack to pass on GXS id. handleIncomingItem(msg_item) ; @@ -1877,7 +1987,8 @@ void p3MsgService::sendDistantMsgItem(RsMsgItem *msgitem) RsGxsId destination_key_id(msgitem->PeerId()) ; RsGxsId signing_key_id ; - msgitem->msgFlags |= RS_MSG_FLAGS_DISTANT ; + msgitem->msgFlags |= RS_MSG_FLAGS_DISTANT ;// just in case, but normally we should always have this flag set, when ending up here. + { RS_STACK_MUTEX(mMsgMtx) ; @@ -1899,15 +2010,14 @@ void p3MsgService::sendDistantMsgItem(RsMsgItem *msgitem) std::cerr << " signing : " << signing_key_id << std::endl; #endif - // The item is serialized and turned into a generic turtle item. + // The item is serialized and turned into a generic turtle item. Use use the explicit serialiser to make sure that the msgId is not included - uint32_t msg_serialized_rssize = _serialiser->size(msgitem) ; - unsigned char *msg_serialized_data = new unsigned char[msg_serialized_rssize] ; + uint32_t msg_serialized_rssize = msgitem->serial_size(false) ; + RsTemporaryMemory msg_serialized_data(msg_serialized_rssize) ; - if(!_serialiser->serialise(msgitem,msg_serialized_data,&msg_serialized_rssize)) + if(!msgitem->serialise(msg_serialized_data,msg_serialized_rssize,false)) { std::cerr << "(EE) p3MsgService::sendTurtleData(): Serialization error." << std::endl; - delete[] msg_serialized_data ; return ; } #ifdef DEBUG_DISTANT_MSG @@ -1917,8 +2027,6 @@ void p3MsgService::sendDistantMsgItem(RsMsgItem *msgitem) GRouterMsgPropagationId grouter_message_id ; mGRouter->sendData(destination_key_id,GROUTER_CLIENT_ID_MESSAGES,msg_serialized_data,msg_serialized_rssize,signing_key_id,grouter_message_id) ; - delete[] msg_serialized_data ; - // now store the grouter id along with the message id, so that we can keep track of received messages { diff --git a/libretroshare/src/services/p3msgservice.h b/libretroshare/src/services/p3msgservice.h index 74f47cf26..401fc4e0a 100644 --- a/libretroshare/src/services/p3msgservice.h +++ b/libretroshare/src/services/p3msgservice.h @@ -56,159 +56,161 @@ class p3IdService; // Temp tweak to test grouter class p3MsgService: public p3Service, public p3Config, public pqiServiceMonitor, public GRouterClientService { - public: - p3MsgService(p3ServiceControl *sc, p3IdService *id_service); - virtual RsServiceInfo getServiceInfo(); +public: + p3MsgService(p3ServiceControl *sc, p3IdService *id_service); + virtual RsServiceInfo getServiceInfo(); - /* External Interface */ - bool getMessageSummaries(std::list &msgList); - bool getMessage(const std::string &mid, Rs::Msgs::MessageInfo &msg); - void getMessageCount(unsigned int *pnInbox, unsigned int *pnInboxNew, unsigned int *pnOutbox, unsigned int *pnDraftbox, unsigned int *pnSentbox, unsigned int *pnTrashbox); + /* External Interface */ + bool getMessageSummaries(std::list &msgList); + bool getMessage(const std::string &mid, Rs::Msgs::MessageInfo &msg); + void getMessageCount(unsigned int *pnInbox, unsigned int *pnInboxNew, unsigned int *pnOutbox, unsigned int *pnDraftbox, unsigned int *pnSentbox, unsigned int *pnTrashbox); - bool decryptMessage(const std::string& mid) ; - bool removeMsgId(const std::string &mid); - bool markMsgIdRead(const std::string &mid, bool bUnreadByUser); - bool setMsgFlag(const std::string &mid, uint32_t flag, uint32_t mask); - bool getMsgParentId(const std::string &msgId, std::string &msgParentId); - // msgParentId == 0 --> remove - bool setMsgParentId(uint32_t msgId, uint32_t msgParentId); + bool decryptMessage(const std::string& mid) ; + bool removeMsgId(const std::string &mid); + bool markMsgIdRead(const std::string &mid, bool bUnreadByUser); + bool setMsgFlag(const std::string &mid, uint32_t flag, uint32_t mask); + bool getMsgParentId(const std::string &msgId, std::string &msgParentId); + // msgParentId == 0 --> remove + bool setMsgParentId(uint32_t msgId, uint32_t msgParentId); - bool MessageSend(Rs::Msgs::MessageInfo &info); - bool SystemMessage(const std::string &title, const std::string &message, uint32_t systemFlag); - bool MessageToDraft(Rs::Msgs::MessageInfo &info, const std::string &msgParentId); - bool MessageToTrash(const std::string &mid, bool bTrash); + bool MessageSend(Rs::Msgs::MessageInfo &info); + bool SystemMessage(const std::string &title, const std::string &message, uint32_t systemFlag); + bool MessageToDraft(Rs::Msgs::MessageInfo &info, const std::string &msgParentId); + bool MessageToTrash(const std::string &mid, bool bTrash); - bool getMessageTagTypes(Rs::Msgs::MsgTagType& tags); - bool setMessageTagType(uint32_t tagId, std::string& text, uint32_t rgb_color); - bool removeMessageTagType(uint32_t tagId); + bool getMessageTagTypes(Rs::Msgs::MsgTagType& tags); + bool setMessageTagType(uint32_t tagId, std::string& text, uint32_t rgb_color); + bool removeMessageTagType(uint32_t tagId); - bool getMessageTag(const std::string &msgId, Rs::Msgs::MsgTagInfo& info); - /* set == false && tagId == 0 --> remove all */ - bool setMessageTag(const std::string &msgId, uint32_t tagId, bool set); + bool getMessageTag(const std::string &msgId, Rs::Msgs::MsgTagInfo& info); + /* set == false && tagId == 0 --> remove all */ + bool setMessageTag(const std::string &msgId, uint32_t tagId, bool set); - bool resetMessageStandardTagTypes(Rs::Msgs::MsgTagType& tags); + bool resetMessageStandardTagTypes(Rs::Msgs::MsgTagType& tags); - void loadWelcomeMsg(); /* startup message */ + void loadWelcomeMsg(); /* startup message */ - - //std::list &getMsgList(); - //std::list &getMsgOutList(); - int tick(); - int status(); + //std::list &getMsgList(); + //std::list &getMsgOutList(); - /*** Overloaded from p3Config ****/ - virtual RsSerialiser *setupSerialiser(); - virtual bool saveList(bool& cleanup, std::list&); - virtual bool loadList(std::list& load); - virtual void saveDone(); - /*** Overloaded from p3Config ****/ + int tick(); + int status(); - /*** Overloaded from pqiMonitor ***/ - virtual void statusChange(const std::list &plist); - int checkOutgoingMessages(); - /*** Overloaded from pqiMonitor ***/ + /*** Overloaded from p3Config ****/ + virtual RsSerialiser *setupSerialiser(); + virtual bool saveList(bool& cleanup, std::list&); + virtual bool loadList(std::list& load); + virtual void saveDone(); + /*** Overloaded from p3Config ****/ - /*** overloaded from p3turtle ***/ + /*** Overloaded from pqiMonitor ***/ + virtual void statusChange(const std::list &plist); + int checkOutgoingMessages(); + /*** Overloaded from pqiMonitor ***/ - virtual void connectToGlobalRouter(p3GRouter *) ; + /*** overloaded from p3turtle ***/ - struct DistantMessengingInvite - { - time_t time_of_validity ; - }; - struct DistantMessengingContact - { - time_t last_hit_time ; - RsPeerId virtual_peer_id ; - uint32_t status ; - bool pending_messages ; - }; - void enableDistantMessaging(bool b) ; - bool distantMessagingEnabled() ; - - void setDistantMessagingPermissionFlags(uint32_t flags) ; - uint32_t getDistantMessagingPermissionFlags() ; + virtual void connectToGlobalRouter(p3GRouter *) ; - private: - void sendDistantMsgItem(RsMsgItem *msgitem) ; + struct DistantMessengingInvite + { + time_t time_of_validity ; + }; + struct DistantMessengingContact + { + time_t last_hit_time ; + RsPeerId virtual_peer_id ; + uint32_t status ; + bool pending_messages ; + }; + void enableDistantMessaging(bool b) ; + bool distantMessagingEnabled() ; - // This contains the ongoing tunnel handling contacts. - // The map is indexed by the hash - // - std::map _ongoing_messages ; + void setDistantMessagingPermissionFlags(uint32_t flags) ; + uint32_t getDistantMessagingPermissionFlags() ; - // Overloaded from GRouterClientService +private: + void sendDistantMsgItem(RsMsgItem *msgitem) ; - virtual bool acceptDataFromPeer(const RsGxsId& gxs_id) ; - virtual void receiveGRouterData(const RsGxsId& destination_key,const RsGxsId& signing_key, GRouterServiceId &client_id, uint8_t *data, uint32_t data_size) ; - virtual void notifyDataStatus(const GRouterMsgPropagationId& msg_id,uint32_t data_status) ; + // This contains the ongoing tunnel handling contacts. + // The map is indexed by the hash + // + std::map _ongoing_messages ; - // Utility functions + // Overloaded from GRouterClientService - bool createDistantMessage(const RsGxsId& destination_gxs_id,const RsGxsId& source_gxs_id,RsMsgItem *msg) ; - bool locked_findHashForVirtualPeerId(const RsPeerId& pid,Sha1CheckSum& hash) ; - void sendGRouterData(const RsGxsId &key_id,RsMsgItem *) ; + virtual bool acceptDataFromPeer(const RsGxsId& gxs_id) ; + virtual void receiveGRouterData(const RsGxsId& destination_key,const RsGxsId& signing_key, GRouterServiceId &client_id, uint8_t *data, uint32_t data_size) ; + virtual void notifyDataStatus(const GRouterMsgPropagationId& msg_id,uint32_t data_status) ; - void manageDistantPeers() ; + // Utility functions - void handleIncomingItem(RsMsgItem *) ; + bool createDistantMessage(const RsGxsId& destination_gxs_id,const RsGxsId& source_gxs_id,RsMsgItem *msg) ; + bool locked_findHashForVirtualPeerId(const RsPeerId& pid,Sha1CheckSum& hash) ; + void sendGRouterData(const RsGxsId &key_id,RsMsgItem *) ; - uint32_t getNewUniqueMsgId(); - uint32_t sendMessage(RsMsgItem *item); - uint32_t sendDistantMessage(RsMsgItem *item,const RsGxsId& signing_gxs_id); - void checkSizeAndSendMessage(RsMsgItem *msg); + void manageDistantPeers() ; - int incomingMsgs(); - void processMsg(RsMsgItem *mi, bool incoming); - bool checkAndRebuildPartialMessage(RsMsgItem*) ; + void handleIncomingItem(RsMsgItem *) ; - void initRsMI(RsMsgItem *msg, Rs::Msgs::MessageInfo &mi); - void initRsMIS(RsMsgItem *msg, Rs::Msgs::MsgInfoSummary &mis); + uint32_t getNewUniqueMsgId(); + uint32_t sendMessage(RsMsgItem *item); + uint32_t sendDistantMessage(RsMsgItem *item,const RsGxsId& signing_gxs_id); + void checkSizeAndSendMessage(RsMsgItem *msg); + void cleanListOfReceivedMessageHashes(); - RsMsgItem *initMIRsMsg(const Rs::Msgs::MessageInfo &info, const RsPeerId& to); - RsMsgItem *initMIRsMsg(const Rs::Msgs::MessageInfo &info, const RsGxsId& to); - void initMIRsMsg(RsMsgItem *item,const Rs::Msgs::MessageInfo &info) ; + int incomingMsgs(); + void processIncomingMsg(RsMsgItem *mi) ; + bool checkAndRebuildPartialMessage(RsMsgItem*) ; - void initStandardTagTypes(); + void initRsMI(RsMsgItem *msg, Rs::Msgs::MessageInfo &mi); + void initRsMIS(RsMsgItem *msg, Rs::Msgs::MsgInfoSummary &mis); - p3IdService *mIdService ; - p3ServiceControl *mServiceCtrl; - p3GRouter *mGRouter ; + RsMsgItem *initMIRsMsg(const Rs::Msgs::MessageInfo &info, const RsPeerId& to); + RsMsgItem *initMIRsMsg(const Rs::Msgs::MessageInfo &info, const RsGxsId& to); + void initMIRsMsg(RsMsgItem *item,const Rs::Msgs::MessageInfo &info) ; - /* Mutex Required for stuff below */ + void initStandardTagTypes(); - RsMutex mMsgMtx; - RsMsgSerialiser *_serialiser ; + p3IdService *mIdService ; + p3ServiceControl *mServiceCtrl; + p3GRouter *mGRouter ; - /* stored list of messages */ - std::map imsg; - /* ones that haven't made it out yet! */ - std::map msgOutgoing; + /* Mutex Required for stuff below */ - std::map _pendingPartialMessages ; + RsMutex mMsgMtx; + RsMsgSerialiser *_serialiser ; - /* maps for tags types and msg tags */ + /* stored list of messages */ + std::map imsg; + /* ones that haven't made it out yet! */ + std::map msgOutgoing; - std::map mTags; - std::map mMsgTags; + std::map _pendingPartialMessages ; - uint32_t mMsgUniqueId; + /* maps for tags types and msg tags */ - // used delete msgSrcIds after config save - std::map mSrcIds; + std::map mTags; + std::map mMsgTags; - // temporary storage. Will not be needed when messages have a proper "from" field. Not saved! - std::map mDistantOutgoingMsgSigners; + uint32_t mMsgUniqueId; + std::map mRecentlyReceivedDistantMessageHashes; - // save the parent of the messages in draft for replied and forwarded - std::map mParentId; + // used delete msgSrcIds after config save + std::map mSrcIds; - std::string config_dir; + // temporary storage. Will not be needed when messages have a proper "from" field. Not saved! + std::map mDistantOutgoingMsgSigners; - bool mDistantMessagingEnabled ; - uint32_t mDistantMessagePermissions ; - bool mShouldEnableDistantMessaging ; + // save the parent of the messages in draft for replied and forwarded + std::map mParentId; + + std::string config_dir; + + bool mDistantMessagingEnabled ; + uint32_t mDistantMessagePermissions ; + bool mShouldEnableDistantMessaging ; }; #endif // MESSAGE_SERVICE_HEADER diff --git a/libretroshare/src/services/p3photoservice.cc b/libretroshare/src/services/p3photoservice.cc index 1821c8d69..759f5ad18 100644 --- a/libretroshare/src/services/p3photoservice.cc +++ b/libretroshare/src/services/p3photoservice.cc @@ -26,7 +26,11 @@ bool RsPhotoThumbnail::copyFrom(const RsPhotoThumbnail &nail) size = nail.size; type = nail.type; - data = (uint8_t *) malloc(size); + data = (uint8_t *) rs_malloc(size); + + if(data == NULL) + return false ; + memcpy(data, nail.data, size); return true; diff --git a/libretroshare/src/tcponudp/tcppacket.cc b/libretroshare/src/tcponudp/tcppacket.cc index 23b007d5b..3f308de1a 100644 --- a/libretroshare/src/tcponudp/tcppacket.cc +++ b/libretroshare/src/tcponudp/tcppacket.cc @@ -36,6 +36,7 @@ #include #include +#include #include @@ -79,8 +80,10 @@ TcpPacket::TcpPacket(uint8 *ptr, int size) if (size > 0) { datasize = size; - data = (uint8 *) malloc(datasize); - memcpy(data, (void *) ptr, size); + data = (uint8 *) rs_malloc(datasize); + + if(data != NULL) + memcpy(data, (void *) ptr, size); } return; } @@ -185,7 +188,17 @@ int TcpPacket::readPacket(void *buf, int size) free(data); } datasize = size - TCP_PSEUDO_HDR_SIZE; - data = (uint8 *) malloc(datasize); + + if(datasize == 0) // this happens! + { + data = NULL ; + return 0 ; + } + + data = (uint8 *) rs_malloc(datasize); + + if(data == NULL) + return 0 ; /* now the data */ memcpy(data, (void *) &(((uint8 *) buf)[20]), datasize); diff --git a/libretroshare/src/tcponudp/udprelay.cc b/libretroshare/src/tcponudp/udprelay.cc index cc339f07d..2f837feec 100644 --- a/libretroshare/src/tcponudp/udprelay.cc +++ b/libretroshare/src/tcponudp/udprelay.cc @@ -26,6 +26,7 @@ #include "udprelay.h" #include #include +#include /* * #define DEBUG_UDP_RELAY 1 @@ -70,7 +71,7 @@ UdpRelayReceiver::UdpRelayReceiver(UdpPublisher *pub) setRelayClassMax(UDP_RELAY_CLASS_GENERAL, UDP_RELAY_DEFAULT_GENERAL, UDP_RELAY_DEFAULT_BANDWIDTH); /* only allocate this space once */ - mTmpSendPkt = malloc(MAX_RELAY_UDP_PACKET_SIZE); + mTmpSendPkt = rs_malloc(MAX_RELAY_UDP_PACKET_SIZE); mTmpSendSize = MAX_RELAY_UDP_PACKET_SIZE; clearDataTransferred(); diff --git a/libretroshare/src/tcponudp/udpstunner.cc b/libretroshare/src/tcponudp/udpstunner.cc index 06e1748ad..421ad8f17 100644 --- a/libretroshare/src/tcponudp/udpstunner.cc +++ b/libretroshare/src/tcponudp/udpstunner.cc @@ -29,6 +29,7 @@ #include "util/rsrandom.h" #include "util/rsprint.h" +#include "util/rsmemory.h" #include "util/rsstring.h" static const int STUN_TTL = 64; @@ -535,7 +536,11 @@ bool UdpStun_generate_stun_pkt(void *stun_pkt, int *len) void *UdpStun_generate_stun_reply(struct sockaddr_in *stun_addr, int *len) { /* just the header */ - void *stun_pkt = malloc(28); + void *stun_pkt = rs_malloc(28); + + if(!stun_pkt) + return NULL ; + ((uint16_t *) stun_pkt)[0] = (uint16_t) htons(0x0101); ((uint16_t *) stun_pkt)[1] = (uint16_t) htons(28); /* only header + 8 byte addr */ /* transaction id - should be random */ diff --git a/libretroshare/src/turtle/rsturtleitem.cc b/libretroshare/src/turtle/rsturtleitem.cc index 4e33f76e8..8139c9ad3 100644 --- a/libretroshare/src/turtle/rsturtleitem.cc +++ b/libretroshare/src/turtle/rsturtleitem.cc @@ -284,19 +284,24 @@ RsTurtleRegExpSearchRequestItem::RsTurtleRegExpSearchRequestItem(void *data,uint uint32_t n =0 ; ok &= getRawUInt32(data,pktsize,&offset,&n) ; - expr._tokens.resize(n) ; + if(ok) + expr._tokens.resize(n) ; - for(uint32_t i=0;i pktsize) + throw std::runtime_error("RsTurtleTunnelOkItem::() wrong rssize (exceeds pktsize).") ; + /* add mandatory parts first */ bool ok = true ; @@ -540,7 +548,11 @@ RsTurtleGenericDataItem::RsTurtleGenericDataItem(void *data,uint32_t pktsize) #ifdef P3TURTLE_DEBUG std::cerr << " request_id=" << (void*)request_id << ", tunnel_id=" << (void*)tunnel_id << std::endl ; #endif - data_bytes = malloc(data_size) ; + + if(data_size > rssize || rssize - data_size < offset) + throw std::runtime_error("RsTurtleTunnelOkItem::() wrong data_size (exceeds rssize).") ; + + data_bytes = rs_malloc(data_size) ; if(data_bytes != NULL) { @@ -548,10 +560,7 @@ RsTurtleGenericDataItem::RsTurtleGenericDataItem(void *data,uint32_t pktsize) offset += data_size ; } else - { - std::cerr << "(EE) RsTurtleGenericDataItem: Error. Cannot allocate data for a size of " << data_size << " bytes." < #include "rscompress.h" #include "zlib.h" +#include "util/rsmemory.h" // 16K buffer size. // @@ -42,7 +43,10 @@ bool RsCompress::compress_memory_chunk(const uint8_t *input_mem,const uint32_t i uint32_t output_offset = 0 ; uint32_t input_offset = 0 ; output_size = 1024 ; - output_mem = (uint8_t*)malloc(output_size) ; + output_mem = (uint8_t*)rs_malloc(output_size) ; + + if(!output_mem) + return false ; int ret, flush; unsigned have; @@ -113,8 +117,11 @@ bool RsCompress::uncompress_memory_chunk(const uint8_t *input_mem,const uint32_t output_size = input_size ; uint32_t output_offset = 0 ; uint32_t input_offset = 0 ; - output_mem = (uint8_t*)malloc(output_size) ; + output_mem = (uint8_t*)rs_malloc(output_size) ; + if(!output_mem) + return false ; + int ret; unsigned have; z_stream strm; diff --git a/libretroshare/src/util/rsdir.cc b/libretroshare/src/util/rsdir.cc index b396b1672..bc9de2c43 100644 --- a/libretroshare/src/util/rsdir.cc +++ b/libretroshare/src/util/rsdir.cc @@ -33,6 +33,7 @@ #include "util/rsdir.h" #include "util/rsstring.h" #include "util/rsrandom.h" +#include "util/rsmemory.h" #include "retroshare/rstypes.h" #include "rsthreads.h" #include @@ -267,7 +268,14 @@ bool RsDirUtil::copyFile(const std::string& source,const std::string& dest) size_t T=0; static const int BUFF_SIZE = 10485760 ; // 10 MB buffer to speed things up. - void *buffer = malloc(BUFF_SIZE) ; + RsTemporaryMemory buffer(BUFF_SIZE) ; + + if(!buffer) + { + fclose(in) ; + fclose(out) ; + return false ; + } bool bRet = true; @@ -286,8 +294,6 @@ bool RsDirUtil::copyFile(const std::string& source,const std::string& dest) fclose(in) ; fclose(out) ; - free(buffer) ; - return true ; #endif diff --git a/libretroshare/src/util/rsmemory.cc b/libretroshare/src/util/rsmemory.cc new file mode 100644 index 000000000..46ffd4a58 --- /dev/null +++ b/libretroshare/src/util/rsmemory.cc @@ -0,0 +1,32 @@ +#include "util/rsmemory.h" + +void *rs_malloc(size_t size) +{ + static const size_t SAFE_MEMALLOC_THRESHOLD = 1024*1024*1024 ; // 1Gb should be enough for everything! + + if(size == 0) + { + std::cerr << "(EE) Memory allocation error. A chunk of size 0 was requested. Callstack:" << std::endl; + print_stacktrace() ; + return NULL ; + } + + if(size > SAFE_MEMALLOC_THRESHOLD) + { + std::cerr << "(EE) Memory allocation error. A chunk of size 0 was requested. Callstack:" << std::endl; + print_stacktrace() ; + return NULL ; + } + + void *mem = malloc(size) ; + + if(mem == NULL) + { + std::cerr << "(EE) Memory allocation error for a chunk of " << size << " bytes. Callstack:" << std::endl; + print_stacktrace() ; + return NULL ; + } + + return mem ; +} + diff --git a/libretroshare/src/util/rsmemory.h b/libretroshare/src/util/rsmemory.h index c6b88ed2b..7da4245c4 100644 --- a/libretroshare/src/util/rsmemory.h +++ b/libretroshare/src/util/rsmemory.h @@ -1,6 +1,10 @@ #pragma once #include +#include +#include + +void *rs_malloc(size_t size) ; // This is a scope guard to release the memory block when going of of the current scope. // Can be very useful to auto-delete some memory on quit without the need to call free each time. @@ -24,7 +28,7 @@ class RsTemporaryMemory public: RsTemporaryMemory(size_t s) { - _mem = (unsigned char *)malloc(s) ; + _mem = (unsigned char *)rs_malloc(s) ; if(_mem) _size = s ; @@ -53,5 +57,3 @@ private: RsTemporaryMemory& operator=(const RsTemporaryMemory&) { return *this ;} RsTemporaryMemory(const RsTemporaryMemory&) {} }; - - diff --git a/libretroshare/src/util/rsrecogn.cc b/libretroshare/src/util/rsrecogn.cc index 6712608a4..0f5fc0504 100644 --- a/libretroshare/src/util/rsrecogn.cc +++ b/libretroshare/src/util/rsrecogn.cc @@ -145,7 +145,12 @@ bool RsRecogn::loadSigningKeys(std::map &signM /* store in */ uint32_t datalen = recognSerialiser.size(item); - uint8_t *data = (uint8_t *) malloc(datalen); + + RsTemporaryMemory data(datalen) ; + + if(!data) + return false ; + uint32_t pktlen = datalen; int signOk = 0; @@ -181,8 +186,6 @@ bool RsRecogn::loadSigningKeys(std::map &signM #endif // DEBUG_RECOGN delete item; } - - free(data); } /* clean up */ @@ -233,7 +236,12 @@ bool RsRecogn::validateTagSignature(RsGxsRecognSignerItem *signer, RsGxsRecognTa RsGxsRecognSerialiser serialiser; uint32_t datalen = serialiser.size(item); - uint8_t *data = (uint8_t *) malloc(datalen); + + RsTemporaryMemory data(datalen) ; + + if(!data) + return false ; + int signOk = 0; uint32_t pktlen = datalen; @@ -262,8 +270,6 @@ bool RsRecogn::validateTagSignature(RsGxsRecognSignerItem *signer, RsGxsRecognTa EVP_MD_CTX_destroy(mdctx); EVP_PKEY_free(signKey); - - free(data); return (signOk == 1); } diff --git a/libretroshare/src/util/smallobject.cc b/libretroshare/src/util/smallobject.cc index 3d91e99f9..ff9beeb48 100644 --- a/libretroshare/src/util/smallobject.cc +++ b/libretroshare/src/util/smallobject.cc @@ -1,6 +1,7 @@ #include #include "smallobject.h" #include "util/rsthreads.h" +#include "util/rsmemory.h" using namespace RsMemoryManagement ; @@ -206,7 +207,7 @@ SmallObjectAllocator::~SmallObjectAllocator() void *SmallObjectAllocator::allocate(size_t bytes) { if(bytes > _maxObjectSize) - return malloc(bytes) ; + return rs_malloc(bytes) ; else if(_lastAlloc != NULL && _lastAlloc->blockSize() == bytes) return _lastAlloc->allocate() ; else diff --git a/openpgpsdk/src/openpgpsdk/util.c b/openpgpsdk/src/openpgpsdk/util.c index 88fe3f100..491611b8b 100644 --- a/openpgpsdk/src/openpgpsdk/util.c +++ b/openpgpsdk/src/openpgpsdk/util.c @@ -114,13 +114,16 @@ void ops_finish(void) \note Should be freed after use with free(). */ void *ops_mallocz(size_t n) - { - void *m=malloc(n); +{ + void *m=malloc(n); - memset(m,'\0',n); + if(m == NULL) + fprintf(stderr,"(EE) Cannot allocate %d bytes of memory in %s\n",n,__PRETTY_FUNCTION__) ; + else + memset(m,'\0',n); - return m; - } + return m; +} typedef struct { diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri index 2291b93f0..52fc91dea 100644 --- a/plugins/Common/retroshare_plugin.pri +++ b/plugins/Common/retroshare_plugin.pri @@ -68,7 +68,11 @@ win32 { } macx { - + #You can found some information here: + #https://developer.apple.com/library/mac/documentation/Porting/Conceptual/PortingUnix/compiling/compiling.html + QMAKE_LFLAGS_PLUGIN -= -dynamiclib + QMAKE_LFLAGS_PLUGIN += -bundle + QMAKE_LFLAGS_PLUGIN += -bundle_loader "../../retroshare-gui/src/RetroShare06.app/Contents/MacOS/RetroShare06" OBJECTS_DIR = temp/obj MOC_DIR = temp/moc diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro index a989ecd64..64c698fe6 100644 --- a/plugins/FeedReader/FeedReader.pro +++ b/plugins/FeedReader/FeedReader.pro @@ -121,8 +121,6 @@ macx { INCLUDEPATH += . $$INC_DIR LIBS = -lcurl -lxml2 -lxslt -lcrypto - -error(Missing RetroShare-gui library. Remove Plugins from RetroShare.pro)) } openbsd-* { diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro index 29bd3783c..c89ec4396 100644 --- a/plugins/VOIP/VOIP.pro +++ b/plugins/VOIP/VOIP.pro @@ -110,8 +110,6 @@ macx { message(Use system opencv libraries.) LIBS += -lopencv_core -lopencv_highgui -lopencv_imgproc } - -error(Missing RetroShare-gui library. Remove Plugins from RetroShare.pro)) } diff --git a/plugins/VOIP/gui/SpeexProcessor.cpp b/plugins/VOIP/gui/SpeexProcessor.cpp index 4322a1912..1ff7bab17 100644 --- a/plugins/VOIP/gui/SpeexProcessor.cpp +++ b/plugins/VOIP/gui/SpeexProcessor.cpp @@ -1,5 +1,6 @@ #include "SpeexProcessor.h" +#include #include #include @@ -350,7 +351,11 @@ void SpeexOutputProcessor::putNetworkPacket(QString name, QByteArray packet) { if (userJitterHash.contains(name)) { userJitter = userJitterHash.value(name); } else { - userJitter = (SpeexJitter*)malloc(sizeof(SpeexJitter)); + userJitter = (SpeexJitter*)rs_malloc(sizeof(SpeexJitter)); + + if(!userJitter) + return ; + speex_jitter_init(userJitter, speex_decoder_init(&speex_wb_mode), SAMPLING_RATE); int on = 1; speex_decoder_ctl(userJitter->dec, SPEEX_SET_ENH, &on); diff --git a/plugins/VOIP/gui/VideoProcessor.cpp b/plugins/VOIP/gui/VideoProcessor.cpp index ad0a217ec..5f4d5de0e 100644 --- a/plugins/VOIP/gui/VideoProcessor.cpp +++ b/plugins/VOIP/gui/VideoProcessor.cpp @@ -10,6 +10,8 @@ #include #include +#include "util/rsmemory.h" + #include "VideoProcessor.h" #include "QVideoDevice.h" @@ -384,7 +386,10 @@ bool JPEGVideo::encodeData(const QImage& image,uint32_t /* size_hint */,RsVOIPDa buffer.open(QIODevice::WriteOnly) ; encoded_frame.save(&buffer,"JPEG") ; - voip_chunk.data = malloc(HEADER_SIZE + qb.size()); + voip_chunk.data = rs_malloc(HEADER_SIZE + qb.size()); + + if(!voip_chunk.data) + return false ; // build header uint32_t flags = differential_frame ? JPEG_VIDEO_FLAGS_DIFFERENTIAL_FRAME : 0x0 ; @@ -679,7 +684,11 @@ bool FFmpegVideo::encodeData(const QImage& image, uint32_t target_encoding_bitra if(got_output) { - voip_chunk.data = malloc(pkt.size + HEADER_SIZE) ; + voip_chunk.data = rs_malloc(pkt.size + HEADER_SIZE) ; + + if(!voip_chunk.data) + return false ; + uint32_t flags = 0; ((unsigned char *)voip_chunk.data)[0] = VideoProcessor::VIDEO_PROCESSOR_CODEC_ID_MPEG_VIDEO & 0xff ; diff --git a/plugins/VOIP/services/p3VOIP.cc b/plugins/VOIP/services/p3VOIP.cc index d5cc4b06b..859c5bf35 100644 --- a/plugins/VOIP/services/p3VOIP.cc +++ b/plugins/VOIP/services/p3VOIP.cc @@ -280,11 +280,10 @@ int p3VOIP::sendVoipData(const RsPeerId& peer_id,const RsVOIPDataChunk& chunk) std::cerr << "Cannot allocate RsVOIPDataItem !" << std::endl; return false ; } - item->voip_data = malloc(chunk.size) ; + item->voip_data = rs_malloc(chunk.size) ; if(item->voip_data == NULL) { - std::cerr << "Cannot allocate RsVOIPDataItem.voip_data of size " << chunk.size << " !" << std::endl; delete item ; return false ; } @@ -432,7 +431,13 @@ bool p3VOIP::getIncomingData(const RsPeerId& peer_id,std::vectordata_size ; - chunk.data = malloc((*it2)->data_size) ; + chunk.data = rs_malloc((*it2)->data_size) ; + + if(chunk.data == NULL) + { + delete *it2 ; + continue ; + } uint32_t type_flags = (*it2)->flags & (RS_VOIP_FLAGS_AUDIO_DATA | RS_VOIP_FLAGS_VIDEO_DATA) ; if(type_flags == RS_VOIP_FLAGS_AUDIO_DATA) diff --git a/plugins/VOIP/services/rsVOIPItems.cc b/plugins/VOIP/services/rsVOIPItems.cc index afc76b505..cd3132dfd 100644 --- a/plugins/VOIP/services/rsVOIPItems.cc +++ b/plugins/VOIP/services/rsVOIPItems.cc @@ -447,7 +447,14 @@ RsVOIPDataItem::RsVOIPDataItem(void *data, uint32_t pktsize) ok &= getRawUInt32(data, rssize, &offset, &flags); ok &= getRawUInt32(data, rssize, &offset, &data_size); - voip_data = malloc(data_size) ; + if(data_size > rssize || rssize - data_size < offset) + throw std::runtime_error("Not enough space.") ; + + voip_data = rs_malloc(data_size) ; + + if(!voip_data) + throw std::runtime_error("Serialization error.") ; + memcpy(voip_data,&((uint8_t*)data)[offset],data_size) ; offset += data_size ; diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp index 9e960f364..5eff6908c 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp +++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp @@ -501,10 +501,7 @@ void ChatLobbyWidget::updateDisplay() #endif - bool subscribed = false; - if (rsMsgs->getVirtualPeerId(lobby.lobby_id, vpid)) { - subscribed = true; - } + bool subscribed = std::find(lobbies.begin(), lobbies.end(), lobby.lobby_id) != lobbies.end(); QTreeWidgetItem *item = NULL; QTreeWidgetItem *lobby_item =NULL; @@ -1101,13 +1098,10 @@ void ChatLobbyWidget::readChatLobbyInvites() continue ; } - rsMsgs->acceptLobbyInvite((*it).lobby_id,chosen_id); - - RsPeerId vpid; - if(rsMsgs->getVirtualPeerId((*it).lobby_id,vpid )) + if(rsMsgs->acceptLobbyInvite((*it).lobby_id,chosen_id)) ChatDialog::chatFriend(ChatId((*it).lobby_id),true); else - std::cerr << "No lobby known with id 0x" << std::hex << (*it).lobby_id << std::dec << std::endl; + std::cerr << "Can't join lobby with id 0x" << std::hex << (*it).lobby_id << std::dec << std::endl; } } diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index 4b8c8847e..795e73a99 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -6,8 +6,8 @@ 0 0 - 1484 - 791 + 745 + 500 @@ -35,6 +35,18 @@ QFrame::Sunken + + 2 + + + 2 + + + 2 + + + 2 + @@ -107,7 +119,7 @@ - + Qt::Horizontal @@ -226,21 +238,39 @@ - - - 0 - - - - Person - - - - - - - - QFrame::StyledPanel + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 12 + + + + + + 64 + 64 + + + + + 64 + 64 + + + + + + + QFrame::Raised diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 49fc7a9f5..4ef41546f 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -852,8 +852,6 @@ void MessagesDialog::insertMessages() rsMail -> getMessageSummaries(msgList); - std::cerr << "MessagesDialog::insertMessages()" << std::endl; - int filterColumn = ui.filterLineEdit->currentFilter(); /* check the mode we are in */ @@ -1098,25 +1096,34 @@ void MessagesDialog::insertMessages() // From .... { bool setText = true; - if (msgbox == RS_MSG_INBOX || msgbox == RS_MSG_OUTBOX) { + if (msgbox == RS_MSG_INBOX || msgbox == RS_MSG_OUTBOX) + { if ((it->msgflags & RS_MSG_SYSTEM) && it->srcId == ownId) { text = "RetroShare"; - } else { + } + else + { if (it->msgflags & RS_MSG_DISTANT) { // distant message setText = false; if (gotInfo || rsMail->getMessage(it->msgId, msgInfo)) { gotInfo = true; - item->setId(RsGxsId(msgInfo.rsgxsid_srcId), COLUMN_FROM, false); - } else { + + if(msgbox != RS_MSG_INBOX && !msgInfo.rsgxsid_msgto.empty()) + item->setId(RsGxsId(*msgInfo.rsgxsid_msgto.begin()), COLUMN_FROM, false); + else + item->setId(RsGxsId(msgInfo.rsgxsid_srcId), COLUMN_FROM, false); + } + else std::cerr << "MessagesDialog::insertMsgTxtAndFiles() Couldn't find Msg" << std::endl; - } - } else { + } + else text = QString::fromUtf8(rsPeers->getPeerName(it->srcId).c_str()); - } } - } else { + } + else + { if (gotInfo || rsMail->getMessage(it->msgId, msgInfo)) { gotInfo = true; @@ -1459,8 +1466,6 @@ void MessagesDialog::setMsgStar(const QList &items, bool star) void MessagesDialog::insertMsgTxtAndFiles(QTreeWidgetItem *item, bool bSetToRead) { - std::cerr << "MessagesDialog::insertMsgTxtAndFiles()" << std::endl; - /* get its Ids */ std::string cid; std::string mid; diff --git a/retroshare-gui/src/gui/PluginManager.cpp b/retroshare-gui/src/gui/PluginManager.cpp index c558954c6..8581cdae6 100644 --- a/retroshare-gui/src/gui/PluginManager.cpp +++ b/retroshare-gui/src/gui/PluginManager.cpp @@ -69,8 +69,10 @@ PluginManager::defaultLoad( ) //=== get current available plugins ===== QStringList currAvailable = workDir.entryList(QDir::Files); -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) QRegExp trx("*.dll") ; +#elif defined(__MACH__) + QRegExp trx("*.dylib"); #else QRegExp trx("*.so"); #endif diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp index fddb96ee3..a2220f2ff 100644 --- a/retroshare-gui/src/gui/RemoteDirModel.cpp +++ b/retroshare-gui/src/gui/RemoteDirModel.cpp @@ -533,6 +533,20 @@ QVariant RetroshareDirModel::data(const QModelIndex &index, int role) const { if(details->min_age > ageIndicator) return QVariant(QColor(Qt::gray)) ; + else if(RemoteMode) + { + FileInfo info; + QVariant local_file_color = QVariant(QColor(Qt::red)); + if(rsFiles->alreadyHaveFile(details->hash, info)) + return local_file_color; + + std::list downloads; + rsFiles->FileDownloads(downloads); + if(std::find(downloads.begin(), downloads.end(), details->hash) != downloads.end()) + return local_file_color; + else + return QVariant(); + } else return QVariant() ; // standard } /* end of TextColorRole */ diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp index cfe4c11d9..d75606bd9 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp @@ -363,10 +363,7 @@ void SharedFilesDialog::changeCurrentViewModel(int viewTypeIndex) ui.dirTreeView->header()->headerDataChanged(Qt::Horizontal, COLUMN_NAME, COLUMN_DIR) ; -#ifdef DONT_USE_SEARCH_IN_TREE_VIEW - if(viewTypeIndex == VIEW_TYPE_FLAT) -#endif - FilterItems(); + FilterItems(); } void LocalSharedFilesDialog::showProperColumns() @@ -1017,6 +1014,11 @@ void SharedFilesDialog::startFilter() void SharedFilesDialog::FilterItems() { +#ifdef DONT_USE_SEARCH_IN_TREE_VIEW + if(proxyModel == tree_proxyModel) + return; +#endif + QString text = ui.filterPatternLineEdit->text(); setCursor(Qt::WaitCursor); diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index c2bc258e8..f11693669 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -1391,7 +1391,13 @@ void ChatWidget::smileyWidget() void ChatWidget::addSmiley() { - ui->chatTextEdit->textCursor().insertText(qobject_cast(sender())->toolTip().split("|").first()); + QString smiley = qobject_cast(sender())->toolTip().split("|").first(); + // add trailing space + smiley += QString(" "); + // add preceding space when needed (not at start of text or preceding space already exists) + if(!ui->chatTextEdit->textCursor().atStart() && ui->chatTextEdit->toPlainText()[ui->chatTextEdit->textCursor().position() - 1] != QChar(' ')) + smiley = QString(" ") + smiley; + ui->chatTextEdit->textCursor().insertText(smiley); } void ChatWidget::clearChatHistory() diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui index e3bab5679..05e2c9240 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.ui +++ b/retroshare-gui/src/gui/chat/ChatWidget.ui @@ -11,12 +11,21 @@ + + 0 + + + 0 + + + 0 + + + 0 + 2 - - 0 - @@ -37,7 +46,16 @@ QFrame::Raised - + + 0 + + + 0 + + + 0 + + 0 @@ -113,7 +131,16 @@ QFrame::Box - + + 6 + + + 6 + + + 6 + + 6 @@ -299,7 +326,16 @@ border-image: url(:/images/closepressed.png) QFrame::Sunken - + + 2 + + + 2 + + + 2 + + 2 @@ -326,8 +362,8 @@ border-image: url(:/images/closepressed.png) Qt::NoFocus - - :/images/emoticons/kopete/kopete020.png:/images/emoticons/kopete/kopete020.png + + :/emojione/1F603.png:/emojione/1F603.png @@ -486,7 +522,16 @@ border-image: url(:/images/closepressed.png) QFrame::Plain - + + 2 + + + 2 + + + 2 + + 2 @@ -556,7 +601,16 @@ border-image: url(:/images/closepressed.png) QFrame::Sunken - + + 2 + + + 2 + + + 2 + + 2 @@ -637,7 +691,16 @@ border-image: url(:/images/closepressed.png) QFrame::Plain - + + 2 + + + 2 + + + 2 + + 2 @@ -652,7 +715,16 @@ border-image: url(:/images/closepressed.png) QFrame::Raised - + + 0 + + + 0 + + + 0 + + 0 @@ -980,7 +1052,7 @@ border-image: url(:/images/closepressed.png) Quotes the selected text - + :/images/document_save.png:/images/document_save.png @@ -1020,6 +1092,7 @@ border-image: url(:/images/closepressed.png) + diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.cpp b/retroshare-gui/src/gui/common/RSTextBrowser.cpp index 930c506ac..20c76703d 100644 --- a/retroshare-gui/src/gui/common/RSTextBrowser.cpp +++ b/retroshare-gui/src/gui/common/RSTextBrowser.cpp @@ -1,3 +1,5 @@ +#include + #include #include @@ -72,15 +74,25 @@ void RSTextBrowser::paintEvent(QPaintEvent *event) QVariant RSTextBrowser::loadResource(int type, const QUrl &name) { - if (mShowImages || type != QTextDocument::ImageResource || name.scheme().compare("data", Qt::CaseInsensitive) != 0) { - return QTextBrowser::loadResource(type, name); - } + // case 1: always trust the image if it comes from an internal resource + + if(name.scheme().compare("qrc",Qt::CaseInsensitive)==0 && type == QTextDocument::ImageResource) + return QTextBrowser::loadResource(type, name); + + // case 2: only display if the user allows it. Data resources can be bad (svg bombs) but we filter them out globally at the network layer. + // It would be good to add here a home-made resource loader that only loads images and not svg crap, just in case. + + if(name.scheme().compare("data",Qt::CaseInsensitive)==0 && mShowImages) + return QTextBrowser::loadResource(type, name); + + // case 3: otherwise, do not display + + std::cerr << "TEXTBROWSER: refusing load ressource request: type=" << type << " scheme=" << name.scheme().toStdString() << ", url=" << name.toString().toStdString() << std::endl; + + if (mImageBlockWidget) + mImageBlockWidget->show(); - if (mImageBlockWidget) { - mImageBlockWidget->show(); - } - - return QPixmap(":/trolltech/styles/commonstyle/images/file-16.png"); + return QPixmap(":/trolltech/styles/commonstyle/images/file-16.png"); } void RSTextBrowser::setImageBlockWidget(RSImageBlockWidget *widget) diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui index c9c650549..4a79121b9 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui @@ -6,8 +6,8 @@ 0 0 - 635 - 634 + 678 + 727 @@ -60,7 +60,7 @@ - 2 + 0 @@ -470,6 +470,9 @@ + + <html><head/><body><p>This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes.</p></body></html> + Auto-download recommended files from this node @@ -495,12 +498,6 @@ - - AvatarWidget - QLabel -
gui/common/AvatarWidget.h
- 1 - HeaderFrame QFrame @@ -512,6 +509,12 @@ QTextBrowser
gui/common/RSTextBrowser.h
 + + AvatarWidget + QLabel +
gui/common/AvatarWidget.h
+ 1 + diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui index df15425a5..16ec2ee08 100644 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui @@ -94,7 +94,7 @@ - The text below is your PGP certificate. You have to provide it to your friend + The text below is your Retroshare certificate. You have to provide it to your friend @@ -278,7 +278,7 @@ - Please, paste your friend's PGP certificate into the box below + Please, paste your friend's Retroshare certificate into the box below @@ -291,6 +291,9 @@ Courier New + + <html><head/><body><p>This box expects your friend's Retroshare certificate. WARNING: this is different from your friend's PGP key. Do not paste your friend's PGP key here (not even a part of it). It's not going to work.</p></body></html> + QPlainTextEdit::NoWrap @@ -524,16 +527,7 @@ - - 9 - - - 9 - - - 9 - - + 9 diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui index 1e498c0e3..26555e9c4 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui @@ -6,7 +6,7 @@ 0 0 - 861 + 990 668 @@ -27,7 +27,7 @@ - 0 + 1 @@ -61,6 +61,9 @@ + + <html><head/><body><p>The PGP key fingerprint is a---supposedly unforgeable---characteristics of the PGP key. In order to make sure that you're dealing with the right key, compare the fingerprints.</p></body></html> + true @@ -78,6 +81,9 @@ + + <html><head/><body><p>The trust level is an optional and local parameter that you can set in order to remember your option about a given PGP key. It is not used whatsoever to authorize connections. </p></body></html> + Unset @@ -158,7 +164,11 @@ - + + + <html><head/><body><p><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.</span></p></body></html> + + @@ -174,10 +184,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Signing a friend's key is a way to express your trust into this friend, to your other friends. Besides, only signed peers will receive information about your other trusted friends.</p> -<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Signing a key cannot be undone, so do it wisely.</p></body></html> +</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.</span></p></body></html> Sign this PGP key @@ -199,6 +207,9 @@ p, li { white-space: pre-wrap; } + + <html><head/><body><p><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.</span></p></body></html> + Sign PGP key @@ -219,6 +230,9 @@ p, li { white-space: pre-wrap; } + + <html><head/><body><p>Click here if you want to refuse connections to nodes authenticated by this key.</p></body></html> + Deny connections @@ -239,6 +253,9 @@ p, li { white-space: pre-wrap; } + + <html><head/><body><p>Click this if you want your node to accept connecting to Retroshare nodes authenticated by this PGP key. This is done automatically when exchanging your Retroshare certificate with someone. In order to make friends, it is better to exchange certificates than accept connections from a given key, since the certificate also contain useful connection information (IP, DNS, SSL ids, etc).</p></body></html> + Accept connections @@ -292,6 +309,9 @@ p, li { white-space: pre-wrap; } + + <html><head/><body><p>This button will toggle the inclusion of signatures in the ascii display of the PGP key. See the comments about signatures in the other tab. </p></body></html> + Include signatures diff --git a/retroshare-gui/src/gui/emojione.qrc b/retroshare-gui/src/gui/emojione.qrc index fd6e30bac..7a374dd63 100644 --- a/retroshare-gui/src/gui/emojione.qrc +++ b/retroshare-gui/src/gui/emojione.qrc @@ -18,7 +18,7 @@ emojione/1F4A6.png emojione/1F4A7.png emojione/1F4A8.png - emojione/1F4A9.png + emojione/1F4A9.png emojione/1F4C0.png emojione/1F4C1.png emojione/1F4C2.png @@ -188,16 +188,6 @@ emojione/1F199.png emojione/1F201.png emojione/1F202.png - emojione/1F232.png - emojione/1F233.png - emojione/1F234.png - emojione/1F235.png - emojione/1F236.png - emojione/1F237.png - emojione/1F238.png - emojione/1F239.png - emojione/1F250.png - emojione/1F251.png emojione/1F300.png emojione/1F301.png emojione/1F302.png @@ -400,6 +390,7 @@ emojione/1F597.png emojione/1F598.png emojione/1F599.png + emojione/1F59E.png emojione/1F600.png emojione/1F601.png emojione/1F602.png @@ -544,8 +535,6 @@ emojione/2934.png emojione/2935.png emojione/3030.png - emojione/3297.png - emojione/3299.png emojione/1f910.png emojione/1f911.png emojione/1f912.png diff --git a/retroshare-gui/src/gui/emojione/0023-20E3.png b/retroshare-gui/src/gui/emojione/0023-20E3.png index a0f796b9d..511a2a9d6 100644 Binary files a/retroshare-gui/src/gui/emojione/0023-20E3.png and b/retroshare-gui/src/gui/emojione/0023-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/002a-20e3.png b/retroshare-gui/src/gui/emojione/002a-20e3.png index 6a5cf5b27..bc95f409c 100644 Binary files a/retroshare-gui/src/gui/emojione/002a-20e3.png and b/retroshare-gui/src/gui/emojione/002a-20e3.png differ diff --git a/retroshare-gui/src/gui/emojione/0030-20E3.png b/retroshare-gui/src/gui/emojione/0030-20E3.png index baaa1b6c4..c8bb62402 100644 Binary files a/retroshare-gui/src/gui/emojione/0030-20E3.png and b/retroshare-gui/src/gui/emojione/0030-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0031-20E3.png b/retroshare-gui/src/gui/emojione/0031-20E3.png index e26264b1d..80eee63eb 100644 Binary files a/retroshare-gui/src/gui/emojione/0031-20E3.png and b/retroshare-gui/src/gui/emojione/0031-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0032-20E3.png b/retroshare-gui/src/gui/emojione/0032-20E3.png index f4c8157e6..f668ce429 100644 Binary files a/retroshare-gui/src/gui/emojione/0032-20E3.png and b/retroshare-gui/src/gui/emojione/0032-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0033-20E3.png b/retroshare-gui/src/gui/emojione/0033-20E3.png index ffa02be8e..574d1b64e 100644 Binary files a/retroshare-gui/src/gui/emojione/0033-20E3.png and b/retroshare-gui/src/gui/emojione/0033-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0034-20E3.png b/retroshare-gui/src/gui/emojione/0034-20E3.png index a4b2b95c3..3adf0c57d 100644 Binary files a/retroshare-gui/src/gui/emojione/0034-20E3.png and b/retroshare-gui/src/gui/emojione/0034-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0035-20E3.png b/retroshare-gui/src/gui/emojione/0035-20E3.png index 35d7da56d..e2c2e2b98 100644 Binary files a/retroshare-gui/src/gui/emojione/0035-20E3.png and b/retroshare-gui/src/gui/emojione/0035-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0036-20E3.png b/retroshare-gui/src/gui/emojione/0036-20E3.png index 15006c059..5a2828043 100644 Binary files a/retroshare-gui/src/gui/emojione/0036-20E3.png and b/retroshare-gui/src/gui/emojione/0036-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0037-20E3.png b/retroshare-gui/src/gui/emojione/0037-20E3.png index 9a298818a..0fc70e574 100644 Binary files a/retroshare-gui/src/gui/emojione/0037-20E3.png and b/retroshare-gui/src/gui/emojione/0037-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0038-20E3.png b/retroshare-gui/src/gui/emojione/0038-20E3.png index e88638d41..f57e3b91d 100644 Binary files a/retroshare-gui/src/gui/emojione/0038-20E3.png and b/retroshare-gui/src/gui/emojione/0038-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0039-20E3.png b/retroshare-gui/src/gui/emojione/0039-20E3.png index ad7b3ef30..d46d32aa5 100644 Binary files a/retroshare-gui/src/gui/emojione/0039-20E3.png and b/retroshare-gui/src/gui/emojione/0039-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/00A9.png b/retroshare-gui/src/gui/emojione/00A9.png index 8a7669c49..c257d5174 100644 Binary files a/retroshare-gui/src/gui/emojione/00A9.png and b/retroshare-gui/src/gui/emojione/00A9.png differ diff --git a/retroshare-gui/src/gui/emojione/00AE.png b/retroshare-gui/src/gui/emojione/00AE.png index fda87a7fe..30fff1819 100644 Binary files a/retroshare-gui/src/gui/emojione/00AE.png and b/retroshare-gui/src/gui/emojione/00AE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F004.png b/retroshare-gui/src/gui/emojione/1F004.png index 2e3313562..565d71046 100644 Binary files a/retroshare-gui/src/gui/emojione/1F004.png and b/retroshare-gui/src/gui/emojione/1F004.png differ diff --git a/retroshare-gui/src/gui/emojione/1F0CF.png b/retroshare-gui/src/gui/emojione/1F0CF.png index 2af151d66..496830045 100644 Binary files a/retroshare-gui/src/gui/emojione/1F0CF.png and b/retroshare-gui/src/gui/emojione/1F0CF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F170.png b/retroshare-gui/src/gui/emojione/1F170.png index f88065af0..b3248d641 100644 Binary files a/retroshare-gui/src/gui/emojione/1F170.png and b/retroshare-gui/src/gui/emojione/1F170.png differ diff --git a/retroshare-gui/src/gui/emojione/1F171.png b/retroshare-gui/src/gui/emojione/1F171.png index 82391db01..7cfa784e6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F171.png and b/retroshare-gui/src/gui/emojione/1F171.png differ diff --git a/retroshare-gui/src/gui/emojione/1F17E.png b/retroshare-gui/src/gui/emojione/1F17E.png index cfdaef1a8..cb55d7bb1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F17E.png and b/retroshare-gui/src/gui/emojione/1F17E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F17F.png b/retroshare-gui/src/gui/emojione/1F17F.png index 4b66db237..5e3474257 100644 Binary files a/retroshare-gui/src/gui/emojione/1F17F.png and b/retroshare-gui/src/gui/emojione/1F17F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F18E.png b/retroshare-gui/src/gui/emojione/1F18E.png index 7eb1c1882..d7d80a0f4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F18E.png and b/retroshare-gui/src/gui/emojione/1F18E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F191.png b/retroshare-gui/src/gui/emojione/1F191.png index 776a4a0df..e14b5ed9b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F191.png and b/retroshare-gui/src/gui/emojione/1F191.png differ diff --git a/retroshare-gui/src/gui/emojione/1F192.png b/retroshare-gui/src/gui/emojione/1F192.png index dd720a0bb..f83cb84e8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F192.png and b/retroshare-gui/src/gui/emojione/1F192.png differ diff --git a/retroshare-gui/src/gui/emojione/1F193.png b/retroshare-gui/src/gui/emojione/1F193.png index a6082c0b6..f5ef7b5ed 100644 Binary files a/retroshare-gui/src/gui/emojione/1F193.png and b/retroshare-gui/src/gui/emojione/1F193.png differ diff --git a/retroshare-gui/src/gui/emojione/1F194.png b/retroshare-gui/src/gui/emojione/1F194.png index 5a9ab2664..e8e34f50a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F194.png and b/retroshare-gui/src/gui/emojione/1F194.png differ diff --git a/retroshare-gui/src/gui/emojione/1F195.png b/retroshare-gui/src/gui/emojione/1F195.png index dbfb1a94d..c2b783cf5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F195.png and b/retroshare-gui/src/gui/emojione/1F195.png differ diff --git a/retroshare-gui/src/gui/emojione/1F196.png b/retroshare-gui/src/gui/emojione/1F196.png index efd186fda..faf83fe33 100644 Binary files a/retroshare-gui/src/gui/emojione/1F196.png and b/retroshare-gui/src/gui/emojione/1F196.png differ diff --git a/retroshare-gui/src/gui/emojione/1F197.png b/retroshare-gui/src/gui/emojione/1F197.png index 18f03ee72..3d6339085 100644 Binary files a/retroshare-gui/src/gui/emojione/1F197.png and b/retroshare-gui/src/gui/emojione/1F197.png differ diff --git a/retroshare-gui/src/gui/emojione/1F198.png b/retroshare-gui/src/gui/emojione/1F198.png index 31d602560..5dcc3eaed 100644 Binary files a/retroshare-gui/src/gui/emojione/1F198.png and b/retroshare-gui/src/gui/emojione/1F198.png differ diff --git a/retroshare-gui/src/gui/emojione/1F199.png b/retroshare-gui/src/gui/emojione/1F199.png index 3ff1c5230..cb898f3e7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F199.png and b/retroshare-gui/src/gui/emojione/1F199.png differ diff --git a/retroshare-gui/src/gui/emojione/1F19A.png b/retroshare-gui/src/gui/emojione/1F19A.png index df2b20fba..d053d76c5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F19A.png and b/retroshare-gui/src/gui/emojione/1F19A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1E8.png index 980b2e8b8..9444c1376 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1E9.png index fa5dfeca3..0f1522b34 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1EA.png index 52753c2f4..f9478ee50 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1EB.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1EB.png index 46dace6dc..81cedfc9e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1EB.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1EC.png index 6a5edf11c..b24f9d847 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1EE.png index 902ac94b8..f5df49746 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1F1.png index 3a0387beb..450c8d5b0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1F2.png index 756308f88..7d9b44633 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1F4.png index deb73ea5e..23091aff1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1F7.png index 954bcccb1..e3d627be8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1F9.png index 9472ab367..7e5d50505 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1FA.png index 471ebe6cd..9a78fb958 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1FC.png index aaffaa6d7..52e31df69 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1FF.png index 77b9627a8..b455c0fa0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1E6.png index b93f40574..307530b96 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1E7.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1E7.png index 6b2a36d05..bcc558454 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1E7.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1E9.png index 025e840f8..4d5232de4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1EA.png index 7b275b51f..5e887afda 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1EB.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1EB.png index 381a2faaf..7a586453d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1EB.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1EC.png index 009f204e6..01d7de0fd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1ED.png index 3f8955778..2107ff717 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1EE.png index d6d1fb04a..a09ac6764 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1EF.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1EF.png index 5497f0123..405f539fd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1EF.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1F2.png index e46149164..171fa5eaa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1F3.png index b02bb8fab..a22c86c89 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1F4.png index 753257a1b..7bf4d571f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1F7.png index e84fb929d..dae5f5f17 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1F8.png index 49ec86c7f..711c45a76 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1F9.png index 6c65c2d38..be481e7d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1FC.png index 3e63e8768..a6016b843 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1FE.png index b54f613d7..7263ae389 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1FF.png index 7a8b34a33..753941407 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1E6.png index 028d730ff..050ebca18 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1E9.png index 0e4ec3e8a..cdc28e96c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1EB.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1EB.png index aa9fe7380..d221f2bab 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1EB.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1EC.png index ab28fed02..b4d0281d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1ED.png index e3400af28..49be7c66e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1EE.png index 83d9ccb9c..13260140d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1F1.png index 6e21cd6c1..c1e8fa72d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1F2.png index d73ce7b05..057318c51 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1F3.png index bc7147655..c9407f3d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1F4.png index f177c15ec..f2347a63a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1F7.png index f96f93409..58bdcf8a9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1FA.png index 2c971d588..665d01ecc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1FB.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1FB.png index c4af5fc6d..4fc447c5f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1FB.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1FE.png index fd66f0797..dc4a2b4a5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1FF.png index 64051b1dd..525fda409 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E9-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1E9-1F1EA.png index 63dbd67c8..64097cd49 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E9-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1E9-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E9-1F1EF.png b/retroshare-gui/src/gui/emojione/1F1E9-1F1EF.png index 2e146c7fc..ac1ec0e94 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E9-1F1EF.png and b/retroshare-gui/src/gui/emojione/1F1E9-1F1EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E9-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1E9-1F1F0.png index 6d1b2a22c..47e8e5043 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E9-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1E9-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E9-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1E9-1F1F2.png index ddd7279f0..77f3ff77e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E9-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1E9-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E9-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1E9-1F1F4.png index ad9ef31bb..0f377f7fd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E9-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1E9-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E9-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1E9-1F1FF.png index 6dd0b3015..b88fcdc09 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E9-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1E9-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1E8.png index 69e96bc35..ed1346f97 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1EA.png index 201078b29..2ff982cdc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1EC.png index 4fee593f2..2d5be073b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1ED.png index e3591363a..17baa1776 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1F7.png index b31ba9f50..5945efc8f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1F8.png index 7cd1fa284..cfe2ad773 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1F9.png index 4f2826a0b..ffb65dd25 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EB-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1EB-1F1EE.png index 516a5d979..b2fc3c8bf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EB-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1EB-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EB-1F1EF.png b/retroshare-gui/src/gui/emojione/1F1EB-1F1EF.png index a97414f77..b396385a2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EB-1F1EF.png and b/retroshare-gui/src/gui/emojione/1F1EB-1F1EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EB-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1EB-1F1F0.png index ab752ce62..07289abbf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EB-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1EB-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EB-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1EB-1F1F2.png index 2ced6315e..137b702a6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EB-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1EB-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EB-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1EB-1F1F4.png index d32baf6d9..e88e0e24f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EB-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1EB-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EB-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1EB-1F1F7.png index f4cceb33b..20527eac5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EB-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1EB-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1E6.png index e50c33d5c..4da8e632a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1E7.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1E7.png index b83808086..4f5707f3c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1E7.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1E9.png index aa7bd8459..3c5fd134c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1EA.png index 509ae5262..aa83ae096 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1ED.png index b88793b2f..31f632d30 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1EE.png index 7aca70bf2..f5939ef0a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1F1.png index 0333e51e9..5cea230ee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1F2.png index 3f3788274..18a2ddd5c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1F3.png index 879ddebee..cd2d53a65 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1F6.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1F6.png index dea20523e..189fcf65d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1F6.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1F6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1F7.png index 9b724e00d..35c61141c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1F9.png index 1df06cfd1..a12ce474d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1FA.png index 172ff7bc8..ec2bbf744 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1FC.png index 7e9cabec1..47d36a5f7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1FE.png index cdae906c4..eea0c9745 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1ED-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1ED-1F1F0.png index 37b002c68..2d3df30b9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1ED-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1ED-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1ED-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1ED-1F1F3.png index 0c5c9852c..b6d2f02f5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1ED-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1ED-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1ED-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1ED-1F1F7.png index 9e31c399a..6bcc20a27 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1ED-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1ED-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1ED-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1ED-1F1F9.png index 6b4c2cc20..770934122 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1ED-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1ED-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1ED-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1ED-1F1FA.png index 57b008c1e..43d9ee414 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1ED-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1ED-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1E9.png index ff9f32304..3f93d4bda 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1EA.png index e3e382d73..c432556a3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1F1.png index e1a58eb6a..7c185b62e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1F3.png index f1f110832..6cba61acb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1F6.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1F6.png index e106cd651..5c193d8fd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1F6.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1F6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1F7.png index 880103635..2824dd70d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1F8.png index 3cbfa0fd0..310fdbe66 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1F9.png index 8bc7af03f..4ead88b47 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EF-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1EF-1F1EA.png index 81f82efba..f9a8ce7dc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EF-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1EF-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EF-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1EF-1F1F2.png index 2550a9e47..f8ddb8e8c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EF-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1EF-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EF-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1EF-1F1F4.png index b3cb8d391..e792bccf7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EF-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1EF-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EF-1F1F5.png b/retroshare-gui/src/gui/emojione/1F1EF-1F1F5.png index 78c983ece..7171833f9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EF-1F1F5.png and b/retroshare-gui/src/gui/emojione/1F1EF-1F1F5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1EA.png index f17798aeb..dba4e063f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1EC.png index 0f0979090..401ed94cb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1ED.png index 309b2f592..75cf8c2be 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1EE.png index c424e798f..5cb70fa12 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1F2.png index e643063e0..a39239115 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1F3.png index 18f64abe7..c4c262969 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1F5.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1F5.png index c4a6f0e6e..e2af6dd27 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1F5.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1F5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1F7.png index 6eb684673..37e640042 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1FC.png index 2e2387524..9645f171c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1FE.png index 7841ed7df..e821f3c5a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1FF.png index a31a525be..5943711a4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1E6.png index 3b2feb481..203e6fa6c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1E7.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1E7.png index 3f3c40885..3661b90b3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1E7.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1E8.png index 59e95546b..08c7a7eb4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1EE.png index 047334b50..5169f4825 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1F0.png index 7b88fc60b..63cdf4cdf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1F7.png index 0920bb40a..5ce1f9e91 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1F8.png index 8ab5bf46c..6e6a93376 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1F9.png index d8a04cb16..e7a4e2157 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1FA.png index 32d1ea069..28a4b7506 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1FB.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1FB.png index 22d94fe1d..81fc06316 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1FB.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1FE.png index abe748ddb..aa5966102 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1E6.png index 06e11ee69..cc0275b4a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1E8.png index 8e6f7fa47..a362e2de5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1E9.png index 1c01c9b5e..64556857d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1EA.png index 11c87d50e..2a5bd4440 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1EC.png index b93b1f6dc..47bb94902 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1ED.png index 76d8fafd6..332ab31a5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F0.png index 0720d7762..8ac7574a8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F1.png index 280586dd5..019b2b705 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F2.png index 62cc6005a..5de7cf32c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F3.png index 62998752b..f7dea4702 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F4.png index 60b6b0f9e..c4e2887fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F7.png index a4acbca13..4bf5f988d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F8.png index 09043c271..88c603947 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F9.png index b5f9e578a..7716807cb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1FA.png index a732c79dc..25a697491 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1FB.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1FB.png index dacc2d875..9b61c743c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1FB.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1FC.png index a8af8e36a..925d07073 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1FD.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1FD.png index 81a32d22d..f430ef3a5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1FD.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1FD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1FE.png index 82900138c..5c07c147f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1FF.png index 90535efae..e75eff224 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1E6.png index b055d22e9..4ed5b28bc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1E8.png index be15a5aa1..6e21c3f47 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1EA.png index f5a610bb9..26f8c31a1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1EC.png index 26b92b89c..bfe4f640e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1EE.png index 4135e4676..c0a462a21 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1F1.png index 4f146b244..5f042de7c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1F4.png index 5d073242f..f74080a07 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1F5.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1F5.png index b3b870955..1bf4e39cf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1F5.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1F5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1F7.png index f0179d154..60279d858 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1FA.png index b09171da0..a114dbc04 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1FF.png index 4ae17b0fc..72a178877 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F4-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1F4-1F1F2.png index 15ee48cce..772ec69fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F4-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1F4-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1E6.png index 64d7ed1e1..6c65714d3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1EA.png index 12dffd53d..49c2ed41a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1EB.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1EB.png index cd49d119b..97b253cac 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1EB.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1EC.png index 0535abbcd..34b6c1535 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1ED.png index 2adeefe7a..964713f26 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1F0.png index b315443bd..fe7640bc6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1F1.png index fcdc24c74..97e699ea9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1F7.png index 068fc0b9f..637e7414e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1F8.png index ccb4a6956..708bfa927 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1F9.png index ea472614f..5c3fd7db6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1FC.png index a998000d8..559b3aa5b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1FE.png index 7ea74f65e..27956e54d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F6-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1F6-1F1E6.png index 02a4b22e9..a964faed6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F6-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1F6-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F7-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1F7-1F1F4.png index 6502019c1..01172e315 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F7-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1F7-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F7-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1F7-1F1F8.png index acc903da5..f74f4a419 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F7-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1F7-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F7-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1F7-1F1FA.png index b2c77554a..4f3bbbc03 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F7-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1F7-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F7-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1F7-1F1FC.png index 0d30c99c7..cc0a3f0c8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F7-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1F7-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1E6.png index 2bf8bde83..ca5dd20da 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1E7.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1E7.png index 1c5da861b..1b124c904 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1E7.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1E8.png index 14b1d72f5..3968be7bd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1E9.png index ef5c15382..7b0d2f243 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1EA.png index 10ba59c54..bc59c94e7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1EC.png index 6486fd9d1..ab0363e72 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1ED.png index 7858fcc8a..1d8669a38 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1EE.png index 7ddf538e5..4fb858be3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F0.png index be1f9c849..7364eead6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F1.png index ff8eb7663..51843f8d0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F2.png index 80f9582d8..67903cb28 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F3.png index ba3a70e3a..96b182073 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F4.png index ac6fc3f61..7c500767e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F7.png index 2810f15fd..a11c2919c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F9.png index a8c5dc4ae..39bfd4c20 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1FB.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1FB.png index 7e4bc3304..afc717dee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1FB.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1FE.png index cbc53f2b9..80ee51681 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1FF.png index 0c65ebfd7..bd0815625 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1E9.png index a05368abb..3da5c5bb2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1EC.png index 1789642d5..3c4af9a24 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1ED.png index 6c70eba77..6f79a6d69 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1EF.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1EF.png index 2fc39ab42..139669dc3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1EF.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1F1.png index f5c7083b8..23f2eff95 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1F2.png index cb6267b7c..27f2e0179 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1F3.png index 3fae721f5..a6aa7bdb8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1F4.png index 545d4f1c9..23965f3c2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1F7.png index 81a8b5da0..2f96b97ca 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1F9.png index 6a8dff0d8..88e6f383f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1FB.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1FB.png index 239f3a76d..5c4bff9bd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1FB.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1FC.png index 75dc1d4e5..2d3e8180f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1FF.png index ebeced101..f81163801 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FA-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1FA-1F1E6.png index 0f67f506f..4e9a768f1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FA-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1FA-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FA-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1FA-1F1EC.png index a5ad3a633..784ce4ab5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FA-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1FA-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FA-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1FA-1F1F8.png index f617f81df..9fc60f33b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FA-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1FA-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FA-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1FA-1F1FE.png index 6b8403711..139fb2107 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FA-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1FA-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FA-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1FA-1F1FF.png index 8d3340aa8..9070f6188 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FA-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1FA-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FB-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1FB-1F1E6.png index da671a5f6..4731c943a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FB-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1FB-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FB-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1FB-1F1E8.png index 7bc5de6f2..077083a8c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FB-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1FB-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FB-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1FB-1F1EA.png index c4033d032..3db950ba3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FB-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1FB-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FB-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1FB-1F1EE.png index a46931fd9..2cfe1e1fc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FB-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1FB-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FB-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1FB-1F1F3.png index e951c3683..de28f4727 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FB-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1FB-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FB-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1FB-1F1FA.png index b509fd543..afe90e932 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FB-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1FB-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FC-1F1EB.png b/retroshare-gui/src/gui/emojione/1F1FC-1F1EB.png index bb32b07c8..7ee75aac2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FC-1F1EB.png and b/retroshare-gui/src/gui/emojione/1F1FC-1F1EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FC-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1FC-1F1F8.png index 29c533a06..8c0b8aa74 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FC-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1FC-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FD-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1FD-1F1F0.png index 25cf1d357..601650411 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FD-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1FD-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FE-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1FE-1F1EA.png index 786a53154..3b971bff0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FE-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1FE-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FF-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1FF-1F1E6.png index 455a84de1..3e4e1d183 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FF-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1FF-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FF-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1FF-1F1F2.png index f941190e9..e57447667 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FF-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1FF-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FF-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1FF-1F1FC.png index 39a32ef04..911c755b9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FF-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1FF-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F201.png b/retroshare-gui/src/gui/emojione/1F201.png index 7348dcc23..0b65aee22 100644 Binary files a/retroshare-gui/src/gui/emojione/1F201.png and b/retroshare-gui/src/gui/emojione/1F201.png differ diff --git a/retroshare-gui/src/gui/emojione/1F202.png b/retroshare-gui/src/gui/emojione/1F202.png index 740314218..784fa1237 100644 Binary files a/retroshare-gui/src/gui/emojione/1F202.png and b/retroshare-gui/src/gui/emojione/1F202.png differ diff --git a/retroshare-gui/src/gui/emojione/1F21A.png b/retroshare-gui/src/gui/emojione/1F21A.png index b83866633..5d0900b70 100644 Binary files a/retroshare-gui/src/gui/emojione/1F21A.png and b/retroshare-gui/src/gui/emojione/1F21A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F22F.png b/retroshare-gui/src/gui/emojione/1F22F.png index 6ab0c4079..6700de8af 100644 Binary files a/retroshare-gui/src/gui/emojione/1F22F.png and b/retroshare-gui/src/gui/emojione/1F22F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F232.png b/retroshare-gui/src/gui/emojione/1F232.png index 81ef44221..a80d9da35 100644 Binary files a/retroshare-gui/src/gui/emojione/1F232.png and b/retroshare-gui/src/gui/emojione/1F232.png differ diff --git a/retroshare-gui/src/gui/emojione/1F233.png b/retroshare-gui/src/gui/emojione/1F233.png index 17d3e9c8f..0698f13c0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F233.png and b/retroshare-gui/src/gui/emojione/1F233.png differ diff --git a/retroshare-gui/src/gui/emojione/1F234.png b/retroshare-gui/src/gui/emojione/1F234.png index 410312b8b..4a554ff29 100644 Binary files a/retroshare-gui/src/gui/emojione/1F234.png and b/retroshare-gui/src/gui/emojione/1F234.png differ diff --git a/retroshare-gui/src/gui/emojione/1F235.png b/retroshare-gui/src/gui/emojione/1F235.png index a2fc2e438..6d773fe8a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F235.png and b/retroshare-gui/src/gui/emojione/1F235.png differ diff --git a/retroshare-gui/src/gui/emojione/1F236.png b/retroshare-gui/src/gui/emojione/1F236.png index d6cdfba4a..aa0bfbefd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F236.png and b/retroshare-gui/src/gui/emojione/1F236.png differ diff --git a/retroshare-gui/src/gui/emojione/1F237.png b/retroshare-gui/src/gui/emojione/1F237.png index 7a22ff967..6aa777599 100644 Binary files a/retroshare-gui/src/gui/emojione/1F237.png and b/retroshare-gui/src/gui/emojione/1F237.png differ diff --git a/retroshare-gui/src/gui/emojione/1F238.png b/retroshare-gui/src/gui/emojione/1F238.png index c32caaad0..e68cedbe6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F238.png and b/retroshare-gui/src/gui/emojione/1F238.png differ diff --git a/retroshare-gui/src/gui/emojione/1F239.png b/retroshare-gui/src/gui/emojione/1F239.png index 16446cd33..187d5d189 100644 Binary files a/retroshare-gui/src/gui/emojione/1F239.png and b/retroshare-gui/src/gui/emojione/1F239.png differ diff --git a/retroshare-gui/src/gui/emojione/1F23A.png b/retroshare-gui/src/gui/emojione/1F23A.png index 8731f44f2..466b06cf4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F23A.png and b/retroshare-gui/src/gui/emojione/1F23A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F250.png b/retroshare-gui/src/gui/emojione/1F250.png index f8019593f..5468e2bf0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F250.png and b/retroshare-gui/src/gui/emojione/1F250.png differ diff --git a/retroshare-gui/src/gui/emojione/1F251.png b/retroshare-gui/src/gui/emojione/1F251.png index bc5503894..35d029586 100644 Binary files a/retroshare-gui/src/gui/emojione/1F251.png and b/retroshare-gui/src/gui/emojione/1F251.png differ diff --git a/retroshare-gui/src/gui/emojione/1F300.png b/retroshare-gui/src/gui/emojione/1F300.png index 36d6ed415..2ab11057f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F300.png and b/retroshare-gui/src/gui/emojione/1F300.png differ diff --git a/retroshare-gui/src/gui/emojione/1F301.png b/retroshare-gui/src/gui/emojione/1F301.png index 1f76f38d7..a2f7a1fbe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F301.png and b/retroshare-gui/src/gui/emojione/1F301.png differ diff --git a/retroshare-gui/src/gui/emojione/1F302.png b/retroshare-gui/src/gui/emojione/1F302.png index 9809aecd5..61c090000 100644 Binary files a/retroshare-gui/src/gui/emojione/1F302.png and b/retroshare-gui/src/gui/emojione/1F302.png differ diff --git a/retroshare-gui/src/gui/emojione/1F303.png b/retroshare-gui/src/gui/emojione/1F303.png index b5eac847b..99ab83e80 100644 Binary files a/retroshare-gui/src/gui/emojione/1F303.png and b/retroshare-gui/src/gui/emojione/1F303.png differ diff --git a/retroshare-gui/src/gui/emojione/1F304.png b/retroshare-gui/src/gui/emojione/1F304.png index e4bf0b85e..63ba56d07 100644 Binary files a/retroshare-gui/src/gui/emojione/1F304.png and b/retroshare-gui/src/gui/emojione/1F304.png differ diff --git a/retroshare-gui/src/gui/emojione/1F305.png b/retroshare-gui/src/gui/emojione/1F305.png index cf035ae89..2005d89ee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F305.png and b/retroshare-gui/src/gui/emojione/1F305.png differ diff --git a/retroshare-gui/src/gui/emojione/1F306.png b/retroshare-gui/src/gui/emojione/1F306.png index 46357b67f..59b84489b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F306.png and b/retroshare-gui/src/gui/emojione/1F306.png differ diff --git a/retroshare-gui/src/gui/emojione/1F307.png b/retroshare-gui/src/gui/emojione/1F307.png index f3d45f3c7..1581aadee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F307.png and b/retroshare-gui/src/gui/emojione/1F307.png differ diff --git a/retroshare-gui/src/gui/emojione/1F308.png b/retroshare-gui/src/gui/emojione/1F308.png index ed5f2f20a..baa210688 100644 Binary files a/retroshare-gui/src/gui/emojione/1F308.png and b/retroshare-gui/src/gui/emojione/1F308.png differ diff --git a/retroshare-gui/src/gui/emojione/1F309.png b/retroshare-gui/src/gui/emojione/1F309.png index cafc49272..0e3818cdc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F309.png and b/retroshare-gui/src/gui/emojione/1F309.png differ diff --git a/retroshare-gui/src/gui/emojione/1F30A.png b/retroshare-gui/src/gui/emojione/1F30A.png index dddc17bef..52c1fdce2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F30A.png and b/retroshare-gui/src/gui/emojione/1F30A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F30B.png b/retroshare-gui/src/gui/emojione/1F30B.png index 0c6bd2648..88dc23dab 100644 Binary files a/retroshare-gui/src/gui/emojione/1F30B.png and b/retroshare-gui/src/gui/emojione/1F30B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F30C.png b/retroshare-gui/src/gui/emojione/1F30C.png index 0518d8952..7f4877734 100644 Binary files a/retroshare-gui/src/gui/emojione/1F30C.png and b/retroshare-gui/src/gui/emojione/1F30C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F30D.png b/retroshare-gui/src/gui/emojione/1F30D.png index d8fe2a7b2..bdad3d019 100644 Binary files a/retroshare-gui/src/gui/emojione/1F30D.png and b/retroshare-gui/src/gui/emojione/1F30D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F30E.png b/retroshare-gui/src/gui/emojione/1F30E.png index 47c8b02a5..602088930 100644 Binary files a/retroshare-gui/src/gui/emojione/1F30E.png and b/retroshare-gui/src/gui/emojione/1F30E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F30F.png b/retroshare-gui/src/gui/emojione/1F30F.png index c7edcdd61..846579f07 100644 Binary files a/retroshare-gui/src/gui/emojione/1F30F.png and b/retroshare-gui/src/gui/emojione/1F30F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F310.png b/retroshare-gui/src/gui/emojione/1F310.png index 1a549b958..e81e2e6b1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F310.png and b/retroshare-gui/src/gui/emojione/1F310.png differ diff --git a/retroshare-gui/src/gui/emojione/1F311.png b/retroshare-gui/src/gui/emojione/1F311.png index 420be2017..509024724 100644 Binary files a/retroshare-gui/src/gui/emojione/1F311.png and b/retroshare-gui/src/gui/emojione/1F311.png differ diff --git a/retroshare-gui/src/gui/emojione/1F312.png b/retroshare-gui/src/gui/emojione/1F312.png index 8ee328636..ba98f5fce 100644 Binary files a/retroshare-gui/src/gui/emojione/1F312.png and b/retroshare-gui/src/gui/emojione/1F312.png differ diff --git a/retroshare-gui/src/gui/emojione/1F313.png b/retroshare-gui/src/gui/emojione/1F313.png index 138649e3c..faf23868f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F313.png and b/retroshare-gui/src/gui/emojione/1F313.png differ diff --git a/retroshare-gui/src/gui/emojione/1F314.png b/retroshare-gui/src/gui/emojione/1F314.png index b487f588c..48beec030 100644 Binary files a/retroshare-gui/src/gui/emojione/1F314.png and b/retroshare-gui/src/gui/emojione/1F314.png differ diff --git a/retroshare-gui/src/gui/emojione/1F315.png b/retroshare-gui/src/gui/emojione/1F315.png index e219e6018..db80c0f6f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F315.png and b/retroshare-gui/src/gui/emojione/1F315.png differ diff --git a/retroshare-gui/src/gui/emojione/1F316.png b/retroshare-gui/src/gui/emojione/1F316.png index 0bba29985..98c655c9c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F316.png and b/retroshare-gui/src/gui/emojione/1F316.png differ diff --git a/retroshare-gui/src/gui/emojione/1F317.png b/retroshare-gui/src/gui/emojione/1F317.png index e6e0bded8..795c31f5a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F317.png and b/retroshare-gui/src/gui/emojione/1F317.png differ diff --git a/retroshare-gui/src/gui/emojione/1F318.png b/retroshare-gui/src/gui/emojione/1F318.png index cdabf9b90..06e297144 100644 Binary files a/retroshare-gui/src/gui/emojione/1F318.png and b/retroshare-gui/src/gui/emojione/1F318.png differ diff --git a/retroshare-gui/src/gui/emojione/1F319.png b/retroshare-gui/src/gui/emojione/1F319.png index c3909c208..c777cf537 100644 Binary files a/retroshare-gui/src/gui/emojione/1F319.png and b/retroshare-gui/src/gui/emojione/1F319.png differ diff --git a/retroshare-gui/src/gui/emojione/1F31A.png b/retroshare-gui/src/gui/emojione/1F31A.png index dc53fae8c..f053bafb1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F31A.png and b/retroshare-gui/src/gui/emojione/1F31A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F31B.png b/retroshare-gui/src/gui/emojione/1F31B.png index 57f8e9654..a53a6708e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F31B.png and b/retroshare-gui/src/gui/emojione/1F31B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F31C.png b/retroshare-gui/src/gui/emojione/1F31C.png index 2e3119c3d..544fc3b7d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F31C.png and b/retroshare-gui/src/gui/emojione/1F31C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F31D.png b/retroshare-gui/src/gui/emojione/1F31D.png index 243244bf9..548370628 100644 Binary files a/retroshare-gui/src/gui/emojione/1F31D.png and b/retroshare-gui/src/gui/emojione/1F31D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F31E.png b/retroshare-gui/src/gui/emojione/1F31E.png index aa2a55a63..01eb0f8e0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F31E.png and b/retroshare-gui/src/gui/emojione/1F31E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F31F.png b/retroshare-gui/src/gui/emojione/1F31F.png index 8e6a42093..85445e940 100644 Binary files a/retroshare-gui/src/gui/emojione/1F31F.png and b/retroshare-gui/src/gui/emojione/1F31F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F320.png b/retroshare-gui/src/gui/emojione/1F320.png index 9dfbe9540..e371b3c21 100644 Binary files a/retroshare-gui/src/gui/emojione/1F320.png and b/retroshare-gui/src/gui/emojione/1F320.png differ diff --git a/retroshare-gui/src/gui/emojione/1F321.png b/retroshare-gui/src/gui/emojione/1F321.png index a9df7e943..40449cdcf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F321.png and b/retroshare-gui/src/gui/emojione/1F321.png differ diff --git a/retroshare-gui/src/gui/emojione/1F327.png b/retroshare-gui/src/gui/emojione/1F327.png index 82f1d9dac..1205c3fbe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F327.png and b/retroshare-gui/src/gui/emojione/1F327.png differ diff --git a/retroshare-gui/src/gui/emojione/1F328.png b/retroshare-gui/src/gui/emojione/1F328.png index eda99b703..ba67dbe7c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F328.png and b/retroshare-gui/src/gui/emojione/1F328.png differ diff --git a/retroshare-gui/src/gui/emojione/1F329.png b/retroshare-gui/src/gui/emojione/1F329.png index 6bb0fe7a2..cfaed819c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F329.png and b/retroshare-gui/src/gui/emojione/1F329.png differ diff --git a/retroshare-gui/src/gui/emojione/1F32A.png b/retroshare-gui/src/gui/emojione/1F32A.png index 7db53e452..c81d8cbd3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F32A.png and b/retroshare-gui/src/gui/emojione/1F32A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F32B.png b/retroshare-gui/src/gui/emojione/1F32B.png index 187701701..69a793720 100644 Binary files a/retroshare-gui/src/gui/emojione/1F32B.png and b/retroshare-gui/src/gui/emojione/1F32B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F32C.png b/retroshare-gui/src/gui/emojione/1F32C.png index 74d3ba541..14b9a75b1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F32C.png and b/retroshare-gui/src/gui/emojione/1F32C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F330.png b/retroshare-gui/src/gui/emojione/1F330.png index 5f039381a..54d338f89 100644 Binary files a/retroshare-gui/src/gui/emojione/1F330.png and b/retroshare-gui/src/gui/emojione/1F330.png differ diff --git a/retroshare-gui/src/gui/emojione/1F331.png b/retroshare-gui/src/gui/emojione/1F331.png index 8efae8cb4..dbe55869b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F331.png and b/retroshare-gui/src/gui/emojione/1F331.png differ diff --git a/retroshare-gui/src/gui/emojione/1F332.png b/retroshare-gui/src/gui/emojione/1F332.png index 15a71c17e..53e54062f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F332.png and b/retroshare-gui/src/gui/emojione/1F332.png differ diff --git a/retroshare-gui/src/gui/emojione/1F333.png b/retroshare-gui/src/gui/emojione/1F333.png index a3e7762d5..39e2598c8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F333.png and b/retroshare-gui/src/gui/emojione/1F333.png differ diff --git a/retroshare-gui/src/gui/emojione/1F334.png b/retroshare-gui/src/gui/emojione/1F334.png index a9221da3b..cc353daaa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F334.png and b/retroshare-gui/src/gui/emojione/1F334.png differ diff --git a/retroshare-gui/src/gui/emojione/1F335.png b/retroshare-gui/src/gui/emojione/1F335.png index f029410fc..c26fc5d79 100644 Binary files a/retroshare-gui/src/gui/emojione/1F335.png and b/retroshare-gui/src/gui/emojione/1F335.png differ diff --git a/retroshare-gui/src/gui/emojione/1F336.png b/retroshare-gui/src/gui/emojione/1F336.png index 098925490..1180b003e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F336.png and b/retroshare-gui/src/gui/emojione/1F336.png differ diff --git a/retroshare-gui/src/gui/emojione/1F337.png b/retroshare-gui/src/gui/emojione/1F337.png index 06f36a6c7..9d2f18beb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F337.png and b/retroshare-gui/src/gui/emojione/1F337.png differ diff --git a/retroshare-gui/src/gui/emojione/1F338.png b/retroshare-gui/src/gui/emojione/1F338.png index 8d3c8048b..45a9113d3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F338.png and b/retroshare-gui/src/gui/emojione/1F338.png differ diff --git a/retroshare-gui/src/gui/emojione/1F339.png b/retroshare-gui/src/gui/emojione/1F339.png index c65bd61b9..b4dd0f450 100644 Binary files a/retroshare-gui/src/gui/emojione/1F339.png and b/retroshare-gui/src/gui/emojione/1F339.png differ diff --git a/retroshare-gui/src/gui/emojione/1F33A.png b/retroshare-gui/src/gui/emojione/1F33A.png index 2e4526342..7159d5f6d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F33A.png and b/retroshare-gui/src/gui/emojione/1F33A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F33B.png b/retroshare-gui/src/gui/emojione/1F33B.png index 5dd8f0be9..dfe138438 100644 Binary files a/retroshare-gui/src/gui/emojione/1F33B.png and b/retroshare-gui/src/gui/emojione/1F33B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F33C.png b/retroshare-gui/src/gui/emojione/1F33C.png index 7b27c12ff..17320ed61 100644 Binary files a/retroshare-gui/src/gui/emojione/1F33C.png and b/retroshare-gui/src/gui/emojione/1F33C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F33D.png b/retroshare-gui/src/gui/emojione/1F33D.png index a6a7a57f0..bc19512b0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F33D.png and b/retroshare-gui/src/gui/emojione/1F33D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F33E.png b/retroshare-gui/src/gui/emojione/1F33E.png index 4a5011024..6fed0c55d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F33E.png and b/retroshare-gui/src/gui/emojione/1F33E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F33F.png b/retroshare-gui/src/gui/emojione/1F33F.png index 619ec4d70..9cf4d974b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F33F.png and b/retroshare-gui/src/gui/emojione/1F33F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F340.png b/retroshare-gui/src/gui/emojione/1F340.png index aa6a0ee43..9d4b8df9b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F340.png and b/retroshare-gui/src/gui/emojione/1F340.png differ diff --git a/retroshare-gui/src/gui/emojione/1F341.png b/retroshare-gui/src/gui/emojione/1F341.png index 38813fa56..b9bc1fca4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F341.png and b/retroshare-gui/src/gui/emojione/1F341.png differ diff --git a/retroshare-gui/src/gui/emojione/1F342.png b/retroshare-gui/src/gui/emojione/1F342.png index cc26a0caf..12b439007 100644 Binary files a/retroshare-gui/src/gui/emojione/1F342.png and b/retroshare-gui/src/gui/emojione/1F342.png differ diff --git a/retroshare-gui/src/gui/emojione/1F343.png b/retroshare-gui/src/gui/emojione/1F343.png index 3012b6810..ef904d6cb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F343.png and b/retroshare-gui/src/gui/emojione/1F343.png differ diff --git a/retroshare-gui/src/gui/emojione/1F344.png b/retroshare-gui/src/gui/emojione/1F344.png index 6b9cc7082..b8782d509 100644 Binary files a/retroshare-gui/src/gui/emojione/1F344.png and b/retroshare-gui/src/gui/emojione/1F344.png differ diff --git a/retroshare-gui/src/gui/emojione/1F345.png b/retroshare-gui/src/gui/emojione/1F345.png index 82603a58d..37c83f11f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F345.png and b/retroshare-gui/src/gui/emojione/1F345.png differ diff --git a/retroshare-gui/src/gui/emojione/1F346.png b/retroshare-gui/src/gui/emojione/1F346.png index eb3a2b2cf..3a67020b1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F346.png and b/retroshare-gui/src/gui/emojione/1F346.png differ diff --git a/retroshare-gui/src/gui/emojione/1F347.png b/retroshare-gui/src/gui/emojione/1F347.png index c7c22b994..bff815106 100644 Binary files a/retroshare-gui/src/gui/emojione/1F347.png and b/retroshare-gui/src/gui/emojione/1F347.png differ diff --git a/retroshare-gui/src/gui/emojione/1F348.png b/retroshare-gui/src/gui/emojione/1F348.png index 3e0ef76fb..da19f1623 100644 Binary files a/retroshare-gui/src/gui/emojione/1F348.png and b/retroshare-gui/src/gui/emojione/1F348.png differ diff --git a/retroshare-gui/src/gui/emojione/1F349.png b/retroshare-gui/src/gui/emojione/1F349.png index 51f923a2f..065d3ecee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F349.png and b/retroshare-gui/src/gui/emojione/1F349.png differ diff --git a/retroshare-gui/src/gui/emojione/1F34A.png b/retroshare-gui/src/gui/emojione/1F34A.png index b52681e3f..cd1bcfef4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F34A.png and b/retroshare-gui/src/gui/emojione/1F34A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F34B.png b/retroshare-gui/src/gui/emojione/1F34B.png index 9e279930a..f50aa8527 100644 Binary files a/retroshare-gui/src/gui/emojione/1F34B.png and b/retroshare-gui/src/gui/emojione/1F34B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F34C.png b/retroshare-gui/src/gui/emojione/1F34C.png index 43bbfd6aa..2e814c467 100644 Binary files a/retroshare-gui/src/gui/emojione/1F34C.png and b/retroshare-gui/src/gui/emojione/1F34C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F34D.png b/retroshare-gui/src/gui/emojione/1F34D.png index bfce26950..e6303db67 100644 Binary files a/retroshare-gui/src/gui/emojione/1F34D.png and b/retroshare-gui/src/gui/emojione/1F34D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F34E.png b/retroshare-gui/src/gui/emojione/1F34E.png index 9df1ae07a..c1534dc1d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F34E.png and b/retroshare-gui/src/gui/emojione/1F34E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F34F.png b/retroshare-gui/src/gui/emojione/1F34F.png index 888bd7a47..4542be449 100644 Binary files a/retroshare-gui/src/gui/emojione/1F34F.png and b/retroshare-gui/src/gui/emojione/1F34F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F350.png b/retroshare-gui/src/gui/emojione/1F350.png index 3bd1550ad..a56d47236 100644 Binary files a/retroshare-gui/src/gui/emojione/1F350.png and b/retroshare-gui/src/gui/emojione/1F350.png differ diff --git a/retroshare-gui/src/gui/emojione/1F351.png b/retroshare-gui/src/gui/emojione/1F351.png index faca8d8d3..02a3c93db 100644 Binary files a/retroshare-gui/src/gui/emojione/1F351.png and b/retroshare-gui/src/gui/emojione/1F351.png differ diff --git a/retroshare-gui/src/gui/emojione/1F352.png b/retroshare-gui/src/gui/emojione/1F352.png index b3c528f36..1f2635a66 100644 Binary files a/retroshare-gui/src/gui/emojione/1F352.png and b/retroshare-gui/src/gui/emojione/1F352.png differ diff --git a/retroshare-gui/src/gui/emojione/1F353.png b/retroshare-gui/src/gui/emojione/1F353.png index 2cf19f948..f11d8661c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F353.png and b/retroshare-gui/src/gui/emojione/1F353.png differ diff --git a/retroshare-gui/src/gui/emojione/1F354.png b/retroshare-gui/src/gui/emojione/1F354.png index 283c6952f..e4804b33e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F354.png and b/retroshare-gui/src/gui/emojione/1F354.png differ diff --git a/retroshare-gui/src/gui/emojione/1F355.png b/retroshare-gui/src/gui/emojione/1F355.png index aea2cab38..33be94939 100644 Binary files a/retroshare-gui/src/gui/emojione/1F355.png and b/retroshare-gui/src/gui/emojione/1F355.png differ diff --git a/retroshare-gui/src/gui/emojione/1F356.png b/retroshare-gui/src/gui/emojione/1F356.png index b2a420f36..4f6a82b34 100644 Binary files a/retroshare-gui/src/gui/emojione/1F356.png and b/retroshare-gui/src/gui/emojione/1F356.png differ diff --git a/retroshare-gui/src/gui/emojione/1F357.png b/retroshare-gui/src/gui/emojione/1F357.png index 1260ee7c2..a15d446f9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F357.png and b/retroshare-gui/src/gui/emojione/1F357.png differ diff --git a/retroshare-gui/src/gui/emojione/1F358.png b/retroshare-gui/src/gui/emojione/1F358.png index f4b751976..2bc88af45 100644 Binary files a/retroshare-gui/src/gui/emojione/1F358.png and b/retroshare-gui/src/gui/emojione/1F358.png differ diff --git a/retroshare-gui/src/gui/emojione/1F359.png b/retroshare-gui/src/gui/emojione/1F359.png index ad6ca2c8e..a9a9a5f11 100644 Binary files a/retroshare-gui/src/gui/emojione/1F359.png and b/retroshare-gui/src/gui/emojione/1F359.png differ diff --git a/retroshare-gui/src/gui/emojione/1F35A.png b/retroshare-gui/src/gui/emojione/1F35A.png index 73312afa5..e424ecb56 100644 Binary files a/retroshare-gui/src/gui/emojione/1F35A.png and b/retroshare-gui/src/gui/emojione/1F35A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F35B.png b/retroshare-gui/src/gui/emojione/1F35B.png index cd6ded87b..b424f47de 100644 Binary files a/retroshare-gui/src/gui/emojione/1F35B.png and b/retroshare-gui/src/gui/emojione/1F35B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F35C.png b/retroshare-gui/src/gui/emojione/1F35C.png index 8b39a0fbf..52e9a771d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F35C.png and b/retroshare-gui/src/gui/emojione/1F35C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F35D.png b/retroshare-gui/src/gui/emojione/1F35D.png index c41d5b2b7..ff5aa4b79 100644 Binary files a/retroshare-gui/src/gui/emojione/1F35D.png and b/retroshare-gui/src/gui/emojione/1F35D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F35E.png b/retroshare-gui/src/gui/emojione/1F35E.png index 87946101b..7e2c1f4ae 100644 Binary files a/retroshare-gui/src/gui/emojione/1F35E.png and b/retroshare-gui/src/gui/emojione/1F35E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F35F.png b/retroshare-gui/src/gui/emojione/1F35F.png index 8c93d1aee..c28171e71 100644 Binary files a/retroshare-gui/src/gui/emojione/1F35F.png and b/retroshare-gui/src/gui/emojione/1F35F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F360.png b/retroshare-gui/src/gui/emojione/1F360.png index a4668e152..61a906c21 100644 Binary files a/retroshare-gui/src/gui/emojione/1F360.png and b/retroshare-gui/src/gui/emojione/1F360.png differ diff --git a/retroshare-gui/src/gui/emojione/1F361.png b/retroshare-gui/src/gui/emojione/1F361.png index 9540ebe5c..d0e9a5cfd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F361.png and b/retroshare-gui/src/gui/emojione/1F361.png differ diff --git a/retroshare-gui/src/gui/emojione/1F362.png b/retroshare-gui/src/gui/emojione/1F362.png index 6d086d830..8d9b7badb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F362.png and b/retroshare-gui/src/gui/emojione/1F362.png differ diff --git a/retroshare-gui/src/gui/emojione/1F363.png b/retroshare-gui/src/gui/emojione/1F363.png index 353e74b14..dc3539b0e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F363.png and b/retroshare-gui/src/gui/emojione/1F363.png differ diff --git a/retroshare-gui/src/gui/emojione/1F364.png b/retroshare-gui/src/gui/emojione/1F364.png index d7d9c1d47..68f426555 100644 Binary files a/retroshare-gui/src/gui/emojione/1F364.png and b/retroshare-gui/src/gui/emojione/1F364.png differ diff --git a/retroshare-gui/src/gui/emojione/1F365.png b/retroshare-gui/src/gui/emojione/1F365.png index fa87acd7a..b933e0f0a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F365.png and b/retroshare-gui/src/gui/emojione/1F365.png differ diff --git a/retroshare-gui/src/gui/emojione/1F366.png b/retroshare-gui/src/gui/emojione/1F366.png index 58b15bb0e..e2ec004bc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F366.png and b/retroshare-gui/src/gui/emojione/1F366.png differ diff --git a/retroshare-gui/src/gui/emojione/1F367.png b/retroshare-gui/src/gui/emojione/1F367.png index 9b1aeb47e..40ba60864 100644 Binary files a/retroshare-gui/src/gui/emojione/1F367.png and b/retroshare-gui/src/gui/emojione/1F367.png differ diff --git a/retroshare-gui/src/gui/emojione/1F368.png b/retroshare-gui/src/gui/emojione/1F368.png index beecdfd49..b4ebc5072 100644 Binary files a/retroshare-gui/src/gui/emojione/1F368.png and b/retroshare-gui/src/gui/emojione/1F368.png differ diff --git a/retroshare-gui/src/gui/emojione/1F369.png b/retroshare-gui/src/gui/emojione/1F369.png index 0c69447a0..b9e41f002 100644 Binary files a/retroshare-gui/src/gui/emojione/1F369.png and b/retroshare-gui/src/gui/emojione/1F369.png differ diff --git a/retroshare-gui/src/gui/emojione/1F36A.png b/retroshare-gui/src/gui/emojione/1F36A.png index 83bd43605..a9b3d501a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F36A.png and b/retroshare-gui/src/gui/emojione/1F36A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F36B.png b/retroshare-gui/src/gui/emojione/1F36B.png index e62daadcc..7bcc18b9d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F36B.png and b/retroshare-gui/src/gui/emojione/1F36B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F36C.png b/retroshare-gui/src/gui/emojione/1F36C.png index f31b30c38..c2dc36091 100644 Binary files a/retroshare-gui/src/gui/emojione/1F36C.png and b/retroshare-gui/src/gui/emojione/1F36C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F36D.png b/retroshare-gui/src/gui/emojione/1F36D.png index df9547e39..2f63a0212 100644 Binary files a/retroshare-gui/src/gui/emojione/1F36D.png and b/retroshare-gui/src/gui/emojione/1F36D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F36E.png b/retroshare-gui/src/gui/emojione/1F36E.png index 50a188a4f..4676eac36 100644 Binary files a/retroshare-gui/src/gui/emojione/1F36E.png and b/retroshare-gui/src/gui/emojione/1F36E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F36F.png b/retroshare-gui/src/gui/emojione/1F36F.png index ab1822953..443110373 100644 Binary files a/retroshare-gui/src/gui/emojione/1F36F.png and b/retroshare-gui/src/gui/emojione/1F36F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F370.png b/retroshare-gui/src/gui/emojione/1F370.png index 5e12d7fb0..f65744b40 100644 Binary files a/retroshare-gui/src/gui/emojione/1F370.png and b/retroshare-gui/src/gui/emojione/1F370.png differ diff --git a/retroshare-gui/src/gui/emojione/1F371.png b/retroshare-gui/src/gui/emojione/1F371.png index 3b2b48549..54f2b9a80 100644 Binary files a/retroshare-gui/src/gui/emojione/1F371.png and b/retroshare-gui/src/gui/emojione/1F371.png differ diff --git a/retroshare-gui/src/gui/emojione/1F372.png b/retroshare-gui/src/gui/emojione/1F372.png index 77019159a..643536e59 100644 Binary files a/retroshare-gui/src/gui/emojione/1F372.png and b/retroshare-gui/src/gui/emojione/1F372.png differ diff --git a/retroshare-gui/src/gui/emojione/1F373.png b/retroshare-gui/src/gui/emojione/1F373.png index ae182fb40..1afd9f680 100644 Binary files a/retroshare-gui/src/gui/emojione/1F373.png and b/retroshare-gui/src/gui/emojione/1F373.png differ diff --git a/retroshare-gui/src/gui/emojione/1F374.png b/retroshare-gui/src/gui/emojione/1F374.png index 3acec679c..cfb2bec6f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F374.png and b/retroshare-gui/src/gui/emojione/1F374.png differ diff --git a/retroshare-gui/src/gui/emojione/1F375.png b/retroshare-gui/src/gui/emojione/1F375.png index c325f11ef..24e792514 100644 Binary files a/retroshare-gui/src/gui/emojione/1F375.png and b/retroshare-gui/src/gui/emojione/1F375.png differ diff --git a/retroshare-gui/src/gui/emojione/1F376.png b/retroshare-gui/src/gui/emojione/1F376.png index 77877f0d2..c084b57da 100644 Binary files a/retroshare-gui/src/gui/emojione/1F376.png and b/retroshare-gui/src/gui/emojione/1F376.png differ diff --git a/retroshare-gui/src/gui/emojione/1F377.png b/retroshare-gui/src/gui/emojione/1F377.png index 067cab5d1..fc2be5c8f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F377.png and b/retroshare-gui/src/gui/emojione/1F377.png differ diff --git a/retroshare-gui/src/gui/emojione/1F378.png b/retroshare-gui/src/gui/emojione/1F378.png index b0f7d6d3b..a73355736 100644 Binary files a/retroshare-gui/src/gui/emojione/1F378.png and b/retroshare-gui/src/gui/emojione/1F378.png differ diff --git a/retroshare-gui/src/gui/emojione/1F379.png b/retroshare-gui/src/gui/emojione/1F379.png index 14c9b0da5..050e8fe83 100644 Binary files a/retroshare-gui/src/gui/emojione/1F379.png and b/retroshare-gui/src/gui/emojione/1F379.png differ diff --git a/retroshare-gui/src/gui/emojione/1F37A.png b/retroshare-gui/src/gui/emojione/1F37A.png index c4ff69eaa..1561bdbf3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F37A.png and b/retroshare-gui/src/gui/emojione/1F37A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F37B.png b/retroshare-gui/src/gui/emojione/1F37B.png index b7267ddf9..f2507addc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F37B.png and b/retroshare-gui/src/gui/emojione/1F37B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F37C.png b/retroshare-gui/src/gui/emojione/1F37C.png index d9676871d..24bda2948 100644 Binary files a/retroshare-gui/src/gui/emojione/1F37C.png and b/retroshare-gui/src/gui/emojione/1F37C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F37D.png b/retroshare-gui/src/gui/emojione/1F37D.png index af9af9771..49b95c709 100644 Binary files a/retroshare-gui/src/gui/emojione/1F37D.png and b/retroshare-gui/src/gui/emojione/1F37D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F380.png b/retroshare-gui/src/gui/emojione/1F380.png index f9738b3b5..48892c2c2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F380.png and b/retroshare-gui/src/gui/emojione/1F380.png differ diff --git a/retroshare-gui/src/gui/emojione/1F381.png b/retroshare-gui/src/gui/emojione/1F381.png index 49f0de74f..bdc736a03 100644 Binary files a/retroshare-gui/src/gui/emojione/1F381.png and b/retroshare-gui/src/gui/emojione/1F381.png differ diff --git a/retroshare-gui/src/gui/emojione/1F382.png b/retroshare-gui/src/gui/emojione/1F382.png index d4f52b89a..cb21bd2dc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F382.png and b/retroshare-gui/src/gui/emojione/1F382.png differ diff --git a/retroshare-gui/src/gui/emojione/1F383.png b/retroshare-gui/src/gui/emojione/1F383.png index a0a0133fa..b6c687803 100644 Binary files a/retroshare-gui/src/gui/emojione/1F383.png and b/retroshare-gui/src/gui/emojione/1F383.png differ diff --git a/retroshare-gui/src/gui/emojione/1F384.png b/retroshare-gui/src/gui/emojione/1F384.png index 8dc16b294..cfff01fcd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F384.png and b/retroshare-gui/src/gui/emojione/1F384.png differ diff --git a/retroshare-gui/src/gui/emojione/1F385.png b/retroshare-gui/src/gui/emojione/1F385.png index b2f71124f..9604b76d3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F385.png and b/retroshare-gui/src/gui/emojione/1F385.png differ diff --git a/retroshare-gui/src/gui/emojione/1F386.png b/retroshare-gui/src/gui/emojione/1F386.png index 161f5d1e3..62294db08 100644 Binary files a/retroshare-gui/src/gui/emojione/1F386.png and b/retroshare-gui/src/gui/emojione/1F386.png differ diff --git a/retroshare-gui/src/gui/emojione/1F387.png b/retroshare-gui/src/gui/emojione/1F387.png index cf8159206..71d84f125 100644 Binary files a/retroshare-gui/src/gui/emojione/1F387.png and b/retroshare-gui/src/gui/emojione/1F387.png differ diff --git a/retroshare-gui/src/gui/emojione/1F388.png b/retroshare-gui/src/gui/emojione/1F388.png index 9ef6cd61b..faabf3173 100644 Binary files a/retroshare-gui/src/gui/emojione/1F388.png and b/retroshare-gui/src/gui/emojione/1F388.png differ diff --git a/retroshare-gui/src/gui/emojione/1F389.png b/retroshare-gui/src/gui/emojione/1F389.png index 92e51bdb2..80324f90d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F389.png and b/retroshare-gui/src/gui/emojione/1F389.png differ diff --git a/retroshare-gui/src/gui/emojione/1F38A.png b/retroshare-gui/src/gui/emojione/1F38A.png index 4b23b339e..29f93ee5d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F38A.png and b/retroshare-gui/src/gui/emojione/1F38A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F38B.png b/retroshare-gui/src/gui/emojione/1F38B.png index a53a8bbb0..da4574e4c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F38B.png and b/retroshare-gui/src/gui/emojione/1F38B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F38C.png b/retroshare-gui/src/gui/emojione/1F38C.png index d62df8865..250265c91 100644 Binary files a/retroshare-gui/src/gui/emojione/1F38C.png and b/retroshare-gui/src/gui/emojione/1F38C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F38D.png b/retroshare-gui/src/gui/emojione/1F38D.png index 327770b27..b05dc1ec1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F38D.png and b/retroshare-gui/src/gui/emojione/1F38D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F38E.png b/retroshare-gui/src/gui/emojione/1F38E.png index 0edb4533e..eb9a2097f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F38E.png and b/retroshare-gui/src/gui/emojione/1F38E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F38F.png b/retroshare-gui/src/gui/emojione/1F38F.png index cdbd6c640..f49c51627 100644 Binary files a/retroshare-gui/src/gui/emojione/1F38F.png and b/retroshare-gui/src/gui/emojione/1F38F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F390.png b/retroshare-gui/src/gui/emojione/1F390.png index a2dd1ec8a..1fae9462d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F390.png and b/retroshare-gui/src/gui/emojione/1F390.png differ diff --git a/retroshare-gui/src/gui/emojione/1F391.png b/retroshare-gui/src/gui/emojione/1F391.png index f750a24a4..7725bd275 100644 Binary files a/retroshare-gui/src/gui/emojione/1F391.png and b/retroshare-gui/src/gui/emojione/1F391.png differ diff --git a/retroshare-gui/src/gui/emojione/1F392.png b/retroshare-gui/src/gui/emojione/1F392.png index eb57b252e..9eeb6a006 100644 Binary files a/retroshare-gui/src/gui/emojione/1F392.png and b/retroshare-gui/src/gui/emojione/1F392.png differ diff --git a/retroshare-gui/src/gui/emojione/1F393.png b/retroshare-gui/src/gui/emojione/1F393.png index 50872f627..c07415c63 100644 Binary files a/retroshare-gui/src/gui/emojione/1F393.png and b/retroshare-gui/src/gui/emojione/1F393.png differ diff --git a/retroshare-gui/src/gui/emojione/1F394.png b/retroshare-gui/src/gui/emojione/1F394.png index 0e3fdfbf1..83e63e134 100644 Binary files a/retroshare-gui/src/gui/emojione/1F394.png and b/retroshare-gui/src/gui/emojione/1F394.png differ diff --git a/retroshare-gui/src/gui/emojione/1F395.png b/retroshare-gui/src/gui/emojione/1F395.png index a9d7c0339..db3e3cc8a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F395.png and b/retroshare-gui/src/gui/emojione/1F395.png differ diff --git a/retroshare-gui/src/gui/emojione/1F396.png b/retroshare-gui/src/gui/emojione/1F396.png index 9481d1b29..f425764d3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F396.png and b/retroshare-gui/src/gui/emojione/1F396.png differ diff --git a/retroshare-gui/src/gui/emojione/1F397.png b/retroshare-gui/src/gui/emojione/1F397.png index a31de8730..f816107f0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F397.png and b/retroshare-gui/src/gui/emojione/1F397.png differ diff --git a/retroshare-gui/src/gui/emojione/1F398.png b/retroshare-gui/src/gui/emojione/1F398.png index e0e407149..eedb3aac4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F398.png and b/retroshare-gui/src/gui/emojione/1F398.png differ diff --git a/retroshare-gui/src/gui/emojione/1F399.png b/retroshare-gui/src/gui/emojione/1F399.png index 8f3747c9f..150ed6167 100644 Binary files a/retroshare-gui/src/gui/emojione/1F399.png and b/retroshare-gui/src/gui/emojione/1F399.png differ diff --git a/retroshare-gui/src/gui/emojione/1F39A.png b/retroshare-gui/src/gui/emojione/1F39A.png index e951df99d..493573a29 100644 Binary files a/retroshare-gui/src/gui/emojione/1F39A.png and b/retroshare-gui/src/gui/emojione/1F39A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F39B.png b/retroshare-gui/src/gui/emojione/1F39B.png index 855c1b060..7b12bc4fe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F39B.png and b/retroshare-gui/src/gui/emojione/1F39B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F39C.png b/retroshare-gui/src/gui/emojione/1F39C.png index e8f65579f..70eeaeec9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F39C.png and b/retroshare-gui/src/gui/emojione/1F39C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F39D.png b/retroshare-gui/src/gui/emojione/1F39D.png index a48326cfb..c448bb6de 100644 Binary files a/retroshare-gui/src/gui/emojione/1F39D.png and b/retroshare-gui/src/gui/emojione/1F39D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F39E.png b/retroshare-gui/src/gui/emojione/1F39E.png index 10f002a19..19157126e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F39E.png and b/retroshare-gui/src/gui/emojione/1F39E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F39F.png b/retroshare-gui/src/gui/emojione/1F39F.png index 644a43d46..b2841a7e8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F39F.png and b/retroshare-gui/src/gui/emojione/1F39F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A0.png b/retroshare-gui/src/gui/emojione/1F3A0.png index ad8195cb8..c9f7c238d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A0.png and b/retroshare-gui/src/gui/emojione/1F3A0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A1.png b/retroshare-gui/src/gui/emojione/1F3A1.png index baf57ed1a..2fa554a78 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A1.png and b/retroshare-gui/src/gui/emojione/1F3A1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A2.png b/retroshare-gui/src/gui/emojione/1F3A2.png index 4be9af92b..5b0bca27f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A2.png and b/retroshare-gui/src/gui/emojione/1F3A2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A3.png b/retroshare-gui/src/gui/emojione/1F3A3.png index 01ed0fab0..5d186900e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A3.png and b/retroshare-gui/src/gui/emojione/1F3A3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A4.png b/retroshare-gui/src/gui/emojione/1F3A4.png index a6182eae2..ecb025a6b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A4.png and b/retroshare-gui/src/gui/emojione/1F3A4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A5.png b/retroshare-gui/src/gui/emojione/1F3A5.png index a31ba62df..1a0ac154b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A5.png and b/retroshare-gui/src/gui/emojione/1F3A5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A6.png b/retroshare-gui/src/gui/emojione/1F3A6.png index a8c02431c..94b04b5fc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A6.png and b/retroshare-gui/src/gui/emojione/1F3A6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A7.png b/retroshare-gui/src/gui/emojione/1F3A7.png index bf9769a7d..3409a9d68 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A7.png and b/retroshare-gui/src/gui/emojione/1F3A7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A8.png b/retroshare-gui/src/gui/emojione/1F3A8.png index c593efa40..336b05bbc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A8.png and b/retroshare-gui/src/gui/emojione/1F3A8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A9.png b/retroshare-gui/src/gui/emojione/1F3A9.png index cc9cccdc0..792935f69 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A9.png and b/retroshare-gui/src/gui/emojione/1F3A9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3AA.png b/retroshare-gui/src/gui/emojione/1F3AA.png index bb9f804f5..ee0d3afa2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3AA.png and b/retroshare-gui/src/gui/emojione/1F3AA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3AB.png b/retroshare-gui/src/gui/emojione/1F3AB.png index 14d139ff2..e2e45a6fa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3AB.png and b/retroshare-gui/src/gui/emojione/1F3AB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3AC.png b/retroshare-gui/src/gui/emojione/1F3AC.png index ae37c7f96..572dda34a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3AC.png and b/retroshare-gui/src/gui/emojione/1F3AC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3AD.png b/retroshare-gui/src/gui/emojione/1F3AD.png index 9998d18ec..50698f764 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3AD.png and b/retroshare-gui/src/gui/emojione/1F3AD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3AE.png b/retroshare-gui/src/gui/emojione/1F3AE.png index 4ccedaec5..18755f62e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3AE.png and b/retroshare-gui/src/gui/emojione/1F3AE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3AF.png b/retroshare-gui/src/gui/emojione/1F3AF.png index 271c85aff..5283a4a84 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3AF.png and b/retroshare-gui/src/gui/emojione/1F3AF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B0.png b/retroshare-gui/src/gui/emojione/1F3B0.png index cfe245f38..4fca22c7a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B0.png and b/retroshare-gui/src/gui/emojione/1F3B0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B1.png b/retroshare-gui/src/gui/emojione/1F3B1.png index 4b1ca1616..8a6333149 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B1.png and b/retroshare-gui/src/gui/emojione/1F3B1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B2.png b/retroshare-gui/src/gui/emojione/1F3B2.png index ee54e8641..f7f2c1d6d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B2.png and b/retroshare-gui/src/gui/emojione/1F3B2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B3.png b/retroshare-gui/src/gui/emojione/1F3B3.png index 1efec6ec4..ead4d328c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B3.png and b/retroshare-gui/src/gui/emojione/1F3B3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B4.png b/retroshare-gui/src/gui/emojione/1F3B4.png index b2d1b7ff7..2e008f817 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B4.png and b/retroshare-gui/src/gui/emojione/1F3B4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B5.png b/retroshare-gui/src/gui/emojione/1F3B5.png index 98343a24e..9dae60e2b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B5.png and b/retroshare-gui/src/gui/emojione/1F3B5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B6.png b/retroshare-gui/src/gui/emojione/1F3B6.png index f5c0ab166..5cbac3db8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B6.png and b/retroshare-gui/src/gui/emojione/1F3B6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B7.png b/retroshare-gui/src/gui/emojione/1F3B7.png index 0288e9fdd..e0ed47b70 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B7.png and b/retroshare-gui/src/gui/emojione/1F3B7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B8.png b/retroshare-gui/src/gui/emojione/1F3B8.png index 12ade3442..57ec48628 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B8.png and b/retroshare-gui/src/gui/emojione/1F3B8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B9.png b/retroshare-gui/src/gui/emojione/1F3B9.png index eb05d04a2..2e0a039a1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B9.png and b/retroshare-gui/src/gui/emojione/1F3B9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3BA.png b/retroshare-gui/src/gui/emojione/1F3BA.png index 587ca92c7..8b9a73ac0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3BA.png and b/retroshare-gui/src/gui/emojione/1F3BA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3BB.png b/retroshare-gui/src/gui/emojione/1F3BB.png index aa73794be..23bde2862 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3BB.png and b/retroshare-gui/src/gui/emojione/1F3BB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3BC.png b/retroshare-gui/src/gui/emojione/1F3BC.png index 391ef1313..f733e0c18 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3BC.png and b/retroshare-gui/src/gui/emojione/1F3BC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3BD.png b/retroshare-gui/src/gui/emojione/1F3BD.png index c8bec66cb..f23748c14 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3BD.png and b/retroshare-gui/src/gui/emojione/1F3BD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3BE.png b/retroshare-gui/src/gui/emojione/1F3BE.png index 1bef4699b..f92cd5d3c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3BE.png and b/retroshare-gui/src/gui/emojione/1F3BE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3BF.png b/retroshare-gui/src/gui/emojione/1F3BF.png index 57db73897..590956c98 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3BF.png and b/retroshare-gui/src/gui/emojione/1F3BF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C0.png b/retroshare-gui/src/gui/emojione/1F3C0.png index fdb35935f..eaa231833 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C0.png and b/retroshare-gui/src/gui/emojione/1F3C0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C1.png b/retroshare-gui/src/gui/emojione/1F3C1.png index 1182cd586..e15a696b7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C1.png and b/retroshare-gui/src/gui/emojione/1F3C1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C2.png b/retroshare-gui/src/gui/emojione/1F3C2.png index 27ad19d5a..4bd61a1e3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C2.png and b/retroshare-gui/src/gui/emojione/1F3C2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C3.png b/retroshare-gui/src/gui/emojione/1F3C3.png index 1721bb8ce..32605baed 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C3.png and b/retroshare-gui/src/gui/emojione/1F3C3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C4.png b/retroshare-gui/src/gui/emojione/1F3C4.png index e54005c1b..ac6c51ec2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C4.png and b/retroshare-gui/src/gui/emojione/1F3C4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C5.png b/retroshare-gui/src/gui/emojione/1F3C5.png index f1e0bd5d0..40000d3a7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C5.png and b/retroshare-gui/src/gui/emojione/1F3C5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C6.png b/retroshare-gui/src/gui/emojione/1F3C6.png index 39387e010..0966b0390 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C6.png and b/retroshare-gui/src/gui/emojione/1F3C6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C7.png b/retroshare-gui/src/gui/emojione/1F3C7.png index 7c2d2ba87..c06aad6ee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C7.png and b/retroshare-gui/src/gui/emojione/1F3C7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C8.png b/retroshare-gui/src/gui/emojione/1F3C8.png index 2565fabc6..5b1704c57 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C8.png and b/retroshare-gui/src/gui/emojione/1F3C8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C9.png b/retroshare-gui/src/gui/emojione/1F3C9.png index 52117b7be..6ead96d70 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C9.png and b/retroshare-gui/src/gui/emojione/1F3C9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3CA.png b/retroshare-gui/src/gui/emojione/1F3CA.png index 0680d4d46..518971f4e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3CA.png and b/retroshare-gui/src/gui/emojione/1F3CA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3CB.png b/retroshare-gui/src/gui/emojione/1F3CB.png index 33b459714..3786bd972 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3CB.png and b/retroshare-gui/src/gui/emojione/1F3CB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3CC.png b/retroshare-gui/src/gui/emojione/1F3CC.png index eb739667d..7d1d1ca6f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3CC.png and b/retroshare-gui/src/gui/emojione/1F3CC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3CD.png b/retroshare-gui/src/gui/emojione/1F3CD.png index d3c8cb415..b03250d08 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3CD.png and b/retroshare-gui/src/gui/emojione/1F3CD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3CE.png b/retroshare-gui/src/gui/emojione/1F3CE.png index c6a404a1f..a9d8c15d9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3CE.png and b/retroshare-gui/src/gui/emojione/1F3CE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3D4.png b/retroshare-gui/src/gui/emojione/1F3D4.png index 000dc2f20..396732811 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3D4.png and b/retroshare-gui/src/gui/emojione/1F3D4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3D5.png b/retroshare-gui/src/gui/emojione/1F3D5.png index 0abec908b..563ac28ed 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3D5.png and b/retroshare-gui/src/gui/emojione/1F3D5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3D6.png b/retroshare-gui/src/gui/emojione/1F3D6.png index fe7c8ef77..018d4b9c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3D6.png and b/retroshare-gui/src/gui/emojione/1F3D6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3D7.png b/retroshare-gui/src/gui/emojione/1F3D7.png index d0c653abb..a7e54fc5c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3D7.png and b/retroshare-gui/src/gui/emojione/1F3D7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3D8.png b/retroshare-gui/src/gui/emojione/1F3D8.png index b2192d33f..eb5c7f0a5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3D8.png and b/retroshare-gui/src/gui/emojione/1F3D8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3D9.png b/retroshare-gui/src/gui/emojione/1F3D9.png index 50b21f6f7..8c9a2d070 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3D9.png and b/retroshare-gui/src/gui/emojione/1F3D9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3DA.png b/retroshare-gui/src/gui/emojione/1F3DA.png index 700b797ed..0b0f779c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3DA.png and b/retroshare-gui/src/gui/emojione/1F3DA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3DB.png b/retroshare-gui/src/gui/emojione/1F3DB.png index 48eee5dfc..cb7ccfbd7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3DB.png and b/retroshare-gui/src/gui/emojione/1F3DB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3DC.png b/retroshare-gui/src/gui/emojione/1F3DC.png index a8d334e07..55a50c5d8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3DC.png and b/retroshare-gui/src/gui/emojione/1F3DC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3DD.png b/retroshare-gui/src/gui/emojione/1F3DD.png index ae456027e..5be55696e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3DD.png and b/retroshare-gui/src/gui/emojione/1F3DD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3DE.png b/retroshare-gui/src/gui/emojione/1F3DE.png index 6804e31be..4b9cafa9d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3DE.png and b/retroshare-gui/src/gui/emojione/1F3DE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3DF.png b/retroshare-gui/src/gui/emojione/1F3DF.png index 6ab3840c9..28d96db5c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3DF.png and b/retroshare-gui/src/gui/emojione/1F3DF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E0.png b/retroshare-gui/src/gui/emojione/1F3E0.png index 92e7d2339..fd1efcf27 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E0.png and b/retroshare-gui/src/gui/emojione/1F3E0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E1.png b/retroshare-gui/src/gui/emojione/1F3E1.png index 66f09aaa0..65edd5329 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E1.png and b/retroshare-gui/src/gui/emojione/1F3E1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E2.png b/retroshare-gui/src/gui/emojione/1F3E2.png index 42609de66..c00294010 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E2.png and b/retroshare-gui/src/gui/emojione/1F3E2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E3.png b/retroshare-gui/src/gui/emojione/1F3E3.png index 03736700e..d6df036f6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E3.png and b/retroshare-gui/src/gui/emojione/1F3E3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E4.png b/retroshare-gui/src/gui/emojione/1F3E4.png index f070f1259..782cb3aa5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E4.png and b/retroshare-gui/src/gui/emojione/1F3E4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E5.png b/retroshare-gui/src/gui/emojione/1F3E5.png index a99a378d0..52431a4ae 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E5.png and b/retroshare-gui/src/gui/emojione/1F3E5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E6.png b/retroshare-gui/src/gui/emojione/1F3E6.png index fbeb3e991..758decaff 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E6.png and b/retroshare-gui/src/gui/emojione/1F3E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E7.png b/retroshare-gui/src/gui/emojione/1F3E7.png index 879310955..3c28d5d81 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E7.png and b/retroshare-gui/src/gui/emojione/1F3E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E8.png b/retroshare-gui/src/gui/emojione/1F3E8.png index 1741e4ae6..58e07af43 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E8.png and b/retroshare-gui/src/gui/emojione/1F3E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E9.png b/retroshare-gui/src/gui/emojione/1F3E9.png index ae9f57eb0..d4bbe02e5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E9.png and b/retroshare-gui/src/gui/emojione/1F3E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3EA.png b/retroshare-gui/src/gui/emojione/1F3EA.png index 478ff4158..38ddd8fec 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3EA.png and b/retroshare-gui/src/gui/emojione/1F3EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3EB.png b/retroshare-gui/src/gui/emojione/1F3EB.png index 59ce2d108..364e44bf5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3EB.png and b/retroshare-gui/src/gui/emojione/1F3EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3EC.png b/retroshare-gui/src/gui/emojione/1F3EC.png index 7459529e9..a2d6cccba 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3EC.png and b/retroshare-gui/src/gui/emojione/1F3EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3ED.png b/retroshare-gui/src/gui/emojione/1F3ED.png index 26eadc15b..893f8cd9a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3ED.png and b/retroshare-gui/src/gui/emojione/1F3ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3EE.png b/retroshare-gui/src/gui/emojione/1F3EE.png index 021ab020d..3f946b1d6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3EE.png and b/retroshare-gui/src/gui/emojione/1F3EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3EF.png b/retroshare-gui/src/gui/emojione/1F3EF.png index 9949fb007..39109f36e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3EF.png and b/retroshare-gui/src/gui/emojione/1F3EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F0.png b/retroshare-gui/src/gui/emojione/1F3F0.png index d85a2588a..908fb71e6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F0.png and b/retroshare-gui/src/gui/emojione/1F3F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F1.png b/retroshare-gui/src/gui/emojione/1F3F1.png index fad07a647..b2c15a428 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F1.png and b/retroshare-gui/src/gui/emojione/1F3F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F2.png b/retroshare-gui/src/gui/emojione/1F3F2.png index a9edf961f..5dfee6029 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F2.png and b/retroshare-gui/src/gui/emojione/1F3F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F3.png b/retroshare-gui/src/gui/emojione/1F3F3.png index 3433c26bf..7c7ac2357 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F3.png and b/retroshare-gui/src/gui/emojione/1F3F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F4.png b/retroshare-gui/src/gui/emojione/1F3F4.png index 5b455b38c..0074268bc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F4.png and b/retroshare-gui/src/gui/emojione/1F3F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F5.png b/retroshare-gui/src/gui/emojione/1F3F5.png index c5e864c42..17421b883 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F5.png and b/retroshare-gui/src/gui/emojione/1F3F5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F6.png b/retroshare-gui/src/gui/emojione/1F3F6.png index 4215c9ad5..5ef12174b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F6.png and b/retroshare-gui/src/gui/emojione/1F3F6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F7.png b/retroshare-gui/src/gui/emojione/1F3F7.png index ccf420d01..b9c42bdd9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F7.png and b/retroshare-gui/src/gui/emojione/1F3F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F400.png b/retroshare-gui/src/gui/emojione/1F400.png index 0d1dc1797..a1201e5f1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F400.png and b/retroshare-gui/src/gui/emojione/1F400.png differ diff --git a/retroshare-gui/src/gui/emojione/1F401.png b/retroshare-gui/src/gui/emojione/1F401.png index 54519606c..a7253fcc0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F401.png and b/retroshare-gui/src/gui/emojione/1F401.png differ diff --git a/retroshare-gui/src/gui/emojione/1F402.png b/retroshare-gui/src/gui/emojione/1F402.png index fd0f7719b..7e2963a6e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F402.png and b/retroshare-gui/src/gui/emojione/1F402.png differ diff --git a/retroshare-gui/src/gui/emojione/1F403.png b/retroshare-gui/src/gui/emojione/1F403.png index 61ccb224e..406bd30ef 100644 Binary files a/retroshare-gui/src/gui/emojione/1F403.png and b/retroshare-gui/src/gui/emojione/1F403.png differ diff --git a/retroshare-gui/src/gui/emojione/1F404.png b/retroshare-gui/src/gui/emojione/1F404.png index 56ae4ca13..61a75fdcb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F404.png and b/retroshare-gui/src/gui/emojione/1F404.png differ diff --git a/retroshare-gui/src/gui/emojione/1F405.png b/retroshare-gui/src/gui/emojione/1F405.png index 90b0efe21..e652e9645 100644 Binary files a/retroshare-gui/src/gui/emojione/1F405.png and b/retroshare-gui/src/gui/emojione/1F405.png differ diff --git a/retroshare-gui/src/gui/emojione/1F406.png b/retroshare-gui/src/gui/emojione/1F406.png index 75bde38a3..52c899860 100644 Binary files a/retroshare-gui/src/gui/emojione/1F406.png and b/retroshare-gui/src/gui/emojione/1F406.png differ diff --git a/retroshare-gui/src/gui/emojione/1F407.png b/retroshare-gui/src/gui/emojione/1F407.png index 7acbff564..93b576553 100644 Binary files a/retroshare-gui/src/gui/emojione/1F407.png and b/retroshare-gui/src/gui/emojione/1F407.png differ diff --git a/retroshare-gui/src/gui/emojione/1F408.png b/retroshare-gui/src/gui/emojione/1F408.png index 78f4aa73f..b8deeeeb5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F408.png and b/retroshare-gui/src/gui/emojione/1F408.png differ diff --git a/retroshare-gui/src/gui/emojione/1F409.png b/retroshare-gui/src/gui/emojione/1F409.png index 9416dc98a..0aa0497b7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F409.png and b/retroshare-gui/src/gui/emojione/1F409.png differ diff --git a/retroshare-gui/src/gui/emojione/1F40A.png b/retroshare-gui/src/gui/emojione/1F40A.png index 1ea9cf67c..4e3e4673c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F40A.png and b/retroshare-gui/src/gui/emojione/1F40A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F40B.png b/retroshare-gui/src/gui/emojione/1F40B.png index 13ab1608d..08ea23240 100644 Binary files a/retroshare-gui/src/gui/emojione/1F40B.png and b/retroshare-gui/src/gui/emojione/1F40B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F40C.png b/retroshare-gui/src/gui/emojione/1F40C.png index dd4245036..70b347c96 100644 Binary files a/retroshare-gui/src/gui/emojione/1F40C.png and b/retroshare-gui/src/gui/emojione/1F40C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F40D.png b/retroshare-gui/src/gui/emojione/1F40D.png index a980c6a2e..247e2b448 100644 Binary files a/retroshare-gui/src/gui/emojione/1F40D.png and b/retroshare-gui/src/gui/emojione/1F40D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F40E.png b/retroshare-gui/src/gui/emojione/1F40E.png index 09f3b876a..43db51692 100644 Binary files a/retroshare-gui/src/gui/emojione/1F40E.png and b/retroshare-gui/src/gui/emojione/1F40E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F40F.png b/retroshare-gui/src/gui/emojione/1F40F.png index 367234ab2..0cec7ce97 100644 Binary files a/retroshare-gui/src/gui/emojione/1F40F.png and b/retroshare-gui/src/gui/emojione/1F40F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F410.png b/retroshare-gui/src/gui/emojione/1F410.png index 1bf33b0e0..1fef3b0a6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F410.png and b/retroshare-gui/src/gui/emojione/1F410.png differ diff --git a/retroshare-gui/src/gui/emojione/1F411.png b/retroshare-gui/src/gui/emojione/1F411.png index 8dcdc1947..ffdc33795 100644 Binary files a/retroshare-gui/src/gui/emojione/1F411.png and b/retroshare-gui/src/gui/emojione/1F411.png differ diff --git a/retroshare-gui/src/gui/emojione/1F412.png b/retroshare-gui/src/gui/emojione/1F412.png index ade0564b6..2a1feac4c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F412.png and b/retroshare-gui/src/gui/emojione/1F412.png differ diff --git a/retroshare-gui/src/gui/emojione/1F413.png b/retroshare-gui/src/gui/emojione/1F413.png index e5d405724..08409cd29 100644 Binary files a/retroshare-gui/src/gui/emojione/1F413.png and b/retroshare-gui/src/gui/emojione/1F413.png differ diff --git a/retroshare-gui/src/gui/emojione/1F414.png b/retroshare-gui/src/gui/emojione/1F414.png index 25fcf087b..7a3fb770a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F414.png and b/retroshare-gui/src/gui/emojione/1F414.png differ diff --git a/retroshare-gui/src/gui/emojione/1F415.png b/retroshare-gui/src/gui/emojione/1F415.png index fa8b1088e..b4f578ddd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F415.png and b/retroshare-gui/src/gui/emojione/1F415.png differ diff --git a/retroshare-gui/src/gui/emojione/1F416.png b/retroshare-gui/src/gui/emojione/1F416.png index 0a588190d..7e386344d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F416.png and b/retroshare-gui/src/gui/emojione/1F416.png differ diff --git a/retroshare-gui/src/gui/emojione/1F417.png b/retroshare-gui/src/gui/emojione/1F417.png index 9eaf8e30c..c03fed945 100644 Binary files a/retroshare-gui/src/gui/emojione/1F417.png and b/retroshare-gui/src/gui/emojione/1F417.png differ diff --git a/retroshare-gui/src/gui/emojione/1F418.png b/retroshare-gui/src/gui/emojione/1F418.png index 0da6778b8..6f7d128ce 100644 Binary files a/retroshare-gui/src/gui/emojione/1F418.png and b/retroshare-gui/src/gui/emojione/1F418.png differ diff --git a/retroshare-gui/src/gui/emojione/1F419.png b/retroshare-gui/src/gui/emojione/1F419.png index 136034685..9ec93b3de 100644 Binary files a/retroshare-gui/src/gui/emojione/1F419.png and b/retroshare-gui/src/gui/emojione/1F419.png differ diff --git a/retroshare-gui/src/gui/emojione/1F41A.png b/retroshare-gui/src/gui/emojione/1F41A.png index 78fe2bec8..cbe39979f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F41A.png and b/retroshare-gui/src/gui/emojione/1F41A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F41B.png b/retroshare-gui/src/gui/emojione/1F41B.png index af4f8e8ec..d0052988a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F41B.png and b/retroshare-gui/src/gui/emojione/1F41B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F41C.png b/retroshare-gui/src/gui/emojione/1F41C.png index 4beee99a8..a8e563fbc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F41C.png and b/retroshare-gui/src/gui/emojione/1F41C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F41D.png b/retroshare-gui/src/gui/emojione/1F41D.png index 8903a3836..678c07fc3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F41D.png and b/retroshare-gui/src/gui/emojione/1F41D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F41E.png b/retroshare-gui/src/gui/emojione/1F41E.png index 46c095b47..04959d6ef 100644 Binary files a/retroshare-gui/src/gui/emojione/1F41E.png and b/retroshare-gui/src/gui/emojione/1F41E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F41F.png b/retroshare-gui/src/gui/emojione/1F41F.png index 4c7936b46..2cb910ee4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F41F.png and b/retroshare-gui/src/gui/emojione/1F41F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F420.png b/retroshare-gui/src/gui/emojione/1F420.png index 6b8b9e53a..4e017702a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F420.png and b/retroshare-gui/src/gui/emojione/1F420.png differ diff --git a/retroshare-gui/src/gui/emojione/1F421.png b/retroshare-gui/src/gui/emojione/1F421.png index b0601827b..7dc0eef4c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F421.png and b/retroshare-gui/src/gui/emojione/1F421.png differ diff --git a/retroshare-gui/src/gui/emojione/1F422.png b/retroshare-gui/src/gui/emojione/1F422.png index 32c1ca9d9..ff60f972b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F422.png and b/retroshare-gui/src/gui/emojione/1F422.png differ diff --git a/retroshare-gui/src/gui/emojione/1F423.png b/retroshare-gui/src/gui/emojione/1F423.png index 99d9328af..28c38b3d1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F423.png and b/retroshare-gui/src/gui/emojione/1F423.png differ diff --git a/retroshare-gui/src/gui/emojione/1F424.png b/retroshare-gui/src/gui/emojione/1F424.png index 56ef68d52..8a711a46f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F424.png and b/retroshare-gui/src/gui/emojione/1F424.png differ diff --git a/retroshare-gui/src/gui/emojione/1F425.png b/retroshare-gui/src/gui/emojione/1F425.png index 123e64f42..6e8ebae53 100644 Binary files a/retroshare-gui/src/gui/emojione/1F425.png and b/retroshare-gui/src/gui/emojione/1F425.png differ diff --git a/retroshare-gui/src/gui/emojione/1F426.png b/retroshare-gui/src/gui/emojione/1F426.png index 33089cef3..c92d1f251 100644 Binary files a/retroshare-gui/src/gui/emojione/1F426.png and b/retroshare-gui/src/gui/emojione/1F426.png differ diff --git a/retroshare-gui/src/gui/emojione/1F427.png b/retroshare-gui/src/gui/emojione/1F427.png index f08faaecd..f88decd4e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F427.png and b/retroshare-gui/src/gui/emojione/1F427.png differ diff --git a/retroshare-gui/src/gui/emojione/1F428.png b/retroshare-gui/src/gui/emojione/1F428.png index 827f607f7..d84c55e06 100644 Binary files a/retroshare-gui/src/gui/emojione/1F428.png and b/retroshare-gui/src/gui/emojione/1F428.png differ diff --git a/retroshare-gui/src/gui/emojione/1F429.png b/retroshare-gui/src/gui/emojione/1F429.png index 97c98d41b..8cbb10743 100644 Binary files a/retroshare-gui/src/gui/emojione/1F429.png and b/retroshare-gui/src/gui/emojione/1F429.png differ diff --git a/retroshare-gui/src/gui/emojione/1F42A.png b/retroshare-gui/src/gui/emojione/1F42A.png index 50acc4752..fe9e97083 100644 Binary files a/retroshare-gui/src/gui/emojione/1F42A.png and b/retroshare-gui/src/gui/emojione/1F42A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F42B.png b/retroshare-gui/src/gui/emojione/1F42B.png index 31b93154e..e1df3e2ea 100644 Binary files a/retroshare-gui/src/gui/emojione/1F42B.png and b/retroshare-gui/src/gui/emojione/1F42B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F42C.png b/retroshare-gui/src/gui/emojione/1F42C.png index d562fa322..28a06ef57 100644 Binary files a/retroshare-gui/src/gui/emojione/1F42C.png and b/retroshare-gui/src/gui/emojione/1F42C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F42D.png b/retroshare-gui/src/gui/emojione/1F42D.png index 7feb9ca55..e3c97eabe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F42D.png and b/retroshare-gui/src/gui/emojione/1F42D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F42E.png b/retroshare-gui/src/gui/emojione/1F42E.png index c6cbe886f..97456691e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F42E.png and b/retroshare-gui/src/gui/emojione/1F42E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F42F.png b/retroshare-gui/src/gui/emojione/1F42F.png index c1f3db1b2..5b8af2084 100644 Binary files a/retroshare-gui/src/gui/emojione/1F42F.png and b/retroshare-gui/src/gui/emojione/1F42F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F430.png b/retroshare-gui/src/gui/emojione/1F430.png index c2d07d548..d98cb38b0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F430.png and b/retroshare-gui/src/gui/emojione/1F430.png differ diff --git a/retroshare-gui/src/gui/emojione/1F431.png b/retroshare-gui/src/gui/emojione/1F431.png index 616ca5a00..298efbf71 100644 Binary files a/retroshare-gui/src/gui/emojione/1F431.png and b/retroshare-gui/src/gui/emojione/1F431.png differ diff --git a/retroshare-gui/src/gui/emojione/1F432.png b/retroshare-gui/src/gui/emojione/1F432.png index e7e8306ac..367390783 100644 Binary files a/retroshare-gui/src/gui/emojione/1F432.png and b/retroshare-gui/src/gui/emojione/1F432.png differ diff --git a/retroshare-gui/src/gui/emojione/1F433.png b/retroshare-gui/src/gui/emojione/1F433.png index e8cfaa334..844e3d4ba 100644 Binary files a/retroshare-gui/src/gui/emojione/1F433.png and b/retroshare-gui/src/gui/emojione/1F433.png differ diff --git a/retroshare-gui/src/gui/emojione/1F434.png b/retroshare-gui/src/gui/emojione/1F434.png index 3d4455e4f..47acb0b79 100644 Binary files a/retroshare-gui/src/gui/emojione/1F434.png and b/retroshare-gui/src/gui/emojione/1F434.png differ diff --git a/retroshare-gui/src/gui/emojione/1F435.png b/retroshare-gui/src/gui/emojione/1F435.png index a271db784..e8df21924 100644 Binary files a/retroshare-gui/src/gui/emojione/1F435.png and b/retroshare-gui/src/gui/emojione/1F435.png differ diff --git a/retroshare-gui/src/gui/emojione/1F436.png b/retroshare-gui/src/gui/emojione/1F436.png index 7eebdd7bb..032eb2a25 100644 Binary files a/retroshare-gui/src/gui/emojione/1F436.png and b/retroshare-gui/src/gui/emojione/1F436.png differ diff --git a/retroshare-gui/src/gui/emojione/1F437.png b/retroshare-gui/src/gui/emojione/1F437.png index b9aa3a755..a82c2ed1a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F437.png and b/retroshare-gui/src/gui/emojione/1F437.png differ diff --git a/retroshare-gui/src/gui/emojione/1F438.png b/retroshare-gui/src/gui/emojione/1F438.png index 873e4c903..ec3b85b54 100644 Binary files a/retroshare-gui/src/gui/emojione/1F438.png and b/retroshare-gui/src/gui/emojione/1F438.png differ diff --git a/retroshare-gui/src/gui/emojione/1F439.png b/retroshare-gui/src/gui/emojione/1F439.png index 309be31ec..a3bc0d1e7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F439.png and b/retroshare-gui/src/gui/emojione/1F439.png differ diff --git a/retroshare-gui/src/gui/emojione/1F43A.png b/retroshare-gui/src/gui/emojione/1F43A.png index c0018fc20..50c2b55ca 100644 Binary files a/retroshare-gui/src/gui/emojione/1F43A.png and b/retroshare-gui/src/gui/emojione/1F43A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F43B.png b/retroshare-gui/src/gui/emojione/1F43B.png index 8debb1d59..28babf126 100644 Binary files a/retroshare-gui/src/gui/emojione/1F43B.png and b/retroshare-gui/src/gui/emojione/1F43B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F43C.png b/retroshare-gui/src/gui/emojione/1F43C.png index b45fa52c8..be236dbd2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F43C.png and b/retroshare-gui/src/gui/emojione/1F43C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F43D.png b/retroshare-gui/src/gui/emojione/1F43D.png index 1e56935bf..7c19ea46c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F43D.png and b/retroshare-gui/src/gui/emojione/1F43D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F43E.png b/retroshare-gui/src/gui/emojione/1F43E.png index a856abd6d..74fb333cf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F43E.png and b/retroshare-gui/src/gui/emojione/1F43E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F43F.png b/retroshare-gui/src/gui/emojione/1F43F.png index aea6c6394..5ef8cfb79 100644 Binary files a/retroshare-gui/src/gui/emojione/1F43F.png and b/retroshare-gui/src/gui/emojione/1F43F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F440.png b/retroshare-gui/src/gui/emojione/1F440.png index d1569480e..11013822c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F440.png and b/retroshare-gui/src/gui/emojione/1F440.png differ diff --git a/retroshare-gui/src/gui/emojione/1F441.png b/retroshare-gui/src/gui/emojione/1F441.png index 29949832a..197a94361 100644 Binary files a/retroshare-gui/src/gui/emojione/1F441.png and b/retroshare-gui/src/gui/emojione/1F441.png differ diff --git a/retroshare-gui/src/gui/emojione/1F442.png b/retroshare-gui/src/gui/emojione/1F442.png index afab5997c..a95c7f76e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F442.png and b/retroshare-gui/src/gui/emojione/1F442.png differ diff --git a/retroshare-gui/src/gui/emojione/1F443.png b/retroshare-gui/src/gui/emojione/1F443.png index f9b0dd3bf..16c6e6422 100644 Binary files a/retroshare-gui/src/gui/emojione/1F443.png and b/retroshare-gui/src/gui/emojione/1F443.png differ diff --git a/retroshare-gui/src/gui/emojione/1F444.png b/retroshare-gui/src/gui/emojione/1F444.png index 7afc2c2a1..ad22024b6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F444.png and b/retroshare-gui/src/gui/emojione/1F444.png differ diff --git a/retroshare-gui/src/gui/emojione/1F445.png b/retroshare-gui/src/gui/emojione/1F445.png index e1d17e69f..90fec1b0b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F445.png and b/retroshare-gui/src/gui/emojione/1F445.png differ diff --git a/retroshare-gui/src/gui/emojione/1F446.png b/retroshare-gui/src/gui/emojione/1F446.png index f53bb4a1a..1bf852500 100644 Binary files a/retroshare-gui/src/gui/emojione/1F446.png and b/retroshare-gui/src/gui/emojione/1F446.png differ diff --git a/retroshare-gui/src/gui/emojione/1F447.png b/retroshare-gui/src/gui/emojione/1F447.png index dc3d2e6f0..4ef557caf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F447.png and b/retroshare-gui/src/gui/emojione/1F447.png differ diff --git a/retroshare-gui/src/gui/emojione/1F448.png b/retroshare-gui/src/gui/emojione/1F448.png index bab94cacb..9de59ae80 100644 Binary files a/retroshare-gui/src/gui/emojione/1F448.png and b/retroshare-gui/src/gui/emojione/1F448.png differ diff --git a/retroshare-gui/src/gui/emojione/1F449.png b/retroshare-gui/src/gui/emojione/1F449.png index c8aefb9b6..ae307665b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F449.png and b/retroshare-gui/src/gui/emojione/1F449.png differ diff --git a/retroshare-gui/src/gui/emojione/1F44A.png b/retroshare-gui/src/gui/emojione/1F44A.png index ef3ed5027..87c82244d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F44A.png and b/retroshare-gui/src/gui/emojione/1F44A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F44B.png b/retroshare-gui/src/gui/emojione/1F44B.png index 7e6753d74..550ef8316 100644 Binary files a/retroshare-gui/src/gui/emojione/1F44B.png and b/retroshare-gui/src/gui/emojione/1F44B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F44C.png b/retroshare-gui/src/gui/emojione/1F44C.png index b16e9b6a8..4857b91f5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F44C.png and b/retroshare-gui/src/gui/emojione/1F44C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F44D.png b/retroshare-gui/src/gui/emojione/1F44D.png index 19e9af684..223af376d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F44D.png and b/retroshare-gui/src/gui/emojione/1F44D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F44E.png b/retroshare-gui/src/gui/emojione/1F44E.png index 6b18635c1..ccf5b8f5a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F44E.png and b/retroshare-gui/src/gui/emojione/1F44E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F44F.png b/retroshare-gui/src/gui/emojione/1F44F.png index e8b827db2..018d1a011 100644 Binary files a/retroshare-gui/src/gui/emojione/1F44F.png and b/retroshare-gui/src/gui/emojione/1F44F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F450.png b/retroshare-gui/src/gui/emojione/1F450.png index 6e5857e3d..3f799f702 100644 Binary files a/retroshare-gui/src/gui/emojione/1F450.png and b/retroshare-gui/src/gui/emojione/1F450.png differ diff --git a/retroshare-gui/src/gui/emojione/1F451.png b/retroshare-gui/src/gui/emojione/1F451.png index 31f6082ce..221d8d35b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F451.png and b/retroshare-gui/src/gui/emojione/1F451.png differ diff --git a/retroshare-gui/src/gui/emojione/1F452.png b/retroshare-gui/src/gui/emojione/1F452.png index 41a21755c..4ab835b66 100644 Binary files a/retroshare-gui/src/gui/emojione/1F452.png and b/retroshare-gui/src/gui/emojione/1F452.png differ diff --git a/retroshare-gui/src/gui/emojione/1F453.png b/retroshare-gui/src/gui/emojione/1F453.png index a3bff2207..5d238cf02 100644 Binary files a/retroshare-gui/src/gui/emojione/1F453.png and b/retroshare-gui/src/gui/emojione/1F453.png differ diff --git a/retroshare-gui/src/gui/emojione/1F454.png b/retroshare-gui/src/gui/emojione/1F454.png index a56907d75..f8bd157dc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F454.png and b/retroshare-gui/src/gui/emojione/1F454.png differ diff --git a/retroshare-gui/src/gui/emojione/1F455.png b/retroshare-gui/src/gui/emojione/1F455.png index b9ac122f4..74931b572 100644 Binary files a/retroshare-gui/src/gui/emojione/1F455.png and b/retroshare-gui/src/gui/emojione/1F455.png differ diff --git a/retroshare-gui/src/gui/emojione/1F456.png b/retroshare-gui/src/gui/emojione/1F456.png index fbfcfc783..6b503b7fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F456.png and b/retroshare-gui/src/gui/emojione/1F456.png differ diff --git a/retroshare-gui/src/gui/emojione/1F457.png b/retroshare-gui/src/gui/emojione/1F457.png index 36b90e238..5e9e4469c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F457.png and b/retroshare-gui/src/gui/emojione/1F457.png differ diff --git a/retroshare-gui/src/gui/emojione/1F458.png b/retroshare-gui/src/gui/emojione/1F458.png index c9e498cc1..1742a321c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F458.png and b/retroshare-gui/src/gui/emojione/1F458.png differ diff --git a/retroshare-gui/src/gui/emojione/1F459.png b/retroshare-gui/src/gui/emojione/1F459.png index 920e8bc9e..65de89755 100644 Binary files a/retroshare-gui/src/gui/emojione/1F459.png and b/retroshare-gui/src/gui/emojione/1F459.png differ diff --git a/retroshare-gui/src/gui/emojione/1F45A.png b/retroshare-gui/src/gui/emojione/1F45A.png index 2d752f1c6..f49afa0b7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F45A.png and b/retroshare-gui/src/gui/emojione/1F45A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F45B.png b/retroshare-gui/src/gui/emojione/1F45B.png index 3d1d7aea6..3e8e737a8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F45B.png and b/retroshare-gui/src/gui/emojione/1F45B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F45C.png b/retroshare-gui/src/gui/emojione/1F45C.png index 2aa2302c1..011f72ec3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F45C.png and b/retroshare-gui/src/gui/emojione/1F45C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F45D.png b/retroshare-gui/src/gui/emojione/1F45D.png index 9642b832c..6ebe0f5a7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F45D.png and b/retroshare-gui/src/gui/emojione/1F45D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F45E.png b/retroshare-gui/src/gui/emojione/1F45E.png index a4c79d232..806eaa1f1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F45E.png and b/retroshare-gui/src/gui/emojione/1F45E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F45F.png b/retroshare-gui/src/gui/emojione/1F45F.png index edd1e21b1..56f18e690 100644 Binary files a/retroshare-gui/src/gui/emojione/1F45F.png and b/retroshare-gui/src/gui/emojione/1F45F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F460.png b/retroshare-gui/src/gui/emojione/1F460.png index 903118999..98b85278f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F460.png and b/retroshare-gui/src/gui/emojione/1F460.png differ diff --git a/retroshare-gui/src/gui/emojione/1F461.png b/retroshare-gui/src/gui/emojione/1F461.png index acebabba2..df833af2c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F461.png and b/retroshare-gui/src/gui/emojione/1F461.png differ diff --git a/retroshare-gui/src/gui/emojione/1F462.png b/retroshare-gui/src/gui/emojione/1F462.png index c105b4619..f3b5962f4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F462.png and b/retroshare-gui/src/gui/emojione/1F462.png differ diff --git a/retroshare-gui/src/gui/emojione/1F463.png b/retroshare-gui/src/gui/emojione/1F463.png index 849e3dec4..560dbf4ff 100644 Binary files a/retroshare-gui/src/gui/emojione/1F463.png and b/retroshare-gui/src/gui/emojione/1F463.png differ diff --git a/retroshare-gui/src/gui/emojione/1F464.png b/retroshare-gui/src/gui/emojione/1F464.png index 714c4c6b3..6f77ddba1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F464.png and b/retroshare-gui/src/gui/emojione/1F464.png differ diff --git a/retroshare-gui/src/gui/emojione/1F465.png b/retroshare-gui/src/gui/emojione/1F465.png index cdf9de079..bfec1cfca 100644 Binary files a/retroshare-gui/src/gui/emojione/1F465.png and b/retroshare-gui/src/gui/emojione/1F465.png differ diff --git a/retroshare-gui/src/gui/emojione/1F466.png b/retroshare-gui/src/gui/emojione/1F466.png index 9e08e9d7c..1e88d3766 100644 Binary files a/retroshare-gui/src/gui/emojione/1F466.png and b/retroshare-gui/src/gui/emojione/1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F467.png b/retroshare-gui/src/gui/emojione/1F467.png index 255a37e6c..c13fda75d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F467.png and b/retroshare-gui/src/gui/emojione/1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F468-1F466-1F466.png b/retroshare-gui/src/gui/emojione/1F468-1F468-1F466-1F466.png index 867ce4b3a..126bd4b3c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F468-1F466-1F466.png and b/retroshare-gui/src/gui/emojione/1F468-1F468-1F466-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F468-1F466.png b/retroshare-gui/src/gui/emojione/1F468-1F468-1F466.png index aa9fbe9b3..59ac6fea3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F468-1F466.png and b/retroshare-gui/src/gui/emojione/1F468-1F468-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F466.png b/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F466.png index 7c0bb43fc..735ebca18 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F466.png and b/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F467.png b/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F467.png index 761d0e9a2..ffbbf3fe1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F467.png and b/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F468-1F467.png b/retroshare-gui/src/gui/emojione/1F468-1F468-1F467.png index 95c337211..d8016064c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F468-1F467.png and b/retroshare-gui/src/gui/emojione/1F468-1F468-1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F469-1F466-1F466.png b/retroshare-gui/src/gui/emojione/1F468-1F469-1F466-1F466.png index c290d9e13..2ffb16b8b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F469-1F466-1F466.png and b/retroshare-gui/src/gui/emojione/1F468-1F469-1F466-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F466.png b/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F466.png index c399cfc69..de19cbe6b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F466.png and b/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F467.png b/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F467.png index 76c639750..e6846ce63 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F467.png and b/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F469-1F467.png b/retroshare-gui/src/gui/emojione/1F468-1F469-1F467.png index 4ed7304f7..4a7f50165 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F469-1F467.png and b/retroshare-gui/src/gui/emojione/1F468-1F469-1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-2764-1F468.png b/retroshare-gui/src/gui/emojione/1F468-2764-1F468.png index d0e00a32f..eb3689d3d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-2764-1F468.png and b/retroshare-gui/src/gui/emojione/1F468-2764-1F468.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-2764-1F48B-1F468.png b/retroshare-gui/src/gui/emojione/1F468-2764-1F48B-1F468.png index 5feda246c..a8793b5df 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-2764-1F48B-1F468.png and b/retroshare-gui/src/gui/emojione/1F468-2764-1F48B-1F468.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468.png b/retroshare-gui/src/gui/emojione/1F468.png index 13d409a21..0bfbf4fd9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468.png and b/retroshare-gui/src/gui/emojione/1F468.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-1F469-1F466-1F466.png b/retroshare-gui/src/gui/emojione/1F469-1F469-1F466-1F466.png index 282f1d453..a47042075 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-1F469-1F466-1F466.png and b/retroshare-gui/src/gui/emojione/1F469-1F469-1F466-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-1F469-1F466.png b/retroshare-gui/src/gui/emojione/1F469-1F469-1F466.png index 8304d8768..55ac74403 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-1F469-1F466.png and b/retroshare-gui/src/gui/emojione/1F469-1F469-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F466.png b/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F466.png index 90cbd3f03..aa46da18a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F466.png and b/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F467.png b/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F467.png index 8fdcab1aa..885d9ae9b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F467.png and b/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-1F469-1F467.png b/retroshare-gui/src/gui/emojione/1F469-1F469-1F467.png index 4946bc8aa..6578bd03a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-1F469-1F467.png and b/retroshare-gui/src/gui/emojione/1F469-1F469-1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-2764-1F469.png b/retroshare-gui/src/gui/emojione/1F469-2764-1F469.png index f9f4ba04e..ea7481ce1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-2764-1F469.png and b/retroshare-gui/src/gui/emojione/1F469-2764-1F469.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-2764-1F48B-1F469.png b/retroshare-gui/src/gui/emojione/1F469-2764-1F48B-1F469.png index e8e370081..4d35751f3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-2764-1F48B-1F469.png and b/retroshare-gui/src/gui/emojione/1F469-2764-1F48B-1F469.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469.png b/retroshare-gui/src/gui/emojione/1F469.png index 1966ef0d6..2614ef5c0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469.png and b/retroshare-gui/src/gui/emojione/1F469.png differ diff --git a/retroshare-gui/src/gui/emojione/1F46A.png b/retroshare-gui/src/gui/emojione/1F46A.png index 840111b2c..11c05d47d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F46A.png and b/retroshare-gui/src/gui/emojione/1F46A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F46B.png b/retroshare-gui/src/gui/emojione/1F46B.png index 44b1620b3..34bb4c924 100644 Binary files a/retroshare-gui/src/gui/emojione/1F46B.png and b/retroshare-gui/src/gui/emojione/1F46B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F46C.png b/retroshare-gui/src/gui/emojione/1F46C.png index ad0c68eb0..1b3cdc24e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F46C.png and b/retroshare-gui/src/gui/emojione/1F46C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F46D.png b/retroshare-gui/src/gui/emojione/1F46D.png index 0eba14235..814345441 100644 Binary files a/retroshare-gui/src/gui/emojione/1F46D.png and b/retroshare-gui/src/gui/emojione/1F46D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F46E.png b/retroshare-gui/src/gui/emojione/1F46E.png index 06582df9a..70943b1c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F46E.png and b/retroshare-gui/src/gui/emojione/1F46E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F46F.png b/retroshare-gui/src/gui/emojione/1F46F.png index 3a32a6daf..0b50812c8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F46F.png and b/retroshare-gui/src/gui/emojione/1F46F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F470.png b/retroshare-gui/src/gui/emojione/1F470.png index 2292c2ac7..69fb540f1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F470.png and b/retroshare-gui/src/gui/emojione/1F470.png differ diff --git a/retroshare-gui/src/gui/emojione/1F471.png b/retroshare-gui/src/gui/emojione/1F471.png index 9a3b2ca0f..8b4788117 100644 Binary files a/retroshare-gui/src/gui/emojione/1F471.png and b/retroshare-gui/src/gui/emojione/1F471.png differ diff --git a/retroshare-gui/src/gui/emojione/1F472.png b/retroshare-gui/src/gui/emojione/1F472.png index 9a545fbf2..9540536f4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F472.png and b/retroshare-gui/src/gui/emojione/1F472.png differ diff --git a/retroshare-gui/src/gui/emojione/1F473.png b/retroshare-gui/src/gui/emojione/1F473.png index 5b2074d41..8a16d4e22 100644 Binary files a/retroshare-gui/src/gui/emojione/1F473.png and b/retroshare-gui/src/gui/emojione/1F473.png differ diff --git a/retroshare-gui/src/gui/emojione/1F474.png b/retroshare-gui/src/gui/emojione/1F474.png index b8cda342c..bb836ffd4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F474.png and b/retroshare-gui/src/gui/emojione/1F474.png differ diff --git a/retroshare-gui/src/gui/emojione/1F475.png b/retroshare-gui/src/gui/emojione/1F475.png index 7456fcae3..0c23967e1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F475.png and b/retroshare-gui/src/gui/emojione/1F475.png differ diff --git a/retroshare-gui/src/gui/emojione/1F476.png b/retroshare-gui/src/gui/emojione/1F476.png index 1c8457d97..d81683077 100644 Binary files a/retroshare-gui/src/gui/emojione/1F476.png and b/retroshare-gui/src/gui/emojione/1F476.png differ diff --git a/retroshare-gui/src/gui/emojione/1F477.png b/retroshare-gui/src/gui/emojione/1F477.png index 5bb2376d8..031d2e7d7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F477.png and b/retroshare-gui/src/gui/emojione/1F477.png differ diff --git a/retroshare-gui/src/gui/emojione/1F478.png b/retroshare-gui/src/gui/emojione/1F478.png index e564b4c8b..d15e7713f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F478.png and b/retroshare-gui/src/gui/emojione/1F478.png differ diff --git a/retroshare-gui/src/gui/emojione/1F479.png b/retroshare-gui/src/gui/emojione/1F479.png index 4c1236123..e623313c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F479.png and b/retroshare-gui/src/gui/emojione/1F479.png differ diff --git a/retroshare-gui/src/gui/emojione/1F47A.png b/retroshare-gui/src/gui/emojione/1F47A.png index 9d36365d9..b92965b4c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F47A.png and b/retroshare-gui/src/gui/emojione/1F47A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F47B.png b/retroshare-gui/src/gui/emojione/1F47B.png index f45ded1bb..b354f4496 100644 Binary files a/retroshare-gui/src/gui/emojione/1F47B.png and b/retroshare-gui/src/gui/emojione/1F47B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F47C.png b/retroshare-gui/src/gui/emojione/1F47C.png index 0ca763bce..3652383c8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F47C.png and b/retroshare-gui/src/gui/emojione/1F47C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F47D.png b/retroshare-gui/src/gui/emojione/1F47D.png index a4a41e5bc..485cc394e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F47D.png and b/retroshare-gui/src/gui/emojione/1F47D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F47E.png b/retroshare-gui/src/gui/emojione/1F47E.png index e428a3aba..069653955 100644 Binary files a/retroshare-gui/src/gui/emojione/1F47E.png and b/retroshare-gui/src/gui/emojione/1F47E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F47F.png b/retroshare-gui/src/gui/emojione/1F47F.png index 433bd30ee..a8a85cfdc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F47F.png and b/retroshare-gui/src/gui/emojione/1F47F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F480.png b/retroshare-gui/src/gui/emojione/1F480.png index fdcb232dc..55426859f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F480.png and b/retroshare-gui/src/gui/emojione/1F480.png differ diff --git a/retroshare-gui/src/gui/emojione/1F481.png b/retroshare-gui/src/gui/emojione/1F481.png index 0c30e6a18..548f5cfad 100644 Binary files a/retroshare-gui/src/gui/emojione/1F481.png and b/retroshare-gui/src/gui/emojione/1F481.png differ diff --git a/retroshare-gui/src/gui/emojione/1F482.png b/retroshare-gui/src/gui/emojione/1F482.png index a9c014618..40cc58159 100644 Binary files a/retroshare-gui/src/gui/emojione/1F482.png and b/retroshare-gui/src/gui/emojione/1F482.png differ diff --git a/retroshare-gui/src/gui/emojione/1F483.png b/retroshare-gui/src/gui/emojione/1F483.png index 71e9ee8e8..0de5d3bd3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F483.png and b/retroshare-gui/src/gui/emojione/1F483.png differ diff --git a/retroshare-gui/src/gui/emojione/1F484.png b/retroshare-gui/src/gui/emojione/1F484.png index 7b1eae505..93622d37d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F484.png and b/retroshare-gui/src/gui/emojione/1F484.png differ diff --git a/retroshare-gui/src/gui/emojione/1F485.png b/retroshare-gui/src/gui/emojione/1F485.png index fdcde53b1..88feb3844 100644 Binary files a/retroshare-gui/src/gui/emojione/1F485.png and b/retroshare-gui/src/gui/emojione/1F485.png differ diff --git a/retroshare-gui/src/gui/emojione/1F486.png b/retroshare-gui/src/gui/emojione/1F486.png index 10eea894a..4f829e24d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F486.png and b/retroshare-gui/src/gui/emojione/1F486.png differ diff --git a/retroshare-gui/src/gui/emojione/1F487.png b/retroshare-gui/src/gui/emojione/1F487.png index 7fd940a1c..684c6b34f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F487.png and b/retroshare-gui/src/gui/emojione/1F487.png differ diff --git a/retroshare-gui/src/gui/emojione/1F488.png b/retroshare-gui/src/gui/emojione/1F488.png index 3d4b2bcd6..b9bfb8013 100644 Binary files a/retroshare-gui/src/gui/emojione/1F488.png and b/retroshare-gui/src/gui/emojione/1F488.png differ diff --git a/retroshare-gui/src/gui/emojione/1F489.png b/retroshare-gui/src/gui/emojione/1F489.png index 04034df0c..e326d755b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F489.png and b/retroshare-gui/src/gui/emojione/1F489.png differ diff --git a/retroshare-gui/src/gui/emojione/1F48A.png b/retroshare-gui/src/gui/emojione/1F48A.png index ca63e5975..b1313bcda 100644 Binary files a/retroshare-gui/src/gui/emojione/1F48A.png and b/retroshare-gui/src/gui/emojione/1F48A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F48B.png b/retroshare-gui/src/gui/emojione/1F48B.png index 36b766639..3048ad124 100644 Binary files a/retroshare-gui/src/gui/emojione/1F48B.png and b/retroshare-gui/src/gui/emojione/1F48B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F48C.png b/retroshare-gui/src/gui/emojione/1F48C.png index 73d93d9f5..77b5d70de 100644 Binary files a/retroshare-gui/src/gui/emojione/1F48C.png and b/retroshare-gui/src/gui/emojione/1F48C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F48D.png b/retroshare-gui/src/gui/emojione/1F48D.png index d0403b297..88818f1c3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F48D.png and b/retroshare-gui/src/gui/emojione/1F48D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F48E.png b/retroshare-gui/src/gui/emojione/1F48E.png index 704202d97..c6f134f46 100644 Binary files a/retroshare-gui/src/gui/emojione/1F48E.png and b/retroshare-gui/src/gui/emojione/1F48E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F48F.png b/retroshare-gui/src/gui/emojione/1F48F.png index 694753a17..a51e9af74 100644 Binary files a/retroshare-gui/src/gui/emojione/1F48F.png and b/retroshare-gui/src/gui/emojione/1F48F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F490.png b/retroshare-gui/src/gui/emojione/1F490.png index 056031866..61baa9bf9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F490.png and b/retroshare-gui/src/gui/emojione/1F490.png differ diff --git a/retroshare-gui/src/gui/emojione/1F491.png b/retroshare-gui/src/gui/emojione/1F491.png index fc8a35875..642a64dbe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F491.png and b/retroshare-gui/src/gui/emojione/1F491.png differ diff --git a/retroshare-gui/src/gui/emojione/1F492.png b/retroshare-gui/src/gui/emojione/1F492.png index 16584ef70..8b5f8a6b6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F492.png and b/retroshare-gui/src/gui/emojione/1F492.png differ diff --git a/retroshare-gui/src/gui/emojione/1F493.png b/retroshare-gui/src/gui/emojione/1F493.png index 7ec9347db..fde1e696d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F493.png and b/retroshare-gui/src/gui/emojione/1F493.png differ diff --git a/retroshare-gui/src/gui/emojione/1F494.png b/retroshare-gui/src/gui/emojione/1F494.png index 75053064c..a57e29c10 100644 Binary files a/retroshare-gui/src/gui/emojione/1F494.png and b/retroshare-gui/src/gui/emojione/1F494.png differ diff --git a/retroshare-gui/src/gui/emojione/1F495.png b/retroshare-gui/src/gui/emojione/1F495.png index 5538934c6..eaf0813f1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F495.png and b/retroshare-gui/src/gui/emojione/1F495.png differ diff --git a/retroshare-gui/src/gui/emojione/1F496.png b/retroshare-gui/src/gui/emojione/1F496.png index 7b6f9230f..224a1d7e0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F496.png and b/retroshare-gui/src/gui/emojione/1F496.png differ diff --git a/retroshare-gui/src/gui/emojione/1F497.png b/retroshare-gui/src/gui/emojione/1F497.png index 6d186a48d..0c0c61e68 100644 Binary files a/retroshare-gui/src/gui/emojione/1F497.png and b/retroshare-gui/src/gui/emojione/1F497.png differ diff --git a/retroshare-gui/src/gui/emojione/1F498.png b/retroshare-gui/src/gui/emojione/1F498.png index 6dbe5a322..2fbd6cca7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F498.png and b/retroshare-gui/src/gui/emojione/1F498.png differ diff --git a/retroshare-gui/src/gui/emojione/1F499.png b/retroshare-gui/src/gui/emojione/1F499.png index 29051c960..70d1b3ff0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F499.png and b/retroshare-gui/src/gui/emojione/1F499.png differ diff --git a/retroshare-gui/src/gui/emojione/1F49A.png b/retroshare-gui/src/gui/emojione/1F49A.png index 87937375a..53d803f8b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F49A.png and b/retroshare-gui/src/gui/emojione/1F49A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F49B.png b/retroshare-gui/src/gui/emojione/1F49B.png index 09a9f0188..a0aeecc53 100644 Binary files a/retroshare-gui/src/gui/emojione/1F49B.png and b/retroshare-gui/src/gui/emojione/1F49B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F49C.png b/retroshare-gui/src/gui/emojione/1F49C.png index c1b9c0702..cfc0f6cf0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F49C.png and b/retroshare-gui/src/gui/emojione/1F49C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F49D.png b/retroshare-gui/src/gui/emojione/1F49D.png index b031386fe..3a9e89b11 100644 Binary files a/retroshare-gui/src/gui/emojione/1F49D.png and b/retroshare-gui/src/gui/emojione/1F49D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F49E.png b/retroshare-gui/src/gui/emojione/1F49E.png index 5969cdf27..e329e8595 100644 Binary files a/retroshare-gui/src/gui/emojione/1F49E.png and b/retroshare-gui/src/gui/emojione/1F49E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F49F.png b/retroshare-gui/src/gui/emojione/1F49F.png index dff40bb2e..a93675d21 100644 Binary files a/retroshare-gui/src/gui/emojione/1F49F.png and b/retroshare-gui/src/gui/emojione/1F49F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A0.png b/retroshare-gui/src/gui/emojione/1F4A0.png index 0c59c4e31..058e5e247 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A0.png and b/retroshare-gui/src/gui/emojione/1F4A0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A1.png b/retroshare-gui/src/gui/emojione/1F4A1.png index ca223972c..6952fa626 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A1.png and b/retroshare-gui/src/gui/emojione/1F4A1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A2.png b/retroshare-gui/src/gui/emojione/1F4A2.png index 6835d1540..76777327a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A2.png and b/retroshare-gui/src/gui/emojione/1F4A2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A3.png b/retroshare-gui/src/gui/emojione/1F4A3.png index 5dc045c1c..23cd364e1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A3.png and b/retroshare-gui/src/gui/emojione/1F4A3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A4.png b/retroshare-gui/src/gui/emojione/1F4A4.png index d7efe266f..c36799acb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A4.png and b/retroshare-gui/src/gui/emojione/1F4A4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A5.png b/retroshare-gui/src/gui/emojione/1F4A5.png index 7f3d6842d..5b086c9c4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A5.png and b/retroshare-gui/src/gui/emojione/1F4A5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A6.png b/retroshare-gui/src/gui/emojione/1F4A6.png index aec0a3bdc..3aa4f438a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A6.png and b/retroshare-gui/src/gui/emojione/1F4A6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A7.png b/retroshare-gui/src/gui/emojione/1F4A7.png index 8a5d50b23..e0108fe84 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A7.png and b/retroshare-gui/src/gui/emojione/1F4A7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A8.png b/retroshare-gui/src/gui/emojione/1F4A8.png index 8fbcbc5dd..8068ec43f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A8.png and b/retroshare-gui/src/gui/emojione/1F4A8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A9.png b/retroshare-gui/src/gui/emojione/1F4A9.png index 239066cdc..13c1d7a5c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A9.png and b/retroshare-gui/src/gui/emojione/1F4A9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4AA.png b/retroshare-gui/src/gui/emojione/1F4AA.png index 7ed0a93cd..4efff713e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4AA.png and b/retroshare-gui/src/gui/emojione/1F4AA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4AB.png b/retroshare-gui/src/gui/emojione/1F4AB.png index a06a7288b..f8204a94c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4AB.png and b/retroshare-gui/src/gui/emojione/1F4AB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4AC.png b/retroshare-gui/src/gui/emojione/1F4AC.png index bab5e56b2..d95f8c325 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4AC.png and b/retroshare-gui/src/gui/emojione/1F4AC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4AD.png b/retroshare-gui/src/gui/emojione/1F4AD.png index 33a0c9f08..4e94cc151 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4AD.png and b/retroshare-gui/src/gui/emojione/1F4AD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4AE.png b/retroshare-gui/src/gui/emojione/1F4AE.png index 2f33111f5..f02993874 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4AE.png and b/retroshare-gui/src/gui/emojione/1F4AE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4AF.png b/retroshare-gui/src/gui/emojione/1F4AF.png index f4a4b6689..6ba9bd9dc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4AF.png and b/retroshare-gui/src/gui/emojione/1F4AF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B0.png b/retroshare-gui/src/gui/emojione/1F4B0.png index 695e60201..d9dd8c3fd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B0.png and b/retroshare-gui/src/gui/emojione/1F4B0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B1.png b/retroshare-gui/src/gui/emojione/1F4B1.png index 19c0742cc..307c2aadb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B1.png and b/retroshare-gui/src/gui/emojione/1F4B1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B2.png b/retroshare-gui/src/gui/emojione/1F4B2.png index f8d2a7b4b..350fcf218 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B2.png and b/retroshare-gui/src/gui/emojione/1F4B2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B3.png b/retroshare-gui/src/gui/emojione/1F4B3.png index 2fbf75d2d..a3ea628a8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B3.png and b/retroshare-gui/src/gui/emojione/1F4B3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B4.png b/retroshare-gui/src/gui/emojione/1F4B4.png index 8c8c11518..4b92e0977 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B4.png and b/retroshare-gui/src/gui/emojione/1F4B4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B5.png b/retroshare-gui/src/gui/emojione/1F4B5.png index 53e2468d9..e0273f71c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B5.png and b/retroshare-gui/src/gui/emojione/1F4B5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B6.png b/retroshare-gui/src/gui/emojione/1F4B6.png index 4c3892e6d..37c5a352d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B6.png and b/retroshare-gui/src/gui/emojione/1F4B6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B7.png b/retroshare-gui/src/gui/emojione/1F4B7.png index a7aa3c782..58359af97 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B7.png and b/retroshare-gui/src/gui/emojione/1F4B7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B8.png b/retroshare-gui/src/gui/emojione/1F4B8.png index b25185773..1800d0810 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B8.png and b/retroshare-gui/src/gui/emojione/1F4B8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B9.png b/retroshare-gui/src/gui/emojione/1F4B9.png index dbf7c8e27..7177a0e9f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B9.png and b/retroshare-gui/src/gui/emojione/1F4B9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4BA.png b/retroshare-gui/src/gui/emojione/1F4BA.png index aa8a56ef8..2461dda71 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4BA.png and b/retroshare-gui/src/gui/emojione/1F4BA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4BB.png b/retroshare-gui/src/gui/emojione/1F4BB.png index 9300f4409..b635454e8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4BB.png and b/retroshare-gui/src/gui/emojione/1F4BB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4BC.png b/retroshare-gui/src/gui/emojione/1F4BC.png index 203132b79..134ebb634 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4BC.png and b/retroshare-gui/src/gui/emojione/1F4BC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4BD.png b/retroshare-gui/src/gui/emojione/1F4BD.png index 80f14e190..e58119565 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4BD.png and b/retroshare-gui/src/gui/emojione/1F4BD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4BE.png b/retroshare-gui/src/gui/emojione/1F4BE.png index bd224cf38..6264f7da7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4BE.png and b/retroshare-gui/src/gui/emojione/1F4BE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4BF.png b/retroshare-gui/src/gui/emojione/1F4BF.png index 6008d1fe5..dae663a9f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4BF.png and b/retroshare-gui/src/gui/emojione/1F4BF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C0.png b/retroshare-gui/src/gui/emojione/1F4C0.png index c8c0dcde9..f485ba8c3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C0.png and b/retroshare-gui/src/gui/emojione/1F4C0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C1.png b/retroshare-gui/src/gui/emojione/1F4C1.png index 913340fed..b394c310a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C1.png and b/retroshare-gui/src/gui/emojione/1F4C1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C2.png b/retroshare-gui/src/gui/emojione/1F4C2.png index d52fe8bcf..f396ab9ff 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C2.png and b/retroshare-gui/src/gui/emojione/1F4C2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C3.png b/retroshare-gui/src/gui/emojione/1F4C3.png index 8427fe259..acb69209c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C3.png and b/retroshare-gui/src/gui/emojione/1F4C3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C4.png b/retroshare-gui/src/gui/emojione/1F4C4.png index ab6897224..17cf7617e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C4.png and b/retroshare-gui/src/gui/emojione/1F4C4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C5.png b/retroshare-gui/src/gui/emojione/1F4C5.png index 405a62f82..946253368 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C5.png and b/retroshare-gui/src/gui/emojione/1F4C5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C6.png b/retroshare-gui/src/gui/emojione/1F4C6.png index 4b0b7bf2b..afd34540f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C6.png and b/retroshare-gui/src/gui/emojione/1F4C6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C7.png b/retroshare-gui/src/gui/emojione/1F4C7.png index 497e6fc83..e9b6247dd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C7.png and b/retroshare-gui/src/gui/emojione/1F4C7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C8.png b/retroshare-gui/src/gui/emojione/1F4C8.png index 5343a4d4f..ad0a54368 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C8.png and b/retroshare-gui/src/gui/emojione/1F4C8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C9.png b/retroshare-gui/src/gui/emojione/1F4C9.png index 66f7729fb..ef58a975e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C9.png and b/retroshare-gui/src/gui/emojione/1F4C9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4CA.png b/retroshare-gui/src/gui/emojione/1F4CA.png index 5c691e8b5..90d6fb841 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4CA.png and b/retroshare-gui/src/gui/emojione/1F4CA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4CB.png b/retroshare-gui/src/gui/emojione/1F4CB.png index ee153f5bc..d7e4599d3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4CB.png and b/retroshare-gui/src/gui/emojione/1F4CB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4CC.png b/retroshare-gui/src/gui/emojione/1F4CC.png index 467166dde..7d7484ca4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4CC.png and b/retroshare-gui/src/gui/emojione/1F4CC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4CD.png b/retroshare-gui/src/gui/emojione/1F4CD.png index d963e31a8..1f76929ae 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4CD.png and b/retroshare-gui/src/gui/emojione/1F4CD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4CE.png b/retroshare-gui/src/gui/emojione/1F4CE.png index 351cd4b5b..a231037ba 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4CE.png and b/retroshare-gui/src/gui/emojione/1F4CE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4CF.png b/retroshare-gui/src/gui/emojione/1F4CF.png index e4d383ebd..a2522cc13 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4CF.png and b/retroshare-gui/src/gui/emojione/1F4CF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D0.png b/retroshare-gui/src/gui/emojione/1F4D0.png index c8bc69272..ddad72c72 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D0.png and b/retroshare-gui/src/gui/emojione/1F4D0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D1.png b/retroshare-gui/src/gui/emojione/1F4D1.png index d93806d06..a9bbc87a3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D1.png and b/retroshare-gui/src/gui/emojione/1F4D1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D2.png b/retroshare-gui/src/gui/emojione/1F4D2.png index 4406bda23..4f761f491 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D2.png and b/retroshare-gui/src/gui/emojione/1F4D2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D3.png b/retroshare-gui/src/gui/emojione/1F4D3.png index 4692393bd..3309e0e20 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D3.png and b/retroshare-gui/src/gui/emojione/1F4D3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D4.png b/retroshare-gui/src/gui/emojione/1F4D4.png index 90ea544ff..512ac0d31 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D4.png and b/retroshare-gui/src/gui/emojione/1F4D4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D5.png b/retroshare-gui/src/gui/emojione/1F4D5.png index f20f1cb56..f8e7eba90 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D5.png and b/retroshare-gui/src/gui/emojione/1F4D5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D6.png b/retroshare-gui/src/gui/emojione/1F4D6.png index efce42489..f701a4d15 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D6.png and b/retroshare-gui/src/gui/emojione/1F4D6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D7.png b/retroshare-gui/src/gui/emojione/1F4D7.png index 9a51ff459..e0098664d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D7.png and b/retroshare-gui/src/gui/emojione/1F4D7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D8.png b/retroshare-gui/src/gui/emojione/1F4D8.png index 3f13696f6..de281d9a4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D8.png and b/retroshare-gui/src/gui/emojione/1F4D8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D9.png b/retroshare-gui/src/gui/emojione/1F4D9.png index c670ad9e5..378bbb042 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D9.png and b/retroshare-gui/src/gui/emojione/1F4D9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4DA.png b/retroshare-gui/src/gui/emojione/1F4DA.png index 7258e5c6c..ade5fd158 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4DA.png and b/retroshare-gui/src/gui/emojione/1F4DA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4DB.png b/retroshare-gui/src/gui/emojione/1F4DB.png index b8bbc7456..409961a27 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4DB.png and b/retroshare-gui/src/gui/emojione/1F4DB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4DC.png b/retroshare-gui/src/gui/emojione/1F4DC.png index ce5a6a4b0..ad25631a8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4DC.png and b/retroshare-gui/src/gui/emojione/1F4DC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4DD.png b/retroshare-gui/src/gui/emojione/1F4DD.png index a37a5ffd9..18c2a00fe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4DD.png and b/retroshare-gui/src/gui/emojione/1F4DD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4DE.png b/retroshare-gui/src/gui/emojione/1F4DE.png index 568152d3d..1b94cdaa3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4DE.png and b/retroshare-gui/src/gui/emojione/1F4DE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4DF.png b/retroshare-gui/src/gui/emojione/1F4DF.png index cc70bd07f..2f5783f8a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4DF.png and b/retroshare-gui/src/gui/emojione/1F4DF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E0.png b/retroshare-gui/src/gui/emojione/1F4E0.png index d9abceab9..a45530169 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E0.png and b/retroshare-gui/src/gui/emojione/1F4E0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E1.png b/retroshare-gui/src/gui/emojione/1F4E1.png index 9b3b94af3..97aafdd58 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E1.png and b/retroshare-gui/src/gui/emojione/1F4E1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E2.png b/retroshare-gui/src/gui/emojione/1F4E2.png index eda1327c6..a26e5c08a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E2.png and b/retroshare-gui/src/gui/emojione/1F4E2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E3.png b/retroshare-gui/src/gui/emojione/1F4E3.png index 5b993f01d..ad892069b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E3.png and b/retroshare-gui/src/gui/emojione/1F4E3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E4.png b/retroshare-gui/src/gui/emojione/1F4E4.png index e1eec9d47..146bc58cf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E4.png and b/retroshare-gui/src/gui/emojione/1F4E4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E5.png b/retroshare-gui/src/gui/emojione/1F4E5.png index 8d88f4b16..11c26b2b6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E5.png and b/retroshare-gui/src/gui/emojione/1F4E5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E6.png b/retroshare-gui/src/gui/emojione/1F4E6.png index 161af9ffd..6a080c5af 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E6.png and b/retroshare-gui/src/gui/emojione/1F4E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E7.png b/retroshare-gui/src/gui/emojione/1F4E7.png index 694f31a8e..43e6b53ad 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E7.png and b/retroshare-gui/src/gui/emojione/1F4E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E8.png b/retroshare-gui/src/gui/emojione/1F4E8.png index 0bc1aad91..f78f51839 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E8.png and b/retroshare-gui/src/gui/emojione/1F4E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E9.png b/retroshare-gui/src/gui/emojione/1F4E9.png index 316a17488..f6491ac5a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E9.png and b/retroshare-gui/src/gui/emojione/1F4E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4EA.png b/retroshare-gui/src/gui/emojione/1F4EA.png index 89ed25a05..7ee06b897 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4EA.png and b/retroshare-gui/src/gui/emojione/1F4EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4EB.png b/retroshare-gui/src/gui/emojione/1F4EB.png index 8101dee69..e2a5c0ad7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4EB.png and b/retroshare-gui/src/gui/emojione/1F4EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4EC.png b/retroshare-gui/src/gui/emojione/1F4EC.png index c0ce11d14..0e2816c8f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4EC.png and b/retroshare-gui/src/gui/emojione/1F4EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4ED.png b/retroshare-gui/src/gui/emojione/1F4ED.png index 72ebd3007..b9341dcc4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4ED.png and b/retroshare-gui/src/gui/emojione/1F4ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4EE.png b/retroshare-gui/src/gui/emojione/1F4EE.png index a952f8028..36113a6d6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4EE.png and b/retroshare-gui/src/gui/emojione/1F4EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4EF.png b/retroshare-gui/src/gui/emojione/1F4EF.png index c476395a3..b5f403ee3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4EF.png and b/retroshare-gui/src/gui/emojione/1F4EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F0.png b/retroshare-gui/src/gui/emojione/1F4F0.png index 0f898e47c..c8c784c54 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F0.png and b/retroshare-gui/src/gui/emojione/1F4F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F1.png b/retroshare-gui/src/gui/emojione/1F4F1.png index 990b70d71..c0513a0f9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F1.png and b/retroshare-gui/src/gui/emojione/1F4F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F2.png b/retroshare-gui/src/gui/emojione/1F4F2.png index 5911e766a..00293f674 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F2.png and b/retroshare-gui/src/gui/emojione/1F4F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F3.png b/retroshare-gui/src/gui/emojione/1F4F3.png index 4fef63132..db10e8774 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F3.png and b/retroshare-gui/src/gui/emojione/1F4F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F4.png b/retroshare-gui/src/gui/emojione/1F4F4.png index a8cf2e2a2..c9cbce97e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F4.png and b/retroshare-gui/src/gui/emojione/1F4F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F5.png b/retroshare-gui/src/gui/emojione/1F4F5.png index 5fbfb6a26..7ba94df81 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F5.png and b/retroshare-gui/src/gui/emojione/1F4F5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F6.png b/retroshare-gui/src/gui/emojione/1F4F6.png index 058813e53..a823a590e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F6.png and b/retroshare-gui/src/gui/emojione/1F4F6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F7.png b/retroshare-gui/src/gui/emojione/1F4F7.png index 88ca33e08..108fc4d0d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F7.png and b/retroshare-gui/src/gui/emojione/1F4F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F8.png b/retroshare-gui/src/gui/emojione/1F4F8.png index 02d786e9b..c46f37156 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F8.png and b/retroshare-gui/src/gui/emojione/1F4F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F9.png b/retroshare-gui/src/gui/emojione/1F4F9.png index b3d49fb18..8651630f4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F9.png and b/retroshare-gui/src/gui/emojione/1F4F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4FA.png b/retroshare-gui/src/gui/emojione/1F4FA.png index 7a403a69a..ce4c1649b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4FA.png and b/retroshare-gui/src/gui/emojione/1F4FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4FB.png b/retroshare-gui/src/gui/emojione/1F4FB.png index 339dd2cbe..f79371854 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4FB.png and b/retroshare-gui/src/gui/emojione/1F4FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4FC.png b/retroshare-gui/src/gui/emojione/1F4FC.png index 37f10cfdf..ad7b9ac99 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4FC.png and b/retroshare-gui/src/gui/emojione/1F4FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4FD.png b/retroshare-gui/src/gui/emojione/1F4FD.png index 9be12847a..08075f077 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4FD.png and b/retroshare-gui/src/gui/emojione/1F4FD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4FE.png b/retroshare-gui/src/gui/emojione/1F4FE.png index 5d87d758a..80848e16f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4FE.png and b/retroshare-gui/src/gui/emojione/1F4FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F500.png b/retroshare-gui/src/gui/emojione/1F500.png index 310a92bc1..318d715f1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F500.png and b/retroshare-gui/src/gui/emojione/1F500.png differ diff --git a/retroshare-gui/src/gui/emojione/1F501.png b/retroshare-gui/src/gui/emojione/1F501.png index 6796d8ffc..3a6dbccde 100644 Binary files a/retroshare-gui/src/gui/emojione/1F501.png and b/retroshare-gui/src/gui/emojione/1F501.png differ diff --git a/retroshare-gui/src/gui/emojione/1F502.png b/retroshare-gui/src/gui/emojione/1F502.png index 4d1cd91c5..583555fce 100644 Binary files a/retroshare-gui/src/gui/emojione/1F502.png and b/retroshare-gui/src/gui/emojione/1F502.png differ diff --git a/retroshare-gui/src/gui/emojione/1F503.png b/retroshare-gui/src/gui/emojione/1F503.png index 973e44c0c..e7121ac23 100644 Binary files a/retroshare-gui/src/gui/emojione/1F503.png and b/retroshare-gui/src/gui/emojione/1F503.png differ diff --git a/retroshare-gui/src/gui/emojione/1F504.png b/retroshare-gui/src/gui/emojione/1F504.png index b07bd3ec8..7eb1ea177 100644 Binary files a/retroshare-gui/src/gui/emojione/1F504.png and b/retroshare-gui/src/gui/emojione/1F504.png differ diff --git a/retroshare-gui/src/gui/emojione/1F505.png b/retroshare-gui/src/gui/emojione/1F505.png index 3fe2de747..3f2bc97a0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F505.png and b/retroshare-gui/src/gui/emojione/1F505.png differ diff --git a/retroshare-gui/src/gui/emojione/1F506.png b/retroshare-gui/src/gui/emojione/1F506.png index 81afb815c..2fece75b4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F506.png and b/retroshare-gui/src/gui/emojione/1F506.png differ diff --git a/retroshare-gui/src/gui/emojione/1F507.png b/retroshare-gui/src/gui/emojione/1F507.png index e19da41c0..0f646e62f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F507.png and b/retroshare-gui/src/gui/emojione/1F507.png differ diff --git a/retroshare-gui/src/gui/emojione/1F508.png b/retroshare-gui/src/gui/emojione/1F508.png index 64bd6e37b..cd32029be 100644 Binary files a/retroshare-gui/src/gui/emojione/1F508.png and b/retroshare-gui/src/gui/emojione/1F508.png differ diff --git a/retroshare-gui/src/gui/emojione/1F509.png b/retroshare-gui/src/gui/emojione/1F509.png index 225663187..e7241a019 100644 Binary files a/retroshare-gui/src/gui/emojione/1F509.png and b/retroshare-gui/src/gui/emojione/1F509.png differ diff --git a/retroshare-gui/src/gui/emojione/1F50A.png b/retroshare-gui/src/gui/emojione/1F50A.png index 891545ca5..2a9850aea 100644 Binary files a/retroshare-gui/src/gui/emojione/1F50A.png and b/retroshare-gui/src/gui/emojione/1F50A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F50B.png b/retroshare-gui/src/gui/emojione/1F50B.png index 2abd958f2..f813f291b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F50B.png and b/retroshare-gui/src/gui/emojione/1F50B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F50C.png b/retroshare-gui/src/gui/emojione/1F50C.png index 22005bfb4..edac69969 100644 Binary files a/retroshare-gui/src/gui/emojione/1F50C.png and b/retroshare-gui/src/gui/emojione/1F50C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F50D.png b/retroshare-gui/src/gui/emojione/1F50D.png index c3ed016e6..e32353c9d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F50D.png and b/retroshare-gui/src/gui/emojione/1F50D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F50E.png b/retroshare-gui/src/gui/emojione/1F50E.png index b7132a95d..f6a04309f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F50E.png and b/retroshare-gui/src/gui/emojione/1F50E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F50F.png b/retroshare-gui/src/gui/emojione/1F50F.png index a02e8010a..0a2a162e8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F50F.png and b/retroshare-gui/src/gui/emojione/1F50F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F510.png b/retroshare-gui/src/gui/emojione/1F510.png index 85a641569..060da0678 100644 Binary files a/retroshare-gui/src/gui/emojione/1F510.png and b/retroshare-gui/src/gui/emojione/1F510.png differ diff --git a/retroshare-gui/src/gui/emojione/1F511.png b/retroshare-gui/src/gui/emojione/1F511.png index 2af6f3e0e..8bdfe0ce0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F511.png and b/retroshare-gui/src/gui/emojione/1F511.png differ diff --git a/retroshare-gui/src/gui/emojione/1F512.png b/retroshare-gui/src/gui/emojione/1F512.png index a3518d475..3734137a9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F512.png and b/retroshare-gui/src/gui/emojione/1F512.png differ diff --git a/retroshare-gui/src/gui/emojione/1F513.png b/retroshare-gui/src/gui/emojione/1F513.png index d78d924bc..67b9eda6a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F513.png and b/retroshare-gui/src/gui/emojione/1F513.png differ diff --git a/retroshare-gui/src/gui/emojione/1F514.png b/retroshare-gui/src/gui/emojione/1F514.png index 79ba54f55..0c38127e1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F514.png and b/retroshare-gui/src/gui/emojione/1F514.png differ diff --git a/retroshare-gui/src/gui/emojione/1F515.png b/retroshare-gui/src/gui/emojione/1F515.png index 8f7677328..66b0a72b1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F515.png and b/retroshare-gui/src/gui/emojione/1F515.png differ diff --git a/retroshare-gui/src/gui/emojione/1F516.png b/retroshare-gui/src/gui/emojione/1F516.png index 6239684a4..752b395a7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F516.png and b/retroshare-gui/src/gui/emojione/1F516.png differ diff --git a/retroshare-gui/src/gui/emojione/1F517.png b/retroshare-gui/src/gui/emojione/1F517.png index d6613aca5..3d8017144 100644 Binary files a/retroshare-gui/src/gui/emojione/1F517.png and b/retroshare-gui/src/gui/emojione/1F517.png differ diff --git a/retroshare-gui/src/gui/emojione/1F518.png b/retroshare-gui/src/gui/emojione/1F518.png index cbce9f459..21fe1c94d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F518.png and b/retroshare-gui/src/gui/emojione/1F518.png differ diff --git a/retroshare-gui/src/gui/emojione/1F519.png b/retroshare-gui/src/gui/emojione/1F519.png index 967104c06..bb1bfdd07 100644 Binary files a/retroshare-gui/src/gui/emojione/1F519.png and b/retroshare-gui/src/gui/emojione/1F519.png differ diff --git a/retroshare-gui/src/gui/emojione/1F51A.png b/retroshare-gui/src/gui/emojione/1F51A.png index 3e57138ea..a613ef8e1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F51A.png and b/retroshare-gui/src/gui/emojione/1F51A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F51B.png b/retroshare-gui/src/gui/emojione/1F51B.png index 41aaeb732..131b85343 100644 Binary files a/retroshare-gui/src/gui/emojione/1F51B.png and b/retroshare-gui/src/gui/emojione/1F51B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F51C.png b/retroshare-gui/src/gui/emojione/1F51C.png index 5ab3f8ade..a85fb02f5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F51C.png and b/retroshare-gui/src/gui/emojione/1F51C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F51D.png b/retroshare-gui/src/gui/emojione/1F51D.png index 34e41d2ff..37201db4c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F51D.png and b/retroshare-gui/src/gui/emojione/1F51D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F51E.png b/retroshare-gui/src/gui/emojione/1F51E.png index f098b1dcd..5341f2222 100644 Binary files a/retroshare-gui/src/gui/emojione/1F51E.png and b/retroshare-gui/src/gui/emojione/1F51E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F51F.png b/retroshare-gui/src/gui/emojione/1F51F.png index 2ed6d0129..9a1f17a7e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F51F.png and b/retroshare-gui/src/gui/emojione/1F51F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F520.png b/retroshare-gui/src/gui/emojione/1F520.png index ad6639475..40d3ebaf8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F520.png and b/retroshare-gui/src/gui/emojione/1F520.png differ diff --git a/retroshare-gui/src/gui/emojione/1F521.png b/retroshare-gui/src/gui/emojione/1F521.png index 229bfe25f..0c8758c48 100644 Binary files a/retroshare-gui/src/gui/emojione/1F521.png and b/retroshare-gui/src/gui/emojione/1F521.png differ diff --git a/retroshare-gui/src/gui/emojione/1F522.png b/retroshare-gui/src/gui/emojione/1F522.png index 38c7a7fb1..0d3f518f3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F522.png and b/retroshare-gui/src/gui/emojione/1F522.png differ diff --git a/retroshare-gui/src/gui/emojione/1F523.png b/retroshare-gui/src/gui/emojione/1F523.png index a385ebbfb..f00bfec1a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F523.png and b/retroshare-gui/src/gui/emojione/1F523.png differ diff --git a/retroshare-gui/src/gui/emojione/1F524.png b/retroshare-gui/src/gui/emojione/1F524.png index 723b66762..6e43a5b40 100644 Binary files a/retroshare-gui/src/gui/emojione/1F524.png and b/retroshare-gui/src/gui/emojione/1F524.png differ diff --git a/retroshare-gui/src/gui/emojione/1F525.png b/retroshare-gui/src/gui/emojione/1F525.png index fcf2d513d..4760d4bf8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F525.png and b/retroshare-gui/src/gui/emojione/1F525.png differ diff --git a/retroshare-gui/src/gui/emojione/1F526.png b/retroshare-gui/src/gui/emojione/1F526.png index 00b834a07..ced6462bf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F526.png and b/retroshare-gui/src/gui/emojione/1F526.png differ diff --git a/retroshare-gui/src/gui/emojione/1F527.png b/retroshare-gui/src/gui/emojione/1F527.png index 41991c682..58bfca877 100644 Binary files a/retroshare-gui/src/gui/emojione/1F527.png and b/retroshare-gui/src/gui/emojione/1F527.png differ diff --git a/retroshare-gui/src/gui/emojione/1F528.png b/retroshare-gui/src/gui/emojione/1F528.png index a8dc285a1..d0d9c030f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F528.png and b/retroshare-gui/src/gui/emojione/1F528.png differ diff --git a/retroshare-gui/src/gui/emojione/1F529.png b/retroshare-gui/src/gui/emojione/1F529.png index 83224f9ce..bc20fede1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F529.png and b/retroshare-gui/src/gui/emojione/1F529.png differ diff --git a/retroshare-gui/src/gui/emojione/1F52A.png b/retroshare-gui/src/gui/emojione/1F52A.png index 2ee074f32..4c4547910 100644 Binary files a/retroshare-gui/src/gui/emojione/1F52A.png and b/retroshare-gui/src/gui/emojione/1F52A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F52B.png b/retroshare-gui/src/gui/emojione/1F52B.png index beddcf353..adce53dcb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F52B.png and b/retroshare-gui/src/gui/emojione/1F52B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F52C.png b/retroshare-gui/src/gui/emojione/1F52C.png index a1ef9b074..5cd55a631 100644 Binary files a/retroshare-gui/src/gui/emojione/1F52C.png and b/retroshare-gui/src/gui/emojione/1F52C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F52D.png b/retroshare-gui/src/gui/emojione/1F52D.png index b28198ce1..613800929 100644 Binary files a/retroshare-gui/src/gui/emojione/1F52D.png and b/retroshare-gui/src/gui/emojione/1F52D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F52E.png b/retroshare-gui/src/gui/emojione/1F52E.png index af7216a3c..e48c1d0e0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F52E.png and b/retroshare-gui/src/gui/emojione/1F52E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F52F.png b/retroshare-gui/src/gui/emojione/1F52F.png index 704a99d53..72b236473 100644 Binary files a/retroshare-gui/src/gui/emojione/1F52F.png and b/retroshare-gui/src/gui/emojione/1F52F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F530.png b/retroshare-gui/src/gui/emojione/1F530.png index 5589e0606..870f671af 100644 Binary files a/retroshare-gui/src/gui/emojione/1F530.png and b/retroshare-gui/src/gui/emojione/1F530.png differ diff --git a/retroshare-gui/src/gui/emojione/1F531.png b/retroshare-gui/src/gui/emojione/1F531.png index dca2879d0..6230f7d53 100644 Binary files a/retroshare-gui/src/gui/emojione/1F531.png and b/retroshare-gui/src/gui/emojione/1F531.png differ diff --git a/retroshare-gui/src/gui/emojione/1F532.png b/retroshare-gui/src/gui/emojione/1F532.png index 02794d815..db26027ef 100644 Binary files a/retroshare-gui/src/gui/emojione/1F532.png and b/retroshare-gui/src/gui/emojione/1F532.png differ diff --git a/retroshare-gui/src/gui/emojione/1F533.png b/retroshare-gui/src/gui/emojione/1F533.png index 7a225c3b4..c365a022d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F533.png and b/retroshare-gui/src/gui/emojione/1F533.png differ diff --git a/retroshare-gui/src/gui/emojione/1F534.png b/retroshare-gui/src/gui/emojione/1F534.png index 4177aa43f..4d05a0752 100644 Binary files a/retroshare-gui/src/gui/emojione/1F534.png and b/retroshare-gui/src/gui/emojione/1F534.png differ diff --git a/retroshare-gui/src/gui/emojione/1F535.png b/retroshare-gui/src/gui/emojione/1F535.png index e2ddda82a..2de19351b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F535.png and b/retroshare-gui/src/gui/emojione/1F535.png differ diff --git a/retroshare-gui/src/gui/emojione/1F536.png b/retroshare-gui/src/gui/emojione/1F536.png index f2589b254..012df89dd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F536.png and b/retroshare-gui/src/gui/emojione/1F536.png differ diff --git a/retroshare-gui/src/gui/emojione/1F537.png b/retroshare-gui/src/gui/emojione/1F537.png index 9a9f23449..b009dbb30 100644 Binary files a/retroshare-gui/src/gui/emojione/1F537.png and b/retroshare-gui/src/gui/emojione/1F537.png differ diff --git a/retroshare-gui/src/gui/emojione/1F538.png b/retroshare-gui/src/gui/emojione/1F538.png index 70a5db8fa..5d8b510fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F538.png and b/retroshare-gui/src/gui/emojione/1F538.png differ diff --git a/retroshare-gui/src/gui/emojione/1F539.png b/retroshare-gui/src/gui/emojione/1F539.png index 04fd317cb..bfc68b759 100644 Binary files a/retroshare-gui/src/gui/emojione/1F539.png and b/retroshare-gui/src/gui/emojione/1F539.png differ diff --git a/retroshare-gui/src/gui/emojione/1F53A.png b/retroshare-gui/src/gui/emojione/1F53A.png index 3d9fb4972..f578e667c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F53A.png and b/retroshare-gui/src/gui/emojione/1F53A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F53B.png b/retroshare-gui/src/gui/emojione/1F53B.png index d07439dbf..08cd42db5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F53B.png and b/retroshare-gui/src/gui/emojione/1F53B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F53C.png b/retroshare-gui/src/gui/emojione/1F53C.png index 45ed98110..d8de0f046 100644 Binary files a/retroshare-gui/src/gui/emojione/1F53C.png and b/retroshare-gui/src/gui/emojione/1F53C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F53D.png b/retroshare-gui/src/gui/emojione/1F53D.png index d547c99aa..ea48f111c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F53D.png and b/retroshare-gui/src/gui/emojione/1F53D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F546.png b/retroshare-gui/src/gui/emojione/1F546.png index 52c1996dc..9891a3cd3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F546.png and b/retroshare-gui/src/gui/emojione/1F546.png differ diff --git a/retroshare-gui/src/gui/emojione/1F547.png b/retroshare-gui/src/gui/emojione/1F547.png index 5d97902de..7c1a2b54c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F547.png and b/retroshare-gui/src/gui/emojione/1F547.png differ diff --git a/retroshare-gui/src/gui/emojione/1F548.png b/retroshare-gui/src/gui/emojione/1F548.png index c551163e9..68cc8134e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F548.png and b/retroshare-gui/src/gui/emojione/1F548.png differ diff --git a/retroshare-gui/src/gui/emojione/1F549.png b/retroshare-gui/src/gui/emojione/1F549.png index 3070becec..7635a4da7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F549.png and b/retroshare-gui/src/gui/emojione/1F549.png differ diff --git a/retroshare-gui/src/gui/emojione/1F54A.png b/retroshare-gui/src/gui/emojione/1F54A.png index dc25f44f1..fcfa8ad62 100644 Binary files a/retroshare-gui/src/gui/emojione/1F54A.png and b/retroshare-gui/src/gui/emojione/1F54A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F550.png b/retroshare-gui/src/gui/emojione/1F550.png index 2663d7adf..502b2f130 100644 Binary files a/retroshare-gui/src/gui/emojione/1F550.png and b/retroshare-gui/src/gui/emojione/1F550.png differ diff --git a/retroshare-gui/src/gui/emojione/1F551.png b/retroshare-gui/src/gui/emojione/1F551.png index 2abe5863f..06666cb11 100644 Binary files a/retroshare-gui/src/gui/emojione/1F551.png and b/retroshare-gui/src/gui/emojione/1F551.png differ diff --git a/retroshare-gui/src/gui/emojione/1F552.png b/retroshare-gui/src/gui/emojione/1F552.png index e416da9a4..ff10a1b07 100644 Binary files a/retroshare-gui/src/gui/emojione/1F552.png and b/retroshare-gui/src/gui/emojione/1F552.png differ diff --git a/retroshare-gui/src/gui/emojione/1F553.png b/retroshare-gui/src/gui/emojione/1F553.png index 6373cf195..0457b29e9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F553.png and b/retroshare-gui/src/gui/emojione/1F553.png differ diff --git a/retroshare-gui/src/gui/emojione/1F554.png b/retroshare-gui/src/gui/emojione/1F554.png index 6cf02080e..cd02dff15 100644 Binary files a/retroshare-gui/src/gui/emojione/1F554.png and b/retroshare-gui/src/gui/emojione/1F554.png differ diff --git a/retroshare-gui/src/gui/emojione/1F555.png b/retroshare-gui/src/gui/emojione/1F555.png index dfda89f1e..f12f74120 100644 Binary files a/retroshare-gui/src/gui/emojione/1F555.png and b/retroshare-gui/src/gui/emojione/1F555.png differ diff --git a/retroshare-gui/src/gui/emojione/1F556.png b/retroshare-gui/src/gui/emojione/1F556.png index 7a58245d9..8affb8f8a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F556.png and b/retroshare-gui/src/gui/emojione/1F556.png differ diff --git a/retroshare-gui/src/gui/emojione/1F557.png b/retroshare-gui/src/gui/emojione/1F557.png index 897a6169e..bacc0eb3f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F557.png and b/retroshare-gui/src/gui/emojione/1F557.png differ diff --git a/retroshare-gui/src/gui/emojione/1F558.png b/retroshare-gui/src/gui/emojione/1F558.png index 54aa48fd6..4505dd785 100644 Binary files a/retroshare-gui/src/gui/emojione/1F558.png and b/retroshare-gui/src/gui/emojione/1F558.png differ diff --git a/retroshare-gui/src/gui/emojione/1F559.png b/retroshare-gui/src/gui/emojione/1F559.png index 5d8c02397..6f2da920d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F559.png and b/retroshare-gui/src/gui/emojione/1F559.png differ diff --git a/retroshare-gui/src/gui/emojione/1F55A.png b/retroshare-gui/src/gui/emojione/1F55A.png index cd11cc37a..7c0230da8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F55A.png and b/retroshare-gui/src/gui/emojione/1F55A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F55B.png b/retroshare-gui/src/gui/emojione/1F55B.png index ffc5a6880..1a7f7ff37 100644 Binary files a/retroshare-gui/src/gui/emojione/1F55B.png and b/retroshare-gui/src/gui/emojione/1F55B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F55C.png b/retroshare-gui/src/gui/emojione/1F55C.png index 536b734cf..a17767e03 100644 Binary files a/retroshare-gui/src/gui/emojione/1F55C.png and b/retroshare-gui/src/gui/emojione/1F55C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F55D.png b/retroshare-gui/src/gui/emojione/1F55D.png index 02612e9de..49e10ca3a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F55D.png and b/retroshare-gui/src/gui/emojione/1F55D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F55E.png b/retroshare-gui/src/gui/emojione/1F55E.png index 435927002..a4d3924b4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F55E.png and b/retroshare-gui/src/gui/emojione/1F55E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F55F.png b/retroshare-gui/src/gui/emojione/1F55F.png index ebfbc4e5c..c33c2add1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F55F.png and b/retroshare-gui/src/gui/emojione/1F55F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F560.png b/retroshare-gui/src/gui/emojione/1F560.png index c81ad14e7..6b15ec4d3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F560.png and b/retroshare-gui/src/gui/emojione/1F560.png differ diff --git a/retroshare-gui/src/gui/emojione/1F561.png b/retroshare-gui/src/gui/emojione/1F561.png index 50dc7d1c5..0a21490aa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F561.png and b/retroshare-gui/src/gui/emojione/1F561.png differ diff --git a/retroshare-gui/src/gui/emojione/1F562.png b/retroshare-gui/src/gui/emojione/1F562.png index d037d6e3d..6640a09af 100644 Binary files a/retroshare-gui/src/gui/emojione/1F562.png and b/retroshare-gui/src/gui/emojione/1F562.png differ diff --git a/retroshare-gui/src/gui/emojione/1F563.png b/retroshare-gui/src/gui/emojione/1F563.png index da33a296e..637a6308c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F563.png and b/retroshare-gui/src/gui/emojione/1F563.png differ diff --git a/retroshare-gui/src/gui/emojione/1F564.png b/retroshare-gui/src/gui/emojione/1F564.png index eba9247af..701ec2c1e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F564.png and b/retroshare-gui/src/gui/emojione/1F564.png differ diff --git a/retroshare-gui/src/gui/emojione/1F565.png b/retroshare-gui/src/gui/emojione/1F565.png index e9aaef1d1..8a17b5c35 100644 Binary files a/retroshare-gui/src/gui/emojione/1F565.png and b/retroshare-gui/src/gui/emojione/1F565.png differ diff --git a/retroshare-gui/src/gui/emojione/1F566.png b/retroshare-gui/src/gui/emojione/1F566.png index 9896cd1bb..9029ddf0b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F566.png and b/retroshare-gui/src/gui/emojione/1F566.png differ diff --git a/retroshare-gui/src/gui/emojione/1F567.png b/retroshare-gui/src/gui/emojione/1F567.png index 833a66267..fb2f30ebf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F567.png and b/retroshare-gui/src/gui/emojione/1F567.png differ diff --git a/retroshare-gui/src/gui/emojione/1F568.png b/retroshare-gui/src/gui/emojione/1F568.png index 73488a8fa..079c98a16 100644 Binary files a/retroshare-gui/src/gui/emojione/1F568.png and b/retroshare-gui/src/gui/emojione/1F568.png differ diff --git a/retroshare-gui/src/gui/emojione/1F569.png b/retroshare-gui/src/gui/emojione/1F569.png index 77d90924a..4766520cd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F569.png and b/retroshare-gui/src/gui/emojione/1F569.png differ diff --git a/retroshare-gui/src/gui/emojione/1F56A.png b/retroshare-gui/src/gui/emojione/1F56A.png index 45b1082d1..99303b2cf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F56A.png and b/retroshare-gui/src/gui/emojione/1F56A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F56B.png b/retroshare-gui/src/gui/emojione/1F56B.png index 41016883f..2c4a33321 100644 Binary files a/retroshare-gui/src/gui/emojione/1F56B.png and b/retroshare-gui/src/gui/emojione/1F56B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F56C.png b/retroshare-gui/src/gui/emojione/1F56C.png index 10db75425..d46ff5640 100644 Binary files a/retroshare-gui/src/gui/emojione/1F56C.png and b/retroshare-gui/src/gui/emojione/1F56C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F56D.png b/retroshare-gui/src/gui/emojione/1F56D.png index 589832022..c97683b6c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F56D.png and b/retroshare-gui/src/gui/emojione/1F56D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F56E.png b/retroshare-gui/src/gui/emojione/1F56E.png index 34fee2ba3..bb153356e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F56E.png and b/retroshare-gui/src/gui/emojione/1F56E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F56F.png b/retroshare-gui/src/gui/emojione/1F56F.png index 128904b93..5fc292aac 100644 Binary files a/retroshare-gui/src/gui/emojione/1F56F.png and b/retroshare-gui/src/gui/emojione/1F56F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F570.png b/retroshare-gui/src/gui/emojione/1F570.png index a745a73b8..daa58920f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F570.png and b/retroshare-gui/src/gui/emojione/1F570.png differ diff --git a/retroshare-gui/src/gui/emojione/1F571.png b/retroshare-gui/src/gui/emojione/1F571.png index e60930771..a291506fe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F571.png and b/retroshare-gui/src/gui/emojione/1F571.png differ diff --git a/retroshare-gui/src/gui/emojione/1F572.png b/retroshare-gui/src/gui/emojione/1F572.png index b0d166064..c392d83cb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F572.png and b/retroshare-gui/src/gui/emojione/1F572.png differ diff --git a/retroshare-gui/src/gui/emojione/1F573.png b/retroshare-gui/src/gui/emojione/1F573.png index 775aff47b..aa4d32ef7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F573.png and b/retroshare-gui/src/gui/emojione/1F573.png differ diff --git a/retroshare-gui/src/gui/emojione/1F574.png b/retroshare-gui/src/gui/emojione/1F574.png index e08702331..a2a986451 100644 Binary files a/retroshare-gui/src/gui/emojione/1F574.png and b/retroshare-gui/src/gui/emojione/1F574.png differ diff --git a/retroshare-gui/src/gui/emojione/1F575.png b/retroshare-gui/src/gui/emojione/1F575.png index a749c2198..064087e8f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F575.png and b/retroshare-gui/src/gui/emojione/1F575.png differ diff --git a/retroshare-gui/src/gui/emojione/1F576.png b/retroshare-gui/src/gui/emojione/1F576.png index b8d6e4dd9..e28516ce6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F576.png and b/retroshare-gui/src/gui/emojione/1F576.png differ diff --git a/retroshare-gui/src/gui/emojione/1F577.png b/retroshare-gui/src/gui/emojione/1F577.png index 6d544cbea..e32c700bd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F577.png and b/retroshare-gui/src/gui/emojione/1F577.png differ diff --git a/retroshare-gui/src/gui/emojione/1F578.png b/retroshare-gui/src/gui/emojione/1F578.png index e64a1fdd8..1ffe465b5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F578.png and b/retroshare-gui/src/gui/emojione/1F578.png differ diff --git a/retroshare-gui/src/gui/emojione/1F579.png b/retroshare-gui/src/gui/emojione/1F579.png index 4dbe6df13..3c86e8cbb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F579.png and b/retroshare-gui/src/gui/emojione/1F579.png differ diff --git a/retroshare-gui/src/gui/emojione/1F57B.png b/retroshare-gui/src/gui/emojione/1F57B.png index b7c206674..84dcef755 100644 Binary files a/retroshare-gui/src/gui/emojione/1F57B.png and b/retroshare-gui/src/gui/emojione/1F57B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F57E.png b/retroshare-gui/src/gui/emojione/1F57E.png index dc06617e5..e2cc813ef 100644 Binary files a/retroshare-gui/src/gui/emojione/1F57E.png and b/retroshare-gui/src/gui/emojione/1F57E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F57F.png b/retroshare-gui/src/gui/emojione/1F57F.png index 4f840fbcd..77243bf7b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F57F.png and b/retroshare-gui/src/gui/emojione/1F57F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F581.png b/retroshare-gui/src/gui/emojione/1F581.png index d6fc604bb..35cfb714a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F581.png and b/retroshare-gui/src/gui/emojione/1F581.png differ diff --git a/retroshare-gui/src/gui/emojione/1F582.png b/retroshare-gui/src/gui/emojione/1F582.png index a1b21dea5..6c43b3c19 100644 Binary files a/retroshare-gui/src/gui/emojione/1F582.png and b/retroshare-gui/src/gui/emojione/1F582.png differ diff --git a/retroshare-gui/src/gui/emojione/1F583.png b/retroshare-gui/src/gui/emojione/1F583.png index 382a68e11..d171200d6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F583.png and b/retroshare-gui/src/gui/emojione/1F583.png differ diff --git a/retroshare-gui/src/gui/emojione/1F585.png b/retroshare-gui/src/gui/emojione/1F585.png index 8347ac788..5993eb822 100644 Binary files a/retroshare-gui/src/gui/emojione/1F585.png and b/retroshare-gui/src/gui/emojione/1F585.png differ diff --git a/retroshare-gui/src/gui/emojione/1F586.png b/retroshare-gui/src/gui/emojione/1F586.png index 7a1bdbbe1..0be702d8c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F586.png and b/retroshare-gui/src/gui/emojione/1F586.png differ diff --git a/retroshare-gui/src/gui/emojione/1F587.png b/retroshare-gui/src/gui/emojione/1F587.png index 5b985c2b8..f18faa64f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F587.png and b/retroshare-gui/src/gui/emojione/1F587.png differ diff --git a/retroshare-gui/src/gui/emojione/1F588.png b/retroshare-gui/src/gui/emojione/1F588.png index 08f0b807a..9092b8063 100644 Binary files a/retroshare-gui/src/gui/emojione/1F588.png and b/retroshare-gui/src/gui/emojione/1F588.png differ diff --git a/retroshare-gui/src/gui/emojione/1F589.png b/retroshare-gui/src/gui/emojione/1F589.png index b7f65b026..e5095a058 100644 Binary files a/retroshare-gui/src/gui/emojione/1F589.png and b/retroshare-gui/src/gui/emojione/1F589.png differ diff --git a/retroshare-gui/src/gui/emojione/1F58A.png b/retroshare-gui/src/gui/emojione/1F58A.png index 99a485ded..000bb7e94 100644 Binary files a/retroshare-gui/src/gui/emojione/1F58A.png and b/retroshare-gui/src/gui/emojione/1F58A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F58B.png b/retroshare-gui/src/gui/emojione/1F58B.png index 9eefd4232..11a21cc5c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F58B.png and b/retroshare-gui/src/gui/emojione/1F58B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F58C.png b/retroshare-gui/src/gui/emojione/1F58C.png index cc614b8c4..8422a8a0d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F58C.png and b/retroshare-gui/src/gui/emojione/1F58C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F58D.png b/retroshare-gui/src/gui/emojione/1F58D.png index 793463fab..a8a229b81 100644 Binary files a/retroshare-gui/src/gui/emojione/1F58D.png and b/retroshare-gui/src/gui/emojione/1F58D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F58E.png b/retroshare-gui/src/gui/emojione/1F58E.png index cf8b0edfc..104435039 100644 Binary files a/retroshare-gui/src/gui/emojione/1F58E.png and b/retroshare-gui/src/gui/emojione/1F58E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F58F.png b/retroshare-gui/src/gui/emojione/1F58F.png index ad427a0e6..73bcbf3f2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F58F.png and b/retroshare-gui/src/gui/emojione/1F58F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F590.png b/retroshare-gui/src/gui/emojione/1F590.png index 0cab4ff29..df6c357a3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F590.png and b/retroshare-gui/src/gui/emojione/1F590.png differ diff --git a/retroshare-gui/src/gui/emojione/1F591.png b/retroshare-gui/src/gui/emojione/1F591.png index a35753c66..80076ad7e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F591.png and b/retroshare-gui/src/gui/emojione/1F591.png differ diff --git a/retroshare-gui/src/gui/emojione/1F592.png b/retroshare-gui/src/gui/emojione/1F592.png index 99bac20d6..d4e2b4374 100644 Binary files a/retroshare-gui/src/gui/emojione/1F592.png and b/retroshare-gui/src/gui/emojione/1F592.png differ diff --git a/retroshare-gui/src/gui/emojione/1F593.png b/retroshare-gui/src/gui/emojione/1F593.png index 2f1d2ab27..6ad5f0e26 100644 Binary files a/retroshare-gui/src/gui/emojione/1F593.png and b/retroshare-gui/src/gui/emojione/1F593.png differ diff --git a/retroshare-gui/src/gui/emojione/1F594.png b/retroshare-gui/src/gui/emojione/1F594.png index 5d25ae137..da37ff25f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F594.png and b/retroshare-gui/src/gui/emojione/1F594.png differ diff --git a/retroshare-gui/src/gui/emojione/1F595.png b/retroshare-gui/src/gui/emojione/1F595.png index a7d12680e..ccec86c88 100644 Binary files a/retroshare-gui/src/gui/emojione/1F595.png and b/retroshare-gui/src/gui/emojione/1F595.png differ diff --git a/retroshare-gui/src/gui/emojione/1F596.png b/retroshare-gui/src/gui/emojione/1F596.png index 70972e4aa..888b209fc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F596.png and b/retroshare-gui/src/gui/emojione/1F596.png differ diff --git a/retroshare-gui/src/gui/emojione/1F597.png b/retroshare-gui/src/gui/emojione/1F597.png index e9757b749..2ee1b684f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F597.png and b/retroshare-gui/src/gui/emojione/1F597.png differ diff --git a/retroshare-gui/src/gui/emojione/1F598.png b/retroshare-gui/src/gui/emojione/1F598.png index 032f40963..ab324f0da 100644 Binary files a/retroshare-gui/src/gui/emojione/1F598.png and b/retroshare-gui/src/gui/emojione/1F598.png differ diff --git a/retroshare-gui/src/gui/emojione/1F599.png b/retroshare-gui/src/gui/emojione/1F599.png index dd391db44..e7e85e11a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F599.png and b/retroshare-gui/src/gui/emojione/1F599.png differ diff --git a/retroshare-gui/src/gui/emojione/1F59E.png b/retroshare-gui/src/gui/emojione/1F59E.png index 8f6ccfd40..e08f2a860 100644 Binary files a/retroshare-gui/src/gui/emojione/1F59E.png and b/retroshare-gui/src/gui/emojione/1F59E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F59F.png b/retroshare-gui/src/gui/emojione/1F59F.png index e68d1ccb0..113d5dff6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F59F.png and b/retroshare-gui/src/gui/emojione/1F59F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5A5.png b/retroshare-gui/src/gui/emojione/1F5A5.png index 39005013d..f8adbc199 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5A5.png and b/retroshare-gui/src/gui/emojione/1F5A5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5A6.png b/retroshare-gui/src/gui/emojione/1F5A6.png index 9bec3bfc2..eae714655 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5A6.png and b/retroshare-gui/src/gui/emojione/1F5A6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5A7.png b/retroshare-gui/src/gui/emojione/1F5A7.png index 116aada03..460b0a1d1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5A7.png and b/retroshare-gui/src/gui/emojione/1F5A7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5A8.png b/retroshare-gui/src/gui/emojione/1F5A8.png index 4d85ce404..b9326d555 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5A8.png and b/retroshare-gui/src/gui/emojione/1F5A8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5A9.png b/retroshare-gui/src/gui/emojione/1F5A9.png index 190c45990..41a28ee03 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5A9.png and b/retroshare-gui/src/gui/emojione/1F5A9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5AA.png b/retroshare-gui/src/gui/emojione/1F5AA.png index 58db87ea7..22b3adfac 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5AA.png and b/retroshare-gui/src/gui/emojione/1F5AA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5AB.png b/retroshare-gui/src/gui/emojione/1F5AB.png index d197593af..b244f28c9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5AB.png and b/retroshare-gui/src/gui/emojione/1F5AB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5AD.png b/retroshare-gui/src/gui/emojione/1F5AD.png index ab4e16c45..47d0966fd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5AD.png and b/retroshare-gui/src/gui/emojione/1F5AD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5AE.png b/retroshare-gui/src/gui/emojione/1F5AE.png index deb02ef69..8f9591678 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5AE.png and b/retroshare-gui/src/gui/emojione/1F5AE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5AF.png b/retroshare-gui/src/gui/emojione/1F5AF.png index d5698678a..46f56fff2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5AF.png and b/retroshare-gui/src/gui/emojione/1F5AF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5B2.png b/retroshare-gui/src/gui/emojione/1F5B2.png index 7089112c7..e498368cd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5B2.png and b/retroshare-gui/src/gui/emojione/1F5B2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5B3.png b/retroshare-gui/src/gui/emojione/1F5B3.png index 1561c12f3..94d95351d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5B3.png and b/retroshare-gui/src/gui/emojione/1F5B3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5B4.png b/retroshare-gui/src/gui/emojione/1F5B4.png index 8b8abe2ae..1307b0626 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5B4.png and b/retroshare-gui/src/gui/emojione/1F5B4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5B8.png b/retroshare-gui/src/gui/emojione/1F5B8.png index 19953434a..7cacc39d7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5B8.png and b/retroshare-gui/src/gui/emojione/1F5B8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5B9.png b/retroshare-gui/src/gui/emojione/1F5B9.png index c694e72fb..54b165e88 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5B9.png and b/retroshare-gui/src/gui/emojione/1F5B9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5BC.png b/retroshare-gui/src/gui/emojione/1F5BC.png index b8771ad69..8e321875b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5BC.png and b/retroshare-gui/src/gui/emojione/1F5BC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5BD.png b/retroshare-gui/src/gui/emojione/1F5BD.png index cc78194dc..b96b04095 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5BD.png and b/retroshare-gui/src/gui/emojione/1F5BD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5BE.png b/retroshare-gui/src/gui/emojione/1F5BE.png index dfad2eb39..b1549ad0d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5BE.png and b/retroshare-gui/src/gui/emojione/1F5BE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5C0.png b/retroshare-gui/src/gui/emojione/1F5C0.png index 2cf7a8f7e..b240a4022 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5C0.png and b/retroshare-gui/src/gui/emojione/1F5C0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5C1.png b/retroshare-gui/src/gui/emojione/1F5C1.png index 70eb6fcf4..45c153cc5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5C1.png and b/retroshare-gui/src/gui/emojione/1F5C1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5C2.png b/retroshare-gui/src/gui/emojione/1F5C2.png index 39e30b5f3..837fa2319 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5C2.png and b/retroshare-gui/src/gui/emojione/1F5C2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5C3.png b/retroshare-gui/src/gui/emojione/1F5C3.png index 97c135844..77b2e19a3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5C3.png and b/retroshare-gui/src/gui/emojione/1F5C3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5C4.png b/retroshare-gui/src/gui/emojione/1F5C4.png index e0bb42aac..6b0baeb11 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5C4.png and b/retroshare-gui/src/gui/emojione/1F5C4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5C6.png b/retroshare-gui/src/gui/emojione/1F5C6.png index e8b06e0ef..56ab8890e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5C6.png and b/retroshare-gui/src/gui/emojione/1F5C6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5C7.png b/retroshare-gui/src/gui/emojione/1F5C7.png index ff10b5e19..e2a10fbde 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5C7.png and b/retroshare-gui/src/gui/emojione/1F5C7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5C9.png b/retroshare-gui/src/gui/emojione/1F5C9.png index 840009c4d..b16a10945 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5C9.png and b/retroshare-gui/src/gui/emojione/1F5C9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5CA.png b/retroshare-gui/src/gui/emojione/1F5CA.png index 702484e74..69d3b0965 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5CA.png and b/retroshare-gui/src/gui/emojione/1F5CA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5CE.png b/retroshare-gui/src/gui/emojione/1F5CE.png index 9d6bf2293..9c7a90694 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5CE.png and b/retroshare-gui/src/gui/emojione/1F5CE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5CF.png b/retroshare-gui/src/gui/emojione/1F5CF.png index bd5bca56c..4379a77cc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5CF.png and b/retroshare-gui/src/gui/emojione/1F5CF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5D0.png b/retroshare-gui/src/gui/emojione/1F5D0.png index aa551f41f..ca07bb1e1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5D0.png and b/retroshare-gui/src/gui/emojione/1F5D0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5D1.png b/retroshare-gui/src/gui/emojione/1F5D1.png index 14f5371b7..6a00b7055 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5D1.png and b/retroshare-gui/src/gui/emojione/1F5D1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5D2.png b/retroshare-gui/src/gui/emojione/1F5D2.png index a9d8047ec..fed8985d7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5D2.png and b/retroshare-gui/src/gui/emojione/1F5D2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5D3.png b/retroshare-gui/src/gui/emojione/1F5D3.png index 88222305e..449ada711 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5D3.png and b/retroshare-gui/src/gui/emojione/1F5D3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5D4.png b/retroshare-gui/src/gui/emojione/1F5D4.png index c98b7f27a..ec3c1064a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5D4.png and b/retroshare-gui/src/gui/emojione/1F5D4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5D8.png b/retroshare-gui/src/gui/emojione/1F5D8.png index d2fa45827..7c08c8d2a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5D8.png and b/retroshare-gui/src/gui/emojione/1F5D8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5D9.png b/retroshare-gui/src/gui/emojione/1F5D9.png index d181c34a0..ccfa06dfe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5D9.png and b/retroshare-gui/src/gui/emojione/1F5D9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5DC.png b/retroshare-gui/src/gui/emojione/1F5DC.png index 281756771..36d76d1f7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5DC.png and b/retroshare-gui/src/gui/emojione/1F5DC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5DD.png b/retroshare-gui/src/gui/emojione/1F5DD.png index 5da4036b8..f76d7b14c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5DD.png and b/retroshare-gui/src/gui/emojione/1F5DD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5DE.png b/retroshare-gui/src/gui/emojione/1F5DE.png index a0031f167..82c170e1c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5DE.png and b/retroshare-gui/src/gui/emojione/1F5DE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5E0.png b/retroshare-gui/src/gui/emojione/1F5E0.png index 495055ba1..044ac845c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5E0.png and b/retroshare-gui/src/gui/emojione/1F5E0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5E1.png b/retroshare-gui/src/gui/emojione/1F5E1.png index b61094657..e2541eeaa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5E1.png and b/retroshare-gui/src/gui/emojione/1F5E1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5E2.png b/retroshare-gui/src/gui/emojione/1F5E2.png index fd42505f9..fafb14951 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5E2.png and b/retroshare-gui/src/gui/emojione/1F5E2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5E3.png b/retroshare-gui/src/gui/emojione/1F5E3.png index f272885cf..95e071d4e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5E3.png and b/retroshare-gui/src/gui/emojione/1F5E3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5E8.png b/retroshare-gui/src/gui/emojione/1F5E8.png index 15e9c93de..ecffca493 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5E8.png and b/retroshare-gui/src/gui/emojione/1F5E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5E9.png b/retroshare-gui/src/gui/emojione/1F5E9.png index 729947377..28f7d99a5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5E9.png and b/retroshare-gui/src/gui/emojione/1F5E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5EA.png b/retroshare-gui/src/gui/emojione/1F5EA.png index 95444a561..9edd384c8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5EA.png and b/retroshare-gui/src/gui/emojione/1F5EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5EB.png b/retroshare-gui/src/gui/emojione/1F5EB.png index 15622e855..53399cd41 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5EB.png and b/retroshare-gui/src/gui/emojione/1F5EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5EC.png b/retroshare-gui/src/gui/emojione/1F5EC.png index ede25aca3..844e8eb84 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5EC.png and b/retroshare-gui/src/gui/emojione/1F5EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5ED.png b/retroshare-gui/src/gui/emojione/1F5ED.png index e3f84fe76..ea0f4d267 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5ED.png and b/retroshare-gui/src/gui/emojione/1F5ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5EE.png b/retroshare-gui/src/gui/emojione/1F5EE.png index 8142ccb3f..0ab3cdf9f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5EE.png and b/retroshare-gui/src/gui/emojione/1F5EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5EF.png b/retroshare-gui/src/gui/emojione/1F5EF.png index 1e5dc9144..b9f1b95fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5EF.png and b/retroshare-gui/src/gui/emojione/1F5EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5F0.png b/retroshare-gui/src/gui/emojione/1F5F0.png index 1e79e4a17..7fcf79704 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5F0.png and b/retroshare-gui/src/gui/emojione/1F5F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5F1.png b/retroshare-gui/src/gui/emojione/1F5F1.png index 3f989b2d2..5d0fa6eb6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5F1.png and b/retroshare-gui/src/gui/emojione/1F5F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5F2.png b/retroshare-gui/src/gui/emojione/1F5F2.png index 491f34920..bb7834377 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5F2.png and b/retroshare-gui/src/gui/emojione/1F5F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5F3.png b/retroshare-gui/src/gui/emojione/1F5F3.png index 01c7c5c8f..d1f1a76d0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5F3.png and b/retroshare-gui/src/gui/emojione/1F5F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5F4.png b/retroshare-gui/src/gui/emojione/1F5F4.png index f18ac8ec4..50129eed1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5F4.png and b/retroshare-gui/src/gui/emojione/1F5F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5F5.png b/retroshare-gui/src/gui/emojione/1F5F5.png index 1f284eb60..3c3155e11 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5F5.png and b/retroshare-gui/src/gui/emojione/1F5F5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5F8.png b/retroshare-gui/src/gui/emojione/1F5F8.png index f10f62028..771a7ec52 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5F8.png and b/retroshare-gui/src/gui/emojione/1F5F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5F9.png b/retroshare-gui/src/gui/emojione/1F5F9.png index c3377cba3..00a5924ee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5F9.png and b/retroshare-gui/src/gui/emojione/1F5F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5FA.png b/retroshare-gui/src/gui/emojione/1F5FA.png index e9a01f254..4f44109a9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5FA.png and b/retroshare-gui/src/gui/emojione/1F5FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5FB.png b/retroshare-gui/src/gui/emojione/1F5FB.png index aa1dc2b94..23b9b632b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5FB.png and b/retroshare-gui/src/gui/emojione/1F5FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5FC.png b/retroshare-gui/src/gui/emojione/1F5FC.png index 0e1f4c8d4..86c994ce3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5FC.png and b/retroshare-gui/src/gui/emojione/1F5FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5FD.png b/retroshare-gui/src/gui/emojione/1F5FD.png index 9b795d34e..ddf20539e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5FD.png and b/retroshare-gui/src/gui/emojione/1F5FD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5FE.png b/retroshare-gui/src/gui/emojione/1F5FE.png index d6285a162..70d69de78 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5FE.png and b/retroshare-gui/src/gui/emojione/1F5FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5FF.png b/retroshare-gui/src/gui/emojione/1F5FF.png index f4290faea..a83e87ab1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5FF.png and b/retroshare-gui/src/gui/emojione/1F5FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F600.png b/retroshare-gui/src/gui/emojione/1F600.png index 85ae38cf7..59abc50ae 100644 Binary files a/retroshare-gui/src/gui/emojione/1F600.png and b/retroshare-gui/src/gui/emojione/1F600.png differ diff --git a/retroshare-gui/src/gui/emojione/1F601.png b/retroshare-gui/src/gui/emojione/1F601.png index c95cffb8f..98773b5f8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F601.png and b/retroshare-gui/src/gui/emojione/1F601.png differ diff --git a/retroshare-gui/src/gui/emojione/1F602.png b/retroshare-gui/src/gui/emojione/1F602.png index 96f890b54..375beadbe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F602.png and b/retroshare-gui/src/gui/emojione/1F602.png differ diff --git a/retroshare-gui/src/gui/emojione/1F603.png b/retroshare-gui/src/gui/emojione/1F603.png index f4f7bd7f1..bf8f6baf4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F603.png and b/retroshare-gui/src/gui/emojione/1F603.png differ diff --git a/retroshare-gui/src/gui/emojione/1F604.png b/retroshare-gui/src/gui/emojione/1F604.png index 3ceef1e16..b74609baa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F604.png and b/retroshare-gui/src/gui/emojione/1F604.png differ diff --git a/retroshare-gui/src/gui/emojione/1F605.png b/retroshare-gui/src/gui/emojione/1F605.png index 7e70e99e9..a1da8cd07 100644 Binary files a/retroshare-gui/src/gui/emojione/1F605.png and b/retroshare-gui/src/gui/emojione/1F605.png differ diff --git a/retroshare-gui/src/gui/emojione/1F606.png b/retroshare-gui/src/gui/emojione/1F606.png index 59a25c547..6e17c23c9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F606.png and b/retroshare-gui/src/gui/emojione/1F606.png differ diff --git a/retroshare-gui/src/gui/emojione/1F607.png b/retroshare-gui/src/gui/emojione/1F607.png index 02898b404..3db445899 100644 Binary files a/retroshare-gui/src/gui/emojione/1F607.png and b/retroshare-gui/src/gui/emojione/1F607.png differ diff --git a/retroshare-gui/src/gui/emojione/1F608.png b/retroshare-gui/src/gui/emojione/1F608.png index 87ce7ad4c..0b0390805 100644 Binary files a/retroshare-gui/src/gui/emojione/1F608.png and b/retroshare-gui/src/gui/emojione/1F608.png differ diff --git a/retroshare-gui/src/gui/emojione/1F609.png b/retroshare-gui/src/gui/emojione/1F609.png index c192693f2..92b0a4e91 100644 Binary files a/retroshare-gui/src/gui/emojione/1F609.png and b/retroshare-gui/src/gui/emojione/1F609.png differ diff --git a/retroshare-gui/src/gui/emojione/1F60A.png b/retroshare-gui/src/gui/emojione/1F60A.png index f814d2aa9..f49f4c33f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F60A.png and b/retroshare-gui/src/gui/emojione/1F60A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F60B.png b/retroshare-gui/src/gui/emojione/1F60B.png index 55fa15cb8..9bb8800e2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F60B.png and b/retroshare-gui/src/gui/emojione/1F60B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F60C.png b/retroshare-gui/src/gui/emojione/1F60C.png index d63be4372..cf2355929 100644 Binary files a/retroshare-gui/src/gui/emojione/1F60C.png and b/retroshare-gui/src/gui/emojione/1F60C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F60D.png b/retroshare-gui/src/gui/emojione/1F60D.png index cce7b56ac..6cbb7e88f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F60D.png and b/retroshare-gui/src/gui/emojione/1F60D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F60E.png b/retroshare-gui/src/gui/emojione/1F60E.png index 4668d7c47..41814b22e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F60E.png and b/retroshare-gui/src/gui/emojione/1F60E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F60F.png b/retroshare-gui/src/gui/emojione/1F60F.png index 6a0c89d49..74bbbfe14 100644 Binary files a/retroshare-gui/src/gui/emojione/1F60F.png and b/retroshare-gui/src/gui/emojione/1F60F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F610.png b/retroshare-gui/src/gui/emojione/1F610.png index a73012062..a012a448a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F610.png and b/retroshare-gui/src/gui/emojione/1F610.png differ diff --git a/retroshare-gui/src/gui/emojione/1F611.png b/retroshare-gui/src/gui/emojione/1F611.png index d09cd3320..09a8f4f8e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F611.png and b/retroshare-gui/src/gui/emojione/1F611.png differ diff --git a/retroshare-gui/src/gui/emojione/1F612.png b/retroshare-gui/src/gui/emojione/1F612.png index 33011da99..ebfd7a477 100644 Binary files a/retroshare-gui/src/gui/emojione/1F612.png and b/retroshare-gui/src/gui/emojione/1F612.png differ diff --git a/retroshare-gui/src/gui/emojione/1F613.png b/retroshare-gui/src/gui/emojione/1F613.png index fd5feedb6..5c4be529b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F613.png and b/retroshare-gui/src/gui/emojione/1F613.png differ diff --git a/retroshare-gui/src/gui/emojione/1F614.png b/retroshare-gui/src/gui/emojione/1F614.png index 34057dd7e..3fcd56265 100644 Binary files a/retroshare-gui/src/gui/emojione/1F614.png and b/retroshare-gui/src/gui/emojione/1F614.png differ diff --git a/retroshare-gui/src/gui/emojione/1F615.png b/retroshare-gui/src/gui/emojione/1F615.png index 2345051fa..d69c69e1e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F615.png and b/retroshare-gui/src/gui/emojione/1F615.png differ diff --git a/retroshare-gui/src/gui/emojione/1F616.png b/retroshare-gui/src/gui/emojione/1F616.png index a6623661c..53e316c4b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F616.png and b/retroshare-gui/src/gui/emojione/1F616.png differ diff --git a/retroshare-gui/src/gui/emojione/1F617.png b/retroshare-gui/src/gui/emojione/1F617.png index df91c7a22..1c2c099c4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F617.png and b/retroshare-gui/src/gui/emojione/1F617.png differ diff --git a/retroshare-gui/src/gui/emojione/1F618.png b/retroshare-gui/src/gui/emojione/1F618.png index ab9bf672d..05d6450c8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F618.png and b/retroshare-gui/src/gui/emojione/1F618.png differ diff --git a/retroshare-gui/src/gui/emojione/1F619.png b/retroshare-gui/src/gui/emojione/1F619.png index d0090c7a6..b07f8ca70 100644 Binary files a/retroshare-gui/src/gui/emojione/1F619.png and b/retroshare-gui/src/gui/emojione/1F619.png differ diff --git a/retroshare-gui/src/gui/emojione/1F61A.png b/retroshare-gui/src/gui/emojione/1F61A.png index 906dcbe64..280969838 100644 Binary files a/retroshare-gui/src/gui/emojione/1F61A.png and b/retroshare-gui/src/gui/emojione/1F61A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F61B.png b/retroshare-gui/src/gui/emojione/1F61B.png index b28aafd8c..931f7ebb3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F61B.png and b/retroshare-gui/src/gui/emojione/1F61B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F61C.png b/retroshare-gui/src/gui/emojione/1F61C.png index cd6fa9b0f..06d9a37e8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F61C.png and b/retroshare-gui/src/gui/emojione/1F61C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F61D.png b/retroshare-gui/src/gui/emojione/1F61D.png index e8e268f03..46afcb525 100644 Binary files a/retroshare-gui/src/gui/emojione/1F61D.png and b/retroshare-gui/src/gui/emojione/1F61D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F61E.png b/retroshare-gui/src/gui/emojione/1F61E.png index 5def3cc9a..23da0ddbb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F61E.png and b/retroshare-gui/src/gui/emojione/1F61E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F61F.png b/retroshare-gui/src/gui/emojione/1F61F.png index e5cc2dbeb..26c364806 100644 Binary files a/retroshare-gui/src/gui/emojione/1F61F.png and b/retroshare-gui/src/gui/emojione/1F61F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F620.png b/retroshare-gui/src/gui/emojione/1F620.png index 10d2fad96..368fbd6d6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F620.png and b/retroshare-gui/src/gui/emojione/1F620.png differ diff --git a/retroshare-gui/src/gui/emojione/1F621.png b/retroshare-gui/src/gui/emojione/1F621.png index 711130d30..87f4df554 100644 Binary files a/retroshare-gui/src/gui/emojione/1F621.png and b/retroshare-gui/src/gui/emojione/1F621.png differ diff --git a/retroshare-gui/src/gui/emojione/1F622.png b/retroshare-gui/src/gui/emojione/1F622.png index 3e49cfe86..113e3e3c4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F622.png and b/retroshare-gui/src/gui/emojione/1F622.png differ diff --git a/retroshare-gui/src/gui/emojione/1F623.png b/retroshare-gui/src/gui/emojione/1F623.png index 3eaf53f10..a885780cd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F623.png and b/retroshare-gui/src/gui/emojione/1F623.png differ diff --git a/retroshare-gui/src/gui/emojione/1F624.png b/retroshare-gui/src/gui/emojione/1F624.png index 22bd4314e..d00a5e410 100644 Binary files a/retroshare-gui/src/gui/emojione/1F624.png and b/retroshare-gui/src/gui/emojione/1F624.png differ diff --git a/retroshare-gui/src/gui/emojione/1F625.png b/retroshare-gui/src/gui/emojione/1F625.png index 9fc0b0495..d8bdbfb7a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F625.png and b/retroshare-gui/src/gui/emojione/1F625.png differ diff --git a/retroshare-gui/src/gui/emojione/1F626.png b/retroshare-gui/src/gui/emojione/1F626.png index 72564ab58..3ed6cfea7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F626.png and b/retroshare-gui/src/gui/emojione/1F626.png differ diff --git a/retroshare-gui/src/gui/emojione/1F627.png b/retroshare-gui/src/gui/emojione/1F627.png index b0be479e4..dbb72e3fd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F627.png and b/retroshare-gui/src/gui/emojione/1F627.png differ diff --git a/retroshare-gui/src/gui/emojione/1F628.png b/retroshare-gui/src/gui/emojione/1F628.png index f66cff7cf..369e221a0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F628.png and b/retroshare-gui/src/gui/emojione/1F628.png differ diff --git a/retroshare-gui/src/gui/emojione/1F629.png b/retroshare-gui/src/gui/emojione/1F629.png index a56b7c78c..e19301fe4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F629.png and b/retroshare-gui/src/gui/emojione/1F629.png differ diff --git a/retroshare-gui/src/gui/emojione/1F62A.png b/retroshare-gui/src/gui/emojione/1F62A.png index b92719d47..971e2cef2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F62A.png and b/retroshare-gui/src/gui/emojione/1F62A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F62B.png b/retroshare-gui/src/gui/emojione/1F62B.png index 4de6f1422..2c7035333 100644 Binary files a/retroshare-gui/src/gui/emojione/1F62B.png and b/retroshare-gui/src/gui/emojione/1F62B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F62C.png b/retroshare-gui/src/gui/emojione/1F62C.png index e77e23a95..5636fc1f0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F62C.png and b/retroshare-gui/src/gui/emojione/1F62C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F62D.png b/retroshare-gui/src/gui/emojione/1F62D.png index 3c345e10f..a4b823699 100644 Binary files a/retroshare-gui/src/gui/emojione/1F62D.png and b/retroshare-gui/src/gui/emojione/1F62D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F62E.png b/retroshare-gui/src/gui/emojione/1F62E.png index 516cf713c..02f3f4d60 100644 Binary files a/retroshare-gui/src/gui/emojione/1F62E.png and b/retroshare-gui/src/gui/emojione/1F62E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F62F.png b/retroshare-gui/src/gui/emojione/1F62F.png index ed5664597..45f31a6b9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F62F.png and b/retroshare-gui/src/gui/emojione/1F62F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F630.png b/retroshare-gui/src/gui/emojione/1F630.png index b74176d17..3fbd940ac 100644 Binary files a/retroshare-gui/src/gui/emojione/1F630.png and b/retroshare-gui/src/gui/emojione/1F630.png differ diff --git a/retroshare-gui/src/gui/emojione/1F631.png b/retroshare-gui/src/gui/emojione/1F631.png index 0929b83cc..ff354229b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F631.png and b/retroshare-gui/src/gui/emojione/1F631.png differ diff --git a/retroshare-gui/src/gui/emojione/1F632.png b/retroshare-gui/src/gui/emojione/1F632.png index b5bbfad64..d8ca952ba 100644 Binary files a/retroshare-gui/src/gui/emojione/1F632.png and b/retroshare-gui/src/gui/emojione/1F632.png differ diff --git a/retroshare-gui/src/gui/emojione/1F633.png b/retroshare-gui/src/gui/emojione/1F633.png index 7264d20c0..90ec4caa6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F633.png and b/retroshare-gui/src/gui/emojione/1F633.png differ diff --git a/retroshare-gui/src/gui/emojione/1F634.png b/retroshare-gui/src/gui/emojione/1F634.png index b418ff070..5f7cba9af 100644 Binary files a/retroshare-gui/src/gui/emojione/1F634.png and b/retroshare-gui/src/gui/emojione/1F634.png differ diff --git a/retroshare-gui/src/gui/emojione/1F635.png b/retroshare-gui/src/gui/emojione/1F635.png index 90fea843e..ab0fe5156 100644 Binary files a/retroshare-gui/src/gui/emojione/1F635.png and b/retroshare-gui/src/gui/emojione/1F635.png differ diff --git a/retroshare-gui/src/gui/emojione/1F636.png b/retroshare-gui/src/gui/emojione/1F636.png index 72bf4e3b0..0a4da5721 100644 Binary files a/retroshare-gui/src/gui/emojione/1F636.png and b/retroshare-gui/src/gui/emojione/1F636.png differ diff --git a/retroshare-gui/src/gui/emojione/1F637.png b/retroshare-gui/src/gui/emojione/1F637.png index 8fc74bc73..641912a0f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F637.png and b/retroshare-gui/src/gui/emojione/1F637.png differ diff --git a/retroshare-gui/src/gui/emojione/1F638.png b/retroshare-gui/src/gui/emojione/1F638.png index ee638f0aa..1e3057f46 100644 Binary files a/retroshare-gui/src/gui/emojione/1F638.png and b/retroshare-gui/src/gui/emojione/1F638.png differ diff --git a/retroshare-gui/src/gui/emojione/1F639.png b/retroshare-gui/src/gui/emojione/1F639.png index 635c24598..a05a81d96 100644 Binary files a/retroshare-gui/src/gui/emojione/1F639.png and b/retroshare-gui/src/gui/emojione/1F639.png differ diff --git a/retroshare-gui/src/gui/emojione/1F63A.png b/retroshare-gui/src/gui/emojione/1F63A.png index a299a3750..02a529a69 100644 Binary files a/retroshare-gui/src/gui/emojione/1F63A.png and b/retroshare-gui/src/gui/emojione/1F63A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F63B.png b/retroshare-gui/src/gui/emojione/1F63B.png index f4ce8478f..e84d043b6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F63B.png and b/retroshare-gui/src/gui/emojione/1F63B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F63C.png b/retroshare-gui/src/gui/emojione/1F63C.png index 1e97ffceb..18ae5c543 100644 Binary files a/retroshare-gui/src/gui/emojione/1F63C.png and b/retroshare-gui/src/gui/emojione/1F63C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F63D.png b/retroshare-gui/src/gui/emojione/1F63D.png index 1ee1ee6b1..4a092ceab 100644 Binary files a/retroshare-gui/src/gui/emojione/1F63D.png and b/retroshare-gui/src/gui/emojione/1F63D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F63E.png b/retroshare-gui/src/gui/emojione/1F63E.png index 5fff48ab7..ead7d7409 100644 Binary files a/retroshare-gui/src/gui/emojione/1F63E.png and b/retroshare-gui/src/gui/emojione/1F63E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F63F.png b/retroshare-gui/src/gui/emojione/1F63F.png index 7ade63711..066c5d2d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F63F.png and b/retroshare-gui/src/gui/emojione/1F63F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F640.png b/retroshare-gui/src/gui/emojione/1F640.png index 445b52ca8..e6c518753 100644 Binary files a/retroshare-gui/src/gui/emojione/1F640.png and b/retroshare-gui/src/gui/emojione/1F640.png differ diff --git a/retroshare-gui/src/gui/emojione/1F641.png b/retroshare-gui/src/gui/emojione/1F641.png index da934d4c1..0ad74508d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F641.png and b/retroshare-gui/src/gui/emojione/1F641.png differ diff --git a/retroshare-gui/src/gui/emojione/1F642.png b/retroshare-gui/src/gui/emojione/1F642.png index 88c5df4b8..be5202461 100644 Binary files a/retroshare-gui/src/gui/emojione/1F642.png and b/retroshare-gui/src/gui/emojione/1F642.png differ diff --git a/retroshare-gui/src/gui/emojione/1F645.png b/retroshare-gui/src/gui/emojione/1F645.png index 6cb81b031..985f8b51e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F645.png and b/retroshare-gui/src/gui/emojione/1F645.png differ diff --git a/retroshare-gui/src/gui/emojione/1F646.png b/retroshare-gui/src/gui/emojione/1F646.png index 6929c03c7..bd7996a61 100644 Binary files a/retroshare-gui/src/gui/emojione/1F646.png and b/retroshare-gui/src/gui/emojione/1F646.png differ diff --git a/retroshare-gui/src/gui/emojione/1F647.png b/retroshare-gui/src/gui/emojione/1F647.png index 473d347cc..4e405e290 100644 Binary files a/retroshare-gui/src/gui/emojione/1F647.png and b/retroshare-gui/src/gui/emojione/1F647.png differ diff --git a/retroshare-gui/src/gui/emojione/1F648.png b/retroshare-gui/src/gui/emojione/1F648.png index 9da869385..5350abd06 100644 Binary files a/retroshare-gui/src/gui/emojione/1F648.png and b/retroshare-gui/src/gui/emojione/1F648.png differ diff --git a/retroshare-gui/src/gui/emojione/1F649.png b/retroshare-gui/src/gui/emojione/1F649.png index 0bfe005bb..e0a3b87ac 100644 Binary files a/retroshare-gui/src/gui/emojione/1F649.png and b/retroshare-gui/src/gui/emojione/1F649.png differ diff --git a/retroshare-gui/src/gui/emojione/1F64A.png b/retroshare-gui/src/gui/emojione/1F64A.png index 8c574d441..f4512226c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F64A.png and b/retroshare-gui/src/gui/emojione/1F64A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F64B.png b/retroshare-gui/src/gui/emojione/1F64B.png index d6c16e41d..a0f035bb9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F64B.png and b/retroshare-gui/src/gui/emojione/1F64B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F64C.png b/retroshare-gui/src/gui/emojione/1F64C.png index cfc0cc1b4..747626670 100644 Binary files a/retroshare-gui/src/gui/emojione/1F64C.png and b/retroshare-gui/src/gui/emojione/1F64C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F64D.png b/retroshare-gui/src/gui/emojione/1F64D.png index 3f7e86691..945a86d5e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F64D.png and b/retroshare-gui/src/gui/emojione/1F64D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F64E.png b/retroshare-gui/src/gui/emojione/1F64E.png index 6bb48071d..be2274bf2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F64E.png and b/retroshare-gui/src/gui/emojione/1F64E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F64F.png b/retroshare-gui/src/gui/emojione/1F64F.png index d3eee6bf3..6cf5b142c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F64F.png and b/retroshare-gui/src/gui/emojione/1F64F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F680.png b/retroshare-gui/src/gui/emojione/1F680.png index 1c3514fe9..69e31cc36 100644 Binary files a/retroshare-gui/src/gui/emojione/1F680.png and b/retroshare-gui/src/gui/emojione/1F680.png differ diff --git a/retroshare-gui/src/gui/emojione/1F681.png b/retroshare-gui/src/gui/emojione/1F681.png index d21298d24..aca107a62 100644 Binary files a/retroshare-gui/src/gui/emojione/1F681.png and b/retroshare-gui/src/gui/emojione/1F681.png differ diff --git a/retroshare-gui/src/gui/emojione/1F682.png b/retroshare-gui/src/gui/emojione/1F682.png index d622067de..1e28f1236 100644 Binary files a/retroshare-gui/src/gui/emojione/1F682.png and b/retroshare-gui/src/gui/emojione/1F682.png differ diff --git a/retroshare-gui/src/gui/emojione/1F683.png b/retroshare-gui/src/gui/emojione/1F683.png index bb27cca9f..82abbcd86 100644 Binary files a/retroshare-gui/src/gui/emojione/1F683.png and b/retroshare-gui/src/gui/emojione/1F683.png differ diff --git a/retroshare-gui/src/gui/emojione/1F684.png b/retroshare-gui/src/gui/emojione/1F684.png index c760874b9..addd11484 100644 Binary files a/retroshare-gui/src/gui/emojione/1F684.png and b/retroshare-gui/src/gui/emojione/1F684.png differ diff --git a/retroshare-gui/src/gui/emojione/1F685.png b/retroshare-gui/src/gui/emojione/1F685.png index fdf1b7b33..45705f092 100644 Binary files a/retroshare-gui/src/gui/emojione/1F685.png and b/retroshare-gui/src/gui/emojione/1F685.png differ diff --git a/retroshare-gui/src/gui/emojione/1F686.png b/retroshare-gui/src/gui/emojione/1F686.png index 949051feb..c93e812a9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F686.png and b/retroshare-gui/src/gui/emojione/1F686.png differ diff --git a/retroshare-gui/src/gui/emojione/1F687.png b/retroshare-gui/src/gui/emojione/1F687.png index f4dd5f20d..8a4154280 100644 Binary files a/retroshare-gui/src/gui/emojione/1F687.png and b/retroshare-gui/src/gui/emojione/1F687.png differ diff --git a/retroshare-gui/src/gui/emojione/1F688.png b/retroshare-gui/src/gui/emojione/1F688.png index 144ac4e5d..c2c3f5d39 100644 Binary files a/retroshare-gui/src/gui/emojione/1F688.png and b/retroshare-gui/src/gui/emojione/1F688.png differ diff --git a/retroshare-gui/src/gui/emojione/1F689.png b/retroshare-gui/src/gui/emojione/1F689.png index 42567d1d0..a4c74dda7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F689.png and b/retroshare-gui/src/gui/emojione/1F689.png differ diff --git a/retroshare-gui/src/gui/emojione/1F68A.png b/retroshare-gui/src/gui/emojione/1F68A.png index 828ba8d9e..b4b94728a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F68A.png and b/retroshare-gui/src/gui/emojione/1F68A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F68B.png b/retroshare-gui/src/gui/emojione/1F68B.png index 2f7c33a09..6ce43289a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F68B.png and b/retroshare-gui/src/gui/emojione/1F68B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F68C.png b/retroshare-gui/src/gui/emojione/1F68C.png index 93286c6f2..5b4599912 100644 Binary files a/retroshare-gui/src/gui/emojione/1F68C.png and b/retroshare-gui/src/gui/emojione/1F68C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F68D.png b/retroshare-gui/src/gui/emojione/1F68D.png index 222b6b729..e2dbcb059 100644 Binary files a/retroshare-gui/src/gui/emojione/1F68D.png and b/retroshare-gui/src/gui/emojione/1F68D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F68E.png b/retroshare-gui/src/gui/emojione/1F68E.png index dabe76dd6..708f8ea83 100644 Binary files a/retroshare-gui/src/gui/emojione/1F68E.png and b/retroshare-gui/src/gui/emojione/1F68E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F68F.png b/retroshare-gui/src/gui/emojione/1F68F.png index 3bb132483..eb31ed035 100644 Binary files a/retroshare-gui/src/gui/emojione/1F68F.png and b/retroshare-gui/src/gui/emojione/1F68F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F690.png b/retroshare-gui/src/gui/emojione/1F690.png index e5cbd2149..11f94ac36 100644 Binary files a/retroshare-gui/src/gui/emojione/1F690.png and b/retroshare-gui/src/gui/emojione/1F690.png differ diff --git a/retroshare-gui/src/gui/emojione/1F691.png b/retroshare-gui/src/gui/emojione/1F691.png index 4dc43a8ac..b893d1392 100644 Binary files a/retroshare-gui/src/gui/emojione/1F691.png and b/retroshare-gui/src/gui/emojione/1F691.png differ diff --git a/retroshare-gui/src/gui/emojione/1F692.png b/retroshare-gui/src/gui/emojione/1F692.png index e9dadb860..df44fead7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F692.png and b/retroshare-gui/src/gui/emojione/1F692.png differ diff --git a/retroshare-gui/src/gui/emojione/1F693.png b/retroshare-gui/src/gui/emojione/1F693.png index 7ec014c7f..a093145c9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F693.png and b/retroshare-gui/src/gui/emojione/1F693.png differ diff --git a/retroshare-gui/src/gui/emojione/1F694.png b/retroshare-gui/src/gui/emojione/1F694.png index bedd187b4..ae3be2788 100644 Binary files a/retroshare-gui/src/gui/emojione/1F694.png and b/retroshare-gui/src/gui/emojione/1F694.png differ diff --git a/retroshare-gui/src/gui/emojione/1F695.png b/retroshare-gui/src/gui/emojione/1F695.png index ecdad92f7..42c47caa7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F695.png and b/retroshare-gui/src/gui/emojione/1F695.png differ diff --git a/retroshare-gui/src/gui/emojione/1F696.png b/retroshare-gui/src/gui/emojione/1F696.png index 50e4d9a9b..0a0789162 100644 Binary files a/retroshare-gui/src/gui/emojione/1F696.png and b/retroshare-gui/src/gui/emojione/1F696.png differ diff --git a/retroshare-gui/src/gui/emojione/1F697.png b/retroshare-gui/src/gui/emojione/1F697.png index d4f2a7cde..2165979bb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F697.png and b/retroshare-gui/src/gui/emojione/1F697.png differ diff --git a/retroshare-gui/src/gui/emojione/1F698.png b/retroshare-gui/src/gui/emojione/1F698.png index 2ab01325a..667cfedf2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F698.png and b/retroshare-gui/src/gui/emojione/1F698.png differ diff --git a/retroshare-gui/src/gui/emojione/1F699.png b/retroshare-gui/src/gui/emojione/1F699.png index d9b2358e8..c6a826934 100644 Binary files a/retroshare-gui/src/gui/emojione/1F699.png and b/retroshare-gui/src/gui/emojione/1F699.png differ diff --git a/retroshare-gui/src/gui/emojione/1F69A.png b/retroshare-gui/src/gui/emojione/1F69A.png index cc1784d28..8d4db10ec 100644 Binary files a/retroshare-gui/src/gui/emojione/1F69A.png and b/retroshare-gui/src/gui/emojione/1F69A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F69B.png b/retroshare-gui/src/gui/emojione/1F69B.png index 6645064ea..a26de88cd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F69B.png and b/retroshare-gui/src/gui/emojione/1F69B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F69C.png b/retroshare-gui/src/gui/emojione/1F69C.png index 874825563..fa3287cf0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F69C.png and b/retroshare-gui/src/gui/emojione/1F69C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F69D.png b/retroshare-gui/src/gui/emojione/1F69D.png index 903a860e6..08e8e081b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F69D.png and b/retroshare-gui/src/gui/emojione/1F69D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F69E.png b/retroshare-gui/src/gui/emojione/1F69E.png index 9cb43ce96..8a6c3477e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F69E.png and b/retroshare-gui/src/gui/emojione/1F69E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F69F.png b/retroshare-gui/src/gui/emojione/1F69F.png index 5f1107eaf..5f6f227f3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F69F.png and b/retroshare-gui/src/gui/emojione/1F69F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A0.png b/retroshare-gui/src/gui/emojione/1F6A0.png index 40542c169..e71e5e826 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A0.png and b/retroshare-gui/src/gui/emojione/1F6A0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A1.png b/retroshare-gui/src/gui/emojione/1F6A1.png index 065c43e06..339af06b0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A1.png and b/retroshare-gui/src/gui/emojione/1F6A1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A2.png b/retroshare-gui/src/gui/emojione/1F6A2.png index 1ae66c064..2954fdd7d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A2.png and b/retroshare-gui/src/gui/emojione/1F6A2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A3.png b/retroshare-gui/src/gui/emojione/1F6A3.png index 7884a6afa..eae8a91c7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A3.png and b/retroshare-gui/src/gui/emojione/1F6A3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A4.png b/retroshare-gui/src/gui/emojione/1F6A4.png index 665e41cfc..deb5cc670 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A4.png and b/retroshare-gui/src/gui/emojione/1F6A4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A5.png b/retroshare-gui/src/gui/emojione/1F6A5.png index eadcb0c69..6e9de4113 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A5.png and b/retroshare-gui/src/gui/emojione/1F6A5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A6.png b/retroshare-gui/src/gui/emojione/1F6A6.png index 6233b8ddf..d7be114a1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A6.png and b/retroshare-gui/src/gui/emojione/1F6A6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A7.png b/retroshare-gui/src/gui/emojione/1F6A7.png index 9fab2da99..1cad8e762 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A7.png and b/retroshare-gui/src/gui/emojione/1F6A7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A8.png b/retroshare-gui/src/gui/emojione/1F6A8.png index 9525b7606..ad2c93dc5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A8.png and b/retroshare-gui/src/gui/emojione/1F6A8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A9.png b/retroshare-gui/src/gui/emojione/1F6A9.png index d9bc69a22..cc30cca3b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A9.png and b/retroshare-gui/src/gui/emojione/1F6A9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6AA.png b/retroshare-gui/src/gui/emojione/1F6AA.png index e556a11ec..878ac5527 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6AA.png and b/retroshare-gui/src/gui/emojione/1F6AA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6AB.png b/retroshare-gui/src/gui/emojione/1F6AB.png index 9db560cc3..6d41e4312 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6AB.png and b/retroshare-gui/src/gui/emojione/1F6AB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6AC.png b/retroshare-gui/src/gui/emojione/1F6AC.png index 74f6342ad..486f611fa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6AC.png and b/retroshare-gui/src/gui/emojione/1F6AC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6AD.png b/retroshare-gui/src/gui/emojione/1F6AD.png index a5a5230ab..a11b8051f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6AD.png and b/retroshare-gui/src/gui/emojione/1F6AD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6AE.png b/retroshare-gui/src/gui/emojione/1F6AE.png index 6b345c207..854dbdcae 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6AE.png and b/retroshare-gui/src/gui/emojione/1F6AE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6AF.png b/retroshare-gui/src/gui/emojione/1F6AF.png index aa06f00d0..3a79be0ad 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6AF.png and b/retroshare-gui/src/gui/emojione/1F6AF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B0.png b/retroshare-gui/src/gui/emojione/1F6B0.png index a80f8760f..a5a091604 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B0.png and b/retroshare-gui/src/gui/emojione/1F6B0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B1.png b/retroshare-gui/src/gui/emojione/1F6B1.png index 6b0819e48..9d9249945 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B1.png and b/retroshare-gui/src/gui/emojione/1F6B1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B2.png b/retroshare-gui/src/gui/emojione/1F6B2.png index e4b93a43b..f7c177c19 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B2.png and b/retroshare-gui/src/gui/emojione/1F6B2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B3.png b/retroshare-gui/src/gui/emojione/1F6B3.png index 8b538a971..7a82268ae 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B3.png and b/retroshare-gui/src/gui/emojione/1F6B3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B4.png b/retroshare-gui/src/gui/emojione/1F6B4.png index 9ec030bf5..5966fc333 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B4.png and b/retroshare-gui/src/gui/emojione/1F6B4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B5.png b/retroshare-gui/src/gui/emojione/1F6B5.png index 9b10588ea..435a75dc1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B5.png and b/retroshare-gui/src/gui/emojione/1F6B5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B6.png b/retroshare-gui/src/gui/emojione/1F6B6.png index 70df10c14..e2fceed7c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B6.png and b/retroshare-gui/src/gui/emojione/1F6B6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B7.png b/retroshare-gui/src/gui/emojione/1F6B7.png index f6fd77334..8df85ea1d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B7.png and b/retroshare-gui/src/gui/emojione/1F6B7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B8.png b/retroshare-gui/src/gui/emojione/1F6B8.png index c04e2626d..0a2d89de1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B8.png and b/retroshare-gui/src/gui/emojione/1F6B8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B9.png b/retroshare-gui/src/gui/emojione/1F6B9.png index f0276e39e..85be8289b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B9.png and b/retroshare-gui/src/gui/emojione/1F6B9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6BA.png b/retroshare-gui/src/gui/emojione/1F6BA.png index 1eaedf725..670942409 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6BA.png and b/retroshare-gui/src/gui/emojione/1F6BA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6BB.png b/retroshare-gui/src/gui/emojione/1F6BB.png index de13e6de9..96c3a1fde 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6BB.png and b/retroshare-gui/src/gui/emojione/1F6BB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6BC.png b/retroshare-gui/src/gui/emojione/1F6BC.png index e4b00cfff..75b8d375d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6BC.png and b/retroshare-gui/src/gui/emojione/1F6BC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6BD.png b/retroshare-gui/src/gui/emojione/1F6BD.png index 76181c1e9..9726156d2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6BD.png and b/retroshare-gui/src/gui/emojione/1F6BD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6BE.png b/retroshare-gui/src/gui/emojione/1F6BE.png index f6b72dfaa..d2ad2225f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6BE.png and b/retroshare-gui/src/gui/emojione/1F6BE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6BF.png b/retroshare-gui/src/gui/emojione/1F6BF.png index c212e3fd0..4977fab4e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6BF.png and b/retroshare-gui/src/gui/emojione/1F6BF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C0.png b/retroshare-gui/src/gui/emojione/1F6C0.png index 8cd17484a..8aa3f6b0e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C0.png and b/retroshare-gui/src/gui/emojione/1F6C0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C1.png b/retroshare-gui/src/gui/emojione/1F6C1.png index 2dc4a32af..248efcee7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C1.png and b/retroshare-gui/src/gui/emojione/1F6C1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C2.png b/retroshare-gui/src/gui/emojione/1F6C2.png index 02ec4d037..9d81a7540 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C2.png and b/retroshare-gui/src/gui/emojione/1F6C2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C3.png b/retroshare-gui/src/gui/emojione/1F6C3.png index 3dc92d80d..d748ea456 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C3.png and b/retroshare-gui/src/gui/emojione/1F6C3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C4.png b/retroshare-gui/src/gui/emojione/1F6C4.png index 7b36ecd79..3df984aef 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C4.png and b/retroshare-gui/src/gui/emojione/1F6C4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C5.png b/retroshare-gui/src/gui/emojione/1F6C5.png index 77d0eecba..0fffcfea3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C5.png and b/retroshare-gui/src/gui/emojione/1F6C5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C6.png b/retroshare-gui/src/gui/emojione/1F6C6.png index 5f82635b7..c9288e5ee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C6.png and b/retroshare-gui/src/gui/emojione/1F6C6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C7.png b/retroshare-gui/src/gui/emojione/1F6C7.png index a7ba0229d..9b526829d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C7.png and b/retroshare-gui/src/gui/emojione/1F6C7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C8.png b/retroshare-gui/src/gui/emojione/1F6C8.png index 974616a88..5178f8e6e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C8.png and b/retroshare-gui/src/gui/emojione/1F6C8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C9.png b/retroshare-gui/src/gui/emojione/1F6C9.png index 9559045ff..943c546e5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C9.png and b/retroshare-gui/src/gui/emojione/1F6C9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6CA.png b/retroshare-gui/src/gui/emojione/1F6CA.png index 05c1b5d58..c450e6e8d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6CA.png and b/retroshare-gui/src/gui/emojione/1F6CA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6CB.png b/retroshare-gui/src/gui/emojione/1F6CB.png index 2ead68002..fb2f5157d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6CB.png and b/retroshare-gui/src/gui/emojione/1F6CB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6CC.png b/retroshare-gui/src/gui/emojione/1F6CC.png index 5474babb0..2b3886e89 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6CC.png and b/retroshare-gui/src/gui/emojione/1F6CC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6CD.png b/retroshare-gui/src/gui/emojione/1F6CD.png index 630b5f5f0..a9de77242 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6CD.png and b/retroshare-gui/src/gui/emojione/1F6CD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6CE.png b/retroshare-gui/src/gui/emojione/1F6CE.png index 6313f8d71..3a9cad3e0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6CE.png and b/retroshare-gui/src/gui/emojione/1F6CE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6CF.png b/retroshare-gui/src/gui/emojione/1F6CF.png index b1d0cf470..2ee28edcb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6CF.png and b/retroshare-gui/src/gui/emojione/1F6CF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E0.png b/retroshare-gui/src/gui/emojione/1F6E0.png index 43b918343..d0cb8b672 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E0.png and b/retroshare-gui/src/gui/emojione/1F6E0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E1.png b/retroshare-gui/src/gui/emojione/1F6E1.png index cce8902aa..0d25a31aa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E1.png and b/retroshare-gui/src/gui/emojione/1F6E1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E2.png b/retroshare-gui/src/gui/emojione/1F6E2.png index 3872d9e97..8dd8bd996 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E2.png and b/retroshare-gui/src/gui/emojione/1F6E2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E3.png b/retroshare-gui/src/gui/emojione/1F6E3.png index 7637f613c..6156044c2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E3.png and b/retroshare-gui/src/gui/emojione/1F6E3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E4.png b/retroshare-gui/src/gui/emojione/1F6E4.png index f863c6760..1957fc8b3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E4.png and b/retroshare-gui/src/gui/emojione/1F6E4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E5.png b/retroshare-gui/src/gui/emojione/1F6E5.png index 770562969..cfb624c8e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E5.png and b/retroshare-gui/src/gui/emojione/1F6E5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E6.png b/retroshare-gui/src/gui/emojione/1F6E6.png index 76f962669..d4fef54a7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E6.png and b/retroshare-gui/src/gui/emojione/1F6E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E7.png b/retroshare-gui/src/gui/emojione/1F6E7.png index c42dc92bc..1ace91658 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E7.png and b/retroshare-gui/src/gui/emojione/1F6E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E8.png b/retroshare-gui/src/gui/emojione/1F6E8.png index 3ab72d1d9..f73c89134 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E8.png and b/retroshare-gui/src/gui/emojione/1F6E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E9.png b/retroshare-gui/src/gui/emojione/1F6E9.png index 28a164d3e..3baf8928e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E9.png and b/retroshare-gui/src/gui/emojione/1F6E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6EA.png b/retroshare-gui/src/gui/emojione/1F6EA.png index 3276b4053..fea8b7a61 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6EA.png and b/retroshare-gui/src/gui/emojione/1F6EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6EB.png b/retroshare-gui/src/gui/emojione/1F6EB.png index a59b15cfa..13ad7f9ee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6EB.png and b/retroshare-gui/src/gui/emojione/1F6EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6EC.png b/retroshare-gui/src/gui/emojione/1F6EC.png index 53219bdbd..0df413a55 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6EC.png and b/retroshare-gui/src/gui/emojione/1F6EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6F0.png b/retroshare-gui/src/gui/emojione/1F6F0.png index d2b111def..61fc8a4c5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6F0.png and b/retroshare-gui/src/gui/emojione/1F6F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6F1.png b/retroshare-gui/src/gui/emojione/1F6F1.png index 93f4f70b8..234dc329c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6F1.png and b/retroshare-gui/src/gui/emojione/1F6F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6F2.png b/retroshare-gui/src/gui/emojione/1F6F2.png index 08041c525..377a0387a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6F2.png and b/retroshare-gui/src/gui/emojione/1F6F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6F3.png b/retroshare-gui/src/gui/emojione/1F6F3.png index 489aa5789..b292cfd07 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6F3.png and b/retroshare-gui/src/gui/emojione/1F6F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e6-1f1f6.png b/retroshare-gui/src/gui/emojione/1f1e6-1f1f6.png index 9a94b3eb3..650d6b54a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e6-1f1f6.png and b/retroshare-gui/src/gui/emojione/1f1e6-1f1f6.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e6-1f1f8.png b/retroshare-gui/src/gui/emojione/1f1e6-1f1f8.png index d8ed9e84b..7a70bf965 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e6-1f1f8.png and b/retroshare-gui/src/gui/emojione/1f1e6-1f1f8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e6-1f1fd.png b/retroshare-gui/src/gui/emojione/1f1e6-1f1fd.png index d9e558170..fd2737d06 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e6-1f1fd.png and b/retroshare-gui/src/gui/emojione/1f1e6-1f1fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e7-1f1f1.png b/retroshare-gui/src/gui/emojione/1f1e7-1f1f1.png index 8dd700305..598662e84 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e7-1f1f1.png and b/retroshare-gui/src/gui/emojione/1f1e7-1f1f1.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e7-1f1f6.png b/retroshare-gui/src/gui/emojione/1f1e7-1f1f6.png index 750d03660..e69a8bfc3 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e7-1f1f6.png and b/retroshare-gui/src/gui/emojione/1f1e7-1f1f6.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e7-1f1fb.png b/retroshare-gui/src/gui/emojione/1f1e7-1f1fb.png index d8d375116..7b02ebf17 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e7-1f1fb.png and b/retroshare-gui/src/gui/emojione/1f1e7-1f1fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e8-1f1e8.png b/retroshare-gui/src/gui/emojione/1f1e8-1f1e8.png index 358797346..6dd0f91ca 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e8-1f1e8.png and b/retroshare-gui/src/gui/emojione/1f1e8-1f1e8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e8-1f1f0.png b/retroshare-gui/src/gui/emojione/1f1e8-1f1f0.png index afcd70279..c64eed352 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e8-1f1f0.png and b/retroshare-gui/src/gui/emojione/1f1e8-1f1f0.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e8-1f1f5.png b/retroshare-gui/src/gui/emojione/1f1e8-1f1f5.png index b476f6c39..7ee75aac2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e8-1f1f5.png and b/retroshare-gui/src/gui/emojione/1f1e8-1f1f5.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e8-1f1fc.png b/retroshare-gui/src/gui/emojione/1f1e8-1f1fc.png index 4d72b8f5c..031eac1a6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e8-1f1fc.png and b/retroshare-gui/src/gui/emojione/1f1e8-1f1fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e8-1f1fd.png b/retroshare-gui/src/gui/emojione/1f1e8-1f1fd.png index 91265d427..407074f28 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e8-1f1fd.png and b/retroshare-gui/src/gui/emojione/1f1e8-1f1fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e9-1f1ec.png b/retroshare-gui/src/gui/emojione/1f1e9-1f1ec.png index dd3e6aa7e..3313c918d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e9-1f1ec.png and b/retroshare-gui/src/gui/emojione/1f1e9-1f1ec.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ea-1f1e6.png b/retroshare-gui/src/gui/emojione/1f1ea-1f1e6.png index 710b06e2d..acc6f17f3 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ea-1f1e6.png and b/retroshare-gui/src/gui/emojione/1f1ea-1f1e6.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ea-1f1fa.png b/retroshare-gui/src/gui/emojione/1f1ea-1f1fa.png index 1e429340d..4e7cd8eca 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ea-1f1fa.png and b/retroshare-gui/src/gui/emojione/1f1ea-1f1fa.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ec-1f1eb.png b/retroshare-gui/src/gui/emojione/1f1ec-1f1eb.png index 501cf9fe3..0e9da86ce 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ec-1f1eb.png and b/retroshare-gui/src/gui/emojione/1f1ec-1f1eb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ec-1f1ec.png b/retroshare-gui/src/gui/emojione/1f1ec-1f1ec.png index c139c5267..c5c2bbf90 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ec-1f1ec.png and b/retroshare-gui/src/gui/emojione/1f1ec-1f1ec.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ec-1f1f5.png b/retroshare-gui/src/gui/emojione/1f1ec-1f1f5.png index 8728610c2..35ff3def7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ec-1f1f5.png and b/retroshare-gui/src/gui/emojione/1f1ec-1f1f5.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ec-1f1f8.png b/retroshare-gui/src/gui/emojione/1f1ec-1f1f8.png index 033da6544..6615c0f13 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ec-1f1f8.png and b/retroshare-gui/src/gui/emojione/1f1ec-1f1f8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ed-1f1f2.png b/retroshare-gui/src/gui/emojione/1f1ed-1f1f2.png index d5943686a..b19efd45f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ed-1f1f2.png and b/retroshare-gui/src/gui/emojione/1f1ed-1f1f2.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ee-1f1e8.png b/retroshare-gui/src/gui/emojione/1f1ee-1f1e8.png index a9d926879..46f16f4fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ee-1f1e8.png and b/retroshare-gui/src/gui/emojione/1f1ee-1f1e8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ee-1f1f2.png b/retroshare-gui/src/gui/emojione/1f1ee-1f1f2.png index 92f1a4389..27f23f01a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ee-1f1f2.png and b/retroshare-gui/src/gui/emojione/1f1ee-1f1f2.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ee-1f1f4.png b/retroshare-gui/src/gui/emojione/1f1ee-1f1f4.png index dd3e6aa7e..3313c918d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ee-1f1f4.png and b/retroshare-gui/src/gui/emojione/1f1ee-1f1f4.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f2-1f1eb.png b/retroshare-gui/src/gui/emojione/1f1f2-1f1eb.png index b476f6c39..7ee75aac2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f2-1f1eb.png and b/retroshare-gui/src/gui/emojione/1f1f2-1f1eb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f2-1f1f5.png b/retroshare-gui/src/gui/emojione/1f1f2-1f1f5.png index 6f5cdbafa..a3393d687 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f2-1f1f5.png and b/retroshare-gui/src/gui/emojione/1f1f2-1f1f5.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f2-1f1f6.png b/retroshare-gui/src/gui/emojione/1f1f2-1f1f6.png index 55a3e159b..cf527cd8c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f2-1f1f6.png and b/retroshare-gui/src/gui/emojione/1f1f2-1f1f6.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f3-1f1eb.png b/retroshare-gui/src/gui/emojione/1f1f3-1f1eb.png index 55b2f1f8c..79b821dbc 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f3-1f1eb.png and b/retroshare-gui/src/gui/emojione/1f1f3-1f1eb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f5-1f1f2.png b/retroshare-gui/src/gui/emojione/1f1f5-1f1f2.png index 06d7abb1f..ee6ab9887 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f5-1f1f2.png and b/retroshare-gui/src/gui/emojione/1f1f5-1f1f2.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f5-1f1f3.png b/retroshare-gui/src/gui/emojione/1f1f5-1f1f3.png index d015f28a2..83840f70d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f5-1f1f3.png and b/retroshare-gui/src/gui/emojione/1f1f5-1f1f3.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f7-1f1ea.png b/retroshare-gui/src/gui/emojione/1f1f7-1f1ea.png index ab079c680..c8a298659 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f7-1f1ea.png and b/retroshare-gui/src/gui/emojione/1f1f7-1f1ea.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f8-1f1ef.png b/retroshare-gui/src/gui/emojione/1f1f8-1f1ef.png index d8d375116..ddf1810c5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f8-1f1ef.png and b/retroshare-gui/src/gui/emojione/1f1f8-1f1ef.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f8-1f1f8.png b/retroshare-gui/src/gui/emojione/1f1f8-1f1f8.png index 503054afb..e72daa95d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f8-1f1f8.png and b/retroshare-gui/src/gui/emojione/1f1f8-1f1f8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f8-1f1fd.png b/retroshare-gui/src/gui/emojione/1f1f8-1f1fd.png index 69a5b7076..1a7a35b59 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f8-1f1fd.png and b/retroshare-gui/src/gui/emojione/1f1f8-1f1fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f9-1f1e6.png b/retroshare-gui/src/gui/emojione/1f1f9-1f1e6.png index 74d9d156b..bfeff756f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f9-1f1e6.png and b/retroshare-gui/src/gui/emojione/1f1f9-1f1e6.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f9-1f1e8.png b/retroshare-gui/src/gui/emojione/1f1f9-1f1e8.png index c64c319ee..d2eb0d400 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f9-1f1e8.png and b/retroshare-gui/src/gui/emojione/1f1f9-1f1e8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f9-1f1eb.png b/retroshare-gui/src/gui/emojione/1f1f9-1f1eb.png index 5ba34d435..df6d25947 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f9-1f1eb.png and b/retroshare-gui/src/gui/emojione/1f1f9-1f1eb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f9-1f1f0.png b/retroshare-gui/src/gui/emojione/1f1f9-1f1f0.png index 822081041..43020303e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f9-1f1f0.png and b/retroshare-gui/src/gui/emojione/1f1f9-1f1f0.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1fa-1f1f2.png b/retroshare-gui/src/gui/emojione/1f1fa-1f1f2.png index 6c3b03092..a47d96d0a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1fa-1f1f2.png and b/retroshare-gui/src/gui/emojione/1f1fa-1f1f2.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1fb-1f1ec.png b/retroshare-gui/src/gui/emojione/1f1fb-1f1ec.png index 11b2f317a..58a00576b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1fb-1f1ec.png and b/retroshare-gui/src/gui/emojione/1f1fb-1f1ec.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1fe-1f1f9.png b/retroshare-gui/src/gui/emojione/1f1fe-1f1f9.png index d902e9531..c67d79845 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1fe-1f1f9.png and b/retroshare-gui/src/gui/emojione/1f1fe-1f1f9.png differ diff --git a/retroshare-gui/src/gui/emojione/1f324.png b/retroshare-gui/src/gui/emojione/1f324.png index 10734ad60..0de48d93e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f324.png and b/retroshare-gui/src/gui/emojione/1f324.png differ diff --git a/retroshare-gui/src/gui/emojione/1f325.png b/retroshare-gui/src/gui/emojione/1f325.png index e8e1c8c79..57590cbc7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f325.png and b/retroshare-gui/src/gui/emojione/1f325.png differ diff --git a/retroshare-gui/src/gui/emojione/1f326.png b/retroshare-gui/src/gui/emojione/1f326.png index 8823417f8..0b76c3dd0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f326.png and b/retroshare-gui/src/gui/emojione/1f326.png differ diff --git a/retroshare-gui/src/gui/emojione/1f32d.png b/retroshare-gui/src/gui/emojione/1f32d.png index d908f58fa..989ad1342 100644 Binary files a/retroshare-gui/src/gui/emojione/1f32d.png and b/retroshare-gui/src/gui/emojione/1f32d.png differ diff --git a/retroshare-gui/src/gui/emojione/1f32e.png b/retroshare-gui/src/gui/emojione/1f32e.png index 4017ac7db..38a2c0436 100644 Binary files a/retroshare-gui/src/gui/emojione/1f32e.png and b/retroshare-gui/src/gui/emojione/1f32e.png differ diff --git a/retroshare-gui/src/gui/emojione/1f32f.png b/retroshare-gui/src/gui/emojione/1f32f.png index cf0e264c7..64235b6fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f32f.png and b/retroshare-gui/src/gui/emojione/1f32f.png differ diff --git a/retroshare-gui/src/gui/emojione/1f37e.png b/retroshare-gui/src/gui/emojione/1f37e.png index 066573790..fba4fe465 100644 Binary files a/retroshare-gui/src/gui/emojione/1f37e.png and b/retroshare-gui/src/gui/emojione/1f37e.png differ diff --git a/retroshare-gui/src/gui/emojione/1f37f.png b/retroshare-gui/src/gui/emojione/1f37f.png index 2fa2c5596..6ce3ab720 100644 Binary files a/retroshare-gui/src/gui/emojione/1f37f.png and b/retroshare-gui/src/gui/emojione/1f37f.png differ diff --git a/retroshare-gui/src/gui/emojione/1f385-1f3fb.png b/retroshare-gui/src/gui/emojione/1f385-1f3fb.png index 5e222755f..b9787fad2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f385-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f385-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f385-1f3fc.png b/retroshare-gui/src/gui/emojione/1f385-1f3fc.png index 37176ea7e..0632e486d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f385-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f385-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f385-1f3fd.png b/retroshare-gui/src/gui/emojione/1f385-1f3fd.png index 5492149ee..a5d8e584a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f385-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f385-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f385-1f3fe.png b/retroshare-gui/src/gui/emojione/1f385-1f3fe.png index ba0d405b1..dce030f66 100644 Binary files a/retroshare-gui/src/gui/emojione/1f385-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f385-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f385-1f3ff.png b/retroshare-gui/src/gui/emojione/1f385-1f3ff.png index d1452d10e..ad691e443 100644 Binary files a/retroshare-gui/src/gui/emojione/1f385-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f385-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c3-1f3fb.png b/retroshare-gui/src/gui/emojione/1f3c3-1f3fb.png index fd6f8587a..85b999403 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c3-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f3c3-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c3-1f3fc.png b/retroshare-gui/src/gui/emojione/1f3c3-1f3fc.png index c13b17c6c..421c3ae18 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c3-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f3c3-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c3-1f3fd.png b/retroshare-gui/src/gui/emojione/1f3c3-1f3fd.png index fcc65fb95..7f48586e7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c3-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f3c3-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c3-1f3fe.png b/retroshare-gui/src/gui/emojione/1f3c3-1f3fe.png index 3ff1f0228..0f07bd8b8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c3-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f3c3-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c3-1f3ff.png b/retroshare-gui/src/gui/emojione/1f3c3-1f3ff.png index 0b882e252..edc634b60 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c3-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f3c3-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c4-1f3fb.png b/retroshare-gui/src/gui/emojione/1f3c4-1f3fb.png index ca09b459a..823565950 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c4-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f3c4-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c4-1f3fc.png b/retroshare-gui/src/gui/emojione/1f3c4-1f3fc.png index 712e0cca2..50a041a11 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c4-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f3c4-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c4-1f3fd.png b/retroshare-gui/src/gui/emojione/1f3c4-1f3fd.png index f7d988844..f1f40afe9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c4-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f3c4-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c4-1f3fe.png b/retroshare-gui/src/gui/emojione/1f3c4-1f3fe.png index 4a3c31910..cdc80fab2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c4-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f3c4-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c4-1f3ff.png b/retroshare-gui/src/gui/emojione/1f3c4-1f3ff.png index 5a34afa9f..213811bcf 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c4-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f3c4-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c7-1f3fb.png b/retroshare-gui/src/gui/emojione/1f3c7-1f3fb.png index ba09a01bb..073957d2e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c7-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f3c7-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c7-1f3fc.png b/retroshare-gui/src/gui/emojione/1f3c7-1f3fc.png index c949514a1..daed3558d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c7-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f3c7-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c7-1f3fd.png b/retroshare-gui/src/gui/emojione/1f3c7-1f3fd.png index 87c99de3c..88a45646d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c7-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f3c7-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c7-1f3fe.png b/retroshare-gui/src/gui/emojione/1f3c7-1f3fe.png index 9097f6dc0..3be2e642a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c7-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f3c7-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c7-1f3ff.png b/retroshare-gui/src/gui/emojione/1f3c7-1f3ff.png index 057ed4404..d59ae677e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c7-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f3c7-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3ca-1f3fb.png b/retroshare-gui/src/gui/emojione/1f3ca-1f3fb.png index 5c4a9ef74..d92536dd5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3ca-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f3ca-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3ca-1f3fc.png b/retroshare-gui/src/gui/emojione/1f3ca-1f3fc.png index 85c00b668..39e9400f0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3ca-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f3ca-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3ca-1f3fd.png b/retroshare-gui/src/gui/emojione/1f3ca-1f3fd.png index e0504655c..9d61f60b4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3ca-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f3ca-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3ca-1f3fe.png b/retroshare-gui/src/gui/emojione/1f3ca-1f3fe.png index 759994bc2..f5f1c5176 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3ca-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f3ca-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3ca-1f3ff.png b/retroshare-gui/src/gui/emojione/1f3ca-1f3ff.png index 44f1aa93d..ce0463658 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3ca-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f3ca-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3cb-1f3fb.png b/retroshare-gui/src/gui/emojione/1f3cb-1f3fb.png index 66580c51c..50b95afdf 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3cb-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f3cb-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3cb-1f3fc.png b/retroshare-gui/src/gui/emojione/1f3cb-1f3fc.png index 782c917f7..d1c5105d0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3cb-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f3cb-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3cb-1f3fd.png b/retroshare-gui/src/gui/emojione/1f3cb-1f3fd.png index aeb05da64..a8c16425c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3cb-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f3cb-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3cb-1f3fe.png b/retroshare-gui/src/gui/emojione/1f3cb-1f3fe.png index a4540c5f0..0ce274d9f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3cb-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f3cb-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3cb-1f3ff.png b/retroshare-gui/src/gui/emojione/1f3cb-1f3ff.png index 523ecc167..8f099ba11 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3cb-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f3cb-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3cf.png b/retroshare-gui/src/gui/emojione/1f3cf.png index cd2bdffa8..a08535b68 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3cf.png and b/retroshare-gui/src/gui/emojione/1f3cf.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3d0.png b/retroshare-gui/src/gui/emojione/1f3d0.png index 6c469e423..809964213 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3d0.png and b/retroshare-gui/src/gui/emojione/1f3d0.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3d1.png b/retroshare-gui/src/gui/emojione/1f3d1.png index 6a67a7e1d..fa53a3b45 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3d1.png and b/retroshare-gui/src/gui/emojione/1f3d1.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3d2.png b/retroshare-gui/src/gui/emojione/1f3d2.png index 6591afdf9..b76f02415 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3d2.png and b/retroshare-gui/src/gui/emojione/1f3d2.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3d3.png b/retroshare-gui/src/gui/emojione/1f3d3.png index 98b51e3fc..c9591e268 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3d3.png and b/retroshare-gui/src/gui/emojione/1f3d3.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3f8.png b/retroshare-gui/src/gui/emojione/1f3f8.png index ed2e73a3b..0425b0e81 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3f8.png and b/retroshare-gui/src/gui/emojione/1f3f8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3f9.png b/retroshare-gui/src/gui/emojione/1f3f9.png index 92d0faa39..149f31f1b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3f9.png and b/retroshare-gui/src/gui/emojione/1f3f9.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3fa.png b/retroshare-gui/src/gui/emojione/1f3fa.png index 731db1ace..c3bf52cbf 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3fa.png and b/retroshare-gui/src/gui/emojione/1f3fa.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3fb.png b/retroshare-gui/src/gui/emojione/1f3fb.png index 936f639bd..afd5cf8d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3fb.png and b/retroshare-gui/src/gui/emojione/1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3fc.png b/retroshare-gui/src/gui/emojione/1f3fc.png index 4d4167b5b..1cd30c8d6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3fc.png and b/retroshare-gui/src/gui/emojione/1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3fd.png b/retroshare-gui/src/gui/emojione/1f3fd.png index 6c5fea443..8cadef08e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3fd.png and b/retroshare-gui/src/gui/emojione/1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3fe.png b/retroshare-gui/src/gui/emojione/1f3fe.png index 94f20c67f..2b714c5fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3fe.png and b/retroshare-gui/src/gui/emojione/1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3ff.png b/retroshare-gui/src/gui/emojione/1f3ff.png index c29c0618d..3fb467273 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3ff.png and b/retroshare-gui/src/gui/emojione/1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f441-1f5e8.png b/retroshare-gui/src/gui/emojione/1f441-1f5e8.png index 908b11b2e..78ffe1bb8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f441-1f5e8.png and b/retroshare-gui/src/gui/emojione/1f441-1f5e8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f442-1f3fb.png b/retroshare-gui/src/gui/emojione/1f442-1f3fb.png index 445cd62c2..0fd292b22 100644 Binary files a/retroshare-gui/src/gui/emojione/1f442-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f442-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f442-1f3fc.png b/retroshare-gui/src/gui/emojione/1f442-1f3fc.png index a327122b2..ce87db740 100644 Binary files a/retroshare-gui/src/gui/emojione/1f442-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f442-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f442-1f3fd.png b/retroshare-gui/src/gui/emojione/1f442-1f3fd.png index 373e895b9..bb08429c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f442-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f442-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f442-1f3fe.png b/retroshare-gui/src/gui/emojione/1f442-1f3fe.png index 99ded564f..157604326 100644 Binary files a/retroshare-gui/src/gui/emojione/1f442-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f442-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f442-1f3ff.png b/retroshare-gui/src/gui/emojione/1f442-1f3ff.png index 80829af62..73afe06ec 100644 Binary files a/retroshare-gui/src/gui/emojione/1f442-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f442-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f443-1f3fb.png b/retroshare-gui/src/gui/emojione/1f443-1f3fb.png index 51d7f2ca9..084fea009 100644 Binary files a/retroshare-gui/src/gui/emojione/1f443-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f443-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f443-1f3fc.png b/retroshare-gui/src/gui/emojione/1f443-1f3fc.png index c07dec3f5..4d5021da4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f443-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f443-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f443-1f3fd.png b/retroshare-gui/src/gui/emojione/1f443-1f3fd.png index ec0ce61ef..296dde779 100644 Binary files a/retroshare-gui/src/gui/emojione/1f443-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f443-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f443-1f3fe.png b/retroshare-gui/src/gui/emojione/1f443-1f3fe.png index 3dff4c728..04100e7e5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f443-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f443-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f443-1f3ff.png b/retroshare-gui/src/gui/emojione/1f443-1f3ff.png index 804106396..0bbc96b1d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f443-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f443-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f446-1f3fb.png b/retroshare-gui/src/gui/emojione/1f446-1f3fb.png index 3e52fc51f..b50c0eb56 100644 Binary files a/retroshare-gui/src/gui/emojione/1f446-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f446-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f446-1f3fc.png b/retroshare-gui/src/gui/emojione/1f446-1f3fc.png index 5eb45e366..fbc340007 100644 Binary files a/retroshare-gui/src/gui/emojione/1f446-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f446-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f446-1f3fd.png b/retroshare-gui/src/gui/emojione/1f446-1f3fd.png index 5eb4e4cca..1668d2e4a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f446-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f446-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f446-1f3fe.png b/retroshare-gui/src/gui/emojione/1f446-1f3fe.png index e6451f669..e28d399a6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f446-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f446-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f446-1f3ff.png b/retroshare-gui/src/gui/emojione/1f446-1f3ff.png index 3f7eea34a..2f443a4fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f446-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f446-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f447-1f3fb.png b/retroshare-gui/src/gui/emojione/1f447-1f3fb.png index 41742e8d9..3eec5d751 100644 Binary files a/retroshare-gui/src/gui/emojione/1f447-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f447-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f447-1f3fc.png b/retroshare-gui/src/gui/emojione/1f447-1f3fc.png index 473158040..5a4f6a67e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f447-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f447-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f447-1f3fd.png b/retroshare-gui/src/gui/emojione/1f447-1f3fd.png index 49cdc38a6..ae9168fc3 100644 Binary files a/retroshare-gui/src/gui/emojione/1f447-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f447-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f447-1f3fe.png b/retroshare-gui/src/gui/emojione/1f447-1f3fe.png index d4bf11e95..5b2b8ed8f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f447-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f447-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f447-1f3ff.png b/retroshare-gui/src/gui/emojione/1f447-1f3ff.png index cae996ea5..cc09f7fd8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f447-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f447-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f448-1f3fb.png b/retroshare-gui/src/gui/emojione/1f448-1f3fb.png index a0d29d8c1..5f2b0f564 100644 Binary files a/retroshare-gui/src/gui/emojione/1f448-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f448-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f448-1f3fc.png b/retroshare-gui/src/gui/emojione/1f448-1f3fc.png index 4e406d291..1c115c419 100644 Binary files a/retroshare-gui/src/gui/emojione/1f448-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f448-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f448-1f3fd.png b/retroshare-gui/src/gui/emojione/1f448-1f3fd.png index 1cff99f9b..e399dd49a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f448-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f448-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f448-1f3fe.png b/retroshare-gui/src/gui/emojione/1f448-1f3fe.png index 382dd0e4a..689f33eb6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f448-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f448-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f448-1f3ff.png b/retroshare-gui/src/gui/emojione/1f448-1f3ff.png index b39c47760..29a193828 100644 Binary files a/retroshare-gui/src/gui/emojione/1f448-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f448-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f449-1f3fb.png b/retroshare-gui/src/gui/emojione/1f449-1f3fb.png index 589bccd06..f4171a27d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f449-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f449-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f449-1f3fc.png b/retroshare-gui/src/gui/emojione/1f449-1f3fc.png index f65364d6e..b8614edfe 100644 Binary files a/retroshare-gui/src/gui/emojione/1f449-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f449-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f449-1f3fd.png b/retroshare-gui/src/gui/emojione/1f449-1f3fd.png index 1d550add3..38c953a86 100644 Binary files a/retroshare-gui/src/gui/emojione/1f449-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f449-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f449-1f3fe.png b/retroshare-gui/src/gui/emojione/1f449-1f3fe.png index b8866bc9f..d84cccd4a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f449-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f449-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f449-1f3ff.png b/retroshare-gui/src/gui/emojione/1f449-1f3ff.png index 6c730cba4..578bad164 100644 Binary files a/retroshare-gui/src/gui/emojione/1f449-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f449-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44a-1f3fb.png b/retroshare-gui/src/gui/emojione/1f44a-1f3fb.png index a29295e30..34a8b498c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44a-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f44a-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44a-1f3fc.png b/retroshare-gui/src/gui/emojione/1f44a-1f3fc.png index 3e45b63be..e47bd04eb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44a-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f44a-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44a-1f3fd.png b/retroshare-gui/src/gui/emojione/1f44a-1f3fd.png index 9aee14adf..ae954aa88 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44a-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f44a-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44a-1f3fe.png b/retroshare-gui/src/gui/emojione/1f44a-1f3fe.png index e5deb46d9..43c001354 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44a-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f44a-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44a-1f3ff.png b/retroshare-gui/src/gui/emojione/1f44a-1f3ff.png index 3afe7a223..b50e7ff74 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44a-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f44a-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44b-1f3fb.png b/retroshare-gui/src/gui/emojione/1f44b-1f3fb.png index b0a9bbe56..d9e029c42 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44b-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f44b-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44b-1f3fc.png b/retroshare-gui/src/gui/emojione/1f44b-1f3fc.png index c0190e113..1e01924c4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44b-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f44b-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44b-1f3fd.png b/retroshare-gui/src/gui/emojione/1f44b-1f3fd.png index 9754d929d..584d2a3fa 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44b-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f44b-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44b-1f3fe.png b/retroshare-gui/src/gui/emojione/1f44b-1f3fe.png index 5a0f3fd57..ba2e67095 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44b-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f44b-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44b-1f3ff.png b/retroshare-gui/src/gui/emojione/1f44b-1f3ff.png index 1e8d8ad9b..e71596644 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44b-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f44b-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44c-1f3fb.png b/retroshare-gui/src/gui/emojione/1f44c-1f3fb.png index 4f490e7fc..9f31aecc0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44c-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f44c-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44c-1f3fc.png b/retroshare-gui/src/gui/emojione/1f44c-1f3fc.png index 79f4bd169..dd9b9c6f0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44c-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f44c-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44c-1f3fd.png b/retroshare-gui/src/gui/emojione/1f44c-1f3fd.png index 593233a69..cf8840946 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44c-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f44c-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44c-1f3fe.png b/retroshare-gui/src/gui/emojione/1f44c-1f3fe.png index 8fa46aab4..b0039f11f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44c-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f44c-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44c-1f3ff.png b/retroshare-gui/src/gui/emojione/1f44c-1f3ff.png index 0f0b37237..78493d109 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44c-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f44c-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44d-1f3fb.png b/retroshare-gui/src/gui/emojione/1f44d-1f3fb.png index 0e0c6fc26..2d1957a5f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44d-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f44d-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44d-1f3fc.png b/retroshare-gui/src/gui/emojione/1f44d-1f3fc.png index 7f2077428..0599f643d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44d-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f44d-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44d-1f3fd.png b/retroshare-gui/src/gui/emojione/1f44d-1f3fd.png index 86e8d8701..22fa70da8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44d-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f44d-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44d-1f3fe.png b/retroshare-gui/src/gui/emojione/1f44d-1f3fe.png index 97e860425..8eec989fa 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44d-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f44d-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44d-1f3ff.png b/retroshare-gui/src/gui/emojione/1f44d-1f3ff.png index fe24ba3cc..9a0f6b9d1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44d-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f44d-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44e-1f3fb.png b/retroshare-gui/src/gui/emojione/1f44e-1f3fb.png index 3fd255ed9..e4e72a2b1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44e-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f44e-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44e-1f3fc.png b/retroshare-gui/src/gui/emojione/1f44e-1f3fc.png index d6a3682e1..f0f43fd7a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44e-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f44e-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44e-1f3fd.png b/retroshare-gui/src/gui/emojione/1f44e-1f3fd.png index 5894b7ad9..4e31f49f1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44e-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f44e-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44e-1f3fe.png b/retroshare-gui/src/gui/emojione/1f44e-1f3fe.png index 4569aacfa..adc3231db 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44e-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f44e-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44e-1f3ff.png b/retroshare-gui/src/gui/emojione/1f44e-1f3ff.png index 1abd6c45c..6e2866819 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44e-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f44e-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44f-1f3fb.png b/retroshare-gui/src/gui/emojione/1f44f-1f3fb.png index e6652c462..385f9377f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44f-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f44f-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44f-1f3fc.png b/retroshare-gui/src/gui/emojione/1f44f-1f3fc.png index e03b0e498..5d1f2f33e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44f-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f44f-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44f-1f3fd.png b/retroshare-gui/src/gui/emojione/1f44f-1f3fd.png index 33434158f..9a6a1aca0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44f-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f44f-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44f-1f3fe.png b/retroshare-gui/src/gui/emojione/1f44f-1f3fe.png index 32c4b71a1..645cdc607 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44f-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f44f-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44f-1f3ff.png b/retroshare-gui/src/gui/emojione/1f44f-1f3ff.png index f384914ea..e134edbbc 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44f-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f44f-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f450-1f3fb.png b/retroshare-gui/src/gui/emojione/1f450-1f3fb.png index 255da7818..eb57a4792 100644 Binary files a/retroshare-gui/src/gui/emojione/1f450-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f450-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f450-1f3fc.png b/retroshare-gui/src/gui/emojione/1f450-1f3fc.png index a113e4fbf..f46510b8f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f450-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f450-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f450-1f3fd.png b/retroshare-gui/src/gui/emojione/1f450-1f3fd.png index b4a6296a8..508aa23b9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f450-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f450-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f450-1f3fe.png b/retroshare-gui/src/gui/emojione/1f450-1f3fe.png index df8007197..39ca833c6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f450-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f450-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f450-1f3ff.png b/retroshare-gui/src/gui/emojione/1f450-1f3ff.png index e1940d2ce..4bce65064 100644 Binary files a/retroshare-gui/src/gui/emojione/1f450-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f450-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f466-1f3fb.png b/retroshare-gui/src/gui/emojione/1f466-1f3fb.png index 5a5b72cf1..af558330f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f466-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f466-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f466-1f3fc.png b/retroshare-gui/src/gui/emojione/1f466-1f3fc.png index 13185a489..ba056d8c8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f466-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f466-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f466-1f3fd.png b/retroshare-gui/src/gui/emojione/1f466-1f3fd.png index a66dfd5fe..832aa023c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f466-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f466-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f466-1f3fe.png b/retroshare-gui/src/gui/emojione/1f466-1f3fe.png index dcb7e9710..8e2d1ff2a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f466-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f466-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f466-1f3ff.png b/retroshare-gui/src/gui/emojione/1f466-1f3ff.png index f4a28f60b..ef18e7388 100644 Binary files a/retroshare-gui/src/gui/emojione/1f466-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f466-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f467-1f3fb.png b/retroshare-gui/src/gui/emojione/1f467-1f3fb.png index c0f4a6713..1bfeb45b1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f467-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f467-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f467-1f3fc.png b/retroshare-gui/src/gui/emojione/1f467-1f3fc.png index 7163d79af..8424a6710 100644 Binary files a/retroshare-gui/src/gui/emojione/1f467-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f467-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f467-1f3fd.png b/retroshare-gui/src/gui/emojione/1f467-1f3fd.png index 149193823..4e88722ed 100644 Binary files a/retroshare-gui/src/gui/emojione/1f467-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f467-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f467-1f3fe.png b/retroshare-gui/src/gui/emojione/1f467-1f3fe.png index f87744cc2..1f088fbef 100644 Binary files a/retroshare-gui/src/gui/emojione/1f467-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f467-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f467-1f3ff.png b/retroshare-gui/src/gui/emojione/1f467-1f3ff.png index 72d03b1bc..bf06d0ef8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f467-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f467-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f468-1f3fb.png b/retroshare-gui/src/gui/emojione/1f468-1f3fb.png index 27adcc8c8..1bb616a23 100644 Binary files a/retroshare-gui/src/gui/emojione/1f468-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f468-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f468-1f3fc.png b/retroshare-gui/src/gui/emojione/1f468-1f3fc.png index 52484e300..5a61f4bf2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f468-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f468-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f468-1f3fd.png b/retroshare-gui/src/gui/emojione/1f468-1f3fd.png index 775e8ab5b..3548165a1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f468-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f468-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f468-1f3fe.png b/retroshare-gui/src/gui/emojione/1f468-1f3fe.png index bbc067fdf..5402eb9fe 100644 Binary files a/retroshare-gui/src/gui/emojione/1f468-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f468-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f468-1f3ff.png b/retroshare-gui/src/gui/emojione/1f468-1f3ff.png index 186b9120e..f62e003f5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f468-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f468-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f469-1f3fb.png b/retroshare-gui/src/gui/emojione/1f469-1f3fb.png index 11f5bb803..0da933b26 100644 Binary files a/retroshare-gui/src/gui/emojione/1f469-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f469-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f469-1f3fc.png b/retroshare-gui/src/gui/emojione/1f469-1f3fc.png index 03c81ed5e..12e885ada 100644 Binary files a/retroshare-gui/src/gui/emojione/1f469-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f469-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f469-1f3fd.png b/retroshare-gui/src/gui/emojione/1f469-1f3fd.png index 796968398..38262f4f4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f469-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f469-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f469-1f3fe.png b/retroshare-gui/src/gui/emojione/1f469-1f3fe.png index 185fa540f..7dc115348 100644 Binary files a/retroshare-gui/src/gui/emojione/1f469-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f469-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f469-1f3ff.png b/retroshare-gui/src/gui/emojione/1f469-1f3ff.png index b3f80ccf9..fd7d6c441 100644 Binary files a/retroshare-gui/src/gui/emojione/1f469-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f469-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f46e-1f3fb.png b/retroshare-gui/src/gui/emojione/1f46e-1f3fb.png index 691c4d6f0..cb0d78cb2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f46e-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f46e-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f46e-1f3fc.png b/retroshare-gui/src/gui/emojione/1f46e-1f3fc.png index 7411a2360..8e05cab22 100644 Binary files a/retroshare-gui/src/gui/emojione/1f46e-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f46e-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f46e-1f3fd.png b/retroshare-gui/src/gui/emojione/1f46e-1f3fd.png index 4c2df68b6..c30208935 100644 Binary files a/retroshare-gui/src/gui/emojione/1f46e-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f46e-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f46e-1f3fe.png b/retroshare-gui/src/gui/emojione/1f46e-1f3fe.png index a9ef4868f..3c1f21081 100644 Binary files a/retroshare-gui/src/gui/emojione/1f46e-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f46e-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f46e-1f3ff.png b/retroshare-gui/src/gui/emojione/1f46e-1f3ff.png index 9b1db8ab3..1664be362 100644 Binary files a/retroshare-gui/src/gui/emojione/1f46e-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f46e-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f470-1f3fb.png b/retroshare-gui/src/gui/emojione/1f470-1f3fb.png index a74f74744..950c6f73f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f470-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f470-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f470-1f3fc.png b/retroshare-gui/src/gui/emojione/1f470-1f3fc.png index eb985fdb6..55edb0fa7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f470-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f470-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f470-1f3fd.png b/retroshare-gui/src/gui/emojione/1f470-1f3fd.png index 8fa08ed66..fed217d9b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f470-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f470-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f470-1f3fe.png b/retroshare-gui/src/gui/emojione/1f470-1f3fe.png index d5cfa07f0..45ce943ce 100644 Binary files a/retroshare-gui/src/gui/emojione/1f470-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f470-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f470-1f3ff.png b/retroshare-gui/src/gui/emojione/1f470-1f3ff.png index 02fff5d4c..bc400ff03 100644 Binary files a/retroshare-gui/src/gui/emojione/1f470-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f470-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f471-1f3fb.png b/retroshare-gui/src/gui/emojione/1f471-1f3fb.png index 82984d406..29dd8a4c0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f471-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f471-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f471-1f3fc.png b/retroshare-gui/src/gui/emojione/1f471-1f3fc.png index 6e4d48196..09a8437eb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f471-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f471-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f471-1f3fd.png b/retroshare-gui/src/gui/emojione/1f471-1f3fd.png index 114778f4d..cb184c1d6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f471-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f471-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f471-1f3fe.png b/retroshare-gui/src/gui/emojione/1f471-1f3fe.png index b122bf1d0..9f8c6407d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f471-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f471-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f471-1f3ff.png b/retroshare-gui/src/gui/emojione/1f471-1f3ff.png index a2c64e3ee..01697ec19 100644 Binary files a/retroshare-gui/src/gui/emojione/1f471-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f471-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f472-1f3fb.png b/retroshare-gui/src/gui/emojione/1f472-1f3fb.png index 870d46eb1..3f6580016 100644 Binary files a/retroshare-gui/src/gui/emojione/1f472-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f472-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f472-1f3fc.png b/retroshare-gui/src/gui/emojione/1f472-1f3fc.png index 0ee587988..0ae64685c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f472-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f472-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f472-1f3fd.png b/retroshare-gui/src/gui/emojione/1f472-1f3fd.png index 2e82a8a29..c4084306b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f472-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f472-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f472-1f3fe.png b/retroshare-gui/src/gui/emojione/1f472-1f3fe.png index 033126053..45df60b69 100644 Binary files a/retroshare-gui/src/gui/emojione/1f472-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f472-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f472-1f3ff.png b/retroshare-gui/src/gui/emojione/1f472-1f3ff.png index a071f4683..5cc711c0c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f472-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f472-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f473-1f3fb.png b/retroshare-gui/src/gui/emojione/1f473-1f3fb.png index fdd3fa725..1b149818a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f473-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f473-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f473-1f3fc.png b/retroshare-gui/src/gui/emojione/1f473-1f3fc.png index 88ae7dea5..ca9b87a1d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f473-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f473-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f473-1f3fd.png b/retroshare-gui/src/gui/emojione/1f473-1f3fd.png index a10139927..110ef10be 100644 Binary files a/retroshare-gui/src/gui/emojione/1f473-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f473-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f473-1f3fe.png b/retroshare-gui/src/gui/emojione/1f473-1f3fe.png index dcaa0df94..a1d8c49a2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f473-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f473-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f473-1f3ff.png b/retroshare-gui/src/gui/emojione/1f473-1f3ff.png index 563095804..75ec2a5c8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f473-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f473-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f474-1f3fb.png b/retroshare-gui/src/gui/emojione/1f474-1f3fb.png index 889cdbf1e..b0c1950f0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f474-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f474-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f474-1f3fc.png b/retroshare-gui/src/gui/emojione/1f474-1f3fc.png index 25cbec033..a4d3a0294 100644 Binary files a/retroshare-gui/src/gui/emojione/1f474-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f474-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f474-1f3fd.png b/retroshare-gui/src/gui/emojione/1f474-1f3fd.png index d28325596..1bf96dd2c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f474-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f474-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f474-1f3fe.png b/retroshare-gui/src/gui/emojione/1f474-1f3fe.png index d6ff04e39..56d8138a7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f474-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f474-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f474-1f3ff.png b/retroshare-gui/src/gui/emojione/1f474-1f3ff.png index 74075b42b..b0df5b4c7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f474-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f474-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f475-1f3fb.png b/retroshare-gui/src/gui/emojione/1f475-1f3fb.png index 56e676240..bcf419786 100644 Binary files a/retroshare-gui/src/gui/emojione/1f475-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f475-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f475-1f3fc.png b/retroshare-gui/src/gui/emojione/1f475-1f3fc.png index 3906995c3..9b6e88cb1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f475-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f475-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f475-1f3fd.png b/retroshare-gui/src/gui/emojione/1f475-1f3fd.png index 9086d6fd9..0229c6860 100644 Binary files a/retroshare-gui/src/gui/emojione/1f475-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f475-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f475-1f3fe.png b/retroshare-gui/src/gui/emojione/1f475-1f3fe.png index 597205cb3..9e2635597 100644 Binary files a/retroshare-gui/src/gui/emojione/1f475-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f475-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f475-1f3ff.png b/retroshare-gui/src/gui/emojione/1f475-1f3ff.png index 0a9dab7d8..ded578d0f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f475-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f475-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f476-1f3fb.png b/retroshare-gui/src/gui/emojione/1f476-1f3fb.png index 39b30c587..0dcf363af 100644 Binary files a/retroshare-gui/src/gui/emojione/1f476-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f476-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f476-1f3fc.png b/retroshare-gui/src/gui/emojione/1f476-1f3fc.png index f12421c73..78beb2d21 100644 Binary files a/retroshare-gui/src/gui/emojione/1f476-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f476-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f476-1f3fd.png b/retroshare-gui/src/gui/emojione/1f476-1f3fd.png index 18791261e..3d6bbd4a3 100644 Binary files a/retroshare-gui/src/gui/emojione/1f476-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f476-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f476-1f3fe.png b/retroshare-gui/src/gui/emojione/1f476-1f3fe.png index f73198d09..4748e5c10 100644 Binary files a/retroshare-gui/src/gui/emojione/1f476-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f476-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f476-1f3ff.png b/retroshare-gui/src/gui/emojione/1f476-1f3ff.png index ca28d9eee..138efbd4b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f476-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f476-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f477-1f3fb.png b/retroshare-gui/src/gui/emojione/1f477-1f3fb.png index fd9ea8718..dde79c6f6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f477-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f477-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f477-1f3fc.png b/retroshare-gui/src/gui/emojione/1f477-1f3fc.png index 4eb06d1db..eb8b81b30 100644 Binary files a/retroshare-gui/src/gui/emojione/1f477-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f477-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f477-1f3fd.png b/retroshare-gui/src/gui/emojione/1f477-1f3fd.png index f372e0839..bed106d5c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f477-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f477-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f477-1f3fe.png b/retroshare-gui/src/gui/emojione/1f477-1f3fe.png index 58c058675..f7b7d656b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f477-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f477-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f477-1f3ff.png b/retroshare-gui/src/gui/emojione/1f477-1f3ff.png index da0c6431e..75fa336a7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f477-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f477-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f478-1f3fb.png b/retroshare-gui/src/gui/emojione/1f478-1f3fb.png index d51d4fdda..0ad53b6be 100644 Binary files a/retroshare-gui/src/gui/emojione/1f478-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f478-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f478-1f3fc.png b/retroshare-gui/src/gui/emojione/1f478-1f3fc.png index 8534f5c53..dad125d8c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f478-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f478-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f478-1f3fd.png b/retroshare-gui/src/gui/emojione/1f478-1f3fd.png index df9a53075..0aae1ea6a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f478-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f478-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f478-1f3fe.png b/retroshare-gui/src/gui/emojione/1f478-1f3fe.png index 7995e9600..67061b782 100644 Binary files a/retroshare-gui/src/gui/emojione/1f478-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f478-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f478-1f3ff.png b/retroshare-gui/src/gui/emojione/1f478-1f3ff.png index 5e7f7c39f..544a8e846 100644 Binary files a/retroshare-gui/src/gui/emojione/1f478-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f478-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f47c-1f3fb.png b/retroshare-gui/src/gui/emojione/1f47c-1f3fb.png index 05401a018..47a3afb9e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f47c-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f47c-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f47c-1f3fc.png b/retroshare-gui/src/gui/emojione/1f47c-1f3fc.png index 8b1c24c2c..86a4b33fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f47c-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f47c-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f47c-1f3fd.png b/retroshare-gui/src/gui/emojione/1f47c-1f3fd.png index 133d2b890..92b61242c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f47c-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f47c-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f47c-1f3fe.png b/retroshare-gui/src/gui/emojione/1f47c-1f3fe.png index 8b373af3b..4ba863637 100644 Binary files a/retroshare-gui/src/gui/emojione/1f47c-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f47c-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f47c-1f3ff.png b/retroshare-gui/src/gui/emojione/1f47c-1f3ff.png index 992a8a30c..1229b9a33 100644 Binary files a/retroshare-gui/src/gui/emojione/1f47c-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f47c-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f481-1f3fb.png b/retroshare-gui/src/gui/emojione/1f481-1f3fb.png index 4d1d3a098..31823ef12 100644 Binary files a/retroshare-gui/src/gui/emojione/1f481-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f481-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f481-1f3fc.png b/retroshare-gui/src/gui/emojione/1f481-1f3fc.png index 63b5fef50..cb71fde01 100644 Binary files a/retroshare-gui/src/gui/emojione/1f481-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f481-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f481-1f3fd.png b/retroshare-gui/src/gui/emojione/1f481-1f3fd.png index c71fdc8de..df9a7cc63 100644 Binary files a/retroshare-gui/src/gui/emojione/1f481-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f481-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f481-1f3fe.png b/retroshare-gui/src/gui/emojione/1f481-1f3fe.png index 922668521..1d21f516f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f481-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f481-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f481-1f3ff.png b/retroshare-gui/src/gui/emojione/1f481-1f3ff.png index 5598e21c0..8d440cbb4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f481-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f481-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f482-1f3fb.png b/retroshare-gui/src/gui/emojione/1f482-1f3fb.png index e4183f284..8f620a261 100644 Binary files a/retroshare-gui/src/gui/emojione/1f482-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f482-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f482-1f3fc.png b/retroshare-gui/src/gui/emojione/1f482-1f3fc.png index 17bcc379d..3ab5d8a4e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f482-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f482-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f482-1f3fd.png b/retroshare-gui/src/gui/emojione/1f482-1f3fd.png index 443e421d0..e1c8c755c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f482-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f482-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f482-1f3fe.png b/retroshare-gui/src/gui/emojione/1f482-1f3fe.png index 67f6a78a0..aa31e884c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f482-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f482-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f482-1f3ff.png b/retroshare-gui/src/gui/emojione/1f482-1f3ff.png index b844700ea..95f065194 100644 Binary files a/retroshare-gui/src/gui/emojione/1f482-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f482-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f483-1f3fb.png b/retroshare-gui/src/gui/emojione/1f483-1f3fb.png index 84bd97aa7..c7cf0f14a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f483-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f483-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f483-1f3fc.png b/retroshare-gui/src/gui/emojione/1f483-1f3fc.png index 3df7b411e..d961b023b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f483-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f483-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f483-1f3fd.png b/retroshare-gui/src/gui/emojione/1f483-1f3fd.png index a5c03373a..9047fa825 100644 Binary files a/retroshare-gui/src/gui/emojione/1f483-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f483-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f483-1f3fe.png b/retroshare-gui/src/gui/emojione/1f483-1f3fe.png index e83754616..0b82cb796 100644 Binary files a/retroshare-gui/src/gui/emojione/1f483-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f483-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f483-1f3ff.png b/retroshare-gui/src/gui/emojione/1f483-1f3ff.png index 2484bd9bd..ccb2ef918 100644 Binary files a/retroshare-gui/src/gui/emojione/1f483-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f483-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f485-1f3fb.png b/retroshare-gui/src/gui/emojione/1f485-1f3fb.png index 5e2b66c61..95bcd8107 100644 Binary files a/retroshare-gui/src/gui/emojione/1f485-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f485-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f485-1f3fc.png b/retroshare-gui/src/gui/emojione/1f485-1f3fc.png index 53ee3146a..eec081ddd 100644 Binary files a/retroshare-gui/src/gui/emojione/1f485-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f485-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f485-1f3fd.png b/retroshare-gui/src/gui/emojione/1f485-1f3fd.png index 988dc7036..31d80dc84 100644 Binary files a/retroshare-gui/src/gui/emojione/1f485-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f485-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f485-1f3fe.png b/retroshare-gui/src/gui/emojione/1f485-1f3fe.png index dede4b948..a9446d754 100644 Binary files a/retroshare-gui/src/gui/emojione/1f485-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f485-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f485-1f3ff.png b/retroshare-gui/src/gui/emojione/1f485-1f3ff.png index 4d0fdca29..9245033f7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f485-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f485-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f486-1f3fb.png b/retroshare-gui/src/gui/emojione/1f486-1f3fb.png index 1733ef4ea..fc78cfd5c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f486-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f486-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f486-1f3fc.png b/retroshare-gui/src/gui/emojione/1f486-1f3fc.png index 2edcb3256..a038498fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f486-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f486-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f486-1f3fd.png b/retroshare-gui/src/gui/emojione/1f486-1f3fd.png index cc29f3432..a1f0b41bb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f486-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f486-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f486-1f3fe.png b/retroshare-gui/src/gui/emojione/1f486-1f3fe.png index db7a98202..f8b128a40 100644 Binary files a/retroshare-gui/src/gui/emojione/1f486-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f486-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f486-1f3ff.png b/retroshare-gui/src/gui/emojione/1f486-1f3ff.png index efb1f3e46..605c8f3b8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f486-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f486-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f487-1f3fb.png b/retroshare-gui/src/gui/emojione/1f487-1f3fb.png index b1b4415e8..97fc245fc 100644 Binary files a/retroshare-gui/src/gui/emojione/1f487-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f487-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f487-1f3fc.png b/retroshare-gui/src/gui/emojione/1f487-1f3fc.png index b1f315cba..5efa57189 100644 Binary files a/retroshare-gui/src/gui/emojione/1f487-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f487-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f487-1f3fd.png b/retroshare-gui/src/gui/emojione/1f487-1f3fd.png index 91a9c69f6..390bb8545 100644 Binary files a/retroshare-gui/src/gui/emojione/1f487-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f487-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f487-1f3fe.png b/retroshare-gui/src/gui/emojione/1f487-1f3fe.png index 0a2906eef..1587214e1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f487-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f487-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f487-1f3ff.png b/retroshare-gui/src/gui/emojione/1f487-1f3ff.png index b404bf1bd..0da63b371 100644 Binary files a/retroshare-gui/src/gui/emojione/1f487-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f487-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f4aa-1f3fb.png b/retroshare-gui/src/gui/emojione/1f4aa-1f3fb.png index 80b5947a2..a0c533bf5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f4aa-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f4aa-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f4aa-1f3fc.png b/retroshare-gui/src/gui/emojione/1f4aa-1f3fc.png index 75b285c79..229dc03f8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f4aa-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f4aa-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f4aa-1f3fd.png b/retroshare-gui/src/gui/emojione/1f4aa-1f3fd.png index 1ff3a0a1a..f60b3ff21 100644 Binary files a/retroshare-gui/src/gui/emojione/1f4aa-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f4aa-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f4aa-1f3fe.png b/retroshare-gui/src/gui/emojione/1f4aa-1f3fe.png index ac3f79be4..1a2117972 100644 Binary files a/retroshare-gui/src/gui/emojione/1f4aa-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f4aa-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f4aa-1f3ff.png b/retroshare-gui/src/gui/emojione/1f4aa-1f3ff.png index ac4ef3d28..c39e9ef82 100644 Binary files a/retroshare-gui/src/gui/emojione/1f4aa-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f4aa-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f4ff.png b/retroshare-gui/src/gui/emojione/1f4ff.png index 3485a0d6b..99bcd5792 100644 Binary files a/retroshare-gui/src/gui/emojione/1f4ff.png and b/retroshare-gui/src/gui/emojione/1f4ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f54b.png b/retroshare-gui/src/gui/emojione/1f54b.png index 568da427d..3d10a7b52 100644 Binary files a/retroshare-gui/src/gui/emojione/1f54b.png and b/retroshare-gui/src/gui/emojione/1f54b.png differ diff --git a/retroshare-gui/src/gui/emojione/1f54c.png b/retroshare-gui/src/gui/emojione/1f54c.png index ef15a064b..2bbb6f8d3 100644 Binary files a/retroshare-gui/src/gui/emojione/1f54c.png and b/retroshare-gui/src/gui/emojione/1f54c.png differ diff --git a/retroshare-gui/src/gui/emojione/1f54d.png b/retroshare-gui/src/gui/emojione/1f54d.png index a6fbd16b7..50d59968a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f54d.png and b/retroshare-gui/src/gui/emojione/1f54d.png differ diff --git a/retroshare-gui/src/gui/emojione/1f54e.png b/retroshare-gui/src/gui/emojione/1f54e.png index 053e19838..5c6e881d2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f54e.png and b/retroshare-gui/src/gui/emojione/1f54e.png differ diff --git a/retroshare-gui/src/gui/emojione/1f575-1f3fb.png b/retroshare-gui/src/gui/emojione/1f575-1f3fb.png index 46b339513..b9af51ed9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f575-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f575-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f575-1f3fc.png b/retroshare-gui/src/gui/emojione/1f575-1f3fc.png index 2f0fbe03d..e6ad4c804 100644 Binary files a/retroshare-gui/src/gui/emojione/1f575-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f575-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f575-1f3fd.png b/retroshare-gui/src/gui/emojione/1f575-1f3fd.png index f4f436b94..93501cfc4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f575-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f575-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f575-1f3fe.png b/retroshare-gui/src/gui/emojione/1f575-1f3fe.png index 874e26ad0..ce159fef9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f575-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f575-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f575-1f3ff.png b/retroshare-gui/src/gui/emojione/1f575-1f3ff.png index 2ed19a6ba..d8b680dfa 100644 Binary files a/retroshare-gui/src/gui/emojione/1f575-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f575-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f590-1f3fb.png b/retroshare-gui/src/gui/emojione/1f590-1f3fb.png index 6af6d69a7..d8d1ab52b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f590-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f590-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f590-1f3fc.png b/retroshare-gui/src/gui/emojione/1f590-1f3fc.png index 83a969d7d..1350e8c5a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f590-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f590-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f590-1f3fd.png b/retroshare-gui/src/gui/emojione/1f590-1f3fd.png index 7b1619db2..3bdd73509 100644 Binary files a/retroshare-gui/src/gui/emojione/1f590-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f590-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f590-1f3fe.png b/retroshare-gui/src/gui/emojione/1f590-1f3fe.png index d95a1634d..89011296e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f590-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f590-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f590-1f3ff.png b/retroshare-gui/src/gui/emojione/1f590-1f3ff.png index 72b5204fb..cd084f6d0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f590-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f590-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f595-1f3fb.png b/retroshare-gui/src/gui/emojione/1f595-1f3fb.png index deb905803..316d5e3c6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f595-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f595-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f595-1f3fc.png b/retroshare-gui/src/gui/emojione/1f595-1f3fc.png index ce2500cfa..8cebd9be8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f595-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f595-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f595-1f3fd.png b/retroshare-gui/src/gui/emojione/1f595-1f3fd.png index 953f280aa..54358b357 100644 Binary files a/retroshare-gui/src/gui/emojione/1f595-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f595-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f595-1f3fe.png b/retroshare-gui/src/gui/emojione/1f595-1f3fe.png index 1ab59227e..65d51742c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f595-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f595-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f595-1f3ff.png b/retroshare-gui/src/gui/emojione/1f595-1f3ff.png index ee8018e8f..107781e0b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f595-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f595-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f596-1f3fb.png b/retroshare-gui/src/gui/emojione/1f596-1f3fb.png index b88e90804..192963e71 100644 Binary files a/retroshare-gui/src/gui/emojione/1f596-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f596-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f596-1f3fc.png b/retroshare-gui/src/gui/emojione/1f596-1f3fc.png index 96b4d0196..e228c2b2a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f596-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f596-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f596-1f3fd.png b/retroshare-gui/src/gui/emojione/1f596-1f3fd.png index 35aad0588..c1c802f30 100644 Binary files a/retroshare-gui/src/gui/emojione/1f596-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f596-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f596-1f3fe.png b/retroshare-gui/src/gui/emojione/1f596-1f3fe.png index aa6b50750..59b7e0238 100644 Binary files a/retroshare-gui/src/gui/emojione/1f596-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f596-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f596-1f3ff.png b/retroshare-gui/src/gui/emojione/1f596-1f3ff.png index 3cdef3898..27c14d3db 100644 Binary files a/retroshare-gui/src/gui/emojione/1f596-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f596-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f5b1.png b/retroshare-gui/src/gui/emojione/1f5b1.png index a45762648..c464eddc9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f5b1.png and b/retroshare-gui/src/gui/emojione/1f5b1.png differ diff --git a/retroshare-gui/src/gui/emojione/1f643.png b/retroshare-gui/src/gui/emojione/1f643.png index 2f31bb5d8..0a539e9f6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f643.png and b/retroshare-gui/src/gui/emojione/1f643.png differ diff --git a/retroshare-gui/src/gui/emojione/1f644.png b/retroshare-gui/src/gui/emojione/1f644.png index 976347503..1ee0d05c2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f644.png and b/retroshare-gui/src/gui/emojione/1f644.png differ diff --git a/retroshare-gui/src/gui/emojione/1f645-1f3fb.png b/retroshare-gui/src/gui/emojione/1f645-1f3fb.png index c89e52296..9f39db989 100644 Binary files a/retroshare-gui/src/gui/emojione/1f645-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f645-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f645-1f3fc.png b/retroshare-gui/src/gui/emojione/1f645-1f3fc.png index 7dc262900..b7b47f4b9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f645-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f645-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f645-1f3fd.png b/retroshare-gui/src/gui/emojione/1f645-1f3fd.png index 4dbc5dd7d..a8e77106c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f645-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f645-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f645-1f3fe.png b/retroshare-gui/src/gui/emojione/1f645-1f3fe.png index 7dffc0e4f..a85db4963 100644 Binary files a/retroshare-gui/src/gui/emojione/1f645-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f645-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f645-1f3ff.png b/retroshare-gui/src/gui/emojione/1f645-1f3ff.png index 5861e5b24..ef9af1515 100644 Binary files a/retroshare-gui/src/gui/emojione/1f645-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f645-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f646-1f3fb.png b/retroshare-gui/src/gui/emojione/1f646-1f3fb.png index f05b86fee..50d27bbf9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f646-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f646-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f646-1f3fc.png b/retroshare-gui/src/gui/emojione/1f646-1f3fc.png index e8efab36d..6612731e9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f646-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f646-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f646-1f3fd.png b/retroshare-gui/src/gui/emojione/1f646-1f3fd.png index 2faa031e2..527f72088 100644 Binary files a/retroshare-gui/src/gui/emojione/1f646-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f646-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f646-1f3fe.png b/retroshare-gui/src/gui/emojione/1f646-1f3fe.png index cbb3eaf92..1be6637c2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f646-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f646-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f646-1f3ff.png b/retroshare-gui/src/gui/emojione/1f646-1f3ff.png index 842d05c0c..9f49c610d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f646-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f646-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f647-1f3fb.png b/retroshare-gui/src/gui/emojione/1f647-1f3fb.png index 8c15b5e43..3e7b913cc 100644 Binary files a/retroshare-gui/src/gui/emojione/1f647-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f647-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f647-1f3fc.png b/retroshare-gui/src/gui/emojione/1f647-1f3fc.png index 96b66f529..e3c9e4414 100644 Binary files a/retroshare-gui/src/gui/emojione/1f647-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f647-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f647-1f3fd.png b/retroshare-gui/src/gui/emojione/1f647-1f3fd.png index 2077f5860..de7e0f867 100644 Binary files a/retroshare-gui/src/gui/emojione/1f647-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f647-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f647-1f3fe.png b/retroshare-gui/src/gui/emojione/1f647-1f3fe.png index 8beaf2fb2..bf03d4207 100644 Binary files a/retroshare-gui/src/gui/emojione/1f647-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f647-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f647-1f3ff.png b/retroshare-gui/src/gui/emojione/1f647-1f3ff.png index 6f7d9bacb..c35bc8cfb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f647-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f647-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64b-1f3fb.png b/retroshare-gui/src/gui/emojione/1f64b-1f3fb.png index 8a3efa5ee..16a866942 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64b-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f64b-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64b-1f3fc.png b/retroshare-gui/src/gui/emojione/1f64b-1f3fc.png index ecaca5fc8..da29ad282 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64b-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f64b-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64b-1f3fd.png b/retroshare-gui/src/gui/emojione/1f64b-1f3fd.png index 2021ef8db..3454a2423 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64b-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f64b-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64b-1f3fe.png b/retroshare-gui/src/gui/emojione/1f64b-1f3fe.png index 67ec79d85..35af6963c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64b-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f64b-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64b-1f3ff.png b/retroshare-gui/src/gui/emojione/1f64b-1f3ff.png index a5ea9702f..36473557a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64b-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f64b-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64c-1f3fb.png b/retroshare-gui/src/gui/emojione/1f64c-1f3fb.png index 5db86ea7b..b25bdc944 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64c-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f64c-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64c-1f3fc.png b/retroshare-gui/src/gui/emojione/1f64c-1f3fc.png index 45451b641..28124ded6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64c-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f64c-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64c-1f3fd.png b/retroshare-gui/src/gui/emojione/1f64c-1f3fd.png index b28555184..41f18db90 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64c-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f64c-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64c-1f3fe.png b/retroshare-gui/src/gui/emojione/1f64c-1f3fe.png index 21882264c..f3e8a31a8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64c-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f64c-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64c-1f3ff.png b/retroshare-gui/src/gui/emojione/1f64c-1f3ff.png index 674509077..20d98f013 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64c-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f64c-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64d-1f3fb.png b/retroshare-gui/src/gui/emojione/1f64d-1f3fb.png index 4d2ea3aa1..8eb8e4570 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64d-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f64d-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64d-1f3fc.png b/retroshare-gui/src/gui/emojione/1f64d-1f3fc.png index 26daabe5a..b467ceef6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64d-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f64d-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64d-1f3fd.png b/retroshare-gui/src/gui/emojione/1f64d-1f3fd.png index e5df1d40a..f2b1f03eb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64d-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f64d-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64d-1f3fe.png b/retroshare-gui/src/gui/emojione/1f64d-1f3fe.png index 5fb54d622..1ca21a42d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64d-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f64d-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64d-1f3ff.png b/retroshare-gui/src/gui/emojione/1f64d-1f3ff.png index 9f0de9cb2..8d2c2b3a3 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64d-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f64d-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64e-1f3fb.png b/retroshare-gui/src/gui/emojione/1f64e-1f3fb.png index e6d37261d..eed745e47 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64e-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f64e-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64e-1f3fc.png b/retroshare-gui/src/gui/emojione/1f64e-1f3fc.png index 818db7724..3f7507cb2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64e-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f64e-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64e-1f3fd.png b/retroshare-gui/src/gui/emojione/1f64e-1f3fd.png index bfd891d22..dfa3dea4f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64e-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f64e-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64e-1f3fe.png b/retroshare-gui/src/gui/emojione/1f64e-1f3fe.png index ae16e85b5..b07caee90 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64e-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f64e-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64e-1f3ff.png b/retroshare-gui/src/gui/emojione/1f64e-1f3ff.png index 9ac084b90..e31bbdf48 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64e-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f64e-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64f-1f3fb.png b/retroshare-gui/src/gui/emojione/1f64f-1f3fb.png index 849abf161..6f0a66ba4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64f-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f64f-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64f-1f3fc.png b/retroshare-gui/src/gui/emojione/1f64f-1f3fc.png index 58e60e3b3..e187f2bd1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64f-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f64f-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64f-1f3fd.png b/retroshare-gui/src/gui/emojione/1f64f-1f3fd.png index 2b4a749dd..1f925737b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64f-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f64f-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64f-1f3fe.png b/retroshare-gui/src/gui/emojione/1f64f-1f3fe.png index 4f3165bf5..a879115e4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64f-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f64f-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64f-1f3ff.png b/retroshare-gui/src/gui/emojione/1f64f-1f3ff.png index e68bc40d1..97af94e1c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64f-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f64f-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6a3-1f3fb.png b/retroshare-gui/src/gui/emojione/1f6a3-1f3fb.png index 806126edd..c31583ba5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6a3-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f6a3-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6a3-1f3fc.png b/retroshare-gui/src/gui/emojione/1f6a3-1f3fc.png index 7aa51033f..7157b4092 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6a3-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f6a3-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6a3-1f3fd.png b/retroshare-gui/src/gui/emojione/1f6a3-1f3fd.png index c654b5de1..8a91b0a74 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6a3-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f6a3-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6a3-1f3fe.png b/retroshare-gui/src/gui/emojione/1f6a3-1f3fe.png index acd362f85..27071035e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6a3-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f6a3-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6a3-1f3ff.png b/retroshare-gui/src/gui/emojione/1f6a3-1f3ff.png index 0ede1851a..afc465e95 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6a3-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f6a3-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b4-1f3fb.png b/retroshare-gui/src/gui/emojione/1f6b4-1f3fb.png index 3166a0512..b53367a27 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b4-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f6b4-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b4-1f3fc.png b/retroshare-gui/src/gui/emojione/1f6b4-1f3fc.png index 59d044506..5e72b33c3 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b4-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f6b4-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b4-1f3fd.png b/retroshare-gui/src/gui/emojione/1f6b4-1f3fd.png index 9db929ca5..933736e9f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b4-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f6b4-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b4-1f3fe.png b/retroshare-gui/src/gui/emojione/1f6b4-1f3fe.png index 4a5103f34..420c91944 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b4-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f6b4-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b4-1f3ff.png b/retroshare-gui/src/gui/emojione/1f6b4-1f3ff.png index 26866013d..b6c540916 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b4-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f6b4-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b5-1f3fb.png b/retroshare-gui/src/gui/emojione/1f6b5-1f3fb.png index 14c27207f..d7da9a33a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b5-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f6b5-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b5-1f3fc.png b/retroshare-gui/src/gui/emojione/1f6b5-1f3fc.png index a9acdce39..3a679ce78 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b5-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f6b5-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b5-1f3fd.png b/retroshare-gui/src/gui/emojione/1f6b5-1f3fd.png index 49a6bdecd..1f9c07148 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b5-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f6b5-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b5-1f3fe.png b/retroshare-gui/src/gui/emojione/1f6b5-1f3fe.png index 05daab641..1391b80ef 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b5-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f6b5-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b5-1f3ff.png b/retroshare-gui/src/gui/emojione/1f6b5-1f3ff.png index 0a18421af..a1bef71d2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b5-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f6b5-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b6-1f3fb.png b/retroshare-gui/src/gui/emojione/1f6b6-1f3fb.png index 66754f9ca..929f5cdd9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b6-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f6b6-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b6-1f3fc.png b/retroshare-gui/src/gui/emojione/1f6b6-1f3fc.png index 8626a2e1b..557dc5679 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b6-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f6b6-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b6-1f3fd.png b/retroshare-gui/src/gui/emojione/1f6b6-1f3fd.png index 0610c0dff..d56af53da 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b6-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f6b6-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b6-1f3fe.png b/retroshare-gui/src/gui/emojione/1f6b6-1f3fe.png index 814c6b443..ad570290a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b6-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f6b6-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b6-1f3ff.png b/retroshare-gui/src/gui/emojione/1f6b6-1f3ff.png index a9a095c7e..678eebaf6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b6-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f6b6-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6c0-1f3fb.png b/retroshare-gui/src/gui/emojione/1f6c0-1f3fb.png index d392c79f9..467acfacd 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6c0-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f6c0-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6c0-1f3fc.png b/retroshare-gui/src/gui/emojione/1f6c0-1f3fc.png index 3721b9070..48d24e3ae 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6c0-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f6c0-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6c0-1f3fd.png b/retroshare-gui/src/gui/emojione/1f6c0-1f3fd.png index 5ab025eef..ba5163209 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6c0-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f6c0-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6c0-1f3fe.png b/retroshare-gui/src/gui/emojione/1f6c0-1f3fe.png index b6996864d..3330aaea1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6c0-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f6c0-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6c0-1f3ff.png b/retroshare-gui/src/gui/emojione/1f6c0-1f3ff.png index b60959b8f..ed971f9c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6c0-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f6c0-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6d0.png b/retroshare-gui/src/gui/emojione/1f6d0.png index b25f03cd7..d61ef3d5e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6d0.png and b/retroshare-gui/src/gui/emojione/1f6d0.png differ diff --git a/retroshare-gui/src/gui/emojione/1f910.png b/retroshare-gui/src/gui/emojione/1f910.png index c0b49c3c7..cca3804ca 100644 Binary files a/retroshare-gui/src/gui/emojione/1f910.png and b/retroshare-gui/src/gui/emojione/1f910.png differ diff --git a/retroshare-gui/src/gui/emojione/1f911.png b/retroshare-gui/src/gui/emojione/1f911.png index fdc22548e..0fdcb7351 100644 Binary files a/retroshare-gui/src/gui/emojione/1f911.png and b/retroshare-gui/src/gui/emojione/1f911.png differ diff --git a/retroshare-gui/src/gui/emojione/1f912.png b/retroshare-gui/src/gui/emojione/1f912.png index a1735544f..b4329af21 100644 Binary files a/retroshare-gui/src/gui/emojione/1f912.png and b/retroshare-gui/src/gui/emojione/1f912.png differ diff --git a/retroshare-gui/src/gui/emojione/1f913.png b/retroshare-gui/src/gui/emojione/1f913.png index 9edc5bc0a..5d0b6ddd6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f913.png and b/retroshare-gui/src/gui/emojione/1f913.png differ diff --git a/retroshare-gui/src/gui/emojione/1f914.png b/retroshare-gui/src/gui/emojione/1f914.png index 8d64af6c5..6c8a308f2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f914.png and b/retroshare-gui/src/gui/emojione/1f914.png differ diff --git a/retroshare-gui/src/gui/emojione/1f915.png b/retroshare-gui/src/gui/emojione/1f915.png index d459b3b4b..c4901e840 100644 Binary files a/retroshare-gui/src/gui/emojione/1f915.png and b/retroshare-gui/src/gui/emojione/1f915.png differ diff --git a/retroshare-gui/src/gui/emojione/1f916.png b/retroshare-gui/src/gui/emojione/1f916.png index bc89fb744..83228abe4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f916.png and b/retroshare-gui/src/gui/emojione/1f916.png differ diff --git a/retroshare-gui/src/gui/emojione/1f917.png b/retroshare-gui/src/gui/emojione/1f917.png index eeebdea7d..41a8c9a8e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f917.png and b/retroshare-gui/src/gui/emojione/1f917.png differ diff --git a/retroshare-gui/src/gui/emojione/1f918-1f3fb.png b/retroshare-gui/src/gui/emojione/1f918-1f3fb.png index f5a1fcdf8..53434b34b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f918-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f918-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f918-1f3fc.png b/retroshare-gui/src/gui/emojione/1f918-1f3fc.png index 4336b4612..be2e08222 100644 Binary files a/retroshare-gui/src/gui/emojione/1f918-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f918-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f918-1f3fd.png b/retroshare-gui/src/gui/emojione/1f918-1f3fd.png index 2449e9d7f..74227cf71 100644 Binary files a/retroshare-gui/src/gui/emojione/1f918-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f918-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f918-1f3fe.png b/retroshare-gui/src/gui/emojione/1f918-1f3fe.png index 13fe8966b..d02794df0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f918-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f918-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f918-1f3ff.png b/retroshare-gui/src/gui/emojione/1f918-1f3ff.png index 80d6708cd..68701b59e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f918-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f918-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f918.png b/retroshare-gui/src/gui/emojione/1f918.png index f08d2fdbd..0c01efb67 100644 Binary files a/retroshare-gui/src/gui/emojione/1f918.png and b/retroshare-gui/src/gui/emojione/1f918.png differ diff --git a/retroshare-gui/src/gui/emojione/1f980.png b/retroshare-gui/src/gui/emojione/1f980.png index 8ada40ea6..3af0cc85e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f980.png and b/retroshare-gui/src/gui/emojione/1f980.png differ diff --git a/retroshare-gui/src/gui/emojione/1f981.png b/retroshare-gui/src/gui/emojione/1f981.png index 38f8207e8..60dd480a5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f981.png and b/retroshare-gui/src/gui/emojione/1f981.png differ diff --git a/retroshare-gui/src/gui/emojione/1f982.png b/retroshare-gui/src/gui/emojione/1f982.png index 09c574f95..bac096e76 100644 Binary files a/retroshare-gui/src/gui/emojione/1f982.png and b/retroshare-gui/src/gui/emojione/1f982.png differ diff --git a/retroshare-gui/src/gui/emojione/1f983.png b/retroshare-gui/src/gui/emojione/1f983.png index cabee62bc..5e5eb4fb1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f983.png and b/retroshare-gui/src/gui/emojione/1f983.png differ diff --git a/retroshare-gui/src/gui/emojione/1f984.png b/retroshare-gui/src/gui/emojione/1f984.png index 11c503fa9..6db8511c4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f984.png and b/retroshare-gui/src/gui/emojione/1f984.png differ diff --git a/retroshare-gui/src/gui/emojione/1f9c0.png b/retroshare-gui/src/gui/emojione/1f9c0.png index c28ac7442..2dea0ea70 100644 Binary files a/retroshare-gui/src/gui/emojione/1f9c0.png and b/retroshare-gui/src/gui/emojione/1f9c0.png differ diff --git a/retroshare-gui/src/gui/emojione/203C.png b/retroshare-gui/src/gui/emojione/203C.png index 22b8788d4..0ea1a55ea 100644 Binary files a/retroshare-gui/src/gui/emojione/203C.png and b/retroshare-gui/src/gui/emojione/203C.png differ diff --git a/retroshare-gui/src/gui/emojione/2049.png b/retroshare-gui/src/gui/emojione/2049.png index 471b22c31..c1d6ae251 100644 Binary files a/retroshare-gui/src/gui/emojione/2049.png and b/retroshare-gui/src/gui/emojione/2049.png differ diff --git a/retroshare-gui/src/gui/emojione/2122.png b/retroshare-gui/src/gui/emojione/2122.png index 418a82745..82178737d 100644 Binary files a/retroshare-gui/src/gui/emojione/2122.png and b/retroshare-gui/src/gui/emojione/2122.png differ diff --git a/retroshare-gui/src/gui/emojione/2139.png b/retroshare-gui/src/gui/emojione/2139.png index 7bec4c6ed..097ed7ef1 100644 Binary files a/retroshare-gui/src/gui/emojione/2139.png and b/retroshare-gui/src/gui/emojione/2139.png differ diff --git a/retroshare-gui/src/gui/emojione/2194.png b/retroshare-gui/src/gui/emojione/2194.png index 6dddba150..839265bab 100644 Binary files a/retroshare-gui/src/gui/emojione/2194.png and b/retroshare-gui/src/gui/emojione/2194.png differ diff --git a/retroshare-gui/src/gui/emojione/2195.png b/retroshare-gui/src/gui/emojione/2195.png index a6dd55285..be3d9755d 100644 Binary files a/retroshare-gui/src/gui/emojione/2195.png and b/retroshare-gui/src/gui/emojione/2195.png differ diff --git a/retroshare-gui/src/gui/emojione/2196.png b/retroshare-gui/src/gui/emojione/2196.png index e81619d07..3a2ae3ef6 100644 Binary files a/retroshare-gui/src/gui/emojione/2196.png and b/retroshare-gui/src/gui/emojione/2196.png differ diff --git a/retroshare-gui/src/gui/emojione/2197.png b/retroshare-gui/src/gui/emojione/2197.png index c706865a3..724d7eda0 100644 Binary files a/retroshare-gui/src/gui/emojione/2197.png and b/retroshare-gui/src/gui/emojione/2197.png differ diff --git a/retroshare-gui/src/gui/emojione/2198.png b/retroshare-gui/src/gui/emojione/2198.png index ab67fe504..6e6a8ac0f 100644 Binary files a/retroshare-gui/src/gui/emojione/2198.png and b/retroshare-gui/src/gui/emojione/2198.png differ diff --git a/retroshare-gui/src/gui/emojione/2199.png b/retroshare-gui/src/gui/emojione/2199.png index d481a7187..19abc6979 100644 Binary files a/retroshare-gui/src/gui/emojione/2199.png and b/retroshare-gui/src/gui/emojione/2199.png differ diff --git a/retroshare-gui/src/gui/emojione/21A9.png b/retroshare-gui/src/gui/emojione/21A9.png index 4ae305055..d733bdaa7 100644 Binary files a/retroshare-gui/src/gui/emojione/21A9.png and b/retroshare-gui/src/gui/emojione/21A9.png differ diff --git a/retroshare-gui/src/gui/emojione/21AA.png b/retroshare-gui/src/gui/emojione/21AA.png index a75478283..cb2383814 100644 Binary files a/retroshare-gui/src/gui/emojione/21AA.png and b/retroshare-gui/src/gui/emojione/21AA.png differ diff --git a/retroshare-gui/src/gui/emojione/231A.png b/retroshare-gui/src/gui/emojione/231A.png index 61a6b65f5..893bddb09 100644 Binary files a/retroshare-gui/src/gui/emojione/231A.png and b/retroshare-gui/src/gui/emojione/231A.png differ diff --git a/retroshare-gui/src/gui/emojione/231B.png b/retroshare-gui/src/gui/emojione/231B.png index 39db47bbc..986c06242 100644 Binary files a/retroshare-gui/src/gui/emojione/231B.png and b/retroshare-gui/src/gui/emojione/231B.png differ diff --git a/retroshare-gui/src/gui/emojione/2328.png b/retroshare-gui/src/gui/emojione/2328.png index 2f480054e..6bf4c3c57 100644 Binary files a/retroshare-gui/src/gui/emojione/2328.png and b/retroshare-gui/src/gui/emojione/2328.png differ diff --git a/retroshare-gui/src/gui/emojione/23E9.png b/retroshare-gui/src/gui/emojione/23E9.png index 2557ca9d7..9684e18b7 100644 Binary files a/retroshare-gui/src/gui/emojione/23E9.png and b/retroshare-gui/src/gui/emojione/23E9.png differ diff --git a/retroshare-gui/src/gui/emojione/23EA.png b/retroshare-gui/src/gui/emojione/23EA.png index dc7edd5e1..929b13be8 100644 Binary files a/retroshare-gui/src/gui/emojione/23EA.png and b/retroshare-gui/src/gui/emojione/23EA.png differ diff --git a/retroshare-gui/src/gui/emojione/23EB.png b/retroshare-gui/src/gui/emojione/23EB.png index adb14bd8a..f7f26fe80 100644 Binary files a/retroshare-gui/src/gui/emojione/23EB.png and b/retroshare-gui/src/gui/emojione/23EB.png differ diff --git a/retroshare-gui/src/gui/emojione/23EC.png b/retroshare-gui/src/gui/emojione/23EC.png index d029d4fa5..5d607f3e9 100644 Binary files a/retroshare-gui/src/gui/emojione/23EC.png and b/retroshare-gui/src/gui/emojione/23EC.png differ diff --git a/retroshare-gui/src/gui/emojione/23F0.png b/retroshare-gui/src/gui/emojione/23F0.png index 0549e869f..3b3cd47e1 100644 Binary files a/retroshare-gui/src/gui/emojione/23F0.png and b/retroshare-gui/src/gui/emojione/23F0.png differ diff --git a/retroshare-gui/src/gui/emojione/23F3.png b/retroshare-gui/src/gui/emojione/23F3.png index 80a52ff5c..30954157a 100644 Binary files a/retroshare-gui/src/gui/emojione/23F3.png and b/retroshare-gui/src/gui/emojione/23F3.png differ diff --git a/retroshare-gui/src/gui/emojione/23ed.png b/retroshare-gui/src/gui/emojione/23ed.png index c653087ba..4a08f473c 100644 Binary files a/retroshare-gui/src/gui/emojione/23ed.png and b/retroshare-gui/src/gui/emojione/23ed.png differ diff --git a/retroshare-gui/src/gui/emojione/23ee.png b/retroshare-gui/src/gui/emojione/23ee.png index fa385b3d2..8ff4391e8 100644 Binary files a/retroshare-gui/src/gui/emojione/23ee.png and b/retroshare-gui/src/gui/emojione/23ee.png differ diff --git a/retroshare-gui/src/gui/emojione/23ef.png b/retroshare-gui/src/gui/emojione/23ef.png index aa0682792..478612f61 100644 Binary files a/retroshare-gui/src/gui/emojione/23ef.png and b/retroshare-gui/src/gui/emojione/23ef.png differ diff --git a/retroshare-gui/src/gui/emojione/23f1.png b/retroshare-gui/src/gui/emojione/23f1.png index a17813bb4..a6e2ea70b 100644 Binary files a/retroshare-gui/src/gui/emojione/23f1.png and b/retroshare-gui/src/gui/emojione/23f1.png differ diff --git a/retroshare-gui/src/gui/emojione/23f2.png b/retroshare-gui/src/gui/emojione/23f2.png index dd3e5e3c2..25db82de7 100644 Binary files a/retroshare-gui/src/gui/emojione/23f2.png and b/retroshare-gui/src/gui/emojione/23f2.png differ diff --git a/retroshare-gui/src/gui/emojione/23f8.png b/retroshare-gui/src/gui/emojione/23f8.png index eede5023f..b9b63afe1 100644 Binary files a/retroshare-gui/src/gui/emojione/23f8.png and b/retroshare-gui/src/gui/emojione/23f8.png differ diff --git a/retroshare-gui/src/gui/emojione/23f9.png b/retroshare-gui/src/gui/emojione/23f9.png index f2ff38b06..7bdbbdefd 100644 Binary files a/retroshare-gui/src/gui/emojione/23f9.png and b/retroshare-gui/src/gui/emojione/23f9.png differ diff --git a/retroshare-gui/src/gui/emojione/23fa.png b/retroshare-gui/src/gui/emojione/23fa.png index c4f57a484..d32849e67 100644 Binary files a/retroshare-gui/src/gui/emojione/23fa.png and b/retroshare-gui/src/gui/emojione/23fa.png differ diff --git a/retroshare-gui/src/gui/emojione/24C2.png b/retroshare-gui/src/gui/emojione/24C2.png index de13b0966..a890bf7a9 100644 Binary files a/retroshare-gui/src/gui/emojione/24C2.png and b/retroshare-gui/src/gui/emojione/24C2.png differ diff --git a/retroshare-gui/src/gui/emojione/25AA.png b/retroshare-gui/src/gui/emojione/25AA.png index a552c9dcd..246cbf2a1 100644 Binary files a/retroshare-gui/src/gui/emojione/25AA.png and b/retroshare-gui/src/gui/emojione/25AA.png differ diff --git a/retroshare-gui/src/gui/emojione/25AB.png b/retroshare-gui/src/gui/emojione/25AB.png index 382cb0cd5..6c3f20b5d 100644 Binary files a/retroshare-gui/src/gui/emojione/25AB.png and b/retroshare-gui/src/gui/emojione/25AB.png differ diff --git a/retroshare-gui/src/gui/emojione/25B6.png b/retroshare-gui/src/gui/emojione/25B6.png index 9fcea68dd..50567f342 100644 Binary files a/retroshare-gui/src/gui/emojione/25B6.png and b/retroshare-gui/src/gui/emojione/25B6.png differ diff --git a/retroshare-gui/src/gui/emojione/25C0.png b/retroshare-gui/src/gui/emojione/25C0.png index 004b29c8e..f12cfc6a0 100644 Binary files a/retroshare-gui/src/gui/emojione/25C0.png and b/retroshare-gui/src/gui/emojione/25C0.png differ diff --git a/retroshare-gui/src/gui/emojione/25FB.png b/retroshare-gui/src/gui/emojione/25FB.png index 50b314d6d..94fe7507a 100644 Binary files a/retroshare-gui/src/gui/emojione/25FB.png and b/retroshare-gui/src/gui/emojione/25FB.png differ diff --git a/retroshare-gui/src/gui/emojione/25FC.png b/retroshare-gui/src/gui/emojione/25FC.png index d8aa360db..42f1a8e24 100644 Binary files a/retroshare-gui/src/gui/emojione/25FC.png and b/retroshare-gui/src/gui/emojione/25FC.png differ diff --git a/retroshare-gui/src/gui/emojione/25FD.png b/retroshare-gui/src/gui/emojione/25FD.png index 03d2a21c3..e17800131 100644 Binary files a/retroshare-gui/src/gui/emojione/25FD.png and b/retroshare-gui/src/gui/emojione/25FD.png differ diff --git a/retroshare-gui/src/gui/emojione/25FE.png b/retroshare-gui/src/gui/emojione/25FE.png index 20248ae17..aeac30b6a 100644 Binary files a/retroshare-gui/src/gui/emojione/25FE.png and b/retroshare-gui/src/gui/emojione/25FE.png differ diff --git a/retroshare-gui/src/gui/emojione/2600.png b/retroshare-gui/src/gui/emojione/2600.png index 94ccede31..1dbf3b07b 100644 Binary files a/retroshare-gui/src/gui/emojione/2600.png and b/retroshare-gui/src/gui/emojione/2600.png differ diff --git a/retroshare-gui/src/gui/emojione/2601.png b/retroshare-gui/src/gui/emojione/2601.png index 9e99d0ac9..2bb687011 100644 Binary files a/retroshare-gui/src/gui/emojione/2601.png and b/retroshare-gui/src/gui/emojione/2601.png differ diff --git a/retroshare-gui/src/gui/emojione/2602.png b/retroshare-gui/src/gui/emojione/2602.png index c4772497b..fd74158b3 100644 Binary files a/retroshare-gui/src/gui/emojione/2602.png and b/retroshare-gui/src/gui/emojione/2602.png differ diff --git a/retroshare-gui/src/gui/emojione/2603.png b/retroshare-gui/src/gui/emojione/2603.png index d1058277e..49715694d 100644 Binary files a/retroshare-gui/src/gui/emojione/2603.png and b/retroshare-gui/src/gui/emojione/2603.png differ diff --git a/retroshare-gui/src/gui/emojione/2604.png b/retroshare-gui/src/gui/emojione/2604.png index 304aaf3fa..12307dd9f 100644 Binary files a/retroshare-gui/src/gui/emojione/2604.png and b/retroshare-gui/src/gui/emojione/2604.png differ diff --git a/retroshare-gui/src/gui/emojione/260E.png b/retroshare-gui/src/gui/emojione/260E.png index 89f93be8c..51bae9e5a 100644 Binary files a/retroshare-gui/src/gui/emojione/260E.png and b/retroshare-gui/src/gui/emojione/260E.png differ diff --git a/retroshare-gui/src/gui/emojione/2611.png b/retroshare-gui/src/gui/emojione/2611.png index f88b621d6..b7c600e02 100644 Binary files a/retroshare-gui/src/gui/emojione/2611.png and b/retroshare-gui/src/gui/emojione/2611.png differ diff --git a/retroshare-gui/src/gui/emojione/2614.png b/retroshare-gui/src/gui/emojione/2614.png index 30c7b62bb..1afc97107 100644 Binary files a/retroshare-gui/src/gui/emojione/2614.png and b/retroshare-gui/src/gui/emojione/2614.png differ diff --git a/retroshare-gui/src/gui/emojione/2615.png b/retroshare-gui/src/gui/emojione/2615.png index 790f30ca6..ba4d34f8c 100644 Binary files a/retroshare-gui/src/gui/emojione/2615.png and b/retroshare-gui/src/gui/emojione/2615.png differ diff --git a/retroshare-gui/src/gui/emojione/2618.png b/retroshare-gui/src/gui/emojione/2618.png index 0dec7c359..79dca809f 100644 Binary files a/retroshare-gui/src/gui/emojione/2618.png and b/retroshare-gui/src/gui/emojione/2618.png differ diff --git a/retroshare-gui/src/gui/emojione/261D.png b/retroshare-gui/src/gui/emojione/261D.png index 723bd36e6..93df9e64c 100644 Binary files a/retroshare-gui/src/gui/emojione/261D.png and b/retroshare-gui/src/gui/emojione/261D.png differ diff --git a/retroshare-gui/src/gui/emojione/261d-1f3fb.png b/retroshare-gui/src/gui/emojione/261d-1f3fb.png index 8ac74ea7a..6aa773931 100644 Binary files a/retroshare-gui/src/gui/emojione/261d-1f3fb.png and b/retroshare-gui/src/gui/emojione/261d-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/261d-1f3fc.png b/retroshare-gui/src/gui/emojione/261d-1f3fc.png index f702cca37..4acffc000 100644 Binary files a/retroshare-gui/src/gui/emojione/261d-1f3fc.png and b/retroshare-gui/src/gui/emojione/261d-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/261d-1f3fd.png b/retroshare-gui/src/gui/emojione/261d-1f3fd.png index 9377672d3..7dae8571f 100644 Binary files a/retroshare-gui/src/gui/emojione/261d-1f3fd.png and b/retroshare-gui/src/gui/emojione/261d-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/261d-1f3fe.png b/retroshare-gui/src/gui/emojione/261d-1f3fe.png index a5dad2e88..d4052999e 100644 Binary files a/retroshare-gui/src/gui/emojione/261d-1f3fe.png and b/retroshare-gui/src/gui/emojione/261d-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/261d-1f3ff.png b/retroshare-gui/src/gui/emojione/261d-1f3ff.png index 389ca872e..00a9987e0 100644 Binary files a/retroshare-gui/src/gui/emojione/261d-1f3ff.png and b/retroshare-gui/src/gui/emojione/261d-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/2620.png b/retroshare-gui/src/gui/emojione/2620.png index df8325c06..c7230d2b7 100644 Binary files a/retroshare-gui/src/gui/emojione/2620.png and b/retroshare-gui/src/gui/emojione/2620.png differ diff --git a/retroshare-gui/src/gui/emojione/2622.png b/retroshare-gui/src/gui/emojione/2622.png index 43562a76e..af5d32967 100644 Binary files a/retroshare-gui/src/gui/emojione/2622.png and b/retroshare-gui/src/gui/emojione/2622.png differ diff --git a/retroshare-gui/src/gui/emojione/2623.png b/retroshare-gui/src/gui/emojione/2623.png index c7c5fd1cf..13658e901 100644 Binary files a/retroshare-gui/src/gui/emojione/2623.png and b/retroshare-gui/src/gui/emojione/2623.png differ diff --git a/retroshare-gui/src/gui/emojione/2626.png b/retroshare-gui/src/gui/emojione/2626.png index 2891a674c..6252c4c27 100644 Binary files a/retroshare-gui/src/gui/emojione/2626.png and b/retroshare-gui/src/gui/emojione/2626.png differ diff --git a/retroshare-gui/src/gui/emojione/262a.png b/retroshare-gui/src/gui/emojione/262a.png index 39965ce41..6e0f14f90 100644 Binary files a/retroshare-gui/src/gui/emojione/262a.png and b/retroshare-gui/src/gui/emojione/262a.png differ diff --git a/retroshare-gui/src/gui/emojione/262e.png b/retroshare-gui/src/gui/emojione/262e.png index 1cc756647..e4be564ff 100644 Binary files a/retroshare-gui/src/gui/emojione/262e.png and b/retroshare-gui/src/gui/emojione/262e.png differ diff --git a/retroshare-gui/src/gui/emojione/262f.png b/retroshare-gui/src/gui/emojione/262f.png index d4f14baee..2f5a13532 100644 Binary files a/retroshare-gui/src/gui/emojione/262f.png and b/retroshare-gui/src/gui/emojione/262f.png differ diff --git a/retroshare-gui/src/gui/emojione/2638.png b/retroshare-gui/src/gui/emojione/2638.png index 1fd796d94..34839562b 100644 Binary files a/retroshare-gui/src/gui/emojione/2638.png and b/retroshare-gui/src/gui/emojione/2638.png differ diff --git a/retroshare-gui/src/gui/emojione/2639.png b/retroshare-gui/src/gui/emojione/2639.png index 103cd99f0..9bff86e11 100644 Binary files a/retroshare-gui/src/gui/emojione/2639.png and b/retroshare-gui/src/gui/emojione/2639.png differ diff --git a/retroshare-gui/src/gui/emojione/263A.png b/retroshare-gui/src/gui/emojione/263A.png index 03f528468..e2ecdabe4 100644 Binary files a/retroshare-gui/src/gui/emojione/263A.png and b/retroshare-gui/src/gui/emojione/263A.png differ diff --git a/retroshare-gui/src/gui/emojione/2648.png b/retroshare-gui/src/gui/emojione/2648.png index 9732b5ff9..411e8110a 100644 Binary files a/retroshare-gui/src/gui/emojione/2648.png and b/retroshare-gui/src/gui/emojione/2648.png differ diff --git a/retroshare-gui/src/gui/emojione/2649.png b/retroshare-gui/src/gui/emojione/2649.png index dd3004209..428373850 100644 Binary files a/retroshare-gui/src/gui/emojione/2649.png and b/retroshare-gui/src/gui/emojione/2649.png differ diff --git a/retroshare-gui/src/gui/emojione/264A.png b/retroshare-gui/src/gui/emojione/264A.png index 67e11ab2f..6e9ec673a 100644 Binary files a/retroshare-gui/src/gui/emojione/264A.png and b/retroshare-gui/src/gui/emojione/264A.png differ diff --git a/retroshare-gui/src/gui/emojione/264B.png b/retroshare-gui/src/gui/emojione/264B.png index 9d7989117..9673e5d88 100644 Binary files a/retroshare-gui/src/gui/emojione/264B.png and b/retroshare-gui/src/gui/emojione/264B.png differ diff --git a/retroshare-gui/src/gui/emojione/264C.png b/retroshare-gui/src/gui/emojione/264C.png index 21544cefc..04e683f4f 100644 Binary files a/retroshare-gui/src/gui/emojione/264C.png and b/retroshare-gui/src/gui/emojione/264C.png differ diff --git a/retroshare-gui/src/gui/emojione/264D.png b/retroshare-gui/src/gui/emojione/264D.png index 3d56f3dfe..28b0255fa 100644 Binary files a/retroshare-gui/src/gui/emojione/264D.png and b/retroshare-gui/src/gui/emojione/264D.png differ diff --git a/retroshare-gui/src/gui/emojione/264E.png b/retroshare-gui/src/gui/emojione/264E.png index 6ecedc565..f491a1258 100644 Binary files a/retroshare-gui/src/gui/emojione/264E.png and b/retroshare-gui/src/gui/emojione/264E.png differ diff --git a/retroshare-gui/src/gui/emojione/264F.png b/retroshare-gui/src/gui/emojione/264F.png index 0932e71b7..b8b007884 100644 Binary files a/retroshare-gui/src/gui/emojione/264F.png and b/retroshare-gui/src/gui/emojione/264F.png differ diff --git a/retroshare-gui/src/gui/emojione/2650.png b/retroshare-gui/src/gui/emojione/2650.png index d9ace6dc5..8b4f1e810 100644 Binary files a/retroshare-gui/src/gui/emojione/2650.png and b/retroshare-gui/src/gui/emojione/2650.png differ diff --git a/retroshare-gui/src/gui/emojione/2651.png b/retroshare-gui/src/gui/emojione/2651.png index ea9f83c9e..6812d052e 100644 Binary files a/retroshare-gui/src/gui/emojione/2651.png and b/retroshare-gui/src/gui/emojione/2651.png differ diff --git a/retroshare-gui/src/gui/emojione/2652.png b/retroshare-gui/src/gui/emojione/2652.png index 5d95e5cd4..da31145ac 100644 Binary files a/retroshare-gui/src/gui/emojione/2652.png and b/retroshare-gui/src/gui/emojione/2652.png differ diff --git a/retroshare-gui/src/gui/emojione/2653.png b/retroshare-gui/src/gui/emojione/2653.png index 0b65bd84f..af63c0024 100644 Binary files a/retroshare-gui/src/gui/emojione/2653.png and b/retroshare-gui/src/gui/emojione/2653.png differ diff --git a/retroshare-gui/src/gui/emojione/2660.png b/retroshare-gui/src/gui/emojione/2660.png index d0e7907b0..3cf4c2f8b 100644 Binary files a/retroshare-gui/src/gui/emojione/2660.png and b/retroshare-gui/src/gui/emojione/2660.png differ diff --git a/retroshare-gui/src/gui/emojione/2663.png b/retroshare-gui/src/gui/emojione/2663.png index e35b8c410..9e4aa85f1 100644 Binary files a/retroshare-gui/src/gui/emojione/2663.png and b/retroshare-gui/src/gui/emojione/2663.png differ diff --git a/retroshare-gui/src/gui/emojione/2665.png b/retroshare-gui/src/gui/emojione/2665.png index b0f089ad8..133c7dc1a 100644 Binary files a/retroshare-gui/src/gui/emojione/2665.png and b/retroshare-gui/src/gui/emojione/2665.png differ diff --git a/retroshare-gui/src/gui/emojione/2666.png b/retroshare-gui/src/gui/emojione/2666.png index 8c34470c8..36571fcb4 100644 Binary files a/retroshare-gui/src/gui/emojione/2666.png and b/retroshare-gui/src/gui/emojione/2666.png differ diff --git a/retroshare-gui/src/gui/emojione/2668.png b/retroshare-gui/src/gui/emojione/2668.png index 33288ed8d..6b0469235 100644 Binary files a/retroshare-gui/src/gui/emojione/2668.png and b/retroshare-gui/src/gui/emojione/2668.png differ diff --git a/retroshare-gui/src/gui/emojione/267B.png b/retroshare-gui/src/gui/emojione/267B.png index ae663e772..5b238869a 100644 Binary files a/retroshare-gui/src/gui/emojione/267B.png and b/retroshare-gui/src/gui/emojione/267B.png differ diff --git a/retroshare-gui/src/gui/emojione/267F.png b/retroshare-gui/src/gui/emojione/267F.png index f14e0908b..210c29a2d 100644 Binary files a/retroshare-gui/src/gui/emojione/267F.png and b/retroshare-gui/src/gui/emojione/267F.png differ diff --git a/retroshare-gui/src/gui/emojione/2692.png b/retroshare-gui/src/gui/emojione/2692.png index 8037b6b01..8200f8f9c 100644 Binary files a/retroshare-gui/src/gui/emojione/2692.png and b/retroshare-gui/src/gui/emojione/2692.png differ diff --git a/retroshare-gui/src/gui/emojione/2693.png b/retroshare-gui/src/gui/emojione/2693.png index 9deb52db8..d8b357021 100644 Binary files a/retroshare-gui/src/gui/emojione/2693.png and b/retroshare-gui/src/gui/emojione/2693.png differ diff --git a/retroshare-gui/src/gui/emojione/2694.png b/retroshare-gui/src/gui/emojione/2694.png index 5ab8d6c1b..3b1192a1f 100644 Binary files a/retroshare-gui/src/gui/emojione/2694.png and b/retroshare-gui/src/gui/emojione/2694.png differ diff --git a/retroshare-gui/src/gui/emojione/2696.png b/retroshare-gui/src/gui/emojione/2696.png index e33693944..499682aec 100644 Binary files a/retroshare-gui/src/gui/emojione/2696.png and b/retroshare-gui/src/gui/emojione/2696.png differ diff --git a/retroshare-gui/src/gui/emojione/2697.png b/retroshare-gui/src/gui/emojione/2697.png index 6587cdbf9..3f432afe8 100644 Binary files a/retroshare-gui/src/gui/emojione/2697.png and b/retroshare-gui/src/gui/emojione/2697.png differ diff --git a/retroshare-gui/src/gui/emojione/2699.png b/retroshare-gui/src/gui/emojione/2699.png index 92e2a9a61..4839f407e 100644 Binary files a/retroshare-gui/src/gui/emojione/2699.png and b/retroshare-gui/src/gui/emojione/2699.png differ diff --git a/retroshare-gui/src/gui/emojione/269b.png b/retroshare-gui/src/gui/emojione/269b.png index 1b7e10122..252e511a7 100644 Binary files a/retroshare-gui/src/gui/emojione/269b.png and b/retroshare-gui/src/gui/emojione/269b.png differ diff --git a/retroshare-gui/src/gui/emojione/269c.png b/retroshare-gui/src/gui/emojione/269c.png index 5295029fc..940c6c659 100644 Binary files a/retroshare-gui/src/gui/emojione/269c.png and b/retroshare-gui/src/gui/emojione/269c.png differ diff --git a/retroshare-gui/src/gui/emojione/26A0.png b/retroshare-gui/src/gui/emojione/26A0.png index 8872c6d4b..0142fe0a1 100644 Binary files a/retroshare-gui/src/gui/emojione/26A0.png and b/retroshare-gui/src/gui/emojione/26A0.png differ diff --git a/retroshare-gui/src/gui/emojione/26A1.png b/retroshare-gui/src/gui/emojione/26A1.png index b0409529e..eda3afd62 100644 Binary files a/retroshare-gui/src/gui/emojione/26A1.png and b/retroshare-gui/src/gui/emojione/26A1.png differ diff --git a/retroshare-gui/src/gui/emojione/26AA.png b/retroshare-gui/src/gui/emojione/26AA.png index 0bbf271da..17aa834ed 100644 Binary files a/retroshare-gui/src/gui/emojione/26AA.png and b/retroshare-gui/src/gui/emojione/26AA.png differ diff --git a/retroshare-gui/src/gui/emojione/26AB.png b/retroshare-gui/src/gui/emojione/26AB.png index c4f57a484..d32849e67 100644 Binary files a/retroshare-gui/src/gui/emojione/26AB.png and b/retroshare-gui/src/gui/emojione/26AB.png differ diff --git a/retroshare-gui/src/gui/emojione/26BD.png b/retroshare-gui/src/gui/emojione/26BD.png index 4b2e517af..2eec6307b 100644 Binary files a/retroshare-gui/src/gui/emojione/26BD.png and b/retroshare-gui/src/gui/emojione/26BD.png differ diff --git a/retroshare-gui/src/gui/emojione/26BE.png b/retroshare-gui/src/gui/emojione/26BE.png index d044f9734..1a8043c97 100644 Binary files a/retroshare-gui/src/gui/emojione/26BE.png and b/retroshare-gui/src/gui/emojione/26BE.png differ diff --git a/retroshare-gui/src/gui/emojione/26C4.png b/retroshare-gui/src/gui/emojione/26C4.png index 45ee6296e..0fdbc0c6a 100644 Binary files a/retroshare-gui/src/gui/emojione/26C4.png and b/retroshare-gui/src/gui/emojione/26C4.png differ diff --git a/retroshare-gui/src/gui/emojione/26C5.png b/retroshare-gui/src/gui/emojione/26C5.png index cf5b73490..3d5643173 100644 Binary files a/retroshare-gui/src/gui/emojione/26C5.png and b/retroshare-gui/src/gui/emojione/26C5.png differ diff --git a/retroshare-gui/src/gui/emojione/26CE.png b/retroshare-gui/src/gui/emojione/26CE.png index 695af6213..3bb5f621e 100644 Binary files a/retroshare-gui/src/gui/emojione/26CE.png and b/retroshare-gui/src/gui/emojione/26CE.png differ diff --git a/retroshare-gui/src/gui/emojione/26D4.png b/retroshare-gui/src/gui/emojione/26D4.png index 1da06ee2e..f2772f9e8 100644 Binary files a/retroshare-gui/src/gui/emojione/26D4.png and b/retroshare-gui/src/gui/emojione/26D4.png differ diff --git a/retroshare-gui/src/gui/emojione/26EA.png b/retroshare-gui/src/gui/emojione/26EA.png index bf6d74e99..a45c52acc 100644 Binary files a/retroshare-gui/src/gui/emojione/26EA.png and b/retroshare-gui/src/gui/emojione/26EA.png differ diff --git a/retroshare-gui/src/gui/emojione/26F2.png b/retroshare-gui/src/gui/emojione/26F2.png index 62f70efa1..95ad69936 100644 Binary files a/retroshare-gui/src/gui/emojione/26F2.png and b/retroshare-gui/src/gui/emojione/26F2.png differ diff --git a/retroshare-gui/src/gui/emojione/26F3.png b/retroshare-gui/src/gui/emojione/26F3.png index dc34930e6..c5b0c0b2c 100644 Binary files a/retroshare-gui/src/gui/emojione/26F3.png and b/retroshare-gui/src/gui/emojione/26F3.png differ diff --git a/retroshare-gui/src/gui/emojione/26F5.png b/retroshare-gui/src/gui/emojione/26F5.png index c3127f468..72066f535 100644 Binary files a/retroshare-gui/src/gui/emojione/26F5.png and b/retroshare-gui/src/gui/emojione/26F5.png differ diff --git a/retroshare-gui/src/gui/emojione/26FA.png b/retroshare-gui/src/gui/emojione/26FA.png index 1e20fc1e6..49922034f 100644 Binary files a/retroshare-gui/src/gui/emojione/26FA.png and b/retroshare-gui/src/gui/emojione/26FA.png differ diff --git a/retroshare-gui/src/gui/emojione/26FD.png b/retroshare-gui/src/gui/emojione/26FD.png index 77b0aed3e..17739c493 100644 Binary files a/retroshare-gui/src/gui/emojione/26FD.png and b/retroshare-gui/src/gui/emojione/26FD.png differ diff --git a/retroshare-gui/src/gui/emojione/26b0.png b/retroshare-gui/src/gui/emojione/26b0.png index 6685d4757..2f8344dbc 100644 Binary files a/retroshare-gui/src/gui/emojione/26b0.png and b/retroshare-gui/src/gui/emojione/26b0.png differ diff --git a/retroshare-gui/src/gui/emojione/26b1.png b/retroshare-gui/src/gui/emojione/26b1.png index aa9dc6039..45135438b 100644 Binary files a/retroshare-gui/src/gui/emojione/26b1.png and b/retroshare-gui/src/gui/emojione/26b1.png differ diff --git a/retroshare-gui/src/gui/emojione/26c8.png b/retroshare-gui/src/gui/emojione/26c8.png index 83cdb94d4..2b8a62e42 100644 Binary files a/retroshare-gui/src/gui/emojione/26c8.png and b/retroshare-gui/src/gui/emojione/26c8.png differ diff --git a/retroshare-gui/src/gui/emojione/26cf.png b/retroshare-gui/src/gui/emojione/26cf.png index b6cc21c13..088ae98a6 100644 Binary files a/retroshare-gui/src/gui/emojione/26cf.png and b/retroshare-gui/src/gui/emojione/26cf.png differ diff --git a/retroshare-gui/src/gui/emojione/26d1.png b/retroshare-gui/src/gui/emojione/26d1.png index 9e8572676..27a73a97e 100644 Binary files a/retroshare-gui/src/gui/emojione/26d1.png and b/retroshare-gui/src/gui/emojione/26d1.png differ diff --git a/retroshare-gui/src/gui/emojione/26d3.png b/retroshare-gui/src/gui/emojione/26d3.png index 604e42bc7..b41e671c3 100644 Binary files a/retroshare-gui/src/gui/emojione/26d3.png and b/retroshare-gui/src/gui/emojione/26d3.png differ diff --git a/retroshare-gui/src/gui/emojione/26e9.png b/retroshare-gui/src/gui/emojione/26e9.png index b0647af6b..83cd681a0 100644 Binary files a/retroshare-gui/src/gui/emojione/26e9.png and b/retroshare-gui/src/gui/emojione/26e9.png differ diff --git a/retroshare-gui/src/gui/emojione/26f0.png b/retroshare-gui/src/gui/emojione/26f0.png index f7d30c53d..8dbb74518 100644 Binary files a/retroshare-gui/src/gui/emojione/26f0.png and b/retroshare-gui/src/gui/emojione/26f0.png differ diff --git a/retroshare-gui/src/gui/emojione/26f1.png b/retroshare-gui/src/gui/emojione/26f1.png index 1ec537e87..600baf494 100644 Binary files a/retroshare-gui/src/gui/emojione/26f1.png and b/retroshare-gui/src/gui/emojione/26f1.png differ diff --git a/retroshare-gui/src/gui/emojione/26f4.png b/retroshare-gui/src/gui/emojione/26f4.png index 31a61f24f..8e964356c 100644 Binary files a/retroshare-gui/src/gui/emojione/26f4.png and b/retroshare-gui/src/gui/emojione/26f4.png differ diff --git a/retroshare-gui/src/gui/emojione/26f7.png b/retroshare-gui/src/gui/emojione/26f7.png index bcbb0ad94..8255bc114 100644 Binary files a/retroshare-gui/src/gui/emojione/26f7.png and b/retroshare-gui/src/gui/emojione/26f7.png differ diff --git a/retroshare-gui/src/gui/emojione/26f8.png b/retroshare-gui/src/gui/emojione/26f8.png index 092f77856..b9d3de868 100644 Binary files a/retroshare-gui/src/gui/emojione/26f8.png and b/retroshare-gui/src/gui/emojione/26f8.png differ diff --git a/retroshare-gui/src/gui/emojione/26f9-1f3fb.png b/retroshare-gui/src/gui/emojione/26f9-1f3fb.png index 9ab4aba0d..974bb41cb 100644 Binary files a/retroshare-gui/src/gui/emojione/26f9-1f3fb.png and b/retroshare-gui/src/gui/emojione/26f9-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/26f9-1f3fc.png b/retroshare-gui/src/gui/emojione/26f9-1f3fc.png index cb20af207..4b5d9b6cd 100644 Binary files a/retroshare-gui/src/gui/emojione/26f9-1f3fc.png and b/retroshare-gui/src/gui/emojione/26f9-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/26f9-1f3fd.png b/retroshare-gui/src/gui/emojione/26f9-1f3fd.png index 0f32b2b8a..0472fccba 100644 Binary files a/retroshare-gui/src/gui/emojione/26f9-1f3fd.png and b/retroshare-gui/src/gui/emojione/26f9-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/26f9-1f3fe.png b/retroshare-gui/src/gui/emojione/26f9-1f3fe.png index 6ffcf78f9..c3c1f5929 100644 Binary files a/retroshare-gui/src/gui/emojione/26f9-1f3fe.png and b/retroshare-gui/src/gui/emojione/26f9-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/26f9-1f3ff.png b/retroshare-gui/src/gui/emojione/26f9-1f3ff.png index 1457b8efd..8b0a58280 100644 Binary files a/retroshare-gui/src/gui/emojione/26f9-1f3ff.png and b/retroshare-gui/src/gui/emojione/26f9-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/26f9.png b/retroshare-gui/src/gui/emojione/26f9.png index fb0a9289a..3a1a492c3 100644 Binary files a/retroshare-gui/src/gui/emojione/26f9.png and b/retroshare-gui/src/gui/emojione/26f9.png differ diff --git a/retroshare-gui/src/gui/emojione/2702.png b/retroshare-gui/src/gui/emojione/2702.png index e1a480666..56e7e34a7 100644 Binary files a/retroshare-gui/src/gui/emojione/2702.png and b/retroshare-gui/src/gui/emojione/2702.png differ diff --git a/retroshare-gui/src/gui/emojione/2705.png b/retroshare-gui/src/gui/emojione/2705.png index 63058b0c3..d2182b9e6 100644 Binary files a/retroshare-gui/src/gui/emojione/2705.png and b/retroshare-gui/src/gui/emojione/2705.png differ diff --git a/retroshare-gui/src/gui/emojione/2708.png b/retroshare-gui/src/gui/emojione/2708.png index bb5ea2de8..7f7d3a6a3 100644 Binary files a/retroshare-gui/src/gui/emojione/2708.png and b/retroshare-gui/src/gui/emojione/2708.png differ diff --git a/retroshare-gui/src/gui/emojione/2709.png b/retroshare-gui/src/gui/emojione/2709.png index 13b5f533f..4ac264319 100644 Binary files a/retroshare-gui/src/gui/emojione/2709.png and b/retroshare-gui/src/gui/emojione/2709.png differ diff --git a/retroshare-gui/src/gui/emojione/270A.png b/retroshare-gui/src/gui/emojione/270A.png index ab5525204..3bc460c9c 100644 Binary files a/retroshare-gui/src/gui/emojione/270A.png and b/retroshare-gui/src/gui/emojione/270A.png differ diff --git a/retroshare-gui/src/gui/emojione/270B.png b/retroshare-gui/src/gui/emojione/270B.png index c50ea0217..e7025fefc 100644 Binary files a/retroshare-gui/src/gui/emojione/270B.png and b/retroshare-gui/src/gui/emojione/270B.png differ diff --git a/retroshare-gui/src/gui/emojione/270C.png b/retroshare-gui/src/gui/emojione/270C.png index d54a2f447..1db91636e 100644 Binary files a/retroshare-gui/src/gui/emojione/270C.png and b/retroshare-gui/src/gui/emojione/270C.png differ diff --git a/retroshare-gui/src/gui/emojione/270F.png b/retroshare-gui/src/gui/emojione/270F.png index fd787b145..133f3fcc9 100644 Binary files a/retroshare-gui/src/gui/emojione/270F.png and b/retroshare-gui/src/gui/emojione/270F.png differ diff --git a/retroshare-gui/src/gui/emojione/270a-1f3fb.png b/retroshare-gui/src/gui/emojione/270a-1f3fb.png index 757d591b9..37ea07ce0 100644 Binary files a/retroshare-gui/src/gui/emojione/270a-1f3fb.png and b/retroshare-gui/src/gui/emojione/270a-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/270a-1f3fc.png b/retroshare-gui/src/gui/emojione/270a-1f3fc.png index 2632ce1eb..b873de0b7 100644 Binary files a/retroshare-gui/src/gui/emojione/270a-1f3fc.png and b/retroshare-gui/src/gui/emojione/270a-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/270a-1f3fd.png b/retroshare-gui/src/gui/emojione/270a-1f3fd.png index c0add8d4b..096428413 100644 Binary files a/retroshare-gui/src/gui/emojione/270a-1f3fd.png and b/retroshare-gui/src/gui/emojione/270a-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/270a-1f3fe.png b/retroshare-gui/src/gui/emojione/270a-1f3fe.png index 2cd2f7b9d..3d2b15e4d 100644 Binary files a/retroshare-gui/src/gui/emojione/270a-1f3fe.png and b/retroshare-gui/src/gui/emojione/270a-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/270a-1f3ff.png b/retroshare-gui/src/gui/emojione/270a-1f3ff.png index 762435b94..206ce0197 100644 Binary files a/retroshare-gui/src/gui/emojione/270a-1f3ff.png and b/retroshare-gui/src/gui/emojione/270a-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/270b-1f3fb.png b/retroshare-gui/src/gui/emojione/270b-1f3fb.png index 9b8e540f0..20e542ac2 100644 Binary files a/retroshare-gui/src/gui/emojione/270b-1f3fb.png and b/retroshare-gui/src/gui/emojione/270b-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/270b-1f3fc.png b/retroshare-gui/src/gui/emojione/270b-1f3fc.png index f2b6709be..ff6fa3d42 100644 Binary files a/retroshare-gui/src/gui/emojione/270b-1f3fc.png and b/retroshare-gui/src/gui/emojione/270b-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/270b-1f3fd.png b/retroshare-gui/src/gui/emojione/270b-1f3fd.png index c322bf82d..a74492cca 100644 Binary files a/retroshare-gui/src/gui/emojione/270b-1f3fd.png and b/retroshare-gui/src/gui/emojione/270b-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/270b-1f3fe.png b/retroshare-gui/src/gui/emojione/270b-1f3fe.png index 75fe419dd..9f38b66e7 100644 Binary files a/retroshare-gui/src/gui/emojione/270b-1f3fe.png and b/retroshare-gui/src/gui/emojione/270b-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/270b-1f3ff.png b/retroshare-gui/src/gui/emojione/270b-1f3ff.png index 4056920e9..136631d43 100644 Binary files a/retroshare-gui/src/gui/emojione/270b-1f3ff.png and b/retroshare-gui/src/gui/emojione/270b-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/270c-1f3fb.png b/retroshare-gui/src/gui/emojione/270c-1f3fb.png index 520c1f25d..cc8b674ef 100644 Binary files a/retroshare-gui/src/gui/emojione/270c-1f3fb.png and b/retroshare-gui/src/gui/emojione/270c-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/270c-1f3fc.png b/retroshare-gui/src/gui/emojione/270c-1f3fc.png index 3157cc922..ef0bec358 100644 Binary files a/retroshare-gui/src/gui/emojione/270c-1f3fc.png and b/retroshare-gui/src/gui/emojione/270c-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/270c-1f3fd.png b/retroshare-gui/src/gui/emojione/270c-1f3fd.png index 65a6891b4..2fb3f4a45 100644 Binary files a/retroshare-gui/src/gui/emojione/270c-1f3fd.png and b/retroshare-gui/src/gui/emojione/270c-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/270c-1f3fe.png b/retroshare-gui/src/gui/emojione/270c-1f3fe.png index 214bc096a..5cb1818e2 100644 Binary files a/retroshare-gui/src/gui/emojione/270c-1f3fe.png and b/retroshare-gui/src/gui/emojione/270c-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/270c-1f3ff.png b/retroshare-gui/src/gui/emojione/270c-1f3ff.png index 35ea61eb0..0527d98d5 100644 Binary files a/retroshare-gui/src/gui/emojione/270c-1f3ff.png and b/retroshare-gui/src/gui/emojione/270c-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/270d-1f3fb.png b/retroshare-gui/src/gui/emojione/270d-1f3fb.png index e0ea1f1fe..89c6711d9 100644 Binary files a/retroshare-gui/src/gui/emojione/270d-1f3fb.png and b/retroshare-gui/src/gui/emojione/270d-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/270d-1f3fc.png b/retroshare-gui/src/gui/emojione/270d-1f3fc.png index 92731a6e6..f316620ef 100644 Binary files a/retroshare-gui/src/gui/emojione/270d-1f3fc.png and b/retroshare-gui/src/gui/emojione/270d-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/270d-1f3fd.png b/retroshare-gui/src/gui/emojione/270d-1f3fd.png index 7299bee5e..e11272d4b 100644 Binary files a/retroshare-gui/src/gui/emojione/270d-1f3fd.png and b/retroshare-gui/src/gui/emojione/270d-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/270d-1f3fe.png b/retroshare-gui/src/gui/emojione/270d-1f3fe.png index 048b60267..4c38483b8 100644 Binary files a/retroshare-gui/src/gui/emojione/270d-1f3fe.png and b/retroshare-gui/src/gui/emojione/270d-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/270d-1f3ff.png b/retroshare-gui/src/gui/emojione/270d-1f3ff.png index 0dd5e4ab5..83e4202bf 100644 Binary files a/retroshare-gui/src/gui/emojione/270d-1f3ff.png and b/retroshare-gui/src/gui/emojione/270d-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/270d.png b/retroshare-gui/src/gui/emojione/270d.png index 5d03a6ddc..28582012f 100644 Binary files a/retroshare-gui/src/gui/emojione/270d.png and b/retroshare-gui/src/gui/emojione/270d.png differ diff --git a/retroshare-gui/src/gui/emojione/2712.png b/retroshare-gui/src/gui/emojione/2712.png index 98abce96f..477e73839 100644 Binary files a/retroshare-gui/src/gui/emojione/2712.png and b/retroshare-gui/src/gui/emojione/2712.png differ diff --git a/retroshare-gui/src/gui/emojione/2714.png b/retroshare-gui/src/gui/emojione/2714.png index 425c2d50b..24860b106 100644 Binary files a/retroshare-gui/src/gui/emojione/2714.png and b/retroshare-gui/src/gui/emojione/2714.png differ diff --git a/retroshare-gui/src/gui/emojione/2716.png b/retroshare-gui/src/gui/emojione/2716.png index c693d91c8..51d5c0800 100644 Binary files a/retroshare-gui/src/gui/emojione/2716.png and b/retroshare-gui/src/gui/emojione/2716.png differ diff --git a/retroshare-gui/src/gui/emojione/271d.png b/retroshare-gui/src/gui/emojione/271d.png index 75ae66dec..d5ba92c72 100644 Binary files a/retroshare-gui/src/gui/emojione/271d.png and b/retroshare-gui/src/gui/emojione/271d.png differ diff --git a/retroshare-gui/src/gui/emojione/2721.png b/retroshare-gui/src/gui/emojione/2721.png index cafbeb3ca..c4a759e91 100644 Binary files a/retroshare-gui/src/gui/emojione/2721.png and b/retroshare-gui/src/gui/emojione/2721.png differ diff --git a/retroshare-gui/src/gui/emojione/2728.png b/retroshare-gui/src/gui/emojione/2728.png index 6870d0d16..149c60619 100644 Binary files a/retroshare-gui/src/gui/emojione/2728.png and b/retroshare-gui/src/gui/emojione/2728.png differ diff --git a/retroshare-gui/src/gui/emojione/2733.png b/retroshare-gui/src/gui/emojione/2733.png index 8a8b4824a..3e56937a7 100644 Binary files a/retroshare-gui/src/gui/emojione/2733.png and b/retroshare-gui/src/gui/emojione/2733.png differ diff --git a/retroshare-gui/src/gui/emojione/2734.png b/retroshare-gui/src/gui/emojione/2734.png index 923647630..0fdd1c22b 100644 Binary files a/retroshare-gui/src/gui/emojione/2734.png and b/retroshare-gui/src/gui/emojione/2734.png differ diff --git a/retroshare-gui/src/gui/emojione/2744.png b/retroshare-gui/src/gui/emojione/2744.png index a33e45895..029cd6668 100644 Binary files a/retroshare-gui/src/gui/emojione/2744.png and b/retroshare-gui/src/gui/emojione/2744.png differ diff --git a/retroshare-gui/src/gui/emojione/2747.png b/retroshare-gui/src/gui/emojione/2747.png index bbc98cdd9..fbc2027a6 100644 Binary files a/retroshare-gui/src/gui/emojione/2747.png and b/retroshare-gui/src/gui/emojione/2747.png differ diff --git a/retroshare-gui/src/gui/emojione/274C.png b/retroshare-gui/src/gui/emojione/274C.png index 838c74e87..51517b777 100644 Binary files a/retroshare-gui/src/gui/emojione/274C.png and b/retroshare-gui/src/gui/emojione/274C.png differ diff --git a/retroshare-gui/src/gui/emojione/274E.png b/retroshare-gui/src/gui/emojione/274E.png index dd2249f8e..62592c2bd 100644 Binary files a/retroshare-gui/src/gui/emojione/274E.png and b/retroshare-gui/src/gui/emojione/274E.png differ diff --git a/retroshare-gui/src/gui/emojione/2753.png b/retroshare-gui/src/gui/emojione/2753.png index 9ac405e3a..d654b9963 100644 Binary files a/retroshare-gui/src/gui/emojione/2753.png and b/retroshare-gui/src/gui/emojione/2753.png differ diff --git a/retroshare-gui/src/gui/emojione/2754.png b/retroshare-gui/src/gui/emojione/2754.png index 4413070bc..718b88127 100644 Binary files a/retroshare-gui/src/gui/emojione/2754.png and b/retroshare-gui/src/gui/emojione/2754.png differ diff --git a/retroshare-gui/src/gui/emojione/2755.png b/retroshare-gui/src/gui/emojione/2755.png index 0f84d0ecc..82e452634 100644 Binary files a/retroshare-gui/src/gui/emojione/2755.png and b/retroshare-gui/src/gui/emojione/2755.png differ diff --git a/retroshare-gui/src/gui/emojione/2757.png b/retroshare-gui/src/gui/emojione/2757.png index d82f61742..92192c80b 100644 Binary files a/retroshare-gui/src/gui/emojione/2757.png and b/retroshare-gui/src/gui/emojione/2757.png differ diff --git a/retroshare-gui/src/gui/emojione/2763.png b/retroshare-gui/src/gui/emojione/2763.png index d462c7aab..dfa5f2a28 100644 Binary files a/retroshare-gui/src/gui/emojione/2763.png and b/retroshare-gui/src/gui/emojione/2763.png differ diff --git a/retroshare-gui/src/gui/emojione/2764.png b/retroshare-gui/src/gui/emojione/2764.png index ab8f38fb5..90416cbfe 100644 Binary files a/retroshare-gui/src/gui/emojione/2764.png and b/retroshare-gui/src/gui/emojione/2764.png differ diff --git a/retroshare-gui/src/gui/emojione/2795.png b/retroshare-gui/src/gui/emojione/2795.png index fb29d04b7..cf2b485c3 100644 Binary files a/retroshare-gui/src/gui/emojione/2795.png and b/retroshare-gui/src/gui/emojione/2795.png differ diff --git a/retroshare-gui/src/gui/emojione/2796.png b/retroshare-gui/src/gui/emojione/2796.png index 69524dc94..7f6252c56 100644 Binary files a/retroshare-gui/src/gui/emojione/2796.png and b/retroshare-gui/src/gui/emojione/2796.png differ diff --git a/retroshare-gui/src/gui/emojione/2797.png b/retroshare-gui/src/gui/emojione/2797.png index 31139ccb3..e783d9621 100644 Binary files a/retroshare-gui/src/gui/emojione/2797.png and b/retroshare-gui/src/gui/emojione/2797.png differ diff --git a/retroshare-gui/src/gui/emojione/27A1.png b/retroshare-gui/src/gui/emojione/27A1.png index d2cf372d2..14f3b155e 100644 Binary files a/retroshare-gui/src/gui/emojione/27A1.png and b/retroshare-gui/src/gui/emojione/27A1.png differ diff --git a/retroshare-gui/src/gui/emojione/27B0.png b/retroshare-gui/src/gui/emojione/27B0.png index 0e2b95ebd..0615483e8 100644 Binary files a/retroshare-gui/src/gui/emojione/27B0.png and b/retroshare-gui/src/gui/emojione/27B0.png differ diff --git a/retroshare-gui/src/gui/emojione/27BF.png b/retroshare-gui/src/gui/emojione/27BF.png index 3b2dc7e9c..6eb3fe43e 100644 Binary files a/retroshare-gui/src/gui/emojione/27BF.png and b/retroshare-gui/src/gui/emojione/27BF.png differ diff --git a/retroshare-gui/src/gui/emojione/2934.png b/retroshare-gui/src/gui/emojione/2934.png index a486a3f9d..451d09d31 100644 Binary files a/retroshare-gui/src/gui/emojione/2934.png and b/retroshare-gui/src/gui/emojione/2934.png differ diff --git a/retroshare-gui/src/gui/emojione/2935.png b/retroshare-gui/src/gui/emojione/2935.png index f5b3e898f..cab2fad57 100644 Binary files a/retroshare-gui/src/gui/emojione/2935.png and b/retroshare-gui/src/gui/emojione/2935.png differ diff --git a/retroshare-gui/src/gui/emojione/2B05.png b/retroshare-gui/src/gui/emojione/2B05.png index 46e31ed43..6c05e76a4 100644 Binary files a/retroshare-gui/src/gui/emojione/2B05.png and b/retroshare-gui/src/gui/emojione/2B05.png differ diff --git a/retroshare-gui/src/gui/emojione/2B06.png b/retroshare-gui/src/gui/emojione/2B06.png index d24098486..a4deaddd9 100644 Binary files a/retroshare-gui/src/gui/emojione/2B06.png and b/retroshare-gui/src/gui/emojione/2B06.png differ diff --git a/retroshare-gui/src/gui/emojione/2B07.png b/retroshare-gui/src/gui/emojione/2B07.png index 052821c35..f1c689184 100644 Binary files a/retroshare-gui/src/gui/emojione/2B07.png and b/retroshare-gui/src/gui/emojione/2B07.png differ diff --git a/retroshare-gui/src/gui/emojione/2B1B.png b/retroshare-gui/src/gui/emojione/2B1B.png index 0a7c3f20f..31e81e7fd 100644 Binary files a/retroshare-gui/src/gui/emojione/2B1B.png and b/retroshare-gui/src/gui/emojione/2B1B.png differ diff --git a/retroshare-gui/src/gui/emojione/2B1C.png b/retroshare-gui/src/gui/emojione/2B1C.png index 20e2fa7c4..d579a3719 100644 Binary files a/retroshare-gui/src/gui/emojione/2B1C.png and b/retroshare-gui/src/gui/emojione/2B1C.png differ diff --git a/retroshare-gui/src/gui/emojione/2B50.png b/retroshare-gui/src/gui/emojione/2B50.png index 1dc3bc982..903ed20c0 100644 Binary files a/retroshare-gui/src/gui/emojione/2B50.png and b/retroshare-gui/src/gui/emojione/2B50.png differ diff --git a/retroshare-gui/src/gui/emojione/2B55.png b/retroshare-gui/src/gui/emojione/2B55.png index 6877e60b7..0cf133dcd 100644 Binary files a/retroshare-gui/src/gui/emojione/2B55.png and b/retroshare-gui/src/gui/emojione/2B55.png differ diff --git a/retroshare-gui/src/gui/emojione/3030.png b/retroshare-gui/src/gui/emojione/3030.png index 67bf45999..f9b466c20 100644 Binary files a/retroshare-gui/src/gui/emojione/3030.png and b/retroshare-gui/src/gui/emojione/3030.png differ diff --git a/retroshare-gui/src/gui/emojione/303D.png b/retroshare-gui/src/gui/emojione/303D.png index aa242349d..e73c8671e 100644 Binary files a/retroshare-gui/src/gui/emojione/303D.png and b/retroshare-gui/src/gui/emojione/303D.png differ diff --git a/retroshare-gui/src/gui/emojione/3297.png b/retroshare-gui/src/gui/emojione/3297.png index d9bd6cdd8..52f00c98d 100644 Binary files a/retroshare-gui/src/gui/emojione/3297.png and b/retroshare-gui/src/gui/emojione/3297.png differ diff --git a/retroshare-gui/src/gui/emojione/3299.png b/retroshare-gui/src/gui/emojione/3299.png index 72f65bdfc..598eeba69 100644 Binary files a/retroshare-gui/src/gui/emojione/3299.png and b/retroshare-gui/src/gui/emojione/3299.png differ diff --git a/retroshare-gui/src/gui/emojione/emotes.acs b/retroshare-gui/src/gui/emojione/emotes.acs index a1944cfe0..aa7c04e9b 100644 --- a/retroshare-gui/src/gui/emojione/emotes.acs +++ b/retroshare-gui/src/gui/emojione/emotes.acs @@ -126,10 +126,14 @@ ":tongue:":"emojione/1F445.png"; ":nail_care:":"emojione/1F485.png"; ":wave:":"emojione/1F44B.png"; -":thumbsup:|:+1:":"emojione/1F44D.png"; -":thumbsdown:|:-1:":"emojione/1F44E.png"; +":thumbsup:|:+1:|(y)|(Y)":"emojione/1F44D.png"; +":thumbsdown:|:-1:|(N)|(n)":"emojione/1F44E.png"; ":muscle:":"emojione/1F4AA.png"; ":middle_finger:|":"emojione/1F595.png"; +":finger_pointing_down:":"emojione/1F597.png"; +":finger_pointing_left:":"emojione/1F598.png"; +":finger_pointing_right:":"emojione/1F599.png"; +":finger_pointing_up:":"emojione/1F59E.png"; ":coffee:|(C)|(c)":"emojione/2615.png"; ":sake:":"emojione/1F376.png"; ":tea:":"emojione/1F375.png"; diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui index f8e947af9..37b11b308 100644 --- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui +++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui @@ -21,7 +21,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -39,7 +48,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -51,7 +69,16 @@ QFrame::Raised - + + 0 + + + 0 + + + 0 + + 0 @@ -76,8 +103,7 @@ - - + @@ -113,7 +139,16 @@ QFrame::Sunken - + + 1 + + + 1 + + + 1 + + 1 @@ -151,8 +186,8 @@ - - :/images/emoticons/kopete/kopete020.png:/images/emoticons/kopete/kopete020.png + + :/emojione/1F603.png:/emojione/1F603.png @@ -319,20 +354,21 @@ p, li { white-space: pre-wrap; } QTextEdit
gui/common/MimeTextEdit.h
+ + GxsIdChooser + QComboBox +
gui/gxs/GxsIdChooser.h
+ HeaderFrame QFrame
gui/common/HeaderFrame.h
1 - - GxsIdChooser - QComboBox -
gui/gxs/GxsIdChooser.h
- + diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp index 6280f029c..fe2e1aad3 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp @@ -213,6 +213,8 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget ui->line_2->hide() ; ui->by_text_label->hide() ; ui->by_label->hide() ; + ui->postText->setImageBlockWidget(ui->imageBlockWidget); + ui->postText->resetImagesStatus(Settings->getForumLoadEmbeddedImages()) ; ui->subscribeToolButton->setToolTip(tr("

Subscribing to the forum will gather \ available posts from your subscribed friends, and make the \ @@ -590,6 +592,7 @@ void GxsForumThreadWidget::changedThread() if (mFillThread) { return; } + ui->postText->resetImagesStatus(Settings->getForumLoadEmbeddedImages()) ; insertMessage(); } diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui index d7018afd7..f156d3a2c 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui @@ -6,17 +6,14 @@ 0 0 - 622 - 412 + 851 + 721 Form - - - 0 - + @@ -117,6 +114,12 @@ QSizePolicy::MinimumExpanding + + + 0 + 0 + + @@ -446,21 +449,37 @@ - - - - 0 - 10 - - - - Qt::CustomContextMenu - + + + + + + + 0 + 0 + + + + + + + + + 0 + 10 + + + + Qt::CustomContextMenu + + + + - + :/images/document_save.png:/images/document_save.png @@ -502,6 +521,12 @@

gui/common/ElidedLabel.h
1 + + RSImageBlockWidget + QWidget +
gui/common/RSImageBlockWidget.h
+ 1 + diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui index bf7189a79..29a47f9e1 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.ui +++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui @@ -612,8 +612,8 @@ Qt::NoFocus - - :/images/emoticons/kopete/kopete020.png:/images/emoticons/kopete/kopete020.png + + :/emojione/1F603.png:/emojione/1F603.png @@ -1262,6 +1262,7 @@ border-image: url(:/images/closepressed.png) + diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp index a6b8b5457..883c05e28 100644 --- a/retroshare-gui/src/gui/notifyqt.cpp +++ b/retroshare-gui/src/gui/notifyqt.cpp @@ -151,11 +151,25 @@ class SignatureEventData { // We need a new memory chnk because there's no guarranty _sign nor _signlen are not in the stack - sign = (unsigned char *)malloc(_signlen) ; + sign = (unsigned char *)rs_malloc(_signlen) ; + + if(!sign) + { + signlen = NULL ; + signature_result = SELF_SIGNATURE_RESULT_FAILED ; + return ; + } + signlen = new unsigned int ; *signlen = _signlen ; signature_result = SELF_SIGNATURE_RESULT_PENDING ; - data = malloc(_len) ; + data = rs_malloc(_len) ; + + if(!data) + { + len = 0 ; + return ; + } len = _len ; memcpy(data,_data,len) ; } @@ -863,11 +877,9 @@ void NotifyQt::UpdateGUI() case RS_POPUP_CHATLOBBY: if ((popupflags & RS_POPUP_CHATLOBBY) && !_disableAllToaster) { - ChatLobbyId lobby_id; - if(!rsMsgs->isLobbyId(RsPeerId(id), lobby_id)) - break; + ChatId chat_id(id); - ChatDialog *chatDialog = ChatDialog::getChat(ChatId(lobby_id)); + ChatDialog *chatDialog = ChatDialog::getChat(chat_id); ChatWidget *chatWidget; if (chatDialog && (chatWidget = chatDialog->getChatWidget()) && chatWidget->isActive()) { // do not show when active @@ -879,7 +891,7 @@ void NotifyQt::UpdateGUI() if (!chatLobbyDialog || chatLobbyDialog->isParticipantMuted(sender)) break; // participant is muted - toaster = new ToasterItem(new ChatLobbyToaster(lobby_id, sender, QString::fromUtf8(msg.c_str()))); + toaster = new ToasterItem(new ChatLobbyToaster(chat_id.toLobbyId(), sender, QString::fromUtf8(msg.c_str()))); } break; case RS_POPUP_CONNECT_ATTEMPT: diff --git a/retroshare-gui/src/util/HandleRichText.cpp b/retroshare-gui/src/util/HandleRichText.cpp index 59466b827..c2b7174e4 100644 --- a/retroshare-gui/src/util/HandleRichText.cpp +++ b/retroshare-gui/src/util/HandleRichText.cpp @@ -105,7 +105,33 @@ void RsHtml::initEmoticons(const QHash< QString, QString >& hash) continue; } defEmbedImg.smileys.insert(smile, it.value()); - newRE += "(" + QRegExp::escape(smile) + ")|"; + // add space around smileys + newRE += "(?:^|\\s)(" + QRegExp::escape(smile) + ")(?:$|\\s)|"; + // explanations: + // (?:^|\s)(*smiley*)(?:$|\s) + // + // (?:^|\s) Non-capturing group + // 1st Alternative: ^ + // ^ assert position at start of the string + // 2nd Alternative: \s + // \s match any white space character [\r\n\t\f ] + // + // 1st Capturing group (*smiley*) + // *smiley* matches the characters *smiley* literally (case sensitive) + // + // (?:$|\s) Non-capturing group + // 1st Alternative: $ + // $ assert position at end of the string + // 2nd Alternative: \s + // \s match any white space character [\r\n\t\f ] + + /* + * TODO + * a better version is: + * (?<=^|\s)(*smile*)(?=$|\s) using the lookbehind/lookahead operator instead of non-capturing groups. + * This solves the problem that spaces are matched, too (see workaround in RsHtml::embedHtml) + * This is not supported by Qt4! + */ } newRE.chop(1); // remove last | defEmbedImg.myRE.setPattern(newRE); @@ -312,7 +338,21 @@ void RsHtml::embedHtml(QTextDocument *textDocument, QDomDocument& doc, QDomEleme { insertedTag = doc.createElement("img"); const EmbedInHtmlImg& embedImg = static_cast(embedInfos); - insertedTag.setAttribute("src", embedImg.smileys[embedInfos.myRE.cap(0)]); + // embedInfos.myRE.cap(0) may include spaces at the end/beginning -> trim! + insertedTag.setAttribute("src", embedImg.smileys[embedInfos.myRE.cap(0).trimmed()]); + /* + * NOTE + * Trailing spaces are matched, too. This leads to embedInfos.myRE.matchedLength() being incorrect. + * This hack reduces nextPos by one so that the new value of currentPos is calculated corretly. + * This is needed to match multiple smileys since the leading whitespace in front of a smiley is required! + * + * This can be avoided by using Qt5 (see comment in RsHtml::initEmoticons) + * + * NOTE + * Preceding spaces are also matched and removed. + */ + if(embedInfos.myRE.cap(0).endsWith(' ')) + nextPos--; } break; }