From 4288785d31e215bc379223577f7d4dd65664ed86 Mon Sep 17 00:00:00 2001
From: tox-user <tox-user@users.noreply.github.com>
Date: Sat, 13 Jan 2018 21:20:03 +0100
Subject: [PATCH] feat(UI): new status icons for message notifications

implements #4858
---
 img/status/{dot_away.svg => away.svg}         |  0
 img/status/away_notification.svg              | 32 ++++++++++++
 img/status/{dot_busy.svg => busy.svg}         |  0
 img/status/busy_notification.svg              | 41 +++++++++++++++
 img/status/dot_away_notification.svg          | 16 ------
 img/status/dot_busy_notification.svg          | 52 -------------------
 img/status/dot_offline_notification.svg       | 14 -----
 img/status/dot_online_notification.svg        | 11 ----
 .../{dot_groupchat.svg => groupchat.svg}      |  0
 ...messages.svg => groupchat_newmessages.svg} |  0
 ...ication.svg => groupchat_notification.svg} |  0
 .../{dot_invisible.svg => invisible.svg}      |  0
 img/status/{dot_offline.svg => offline.svg}   |  0
 img/status/offline_notification.svg           | 32 ++++++++++++
 img/status/{dot_online.svg => online.svg}     |  0
 img/status/online_notification.svg            | 32 ++++++++++++
 res.qrc                                       | 22 ++++----
 src/widget/contentdialog.cpp                  |  8 +--
 src/widget/friendwidget.cpp                   | 18 +++----
 src/widget/groupwidget.cpp                    |  6 +--
 src/widget/widget.cpp                         |  8 +--
 21 files changed, 168 insertions(+), 124 deletions(-)
 rename img/status/{dot_away.svg => away.svg} (100%)
 create mode 100644 img/status/away_notification.svg
 rename img/status/{dot_busy.svg => busy.svg} (100%)
 create mode 100644 img/status/busy_notification.svg
 delete mode 100644 img/status/dot_away_notification.svg
 delete mode 100644 img/status/dot_busy_notification.svg
 delete mode 100644 img/status/dot_offline_notification.svg
 delete mode 100644 img/status/dot_online_notification.svg
 rename img/status/{dot_groupchat.svg => groupchat.svg} (100%)
 rename img/status/{dot_groupchat_newmessages.svg => groupchat_newmessages.svg} (100%)
 rename img/status/{dot_groupchat_notification.svg => groupchat_notification.svg} (100%)
 rename img/status/{dot_invisible.svg => invisible.svg} (100%)
 rename img/status/{dot_offline.svg => offline.svg} (100%)
 create mode 100644 img/status/offline_notification.svg
 rename img/status/{dot_online.svg => online.svg} (100%)
 create mode 100644 img/status/online_notification.svg

diff --git a/img/status/dot_away.svg b/img/status/away.svg
similarity index 100%
rename from img/status/dot_away.svg
rename to img/status/away.svg
diff --git a/img/status/away_notification.svg b/img/status/away_notification.svg
new file mode 100644
index 000000000..a7ee46443
--- /dev/null
+++ b/img/status/away_notification.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   height="14"
+   width="14"
+   xml:space="preserve"
+   enable-background="new 0 0 10 10"
+   viewBox="0 0 14 14"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.1"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><g
+     style="stroke-width:0.36135802;stroke-miterlimit:4;stroke-dasharray:none;stroke:#cdbe41"
+     id="layer1"
+     transform="matrix(3.0289233,0,0,3.0289233,0.18380903,-887.48895)"><path
+       style="fill:#000000;stroke-width:0.36135802;stroke-miterlimit:4;stroke-dasharray:none;stroke:#cdbe41"
+       d=""
+       id="path4500" /><path
+       style="fill:#000000;stroke-width:0.36135802;stroke-miterlimit:4;stroke-dasharray:none;stroke:#cdbe41"
+       d=""
+       id="path4498" /><path
+       id="path4528"
+       style="fill:none;stroke:#cdbe41;stroke-width:0.36135802;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.10133195,293.90792 1.88406635,1.94794 H 2.5570778 L 4.3764717,293.9374 M 0.13990242,293.77165 H 4.375461 v 2.99779 H 0.13310726 l 9.0535e-4,-3.17789" /></g></svg>
\ No newline at end of file
diff --git a/img/status/dot_busy.svg b/img/status/busy.svg
similarity index 100%
rename from img/status/dot_busy.svg
rename to img/status/busy.svg
diff --git a/img/status/busy_notification.svg b/img/status/busy_notification.svg
new file mode 100644
index 000000000..e7cae2bec
--- /dev/null
+++ b/img/status/busy_notification.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   height="14"
+   width="14"
+   xml:space="preserve"
+   enable-background="new 0 0 10 10"
+   viewBox="0 0 14 14"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.1"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><g
+     style="stroke-width:0.36135802;stroke-miterlimit:4;stroke-dasharray:none;stroke:#c94f50"
+     id="layer1"
+     transform="matrix(3.0289233,0,0,3.0289233,0.18380903,-887.48895)"><path
+       style="fill:#000000;stroke-width:0.36135802;stroke-miterlimit:4;stroke-dasharray:none;stroke:#c94f50"
+       d=""
+       id="path4500" /><path
+       style="fill:#000000;stroke-width:0.36135802;stroke-miterlimit:4;stroke-dasharray:none;stroke:#c94f50"
+       d=""
+       id="path4498" /><path
+       id="path4528"
+       style="fill:none;stroke:#c94f50;stroke-width:0.36135802;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.10133195,293.90792 1.88406635,1.94794 H 2.5570778 L 4.3764717,293.9374 M 0.13990242,293.77165 H 4.375461 v 2.99779 H 0.13310726 l 9.0535e-4,-3.17789" /></g><path
+     d="m 10.053717,7.2034804 c 0,-1.7077371 -1.3111442,-3.0490702 -3.0188813,-3.0490702 -1.7077372,0 -3.0188815,1.3111442 -3.0188815,3.0188812 0,1.7077372 1.3111443,3.0188816 3.0188815,3.0188816 1.7077371,0 3.0615753,-1.3236491 3.0188813,-2.9886926 z M 4.9216188,6.5695153 c 0.5055481,0 4.2264342,0 4.2264342,0 0,0.3576655 0,0.7183127 0,1.2075524 -0.5600147,0 -3.5305832,0 -4.2264342,0 0,-0.3231018 -2.1e-6,-0.720037 0,-1.2075524 z"
+     id="path3"
+     style="fill:#c94f50;stroke-width:0.60377628" /><rect
+     y="7.1552882"
+     x="5.6552882"
+     height="0.13001703"
+     width="2.8144238"
+     id="rect821"
+     style="opacity:1;fill:#ff00ff;fill-opacity:1;stroke:#ffffff;stroke-width:1.4043262;stroke-miterlimit:4;stroke-dasharray:none" /></svg>
\ No newline at end of file
diff --git a/img/status/dot_away_notification.svg b/img/status/dot_away_notification.svg
deleted file mode 100644
index 640810a61..000000000
--- a/img/status/dot_away_notification.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#CDBE41" d="M8,4.5c1.9,0,3.5,1.6,3.5,3.5h-7C4.5,6.1,6.1,4.5,8,4.5 M8,3C5.2,3,3,5.2,3,8s2.2,5,5,5c2.8,0,5-2.2,5-5
-			S10.8,3,8,3z"/>
-	</g>
-</g>
-<g>
-	<path fill="#CDBE41" d="M8,1.5c3.6,0,6.5,2.9,6.5,6.5s-2.9,6.5-6.5,6.5S1.5,11.6,1.5,8S4.4,1.5,8,1.5 M8,0C3.6,0,0,3.6,0,8
-		s3.6,8,8,8s8-3.6,8-8S12.4,0,8,0z"/>
-</g>
-</svg>
diff --git a/img/status/dot_busy_notification.svg b/img/status/dot_busy_notification.svg
deleted file mode 100644
index c1e7d0a27..000000000
--- a/img/status/dot_busy_notification.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 16 16"
-   enable-background="new 0 0 16 16"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="dot_busy_notification.svg"><metadata
-     id="metadata13"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs11" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="721"
-     id="namedview9"
-     showgrid="false"
-     inkscape:zoom="29.5"
-     inkscape:cx="6.3555457"
-     inkscape:cy="7.1223848"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" /><g
-     id="g5"><path
-       fill="#C94F50"
-       d="M8,1.5c3.6,0,6.5,2.9,6.5,6.5s-2.9,6.5-6.5,6.5S1.5,11.6,1.5,8S4.4,1.5,8,1.5 M8,0C3.6,0,0,3.6,0,8   s3.6,8,8,8s8-3.6,8-8S12.4,0,8,0z"
-       id="path7" /></g><path
-     d="M 13,8.0499997 C 13,5.2215727 10.828427,3.0000002 7.9999997,3.0000002 5.1715726,3.0000002 3,5.1715727 3,7.9999997 3,10.828428 5.1715726,13 7.9999997,13 10.828427,13 13.070711,10.807717 13,8.0499997 Z m -8.5000003,-1.05 c 0.8373105,0 7.0000003,0 7.0000003,0 0,0.592382 0,1.1897 0,2 -0.92752,0 -5.8475021,0 -7.0000003,0 0,-0.535134 -3.5e-6,-1.192555 0,-2 z"
-     id="path3-0"
-     inkscape:connector-curvature="0"
-     style="fill:#c94f50"
-     sodipodi:nodetypes="cssscccccc" /></svg>
\ No newline at end of file
diff --git a/img/status/dot_offline_notification.svg b/img/status/dot_offline_notification.svg
deleted file mode 100644
index 24eb6cdd4..000000000
--- a/img/status/dot_offline_notification.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<path fill="#C94F50" d="M8,4.5c1.9,0,3.5,1.6,3.5,3.5S9.9,11.5,8,11.5c-1.9,0-3.5-1.6-3.5-3.5S6.1,4.5,8,4.5 M8,3C5.2,3,3,5.2,3,8
-		s2.2,5,5,5c2.8,0,5-2.2,5-5S10.8,3,8,3z"/>
-</g>
-<g>
-	<path fill="#C94F50" d="M8,1.5c3.6,0,6.5,2.9,6.5,6.5s-2.9,6.5-6.5,6.5S1.5,11.6,1.5,8S4.4,1.5,8,1.5 M8,0C3.6,0,0,3.6,0,8
-		s3.6,8,8,8s8-3.6,8-8S12.4,0,8,0z"/>
-</g>
-</svg>
diff --git a/img/status/dot_online_notification.svg b/img/status/dot_online_notification.svg
deleted file mode 100644
index 9d1549817..000000000
--- a/img/status/dot_online_notification.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<circle fill="#6FC062" cx="8" cy="8" r="5"/>
-<g>
-	<path fill="#6FC062" d="M8,1.5c3.6,0,6.5,2.9,6.5,6.5s-2.9,6.5-6.5,6.5S1.5,11.6,1.5,8S4.4,1.5,8,1.5 M8,0C3.6,0,0,3.6,0,8
-		s3.6,8,8,8s8-3.6,8-8S12.4,0,8,0z"/>
-</g>
-</svg>
diff --git a/img/status/dot_groupchat.svg b/img/status/groupchat.svg
similarity index 100%
rename from img/status/dot_groupchat.svg
rename to img/status/groupchat.svg
diff --git a/img/status/dot_groupchat_newmessages.svg b/img/status/groupchat_newmessages.svg
similarity index 100%
rename from img/status/dot_groupchat_newmessages.svg
rename to img/status/groupchat_newmessages.svg
diff --git a/img/status/dot_groupchat_notification.svg b/img/status/groupchat_notification.svg
similarity index 100%
rename from img/status/dot_groupchat_notification.svg
rename to img/status/groupchat_notification.svg
diff --git a/img/status/dot_invisible.svg b/img/status/invisible.svg
similarity index 100%
rename from img/status/dot_invisible.svg
rename to img/status/invisible.svg
diff --git a/img/status/dot_offline.svg b/img/status/offline.svg
similarity index 100%
rename from img/status/dot_offline.svg
rename to img/status/offline.svg
diff --git a/img/status/offline_notification.svg b/img/status/offline_notification.svg
new file mode 100644
index 000000000..53bb34986
--- /dev/null
+++ b/img/status/offline_notification.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   height="14"
+   width="14"
+   xml:space="preserve"
+   enable-background="new 0 0 10 10"
+   viewBox="0 0 14 14"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.1"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><g
+     style="stroke-width:0.36135802;stroke-miterlimit:4;stroke-dasharray:none;stroke:#c94f50"
+     id="layer1"
+     transform="matrix(3.0289233,0,0,3.0289233,0.18380903,-887.48895)"><path
+       style="fill:#000000;stroke-width:0.36135802;stroke-miterlimit:4;stroke-dasharray:none;stroke:#c94f50"
+       d=""
+       id="path4500" /><path
+       style="fill:#000000;stroke-width:0.36135802;stroke-miterlimit:4;stroke-dasharray:none;stroke:#c94f50"
+       d=""
+       id="path4498" /><path
+       id="path4528"
+       style="fill:none;stroke:#c94f50;stroke-width:0.36135802;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.10133195,293.90792 1.88406635,1.94794 H 2.5570778 L 4.3764717,293.9374 M 0.13990242,293.77165 H 4.375461 v 2.99779 H 0.13310726 l 9.0535e-4,-3.17789" /></g></svg>
\ No newline at end of file
diff --git a/img/status/dot_online.svg b/img/status/online.svg
similarity index 100%
rename from img/status/dot_online.svg
rename to img/status/online.svg
diff --git a/img/status/online_notification.svg b/img/status/online_notification.svg
new file mode 100644
index 000000000..d988dd155
--- /dev/null
+++ b/img/status/online_notification.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   height="14"
+   width="14"
+   xml:space="preserve"
+   enable-background="new 0 0 10 10"
+   viewBox="0 0 14 14"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.1"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><g
+     style="stroke-width:0.36135802;stroke-miterlimit:4;stroke-dasharray:none"
+     id="layer1"
+     transform="matrix(3.0289233,0,0,3.0289233,0.18380903,-887.48895)"><path
+       style="fill:#000000;stroke-width:0.36135802;stroke-miterlimit:4;stroke-dasharray:none"
+       d=""
+       id="path4500" /><path
+       style="fill:#000000;stroke-width:0.36135802;stroke-miterlimit:4;stroke-dasharray:none"
+       d=""
+       id="path4498" /><path
+       id="path4528"
+       style="fill:none;stroke:#6fc062;stroke-width:0.36135802;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.10133195,293.90792 1.88406635,1.94794 H 2.5570778 L 4.3764717,293.9374 M 0.13990242,293.77165 H 4.375461 v 2.99779 H 0.13310726 l 9.0535e-4,-3.17789" /></g></svg>
\ No newline at end of file
diff --git a/res.qrc b/res.qrc
index 1eb97b5de..bac33714b 100644
--- a/res.qrc
+++ b/res.qrc
@@ -21,17 +21,17 @@
         <file>img/settings/general.png</file>
         <file>img/settings/identity.png</file>
         <file>img/settings/privacy.png</file>
-        <file>img/status/dot_away.svg</file>
-        <file>img/status/dot_away_notification.svg</file>
-        <file>img/status/dot_busy.svg</file>
-        <file>img/status/dot_busy_notification.svg</file>
-        <file>img/status/dot_groupchat.svg</file>
-        <file>img/status/dot_groupchat_newmessages.svg</file>
-        <file>img/status/dot_groupchat_notification.svg</file>
-        <file>img/status/dot_offline.svg</file>
-        <file>img/status/dot_offline_notification.svg</file>
-        <file>img/status/dot_online.svg</file>
-        <file>img/status/dot_online_notification.svg</file>
+        <file>img/status/away.svg</file>
+        <file>img/status/away_notification.svg</file>
+        <file>img/status/busy.svg</file>
+        <file>img/status/busy_notification.svg</file>
+        <file>img/status/groupchat.svg</file>
+        <file>img/status/groupchat_newmessages.svg</file>
+        <file>img/status/groupchat_notification.svg</file>
+        <file>img/status/offline.svg</file>
+        <file>img/status/offline_notification.svg</file>
+        <file>img/status/online.svg</file>
+        <file>img/status/online_notification.svg</file>
         <file>img/taskbar/dark/taskbar_online.svg</file>
         <file>img/taskbar/dark/taskbar_away.svg</file>
         <file>img/taskbar/dark/taskbar_busy.svg</file>
diff --git a/src/widget/contentdialog.cpp b/src/widget/contentdialog.cpp
index 3299385a4..275d21164 100644
--- a/src/widget/contentdialog.cpp
+++ b/src/widget/contentdialog.cpp
@@ -493,10 +493,10 @@ void ContentDialog::updateTitleAndStatusIcon()
 
     Status currentStatus = activeChatroomWidget->getFriend()->getStatus();
 
-    QMap<Status, QIcon> icons{{Status::Online, QIcon(":/img/status/dot_online.svg")},
-                              {Status::Away, QIcon(":/img/status/dot_away.svg")},
-                              {Status::Busy, QIcon(":/img/status/dot_busy.svg")},
-                              {Status::Offline, QIcon(":/img/status/dot_offline.svg")}};
+    QMap<Status, QIcon> icons{{Status::Online, QIcon(":/img/status/online.svg")},
+                              {Status::Away, QIcon(":/img/status/away.svg")},
+                              {Status::Busy, QIcon(":/img/status/busy.svg")},
+                              {Status::Offline, QIcon(":/img/status/offline.svg")}};
 
     setWindowIcon(icons[currentStatus]);
 }
diff --git a/src/widget/friendwidget.cpp b/src/widget/friendwidget.cpp
index 5227904af..8c2675bf2 100644
--- a/src/widget/friendwidget.cpp
+++ b/src/widget/friendwidget.cpp
@@ -63,7 +63,7 @@ FriendWidget::FriendWidget(const Friend* f, bool compact)
     , isDefaultAvatar{true}
 {
     avatar->setPixmap(QPixmap(":/img/contact.svg"));
-    statusPic.setPixmap(QPixmap(":/img/status/dot_offline.svg"));
+    statusPic.setPixmap(QPixmap(":/img/status/offline.svg"));
     statusPic.setMargin(3);
     nameLabel->setText(f->getDisplayedName());
     nameLabel->setTextFormat(Qt::PlainText);
@@ -300,14 +300,14 @@ void FriendWidget::setAsInactiveChatroom()
 void FriendWidget::updateStatusLight()
 {
     static const QString statuses[] = {
-        ":img/status/dot_online.svg",
-        ":img/status/dot_online_notification.svg",
-        ":img/status/dot_away.svg",
-        ":img/status/dot_away_notification.svg",
-        ":img/status/dot_busy.svg",
-        ":img/status/dot_busy_notification.svg",
-        ":img/status/dot_offline.svg",
-        ":img/status/dot_offline_notification.svg",
+        ":img/status/online.svg",
+        ":img/status/online_notification.svg",
+        ":img/status/away.svg",
+        ":img/status/away_notification.svg",
+        ":img/status/busy.svg",
+        ":img/status/busy_notification.svg",
+        ":img/status/offline.svg",
+        ":img/status/offline_notification.svg",
     };
 
     const bool event = frnd->getEventFlag();
diff --git a/src/widget/groupwidget.cpp b/src/widget/groupwidget.cpp
index d48946f38..36dfc9488 100644
--- a/src/widget/groupwidget.cpp
+++ b/src/widget/groupwidget.cpp
@@ -45,7 +45,7 @@ GroupWidget::GroupWidget(int groupId, const QString& name, bool compact)
     , groupId{groupId}
 {
     avatar->setPixmap(Style::scaleSvgImage(":img/group.svg", avatar->width(), avatar->height()));
-    statusPic.setPixmap(QPixmap(":img/status/dot_online.svg"));
+    statusPic.setPixmap(QPixmap(":img/status/online.svg"));
     statusPic.setMargin(3);
     nameLabel->setText(name);
 
@@ -179,10 +179,10 @@ void GroupWidget::updateStatusLight()
     Group* g = GroupList::findGroup(groupId);
 
     if (!g->getEventFlag()) {
-        statusPic.setPixmap(QPixmap(":img/status/dot_online.svg"));
+        statusPic.setPixmap(QPixmap(":img/status/online.svg"));
         statusPic.setMargin(3);
     } else {
-        statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.svg"));
+        statusPic.setPixmap(QPixmap(":img/status/online_notification.svg"));
         statusPic.setMargin(0);
     }
 }
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index be0efe72b..19b3f3ab5 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -2188,13 +2188,13 @@ QString Widget::getStatusIconPath(Status status)
 {
     switch (status) {
     case Status::Online:
-        return ":/img/status/dot_online.svg";
+        return ":/img/status/online.svg";
     case Status::Away:
-        return ":/img/status/dot_away.svg";
+        return ":/img/status/away.svg";
     case Status::Busy:
-        return ":/img/status/dot_busy.svg";
+        return ":/img/status/busy.svg";
     case Status::Offline:
-        return ":/img/status/dot_offline.svg";
+        return ":/img/status/offline.svg";
     }
     qWarning() << "Status unknown";
     assert(false);