diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh
index ca8646be51e4c6d32d105b718f92ccbbc383dbf2..111610a858793543cc61a7b342566c5d34970410 100755
--- a/.ci/macos/notarize.sh
+++ b/.ci/macos/notarize.sh
@@ -19,12 +19,23 @@ security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain
   # mkdir -p nheko.app/Contents/Frameworks
   # find "${ICU_LIB}" -type l -name "*.dylib" -exec cp -a -n {} nheko.app/Contents/Frameworks/ \; || true
 
-  macdeployqt nheko.app -dmg -always-overwrite -qmldir=../resources/qml/ -sign-for-notarization="${APPLE_DEV_IDENTITY}"
+  #macdeployqt nheko.app -dmg -always-overwrite -qmldir=../resources/qml/ -sign-for-notarization="${APPLE_DEV_IDENTITY}"
+  macdeployqt nheko.app -always-overwrite -qmldir=../resources/qml/
 
-  user=$(id -nu)
-  chown "${user}" nheko.dmg
+  # user=$(id -nu)
+  # chown "${user}" nheko.dmg
 )
 
+echo "[INFO] Signing app contents"
+find "build/nheko.app/Contents"|while read fname; do
+    if [[ -f $fname ]]; then
+        echo "[INFO] Signing $fname"
+        codesign --force --timestamp --options=runtime --sign "${APPLE_DEV_IDENTITY}" "$fname"
+    fi
+done
+
+codesign --force --timestamp --options=runtime --sign "${APPLE_DEV_IDENTITY}" "build/nheko.app"
+
 NOTARIZE_SUBMIT_LOG=$(mktemp -t notarize-submit)
 NOTARIZE_STATUS_LOG=$(mktemp -t notarize-status)
 
@@ -59,7 +70,7 @@ while sleep 60 && date; do
   if [ -n "${isFailure}" ]; then
       echo "Notarization failed"
       cat "$NOTARIZE_STATUS_LOG" 1>&2
-      return 1
+      exit 1
   fi
   echo "Notarization not finished yet, sleep 1m then check again..."
 done
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f0ec910882abb489dfcdf291aabf9818a5623e0..af6421123ea6e2739eb794b9d500b4e9d82f8db3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,41 +4,34 @@ variables:
   # prevent configure tzdata hanging apt install commands
   DEBIAN_FRONTEND: noninteractive
 
-build-gcc7:
+build-gcc9:
   stage: build
-  image: ubuntu:16.04
+  image: ubuntu:20.04
   tags: [docker]
   variables:
-    CXX: g++-7
-    CC: gcc-7
     QT_PKG: 515
     TRAVIS_OS_NAME: linux
   before_script:
     - apt-get update
     - apt-get install -y software-properties-common
     - add-apt-repository ppa:ubuntu-toolchain-r/test -y
-    - add-apt-repository ppa:beineri/opt-qt-5.15.2-xenial -y
-    - apt-get update && apt-get -y install --no-install-recommends g++-7 build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libgl1-mesa-dev libssl-dev git ccache
+    - add-apt-repository ppa:beineri/opt-qt-5.15.2-focal -y
+    - apt-get update && apt-get -y install --no-install-recommends build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libgl1-mesa-dev libssl-dev git ccache pkg-config libsecret-1-dev cmake
     # need recommended deps for wget
     - apt-get -y install wget
-    - wget https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0-Linux-x86_64.sh && sh cmake-3.19.0-Linux-x86_64.sh  --skip-license  --prefix=/usr/local
     - /usr/sbin/update-ccache-symlinks
-    - update-alternatives --install /usr/bin/gcc gcc "/usr/bin/${CC}" 10
-    - update-alternatives --install /usr/bin/g++ g++ "/usr/bin/${CXX}" 10
-    - update-alternatives --set gcc "/usr/bin/${CC}"
-    - update-alternatives --set g++ "/usr/bin/${CXX}"
+    - wget https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0-Linux-x86_64.sh && sh cmake-3.19.0-Linux-x86_64.sh  --skip-license  --prefix=/usr/local
     - rm -rf ../.hunter &&  mv .hunter ../.hunter || true
   script:
-    - export PATH="/usr/lib/ccache:${PATH}"
+    - export PATH="/usr/local/bin/:/usr/lib/ccache:${PATH}"
     - export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l)
-    - export PATH="/usr/local/bin/:${PATH}"
     - . "/opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh" || true
     - cmake -GNinja -H. -Bbuild
         -DCMAKE_INSTALL_PREFIX=.deps/usr
         -DHUNTER_ROOT="../.hunter"
         -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=ON -DUSE_BUNDLED_LMDB=OFF
         -DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release
-        -DCI_BUILD=ON
+        -DCI_BUILD=ON -DFETCHCONTENT_QUIET=OFF
     - cmake --build build
   after_script:
     - mv ../.hunter .hunter
@@ -69,6 +62,7 @@ build-macos:
         -DUSE_BUNDLED_BOOST=ON
         -DCI_BUILD=ON
     - cmake --build build
+    - (cd build && git clone https://github.com/Nheko-Reborn/qt-jdenticon.git && cd qt-jdenticon && qmake && make -j 4 && cp libqtjdenticon.dylib ../nheko.app/Contents/MacOS)
   after_script:
     - mv ../.hunter .hunter
   artifacts:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f20d747e659b3a198416d274c1d0a6620a6e8c13..8b8dc8ad8160995c592d8cf13c4c8dbfa6701834 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,7 @@
 - Right click -> copy address location.
 - Forward messages. (Jedi18)
 - Alt-F to forward messages.
+- A new video and audio player, that should look a bit nicer.
 
 ### Improvements
 
@@ -173,10 +174,13 @@
 - Fix rooms not showing, when groups endpoint is missing.
 - Don't use deprecated parameters in /login.
 - Fix encoding issues when translating matrix.to to matrix: URIs.
+- Prevent edits from stripping the whole message, if it had a quote.
 
 ### Packaging changes
 
 - Removed the AppImage
+- Removed dependency on boost
+- Now depends on [coeurl](https://nheko.im/nheko-reborn/coeurl), which depends on libevent and libcurl.
 
 ## [0.8.2] -- 2021-04-23
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c43721f7df2e5bb2b5d43fa358677d073a6b825..6424f38fd8ab8de89b7dd269373773a7fbf51177 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,23 @@ HunterGate(
 	LOCAL
 	)
 
+macro(hunter_add_package_safe)
+	set(pkg_temp_backup_libdir "$ENV{PKG_CONFIG_LIBDIR}")
+	set(pkg_temp_backup_path "$ENV{PKG_CONFIG_PATH}")
+	hunter_add_package(${ARGV})
+	if("${pkg_temp_backup_path}" STREQUAL "")
+		unset(ENV{PKG_CONFIG_PATH})
+	else()
+		set(ENV{PKG_CONFIG_PATH} "${pkg_temp_backup_path}")
+	endif()
+	if("${pkg_temp_backup_libdir}" STREQUAL "")
+		unset(ENV{PKG_CONFIG_LIBDIR})
+	else()
+		set(ENV{PKG_CONFIG_LIBDIR} "${pkg_temp_backup_libdir}")
+	endif()
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+endmacro()
+
 option(USE_BUNDLED_SPDLOG "Use the bundled version of spdlog." ${HUNTER_ENABLED})
 option(USE_BUNDLED_OLM "Use the bundled version of libolm." ${HUNTER_ENABLED})
 option(USE_BUNDLED_GTEST "Use the bundled version of Google Test." ${HUNTER_ENABLED})
@@ -120,10 +137,16 @@ endif()
 #
 ## Need to repeat all libevent deps?!?
 if (USE_BUNDLED_LIBEVENT)
-	hunter_add_package(Libevent)
+	hunter_add_package_safe(Libevent)
 	find_package(Libevent CONFIG REQUIRED)
 else()
 	find_package(PkgConfig REQUIRED) 
+if (HUNTER_ENABLED)
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+	set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_LIBDIR}")
+	set(ENV{PKG_CONFIG_LIBDIR} "${pkg_temp_backup}")
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+endif()
 	pkg_check_modules(libevent_core REQUIRED IMPORTED_TARGET libevent_core)
 	if (WIN32)
 		pkg_check_modules(libevent_windows REQUIRED IMPORTED_TARGET libevent_windows)
@@ -135,16 +158,22 @@ endif()
 
 # curl
 if (USE_BUNDLED_LIBCURL)
-	hunter_add_package(CURL)
+	hunter_add_package_safe(CURL)
 	find_package(CURL CONFIG REQUIRED)
 else()
 	find_package(PkgConfig REQUIRED) 
+if (HUNTER_ENABLED)
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+	set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_LIBDIR}")
+	set(ENV{PKG_CONFIG_LIBDIR} "${pkg_temp_backup}")
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+endif()
 	pkg_check_modules(libcurl REQUIRED IMPORTED_TARGET libcurl)
 endif()
 
 # spdlog
 if(USE_BUNDLED_SPDLOG)
-	hunter_add_package(spdlog)
+	hunter_add_package_safe(spdlog)
 endif()
 find_package(spdlog 1.0.0 CONFIG REQUIRED)
 
@@ -153,7 +182,7 @@ find_package(spdlog 1.0.0 CONFIG REQUIRED)
 #
 #include(LMDB)
 if(USE_BUNDLED_LMDB)
-	hunter_add_package(lmdb)
+	hunter_add_package_safe(lmdb)
 	find_package(liblmdb CONFIG REQUIRED)
 
 	target_include_directories(liblmdb::lmdb INTERFACE
@@ -170,11 +199,17 @@ find_package(Qt5QuickCompiler)
 find_package(Qt5DBus)
 
 if (USE_BUNDLED_QTKEYCHAIN)
+if (HUNTER_ENABLED)
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+	set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_LIBDIR}")
+	set(ENV{PKG_CONFIG_LIBDIR} "${pkg_temp_backup}")
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+endif()
 	include(FetchContent)
 	FetchContent_Declare(
 		qt5keychain
 		GIT_REPOSITORY https://github.com/frankosterfeld/qtkeychain.git
-		GIT_TAG        v0.12.0
+		GIT_TAG        v0.13.1
 		)
 	if (BUILD_SHARED_LIBS)
 		set(QTKEYCHAIN_STATIC OFF CACHE INTERNAL "")
@@ -380,7 +415,7 @@ include(FeatureSummary)
 
 
 if(USE_BUNDLED_OPENSSL)
-	hunter_add_package(OpenSSL)
+	hunter_add_package_safe(OpenSSL)
 endif()
 find_package(OpenSSL 1.1.0 REQUIRED)
 if(USE_BUNDLED_MTXCLIENT)
@@ -388,7 +423,7 @@ if(USE_BUNDLED_MTXCLIENT)
 	FetchContent_Declare(
 		MatrixClient
 		GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
-		GIT_TAG        bacb7e524ff0f38591b88b248d8d8409b7fd49a0
+		GIT_TAG        v0.6.0
 		)
 	set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
 	set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
@@ -401,7 +436,7 @@ if(USE_BUNDLED_OLM)
 	FetchContent_Declare(
 		Olm
 		GIT_REPOSITORY https://gitlab.matrix.org/matrix-org/olm.git
-		GIT_TAG        3.2.4
+		GIT_TAG        3.2.6
 		)
 	set(OLM_TESTS OFF CACHE INTERNAL "")
 	FetchContent_MakeAvailable(Olm)
@@ -414,7 +449,7 @@ else()
 		)
 endif()
 if(USE_BUNDLED_SPDLOG)
-	hunter_add_package(spdlog)
+	hunter_add_package_safe(spdlog)
 endif()
 find_package(spdlog 1.0.0 CONFIG REQUIRED)
 
@@ -423,21 +458,21 @@ if(USE_BUNDLED_CMARK)
 	FetchContent_Declare(
 		cmark
 		GIT_REPOSITORY https://github.com/commonmark/cmark.git
-		GIT_TAG        242e277a661ec7e51f34dcaf86c1925d550b1498 #0.29.0 << doesn't work with fetch content yet
+		GIT_TAG        0.30.2
 		CMAKE_ARGS     "CMARK_STATIC=ON CMARK_SHARED=OFF CMARK_TESTS=OFF CMARK_TESTS=OFF"
 		)
 	FetchContent_MakeAvailable(cmark)
 	if (MSVC)
-		add_library(cmark::cmark ALIAS libcmark)
+		add_library(cmark::cmark ALIAS cmark)
 	else()
-		add_library(cmark::cmark ALIAS libcmark_static)
+		add_library(cmark::cmark ALIAS cmark_static)
 	endif()
 else()
 	find_package(cmark REQUIRED 0.29.0)
 endif()
 
 if(USE_BUNDLED_JSON)
-	hunter_add_package(nlohmann_json)
+	hunter_add_package_safe(nlohmann_json)
 endif()
 find_package(nlohmann_json 3.2.0)
 set_package_properties(nlohmann_json PROPERTIES
@@ -452,10 +487,10 @@ if(USE_BUNDLED_LMDBXX)
 		lmdbxx
 		URL "https://raw.githubusercontent.com/hoytech/lmdbxx/1.0.0/lmdb++.h"
 		DOWNLOAD_NO_EXTRACT TRUE
+		CONFIGURE_COMMAND ""
+		BUILD_COMMAND ""
 		)
-	if(NOT lmdbxx_POPULATED)
-		FetchContent_Populate(lmdbxx)
-	endif()
+	FetchContent_Populate(lmdbxx)
 	add_library(lmdbxx INTERFACE)
 	target_include_directories(lmdbxx INTERFACE ${lmdbxx_SOURCE_DIR})
 	add_library(lmdbxx::lmdbxx ALIAS lmdbxx)
@@ -474,8 +509,15 @@ else()
 	add_library(lmdbxx::lmdbxx ALIAS lmdbxx)
 endif()
 
+if (HUNTER_ENABLED)
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+	set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_LIBDIR}")
+	set(ENV{PKG_CONFIG_LIBDIR} "${pkg_temp_backup}")
+	unset(ENV{PKG_CONFIG_LIBDIR})
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+endif()
 include(FindPkgConfig)
-pkg_check_modules(GSTREAMER IMPORTED_TARGET gstreamer-sdp-1.0>=1.18 gstreamer-webrtc-1.0>=1.18)
+pkg_check_modules(GSTREAMER NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH IMPORTED_TARGET gstreamer-sdp-1.0>=1.18 gstreamer-webrtc-1.0>=1.18)
 if (TARGET PkgConfig::GSTREAMER)
 	add_feature_info(voip ON "GStreamer found. Call support is enabled automatically.")
 	pkg_check_modules(XCB IMPORTED_TARGET xcb xcb-ewmh)
@@ -691,7 +733,7 @@ if(USE_BUNDLED_COEURL)
 	FetchContent_Declare(
 		coeurl
 		GIT_REPOSITORY https://nheko.im/Nheko-Reborn/coeurl.git
-		GIT_TAG        3901507db25cf3f9364b58cd8c7880640900c992
+		GIT_TAG        v0.1.0
 		)
 	FetchContent_MakeAvailable(coeurl)
 	target_link_libraries(nheko PUBLIC coeurl::coeurl)
@@ -700,6 +742,12 @@ elseif(coeurl_DIR)
 	target_link_libraries(nheko PUBLIC coeurl::coeurl)
 else()
 	find_package(PkgConfig REQUIRED)
+if (HUNTER_ENABLED)
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+	set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_LIBDIR}")
+	set(ENV{PKG_CONFIG_LIBDIR} "${pkg_temp_backup}")
+	message("pkg_conf_path: '$ENV{PKG_CONFIG_PATH}', pkg_conf_libdir: '$ENV{PKG_CONFIG_LIBDIR}'")
+endif()
 	pkg_check_modules(coeurl REQUIRED IMPORTED_TARGET coeurl)
 	target_link_libraries(nheko PUBLIC PkgConfig::coeurl)
 endif()
@@ -720,7 +768,7 @@ if(NOT MSVC AND NOT HAIKU)
 	endif()
 endif()
 
-set_target_properties(nheko PROPERTIES SKIP_BUILD_RPATH TRUE)
+set_target_properties(nheko PROPERTIES CMAKE_SKIP_INSTALL_RPATH TRUE)
 
 if(UNIX AND NOT APPLE)
 	install (TARGETS nheko RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/README.md b/README.md
index b5ed4966bc3a936aeee6372d462329f0c83f70e7..26167c16babadc412b7e4e4018fe6cc1ea3b7943 100644
--- a/README.md
+++ b/README.md
@@ -369,7 +369,8 @@ Here are some screen shots to get a feel for the UI, but things will probably ch
 
 ### Third party
 
-[Single Application for Qt](https://github.com/itay-grudev/SingleApplication)
+- [Single Application for Qt](https://github.com/itay-grudev/SingleApplication)
+- [Fluent Icons](https://github.com/microsoft/fluentui-system-icons)
 
 [Matrix]:https://matrix.org
 [Element]:https://element.io
diff --git a/appveyor.yml b/appveyor.yml
index d54fffba6f2a4f83c92ea24b88754684bdb63caa..51bf949d8300d4b9cae9e347bd59f1c7e0343fa8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -54,12 +54,19 @@ build_script:
 
     - cmake --build build --config Release
 
+    - git clone https://github.com/Nheko-Reborn/qt-jdenticon.git
+    - cd qt-jdenticon
+    - qmake
+    - nmake
+    - cd ..
+
 after_build:
     # Variables
     - set BUILD=%APPVEYOR_BUILD_FOLDER%
     - echo %BUILD%
     - mkdir NhekoRelease
     - copy build\Release\nheko.exe NhekoRelease\nheko.exe
+    - copy qt-jdenticon\release\qtjdenticon0.dll NhekoRelease\qtjdenticon0.dll
     - copy build\_deps\cmark-build\src\Release\cmark.dll NhekoRelease\cmark.dll
     - windeployqt --qmldir resources\qml\ NhekoRelease\nheko.exe
 
diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml
index af010422d66e8ac535e28449f8a9303cfaffebfe..a252da7adf0a039313e7478f9a2e8abf7b0e1e75 100644
--- a/io.github.NhekoReborn.Nheko.yaml
+++ b/io.github.NhekoReborn.Nheko.yaml
@@ -59,9 +59,9 @@ modules:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMARK_TESTS=OFF
     sources:
-      - sha256: 2558ace3cbeff85610de3bda32858f722b359acdadf0c4691851865bb84924a6
+      - sha256: 6c7d2bcaea1433d977d8fed0b55b71c9d045a7cdf616e3cd2dce9007da753db3
         type: archive
-        url: https://github.com/commonmark/cmark/archive/0.29.0.tar.gz
+        url: https://github.com/commonmark/cmark/archive/0.30.2.tar.gz
   - name: spdlog
     buildsystem: cmake-ninja
     config-opts:
@@ -78,11 +78,23 @@ modules:
     buildsystem: cmake-ninja
     name: olm
     sources:
-      - commit: 64afab93645957846d936a19b8501dbd3f2cc4a1
+      - commit: 8656f1463c4e16366335fb468453a9455a366c78
         disable-shallow-clone: true
-        tag: 3.2.4
+        tag: 3.2.6
         type: git
         url: https://gitlab.matrix.org/matrix-org/olm.git
+  - buildsystem: meson
+    name: libsecret
+    config-opts:
+      - -Dmanpage=false
+      - -Dvapi=false
+      - -Dgtk_doc=false
+      - -Dintrospection=false
+    sources:
+      - commit: 3fe635e64efd4b8dbc9ec3548b0bc8034c7665c4
+        tag: 0.20.4
+        type: git
+        url: https://gitlab.gnome.org/GNOME/libsecret.git
   - config-opts:
       - -DCMAKE_BUILD_TYPE=Release
       - -DBUILD_TEST_APPLICATION=OFF
@@ -90,8 +102,8 @@ modules:
     buildsystem: cmake-ninja
     name: QtKeychain
     sources:
-      - commit: 815fe610353ff8ad7e2f1121c368a74df8db5eb7
-        tag: v0.12.0
+      - commit: f59ac26be709fd2d8d7a062fab1cf1e67a93806c
+        tag: v0.13.1
         type: git
         url: https://github.com/frankosterfeld/qtkeychain.git
   - config-opts:
@@ -99,14 +111,14 @@ modules:
     buildsystem: cmake
     name: nlohmann
     sources:
-      - sha256: d51a3a8d3efbb1139d7608e28782ea9efea7e7933157e8ff8184901efd8ee760
+      - sha256: 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3
         type: archive
-        url: https://github.com/nlohmann/json/archive/v3.7.0.tar.gz
+        url: https://github.com/nlohmann/json/archive/v3.10.4.tar.gz
   - buildsystem: meson
     name: gstreamer
     sources:
-      - commit: a42fe476d3ee5576921f67a331464065ec33b9a4
-        tag: 1.18.3
+      - commit: 71c213f99ad5c8fc8f36a26238483f2bdf7d846a
+        tag: 1.18.5
         type: git
         url: https://gitlab.freedesktop.org/gstreamer/gstreamer.git
   - config-opts:
@@ -115,8 +127,8 @@ modules:
     buildsystem: meson
     name: gstreamer-plugins-base
     sources:
-      - commit: 2cc319ee13f6b72df3d432b7c75aca81feb260e5
-        tag: 1.18.3
+      - commit: 57fb883b3f8c6d7a397afc0dfc4a7c2e5af05579
+        tag: 1.18.5
         type: git
         url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base.git
   - config-opts:
@@ -128,8 +140,8 @@ modules:
     buildsystem: meson
     name: gstreamer-plugins-good
     sources:
-      - commit: e816c6cd73c9e0676828c9e227a049ebad3d019f
-        tag: 1.18.3
+      - commit: 56dec037a80266add6853e4b06e2dc379de757d1
+        tag: 1.18.5
         type: git
         url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-good.git
   - config-opts:
@@ -143,16 +155,28 @@ modules:
     buildsystem: meson
     name: gstreamer-plugins-bad
     sources:
-      - commit: 382e373d9be363f1e21b12990a4d12f1ecb6df41
-        tag: 1.18.3
+      - commit: d3af58d5b31941caa26c3ded85d7a7b84a91f0cc
+        tag: 1.18.5
         type: git
         url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git
+  - buildsystem: qmake
+    name: qt-jdenticon
+    no-make-install: true
+    build-commands:
+      - mkdir -p /app/bin/
+      - cp libqtjdenticon.so /app/bin/
+    sources:
+      - commit: e58c14369dfbf008c63f43a4556b2e52232e0265
+        tag: v0.1.0
+        type: git
+        url: https://github.com/Nheko-Reborn/qt-jdenticon.git
   - buildsystem: meson
     config-opts:
       - -Ddefault_library=static
     name: coeurl
     sources:
-      - commit: 3901507db25cf3f9364b58cd8c7880640900c992
+      - commit: a08f619adaa1ccd34eb6315d6578eddae0d1cc9b
+        tag: v0.1.0
         type: git
         url: https://nheko.im/nheko-reborn/coeurl.git
   - config-opts:
@@ -163,7 +187,8 @@ modules:
     buildsystem: cmake-ninja
     name: mtxclient
     sources:
-      - commit: bacb7e524ff0f38591b88b248d8d8409b7fd49a0
+      - commit: eecc4e93f2137c658014f17cefd62ad569063769
+        tag: v0.6.0
         type: git
         url: https://github.com/Nheko-Reborn/mtxclient.git
   - config-opts:
diff --git a/resources/icons/emoji-categories/activity.png b/resources/icons/emoji-categories/activity.png
deleted file mode 100644
index 2d360762371055915dc0970ede31c7f152cee525..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/activity.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR���������àw=ø���bKGD�ÿ�ÿ�ÿ ½§“��IDATH‰µ–¿OTAÇ?÷ ´=áDŽFíkNÁ¿@j±jñO $jc)…‹”üL´AL.€JÚ=b¿“7·÷îÝÃ$/»óÝ™ùÎnfg_|æ€*p(	ÿìï
à{82¬V¯	¼Q}Éà—s^´"¬&›pÌö
-þÄ9|&¢u#ð2![Kh!/óf”Q±‚!ÙA3k'%Òcy
-li¾ÜÁsa[À¢KnؽÒÂ[é3ҁÁ‚AÙ´ä°.ý…ªåV�ve8•C0-ý«| TÓ‰b–B�u`ߪk^¥»ØÚ†#Þ#܏`.q[«EÎ5ÞÊ!¸©q;Â×4Î�|ûÕÈh\ø¾Ãâ#:^Ž|¯	ß)ªçBN–ÿ#¿“s
-lò/!”ÀuB%ØwEøÃLL·&7ùÞ~˜�
)·#öI;9ÚZ%Â-V#6¥<ŒŒ¦5~Ê!°µ»n±6.‘}Ѭºî8ǸŠ¦¤ï’aY±þ¾¼”á;éUé?	¦oñ¥[õ[!툋ÀÍŸE[ÏjvˤÍnIó#àbdÇ,gk×E:Ûõý8¸É‚#øÌÙœÇÝ‚ûøŒjÀ<Oæ<íOæp¯Wp“"°B¨„~ý×dœ9´ßÎ,)‘þ¶”iÿmiê¼.=SNó'Ä_Šoûõ����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/activity.svg b/resources/icons/emoji-categories/activity.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0025111c750f1b5bea07805112accab6ddb13d94
--- /dev/null
+++ b/resources/icons/emoji-categories/activity.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.08706 7.18785C6.02201 7.35088 5.96237 7.51555 5.90814 7.68161C6.37118 7.75292 6.87059 7.84964 7.39119 7.9808C7.63693 7.29058 7.99847 6.63236 8.47583 6.0363L12.6895 10.25L12.4375 10.5019C12.6247 10.6634 12.8083 10.8335 12.9875 11.0127C13.1667 11.1918 13.3368 11.3754 13.4982 11.5626L13.7501 11.3106L17.9635 15.5239C17.3675 16.0012 16.7094 16.3627 16.0193 16.6085C16.1504 17.1291 16.2472 17.6285 16.3185 18.0915C16.6436 17.9853 16.9635 17.8584 17.276 17.7107C18.1109 17.3162 18.8933 16.7737 19.5838 16.0833C19.7145 15.9526 19.8399 15.8186 19.96 15.6816C20.522 15.0395 20.9861 14.3094 21.3289 13.5148C21.7434 12.5518 21.966 11.5259 21.9965 10.4954C21.9989 10.4139 22.0001 10.3321 22.0001 10.25C22.0001 10.1458 21.9981 10.042 21.9943 9.93868C21.9725 9.35607 21.8892 8.77533 21.7446 8.207C21.0019 5.29266 18.7081 2.99781 15.7937 2.25509C15.398 2.15433 14.9959 2.0836 14.5916 2.0424C14.3149 2.01436 14.0342 2 13.7501 2C13.4726 2 13.1982 2.0137 12.9277 2.04047C12.2733 2.10565 11.6252 2.24882 10.9985 2.47C8.76014 3.26166 6.96533 4.99194 6.08706 7.18785ZM20.0475 7.81481C19.1674 8.50945 17.9608 8.58967 17.0053 8.05547L19.0245 6.0363C19.4634 6.58439 19.8044 7.18505 20.0475 7.81481ZM15.9181 9.14268C17.2639 10.0817 19.0318 10.1519 20.4407 9.35317C20.6778 11.1325 20.2056 12.9883 19.0242 14.4633L14.8108 10.25L15.9181 9.14268ZM14.8574 8.08201L13.7501 9.1893L9.53645 4.9756C11.0116 3.79404 12.8676 3.32188 14.6471 3.55914C13.8483 4.96806 13.9184 6.73612 14.8574 8.08201ZM15.9446 6.9948C15.4104 6.03922 15.4907 4.83257 16.1855 3.95245C16.8152 4.19559 17.4158 4.53664 17.9638 4.9756L15.9446 6.9948ZM6.96973 13.4697C7.26262 13.1768 7.7375 13.1768 8.03039 13.4697L10.5304 15.9697C10.8233 16.2626 10.8233 16.7374 10.5304 17.0303C10.2375 17.3232 9.76262 17.3232 9.46973 17.0303L6.96973 14.5303C6.67684 14.2374 6.67684 13.7626 6.96973 13.4697ZM2.02815 11.0186C1.9188 9.57689 3.07688 8.4188 4.5186 8.52815C6.49666 8.67819 9.85794 9.29728 12.2804 11.7197C14.7028 14.1422 15.3219 17.5035 15.472 19.4815C15.5813 20.9232 14.4232 22.0813 12.9815 21.972C11.0035 21.8219 7.64217 21.2028 5.21972 18.7804C2.79728 16.3579 2.17819 12.9967 2.02815 11.0186ZM4.40515 10.0239C3.87938 9.98398 3.48398 10.3794 3.52386 10.9051C3.66515 12.7678 4.24225 15.6816 6.28038 17.7197C8.31852 19.7579 11.2323 20.335 13.095 20.4763C13.6207 20.5161 14.0161 20.1207 13.9763 19.595C13.835 17.7323 13.2579 14.8185 11.2197 12.7804C9.18159 10.7423 6.26785 10.1651 4.40515 10.0239Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/emoji-categories/activity@2x.png b/resources/icons/emoji-categories/activity@2x.png
deleted file mode 100644
index d8f8871158c09a0933db139e1e2b712a745e568b..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/activity@2x.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR���0���0���Wù‡���bKGD�ÿ�ÿ�ÿ ½§“��™IDAThÕšßoEÇ?w)—#ÆZl•@ñAÁ„˜â›ñG Ð?ÀÆ€˜�ò�’ˆò'¨ø$jâÄGxZ >ø¢iTEK["$÷^}˜]Ù~wfvzwKÊ7™‡Ùó=gΙÝ;3çÌ­PO�«`	PîˆåSÀ`ø8.–4~K¨Û€!àßÛ °5¶uËÐ	®p\Ûð°x6Ÿ¼L–踶kÀÛÀ‚²ï¾óÜN{Í@¯…ÓËö§c—½aà²œïÇ=ë`fÌöê•«èŒuÿtØž�6uþ% n1þ7°¨ztóHPm[têÀ@ç]¯xS€~h�	6yÆ›qýØg>i'J‰T0¿!×xu`}¨óÝd¿ùë@Cž=Wb�:ûxLýM,Ës¾Jvµiχåù`‰œî§ñ˜ºRÆ,çNì´¼;–-'û-!€Ç„×�VIJ7-v^wZŒÙÓäÏ„óµÈ?*!€CÂû2%«�_ˆ|è°:h!v
-çiá\à.²ßú“Âé";±ÔPìÙf‡eÀyÀ¯ÂÛX €ÍÂ"o—ð¦àV!ŒâÞ¤ö×õ… ŸÏ>¯û”ænIôH¼Óaàqá^Ƽ™™0ÎZϸo÷D"è`úrÕÀ¬mÃ$'y«Q^�kD>†}"t‰ŸM =ú˜¾«¿{Ձ£òìßÕ9‚™<F™¾÷T€uf&ÔP¾—þª�ÅÃÒÿ!@ç¨ô×D˜6¡�C?II€Žâþ›6¨o=°Tž
0ô£ôïÐQÜ+ý�~‘þÒ
-æywÌŒU€ø“¹Œ¶]ï¶B„Ù–oWLF˜ü6˜5Ö×zEç¼…£Pùy‘÷Œ»RtÆ#àœ<ÌÍz€‡¤ÿ[€Žb4Ǧ
ÝÒ?gä¡/Iq
6 £¸ ýtt÷>a
-­iôZ.ýá�…ê¨Mú¤LeYIšÈ¤ÑüÅ9Ì%ÂA1¶ËcHÓ——}œÞ-Ücp3û9$äWponOIÿ[ü§H±®Ïv‚*ð²<û$Ý©‘Í;mIÍl§”°§”Û„—I)ÁÔç•Ô%œg„ópg�’Mêõ-´“ýÔÞ³³•U>Î7"ÿÐáXh��ï«”¬‚)í¤å˜…ÇŠ–}…-_&Àjá5¹¹ã¾e±³Ýc‹ù˜ò´•O8lÌ4�È/--ž"§´æfdBmÅÝþØ(\[q÷*Ùäˉ
øËëC”_^×oºÕgCO0à1x+/8šÀ‹3ôý`ã˜*±ï614€±-×SËÎ'XOö7‘´‹À;d÷‹�º€=±
›í«´ðÙ¸°Œìê¤mx³bÙ®YWŲýø¯l“Õ&øŠ6ÌE·ëm”Ñ’‹îY-2t�ï“ݵ‹´)LÍß¹ÃÎj˜÷qü·î®Öĉ_¥@]*o-E;°“¤ô`ʆ÷0ýï6—1§Íôßm.ø?–òŽ‰`fØ����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/flags.png b/resources/icons/emoji-categories/flags.png
deleted file mode 100644
index 9a52000fd1562d9acaad273c80ff6da9181ffe3a..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/flags.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR���������àw=ø���bKGD�ÿ�ÿ�ÿ ½§“��UIDATH‰µ–½JÄ@…¿]lÅ?°<Â>€`|ÅÂ.•µ>ˆ`!ZX¬µö®X[
-
-éE[Ö"'šÄ™ÉÌÆ\’;çÞ97÷03Hw`Š¬€	`Es)0
-QÁ•Þ×ô‡\ëytcOq«>U<ÀÙ'€W`³žâR‚¯ËÏuè9rºÀ5ºäÚtˆ_Àûɳä:Ôõ7;ÅC—U5Çø:8u9¸!?T‡Èà—ªkªClðK¶ €¡ü„°ÝWÞnÅ/ÙP$‹üêà;¼t8¸eÀŠšt€àMsÏ…œ?:mSÀ‘ /l¸,T~ÌWbÏ…%ÕEfOàÞ@Ö2«w—*óÑFn›ÀP3íÒê~øw›&;ºÛ"�¸%kÓrÓ…lYÞ&¯Ûª	Ak:L’ýÊx]‡.ûÇ£±Ÿ
Äx����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/flags.svg b/resources/icons/emoji-categories/flags.svg
new file mode 100644
index 0000000000000000000000000000000000000000..78ad8978cc7149bc72da92d846daa38446ee15f5
--- /dev/null
+++ b/resources/icons/emoji-categories/flags.svg
@@ -0,0 +1,3 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.5 16.5V4.5H21.8915L18.3653 10.1004C18.2116 10.3446 18.2116 10.6554 18.3653 10.8996L21.8915 16.5H5.5ZM5.5 18H23.25C23.8402 18 24.1991 17.3498 23.8847 16.8504L19.8863 10.5L23.8847 4.14961C24.1991 3.65017 23.8402 3 23.25 3H4.75C4.33579 3 4 3.33579 4 3.75V24.25C4 24.6642 4.33579 25 4.75 25C5.16421 25 5.5 24.6642 5.5 24.25V18Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/emoji-categories/flags@2x.png b/resources/icons/emoji-categories/flags@2x.png
deleted file mode 100644
index 45350593bd9a1e8ba65706e64aa0a5a67fb4d08a..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/flags@2x.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR���0���0���Wù‡���bKGD�ÿ�ÿ�ÿ ½§“��íIDAThÕš¿kQÇ?9OQAA,d{AA‰¿²EÑBÄ6ÿ…B,EAÁÂ"}þáVDE	‰`!#h¢h±·fÞÜîÝ쏗ÝûÂãnvÞ¼™Ù7ߝ}Ü,�»ãÐfˆÐ"!ï�ÕJ1´€Žº6©d¹C>Fà;¨ŒÂ2Æ-àðI\;lò³2˜¨b‘ǸÛ:.t~Kh¡Là­îg¿2úÜZ?RpŒ+b­€<°$�½<‹:~¯ªZ/Ià+ðA\?Œ
-Yó lÝV½�pkó¤ÐJ·l-á+¤B$¸¢½®ôº„%|Ëä#{¶PK|ït'&ØhBª?™À"0/äqÜ2ñ̓A0ù{Hv™øåA%ýâ’2º¡ô¾yäÐn	A\çkB®³˜ú…Nà0'ä£À6!ot?(äï>º�¿<Ðu>HŸŠ‹Êè¦Ò7Šº„ Þ¶U!ë�#%k}”æAZ߁÷B>B|ÔL0<¸‹»mg….`xp^ÝVz̓ªG |õåAZ	<ÇåAçä¾<ÈJ`	x'äÃÀN!oô99“Y	€{JÛrT(,;B%kZŸŠs¸uwÇèÜÒ'�¯I¯ÿEಚoz/ÒØüo	Ì(GÓB×®?¹Ò‚Ÿöd¬ÛQs§,Á¼«À.ƒÍ”r””bÞ»®1­lf,	ÜRF6²Y®Qì®K„ÊÎÔÎ(£{#ü÷‰ÿ<è÷xAüN ûA"ã¼²%ðx#äƒÀnþûD‚‰A	€ÛF€S›¨P8ùZ&MâÖݏyÁn™ë?½™Md
Ø[o8ë°p�zy _¶jƒ5HÉaµaøÇà'ëe4ßz3ñ÷i´¯ÞpbXKzÅiÊ$`}­hÚÄEHJèc½áÃ\ì¯7œ|%
äAÙ†’Kä<ùÄ?3$£›6u����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/foods.png b/resources/icons/emoji-categories/foods.png
deleted file mode 100644
index 15c310698688e02d45aff9fa5f355128b156c1af..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/foods.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR���������àw=ø���bKGD�ÿ�ÿ�ÿ ½§“��ÎIDATH‰­ÕMˆMaÀñŸ;Ó”ÁbfÅ’˜	S²ñ‘¥enÊRi’…5’L6Ʊµd¡…b%Š’(›Á$ѤL¾j®é‹÷9îí2ÇÎSoç<ïÿ9ÏûqŠe7žb
-ÿ[ZŽ!ë;Ûüë0†—øŽGeà[ØÀ„þp³Éï–I°'&=G?ºñ1lWâù0þR²D*=ÃÂ¥¶¯m`GY(,ÅI¼Hû4ÛÞoá"Þ…>#U;ŠesÁëøì÷-;¦±«¾]kÓ®a3¢8ÛQAgÂ×±[0®µ?Ûrx¯´ÎŽ,ß0&bčëm$þu V0q¾RÃÃ`ŽÐ*koð\öó*L†²²ÂÁœ ]ó‹*L°8˜ßjÒy‡ž
-䬙^…²ºÂ9ëu
wB©W˜ ?Æ·aHZ¯Oè«�Þ¬ksãÍ0œª Áé`·‡¤ë=‹MÿߌÖt:Fæ)¬úør¼Æá?tãF¼‘É|e0æd¸® õâ~~‰/Y!uµýRuSñÞ¾#øsî£Pzp^¹ÐÄ9%/ë\–þUÓx,ï:ž„mRj¥ëç‚ü{¤\¾ä����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/foods.svg b/resources/icons/emoji-categories/foods.svg
new file mode 100644
index 0000000000000000000000000000000000000000..713ec0ab01b55c526d4e006d5aad7216f1050687
--- /dev/null
+++ b/resources/icons/emoji-categories/foods.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.39837 11.2354C8.80455 11.1542 9.06797 10.7591 8.98674 10.3529C8.90552 9.94676 8.5104 9.68334 8.10423 9.76457C7.20083 9.94523 6.51873 10.5762 6.15571 11.4233C5.79648 12.2616 5.74317 13.3095 6.02353 14.4318C6.12392 14.8336 6.53108 15.078 6.93294 14.9776C7.33481 14.8773 7.5792 14.4701 7.47881 14.0682C7.25953 13.1905 7.33123 12.4884 7.53445 12.0142C7.73386 11.5488 8.05164 11.3048 8.39837 11.2354ZM5.47243 3.41992C5.39053 4.80601 5.86278 6.22149 6.88961 7.30235C5.01209 7.84197 3.51893 9.43972 3.22913 11.5183C2.90072 13.8738 3.38485 16.2709 4.60169 18.3143L4.95271 18.9037C4.96572 18.9256 4.97982 18.9468 4.99498 18.9672L6.41094 20.8739C7.68739 22.5927 10.2023 22.7527 11.6862 21.2094C11.858 21.0307 12.1439 21.0307 12.3157 21.2094C13.7996 22.7527 16.3145 22.5927 17.591 20.8739L19.0069 18.9672C19.0221 18.9468 19.0362 18.9256 19.0492 18.9037L19.4002 18.3143C20.6171 16.2709 21.1012 13.8738 20.7728 11.5183C20.3641 8.58694 17.5621 6.61189 14.6639 7.21235L12.7617 7.60645L12.7587 7.60709C12.789 6.82725 12.9107 5.98621 13.15 5.26843C13.4393 4.40047 13.8421 3.87869 14.2894 3.69232C14.6718 3.533 14.8526 3.0939 14.6933 2.71155C14.5339 2.3292 14.0948 2.14839 13.7125 2.3077C12.6598 2.74632 12.0626 3.78704 11.7269 4.79409C11.7113 4.84112 11.696 4.88844 11.6812 4.93604C11.4414 4.4716 11.1269 4.03573 10.7376 3.64645C9.64506 2.55389 8.18555 2.05016 6.75733 2.1348C6.06425 2.17588 5.51339 2.72683 5.47243 3.41992ZM6.96471 3.62704C7.94448 3.60028 8.93029 3.96044 9.67696 4.70711C10.4235 5.45363 10.7836 6.43917 10.7571 7.41874C10.5757 7.42369 10.3941 7.41539 10.2139 7.39383L9.59698 7.26601C9.02869 7.09656 8.49355 6.78742 8.0448 6.33866C7.29828 5.59215 6.93812 4.60661 6.96471 3.62704ZM9.03369 8.68116L9.23606 8.72309C9.47606 8.79107 9.71995 8.84146 9.96569 8.87426L10.9358 9.07526C11.6385 9.22083 12.3635 9.22083 13.0661 9.07526L14.9682 8.68116C17.0172 8.25664 18.9982 9.65298 19.2871 11.7254C19.5685 13.7431 19.1538 15.7965 18.1114 17.5468L17.7799 18.1035L16.3867 19.9796C15.6633 20.9537 14.2379 21.0444 13.3969 20.1697C12.635 19.3773 11.3669 19.3773 10.605 20.1697C9.76396 21.0444 8.33863 20.9537 7.61519 19.9796L6.22198 18.1035L5.89049 17.5468C4.84815 15.7965 4.43344 13.7431 4.71476 11.7254C5.00371 9.65298 6.98471 8.25663 9.03369 8.68116Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/emoji-categories/foods@2x.png b/resources/icons/emoji-categories/foods@2x.png
deleted file mode 100644
index bbdd2a3c82555a12f008c7d0509bf268abb0b052..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/foods@2x.png
+++ /dev/null
@@ -1,9 +0,0 @@
-‰PNG
-
-���
IHDR���0���0���Wù‡���bKGD�ÿ�ÿ�ÿ ½§“��<IDAThÍÚ[ˆUUÇñϜѱ„TŒR&³–†Ú
SÊÂÊÊ*IŠ.уA=TöP!!ô݉¨Ô4º¼ôP&EFFX¦ÑÍ°ÈQËš$4ÇÖÜgí=ûìsfΰ`öYÿµþß½×ý¿†Ái"žÂ×؍¸iuV¦{Ћ#9iE‹uv¢cHè8yV>x:ÝÖ žn,ÁZlwôcìōí�ï×3ÃAÆä”?«p¨ ì¯í‚¿&ÇY/Ä\üå=’*ہGñoxú¡]/ðväègLMå?åïH~ïÄêà‡ñ
®h×lÞåŸ ;°/Æ+�oÇ2ÌÁøvA§µ.؃‘Í«²­ƒïy­
-è´æ
-Íœ†éÃ˘”Ø,RÜM¶cr•Ð±–É;€§q!þÀ¦G>|§[£Ì¢Qúè"¡?OUÜ_ûØÎœ¼»ñ!nÅ%˜‘Ô5:)׃Ÿ°ïᣤ®–TÃí”VfÞ/³.¬K½`™ôU÷1
-5›‡|(ÒœRþ2acVTaŸì`L:¬qËô`^#ø™ò7h‡„…h1NGWb?Óp?¾lxîKÊŽMêêJê^œøÊÛjôbö@ð'áÇœBoáÌFo.ôÓp°�ü –*7㜅7sêØ…“ó
-¬û°\óÛÛË…eìxo’׬–í^¯ÇF³s>Ñ‚³~uãE|Ÿ¤’ßZÕ
-ُ;+m°&2øÌ0,óêÄêWögŽ‘Ýâίž±¡¨güGØ<º9ÊØ6L€ÔïÔ³ÞP6hi½[1XY‘e»´†ó¢7UÃÓ’>Žž§×„Å#­o+‚iEq÷žûÕ÷«qC5£Õ³î#»d.ºê­ì5áÒQ5UŠ?î¡š¤RšXL+š=ï«9úè×ÌŠ`ZQ̶£&lmÓZXL+º.zÞ×ÊŽì.ÇžFÊîr¯†ãe§Òc±ªgüÇõg¾enÀFú@=ãóéÌY²‡†«*,Ò|ÙóÀù±ÑúÈèS\6”P>Q϶>Ïpºl¤áÞjµD6‚1c ã7"ã^åôíÒ²Q’ÕE&	ÓhºÀ&ó?)lŸã)~RQ!Â-c|À_¥ÚñÐ!D¼cŽ[ÊV°2§ðò!ÇXOæøÏ„RŠ4N8<Ä•<¦½-сÇsünÓÂ9å4ìÌ©ì5Œj¨ì¾rìo'N-Mé!¨WºYñ®ušp�ÿ;IïàÜûYø<ÇÏnõ—ˆ-éùÑêÃB8òz!ê6AXK–
-·5±ý!<=±íNÊ®•éþ]ÎjÛª¦ÿ;iWÚ*l´Fã9ÍÝ°4›ú£‡>­9ÂâÖf¿p=tþ*a¿Q¸7kJƒ™/.#æ	³Äa¥Ü…÷……è·Ä¶wáÊäïñÂMæ/ÂEÞa7­ÿ¡[s؉ÿ¼����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/nature.png b/resources/icons/emoji-categories/nature.png
deleted file mode 100644
index eb1786cf16e521f25c6907b130fda9cfa24bedfc..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/nature.png
+++ /dev/null
@@ -1,8 +0,0 @@
-‰PNG
-
-���
IHDR���������àw=ø���bKGD�ÿ�ÿ�ÿ ½§“��PIDATH‰­ÕË‹Qðk(
-ɤ¬ÝQ.¹e#ù”Õ++e\n	emP$E"aá¶A’22Fî÷ŸÅy^¿wN¿aß:½ïsû>Ϲ<çPE4£
/±uþŒÁØ1Ñ„Þ¹S?œD%p�WÑŽ¯øÿ×p0|ò¸Öàü…ax5˜3É»m³B·­ ŸPªl^èVà{Œ]˜‹Q€A¨ÇìƏð[±óCþ‚APÁ‘pŠç¡kÊײšÃ÷†„îhè¶Ãíæ„qcÈЫ	zábÄl]cÈ7àuEö«!/îy¥s%äa!wÖ¾‚þQM‘pÄ_$1¯ƒc`È_I'§˜Áªø¿[ñ-5HsÛƒˆ]‰Ññÿ†Ð(ï
-ÖEÐېßÔHÛÖ‡Ü^*ôW]¯
-N©nnKm©‘ ·õÆiÕ~ªà,Ò¹i&× ë.&d\Ãj¼
-å¬$˜¤®î„ÃjÏz©c¯KûõPº‡vK›YÆlÕ}KƶøNÄ™’þ¦dD
˜Š˜žÍ�îŠòµz'¾33²¼Ê2ê3¹¸ËÎ×r®“.¨/SÒ/Q=aåÑ¡órŽÃG©ÙwUÑ¡¾™U>^:ïù›Ð«z§mꊆãn8~Â9i3‹àò¸8‹Ï¡;#½Œ¿ÅȘɧŒðVÿÅŒ6ë|hþˆ:éQ)ªkÀe\’Ö»"í×béúg<
²}Ò«6
-ûC÷¤'ÄVJ•æ{ðËÿGR£µâEŒVݼ³~ÉÝ,6ƒµ����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/nature.svg b/resources/icons/emoji-categories/nature.svg
new file mode 100644
index 0000000000000000000000000000000000000000..dd91b835d0376dfc26ca56d5942523e9fc289113
--- /dev/null
+++ b/resources/icons/emoji-categories/nature.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.2491 2.00002L16.4346 2C16.9438 2 17.442 2.14135 17.8752 2.40794L20.6431 4.11125C20.8649 4.24775 21 4.48955 21 4.75V6.25C21 7.49264 19.9926 8.5 18.75 8.5H18.5V17.5469C19.497 17.6807 20.1945 18.1015 20.5946 18.8224C20.8179 19.2247 20.9126 19.6625 20.9569 20.0651C21.0001 20.4561 21 20.8643 21 21.2247V21.25C21 21.6642 20.6642 22 20.25 22H16.2508H5.83333C3.71624 22 2 20.2838 2 18.1667C2 16.7686 2.74891 15.5462 3.86385 14.8774C4.21907 14.6644 4.67975 14.7796 4.89281 15.1348C5.10587 15.49 4.99062 15.9507 4.63541 16.1638C3.95359 16.5727 3.5 17.3171 3.5 18.1667C3.5 19.4553 4.54467 20.5 5.83333 20.5C6.15188 20.5 6.34997 20.4168 6.48162 20.3242C6.62082 20.2262 6.72963 20.0859 6.81348 19.9168C6.89798 19.7464 6.94675 19.5671 6.97352 19.4243C6.98658 19.3546 6.99358 19.2981 6.9972 19.2617C6.99876 19.246 6.99967 19.2343 7.00015 19.2273L7.00059 19.1925C7.00115 19.1586 7.00224 19.1104 7.00436 19.0493C7.00859 18.9273 7.01695 18.7535 7.03348 18.5397C7.06646 18.1132 7.13235 17.5223 7.26464 16.8627C7.52372 15.5707 8.06051 13.8945 9.21612 12.7232C10.0641 11.8638 10.525 10.6045 10.7634 9.35923C10.9991 8.12815 11 7.00801 11 6.5V4.25002C11 3.00796 12.0059 2.00003 13.2491 2.00002ZM7.75 19.25C8.49958 19.275 8.49956 19.2757 8.49956 19.2757L8.49948 19.2781L8.49932 19.2819L8.49888 19.2919L8.49726 19.3205C8.4958 19.3433 8.49348 19.3735 8.48984 19.4101C8.48259 19.4831 8.46993 19.5829 8.44783 19.7007C8.40796 19.9134 8.33458 20.2001 8.19703 20.5H15.4473C15.3561 20.0064 15.1078 19.4939 14.4335 19.1799C14.4224 19.1748 14.4115 19.1694 14.4008 19.1637C14.3486 19.1363 14.1994 19.0871 13.9516 19.0479C13.7216 19.0116 13.4674 18.9931 13.25 18.9931C13.1964 18.9931 13.0783 18.9947 12.9672 18.9965L12.8256 18.9988L12.7665 18.9999L12.7655 18.9999C12.3513 19.0075 12.0095 18.6779 12.0019 18.2637C11.9943 17.8496 12.3239 17.5077 12.738 17.5001L12.7995 17.499L12.9435 17.4966C13.0511 17.4949 13.1822 17.4931 13.25 17.4931C13.4846 17.4931 13.7453 17.5086 14 17.5402V15.2528C14 14.8386 14.3358 14.5028 14.75 14.5028C15.1642 14.5028 15.5 14.8386 15.5 15.2528V18.0573C16.5648 18.7386 16.8739 19.7599 16.9635 20.5H19.4875C19.4825 20.407 19.4756 20.317 19.466 20.2294C19.4328 19.9286 19.3719 19.7103 19.2831 19.5504C19.153 19.3159 18.8498 19 17.75 19C17.3358 19 17 18.6642 17 18.25V7.75C17 7.33579 17.3358 7 17.75 7H18.75C19.1642 7 19.5 6.66421 19.5 6.25V5.16909L17.089 3.68543C16.8918 3.56405 16.6657 3.5 16.4346 3.5L13.2491 3.50002C12.8355 3.50002 12.5 3.83523 12.5 4.25002V6.48171C12.5128 6.71048 12.592 6.90709 12.7051 7.03567C12.8062 7.15046 12.9658 7.25 13.25 7.25C13.5368 7.25 13.7027 7.14866 13.8057 7.031C13.9206 6.89967 14 6.69587 14 6.45C14 6.03579 14.3358 5.7 14.75 5.7C15.1642 5.7 15.5 6.03579 15.5 6.45C15.5 7.00412 15.3227 7.57533 14.9343 8.01899C14.534 8.47634 13.9499 8.75 13.25 8.75C12.938 8.75 12.6513 8.69566 12.3945 8.59601C12.3568 8.92795 12.3058 9.27987 12.2366 9.64132C11.975 11.0074 11.4359 12.6092 10.2839 13.7768C9.43949 14.6326 8.97628 15.9563 8.73536 17.1576C8.61765 17.7446 8.55854 18.2736 8.52902 18.6554C8.5143 18.8458 8.50703 18.9982 8.50346 19.1013C8.50167 19.1529 8.5008 19.192 8.50039 19.2173L8.50004 19.2446L8.5 19.25C8.5 19.2582 8.49983 19.2675 8.49956 19.2757L7.75 19.25Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/emoji-categories/nature@2x.png b/resources/icons/emoji-categories/nature@2x.png
deleted file mode 100644
index 81db5c08e342db8a41b4af6e392f48af20a06e04..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/nature@2x.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR���0���0���Wù‡���bKGD�ÿ�ÿ�ÿ ½§“��6IDAThÍ™ih]EÇ}ƤUƒÚ-b-¸ ø¥Mµ~°Ru)¦ˆbQ¨Æ¬ˆÖ—¨¨üV[”‚ ÅÖºµÖº+±	E­‘Ô´‰¦ŠI›gmZ“ç‡3×NÎ̽wÞû‡7sþçÌ™ûfÎœ™dœ	¬¶ƒÀÇÀõ@MŠ^1¨1¶7š¾¶+€†bŒ¼äcÊÏÀ…%»|�󁮘¾F—€ÃBM:bŒiÃËÿràI`µÑÝXÜÓÖa8OÍÀ±À³ÆVZíÀÔ4秝Æþ¯ÒL‰s~ðŽGiÐ4¯~­bË(°˜\ôy8o_Üá!†LË*8€çT_Ç�_yx·jçFV¾MÚ¥xsaÁNÓyòõ²¦ó cìœ,FD·ÇÎ^ñ1wZÿ	i“V„¿€S•¡:àwÅFp±hÆý ;qÿõYÀÅ[	þPÂ<­PœJt>ÂBc˶½ÜÃ{DqúïÌU‚AÜ©3OqòÈ¿V.èÎWœÉÀnÅ™¿ÓFÿ‰âlÄŒ¾L¨6©>6xx+çq€uªñ*¥T¯ä#Àéet>ÂlÜ­×a‹’¯Í�3i‹ª7«ú‡ÀwepXã[`½j»BÕ;U}†o�½ª~Žª¿Q¸oÁжuHÝ¡êǁôÜþEɳåð4zºv+ù¡J¾ÜøZm)T#›‹-¯­˜û²9éÍö§VÉs`¿2Reý¾’±¹0d~W#¬™vmª³8$éí~³¸5À"«®Sê}{TÑš˜‚¤À¶ìeK¹MÉò¦-
iz¯âN£(=CÉz¾V
H¶·Fµ36¬ù2Å_¦W|Y[¾É©ªö/2¸e6Ð
-4©ög€¬zÞãÜHÀ�Òô¶àf¥MÀ=¸ûO7¸Ûø§Àߪmlø¦ÂÑ«Fv{›³øQµ-8ËcÐ.}¸ÙaÔI2]Ä!zuÈÔJò­dnõ$n
-pªRX”à×6`BÉ?–$­¬‰èO-A­§Å¸›V¸«RÞ`ÇŸaàæ8…,rye+<Xq7ãqµò¥	³ÿ¡J)|8¼Þj;"°³ZàbdaÍ4zQÚ1䐵ö
×s6õÁê]T¶¬�r¥gÁ4ZÇÏ“†€û€Rx'©úÖã5Œ=XlJá_K|¤H+-)¶×*~ðu¦
"¡6¾{›ÐòeŠ:¼Ï€ÞOKàê«–BÊλYÅÕ'E þË~®êI×'¥/Ûdúl¾ºÃ0vô?á_ð�'"N¡_¿8!ÆæDÜ›»ÆBP…ü½¡)E–Ânµ7ãÞ8ØÐ	fZ ñâQe$GòkÉ$à~äTçø.$|NL°snF0¯˜LýrnÁM­#ÌGö‘¸ôŽ“€{‘´ÙÖy³ç#\ãH/ð<’-žŒ|Ñ‘ƒIÚô1Üjd
\‚¼ÒøNj[Q·ÐÅà¡�§òöð1ÀïN)Õù7<·uñeµ¾w…¸²Ž„§¤b1x÷C—=¸7Þyà<Ü;(]Ú‘E\QT!ïÇ·¯ã~í;
Ï^Ì=¦ínÅݼ…D¦1iòxB?MEÙk2ˆà"ÓV§¸ãêit.ÔšÀ½Mq“r¡qÃ*ܹüp)²—LCæõû^%oºƒQìÒ¡&*9äñî Àd—u~7ÖÅAƒYÀG¤;ÿ•}c(À‹Hvš3¥9ÿž]îÎþ^2TB|ðÜ����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/objects.png b/resources/icons/emoji-categories/objects.png
deleted file mode 100644
index 45c6eb37970d1fce36bac64e9f1b656b5cc035b7..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/objects.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-���
IHDR���������àw=ø���bKGD�ÿ�ÿ�ÿ ½§“��IDATH‰•±OQÆ3s&$gg…ŠÆJ¤’h$Ñ`meÔÐX¨46j‰úh§6œÿQ;í0"&VZr‰$&`b<"ˆÐ‘s-ÞìÝfý}ç—Ln÷Ý7óÍ›yªq	h�M`×m˜¦ü{â°dö8Þoð)`Ëüæ€qà Ûi_k9g8ßOæyð`(Â^DÆRò²,�’ÀׂȻ*ò4ݲÄ2/£N·\ËêE\ñߧÀNÛÀ³RŒ}Ñô,N‰ÙGQ]ÇìjHEïˆjSTWP½
€ÙuQý.fË„ŸZ¸'vœ4(fD5Õ?¨ÞóçŽavSTwE5³%BI³ªçÝ3 fË°íAo z××öD5‘E÷vß­˜À'{Yîw²6ûD誢ú­°“[î;ᾟc/œôÀ߉ꦨþ¥V»Ða©ÎºÀ0૏Üw>&0餖oà$a²‹Ì®Ñ¬:°á¾gb†%#O¹÷ƒ¯Ýg±‚Àaìs‘z„[^9÷—û&a’îdn�	qÐa¾–—¥EBiÊ8JõQÛ‘~ƒçÈ4Z¼p…ÿ{¢–(ô˜Výýp9űê8Žf—'u_60êïk€‘xÁÄ𜰋=Âtv›óµŒp´ÿ7xBȾÜ9mà1i·^%Îoßno€³)Žÿ�+ö¤–³>ª����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/objects.svg b/resources/icons/emoji-categories/objects.svg
new file mode 100644
index 0000000000000000000000000000000000000000..cf342af136260fe8f8d54612f8f4a2bac110a7ec
--- /dev/null
+++ b/resources/icons/emoji-categories/objects.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.25 6.75073C11.25 6.33652 11.5858 6.00073 12 6.00073C12.4142 6.00073 12.75 6.33652 12.75 6.75073V8.25076C12.75 8.66498 12.4142 9.00076 12 9.00076C11.5858 9.00076 11.25 8.66498 11.25 8.25076V6.75073Z" fill="#212121"/>
+<path d="M16.2803 8.21607C15.9874 7.92318 15.5126 7.92318 15.2197 8.21607L14.159 9.27675C13.8661 9.56964 13.8661 10.0445 14.159 10.3374C14.4519 10.6303 14.9268 10.6303 15.2197 10.3374L16.2803 9.27673C16.5732 8.98384 16.5732 8.50896 16.2803 8.21607Z" fill="#212121"/>
+<path d="M8.78032 8.21607C8.48743 7.92318 8.01255 7.92318 7.71966 8.21607C7.42677 8.50896 7.42677 8.98384 7.71966 9.27673L8.78034 10.3374C9.07324 10.6303 9.54811 10.6303 9.841 10.3374C10.1339 10.0445 10.1339 9.56964 9.841 9.27675L8.78032 8.21607Z" fill="#212121"/>
+<path d="M12 2.00098C16.0041 2.00098 19.25 5.24691 19.25 9.25098C19.25 11.347 18.3493 13.2707 16.5869 14.9929C16.51 15.0681 16.4504 15.1586 16.4118 15.2582L16.3804 15.3605L15.2493 20.2561C15.0266 21.22 14.2035 21.9183 13.2302 21.993L13.057 21.9996H10.9433C9.95374 21.9996 9.08791 21.3545 8.79629 20.4228L8.75088 20.2555L7.62132 15.3607C7.58904 15.2208 7.51728 15.0931 7.41456 14.9928C5.73515 13.3526 4.83778 11.5297 4.75613 9.54923L4.75 9.25098L4.75388 9.01166C4.88014 5.11837 8.07601 2.00098 12 2.00098ZM14.115 18.499H9.884L10.2125 19.9182C10.2831 20.2245 10.5357 20.4504 10.8401 20.4925L10.9433 20.4996H13.057C13.3713 20.4996 13.6481 20.3044 13.7577 20.0174L13.7878 19.9184L14.115 18.499ZM12 3.50098C8.89821 3.50098 6.37006 5.95699 6.25415 9.03042L6.25 9.25098L6.25672 9.52799C6.33286 11.0913 7.05722 12.5471 8.46262 13.9197C8.72675 14.1777 8.92265 14.496 9.03422 14.846L9.08291 15.0235L9.538 16.999H11.25V10.7503C11.25 10.3361 11.5858 10.0003 12 10.0003C12.4142 10.0003 12.75 10.3361 12.75 10.7503V16.999H14.461L14.9189 15.0228C15.0019 14.6634 15.1718 14.3309 15.4124 14.0539L15.5386 13.9201C16.9432 12.5475 17.6672 11.0916 17.7433 9.52803L17.75 9.25098L17.7458 9.03042C17.6299 5.95699 15.1018 3.50098 12 3.50098Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/emoji-categories/objects@2x.png b/resources/icons/emoji-categories/objects@2x.png
deleted file mode 100644
index 01fd5cb4df5e814dafa090d5e6cd0b966c002ceb..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/objects@2x.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR���0���0���Wù‡���bKGD�ÿ�ÿ�ÿ ½§“��wIDAThí™MŒEÇõª]cƒcŒ	ÙÃÁ›ÊÊÇŠ`"Œñƒ£c<9Æ‰¬D¼˜èE&$~�A‘¬‹¢n0.ºÄ°b6H\EvšCÕŒÃëêž™îž]Mü'•twUýßÿuW½zUm(+ ¸Xâë.SÀp8�üX¢í܈€íÀ@Üfùx°ó®Úc3p:C`«eØ4ŸÂo” \—ׁ:-~90–!bØ	¬Ç̓}éóÏv6é?
-T:)~"`´
-¼ô¶ÁÕŒø¾¡!Uº‹	¿¹IàÞ¼«3ÞQàú¼	„Æü!`Y	ÜÏ¥ù÷”À
¸hßU–Ïrb¨(qD2TNRΛרxîF[ßSpØ®«óÍ°šäÄ~²áQEöNA­`Ÿ²y$/ÑJ’o¿P™ý»wæ!z^}U’ÀVpBÙ~6­¡d¨û°ö!#rÖˆ\4Æ|Üè»FDÞ6"§ŒÈ)y¸/Ðn1æ3#rɈœÅÚ-þù~Í—¡3ú-¬ðâã†rX[ë$"/«úZ©"²£ÎEÈߪ͔¯Ý låqà‚"éIq 6ÖŽ‘RÄÿㄵO�bD¾	Ô×èU¶Ïçqà/EÒ
€µ[ŒÈ”6ŽµO‘ËMˆÈ¬ÝE›½íneûÏ<Ì*’%•Æ˜ýJÀ¬º?G
aíc~Œ7Öývͽ1û”í›”í?ò80M`Õaí3Yok·ÖÛŠìhÒöe»OÙþ%ãŠdPÕ¯0"Õ (7'ÑmDfRøäFFOâãi"³Â踺סìq|0Ô1†WÔ£KÞµ5nåU×©û:S¡²d(³öÑÀMKÀzŒÈÕvXh«Cøsy¸k«P*aŒµ]!ŠH#‘áFDd8ÐL§sÀmy�wôÑH6h³TD†1°öá&|]"òšùADvÞS¼§lÎ+àqEVÅ¥¼Â€²ÛŠZà;Ex†ÎœT€Ÿ”­oÉ4-aä&£[ÊÃ$¿öÚ¬Ní`ÉO{ˆr¾D…¤øØ]w‹ŸNRlN6µ]X™_p[_ŒUq‹Q\ý$£M­œ¤ƒ§sË€c)†cÜô.èÃe•Ýþzƒ¯Ó‹Tc9
-,í”øáÆgšˆ¼åUÏÝLGâ}CÈ¥¥pŒm@;•æ|T°7·pcþàV_7
üŠ;iûøÔ?[Pè1Ê*Ó°*Ð?Êž_âŽ_ŽáRÿüfà.ܱäVàž²´ü?‰ÿyÊŒBÓ¸½pp7.-÷uç}ý8î˸(µ ývú™ìx
£JSÐ…;„ÕbæpÉÝ&\RVñ×#¾N·¸nžµ×Ñ|ÕjùˆùOÙˆpYfèŸoZ©»è@Î_ƒd§ÊµrTÿo„�qü$n%žñ×{q¹R©¡û*Õ5TX”n³����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/people.png b/resources/icons/emoji-categories/people.png
deleted file mode 100644
index 710e808a7b823d5d7a383a63ab76b38f1e51e5b3..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/people.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR���������àw=ø���bKGD�ÿ�ÿ�ÿ ½§“��úIDATH‰­Ö=OTQàg·ÀBbb¡‰°	Zšø#äC°5Ú[(X‰þ
K£6F4ùZÒbÀС0 ¸g®÷rXvWðM&7g>Þ™;wÎ9·¦=0‰1œC#ô_ñðëxö¡OðͲ‹×Q@W¸­ÞÆ,nbÇC†C7>Mlb¢ùý¨¨‰·¸ÐEAƒ˜«¼Ít»ÊwCtAœc¦¿ïMʶ†¼š¤hW_Õð\Ù–£b>¸žŠiZ¶ííù˜4ŽëiAtý"v‚³S‘q6#XWŽâZ‹íìoB·ŽÑP.´ 9,
-®QX‰lC™ÓHT¹†k-HÚÙ‡ƒó3åôô½ð¿è
έú$­¢àý]ÇF,ú2§âͺ‘ïYlÁµQÇj,®fNËÿPqî[p­Ö±‹ÉÌée<WpµL®àGø¼Êb®E8«Ühƒ§cX’Z°ŒqœÀiÜÁ·°-¡§7$m´ŸÊûópžË*é¯$i%KáS &]@Mé>ÙC´†™,Iîá“ôá·ð1t=™ï#åG?“ÙL(Û<I'Ôð°ý Çiå…3/\0$
Å…3Õ)`BÙ®é຅KÒíÅeÜÛŽ²-ã]Ná±4	Ý\ú/´è9©wíÐPþ¶œ·÷·eUšó÷±n‰?wá¯õëe����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/people.svg b/resources/icons/emoji-categories/people.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9b3b58f2276afef7a40276c51820a7561cd9e584
--- /dev/null
+++ b/resources/icons/emoji-categories/people.svg
@@ -0,0 +1,3 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.5 13C18.3284 13 19 12.3284 19 11.5C19 10.6716 18.3284 10 17.5 10C16.6716 10 16 10.6716 16 11.5C16 12.3284 16.6716 13 17.5 13ZM12 11.5C12 12.3284 11.3284 13 10.5 13C9.67157 13 9 12.3284 9 11.5C9 10.6716 9.67157 10 10.5 10C11.3284 10 12 10.6716 12 11.5ZM8.32825 17.1299C8.66982 16.8975 9.13472 16.9852 9.36831 17.3254L9.37651 17.3369C9.38499 17.3485 9.3998 17.3685 9.42099 17.3956C9.4634 17.4498 9.53104 17.5323 9.62406 17.6338C9.81053 17.8372 10.0962 18.1136 10.482 18.3912C11.2501 18.9437 12.4127 19.5 14.0001 19.5C15.5875 19.5 16.7501 18.9437 17.5182 18.3912C17.904 18.1136 18.1896 17.8372 18.3761 17.6338C18.4691 17.5323 18.5368 17.4498 18.5792 17.3956C18.6003 17.3685 18.6152 17.3485 18.6236 17.3369L18.6312 17.3263C18.8646 16.9854 19.33 16.8973 19.6719 17.1299C20.0144 17.3628 20.1031 17.8293 19.8702 18.1718L19.8693 18.1731L19.8683 18.1747L19.8657 18.1784L19.8586 18.1886C19.853 18.1965 19.8457 18.2068 19.8366 18.2193C19.8184 18.2443 19.7932 18.278 19.761 18.3193C19.6965 18.4018 19.6036 18.5146 19.4817 18.6475C19.2384 18.9128 18.8771 19.2614 18.3941 19.6088C17.4246 20.3063 15.9621 21 14.0001 21C12.038 21 10.5756 20.3063 9.60604 19.6088C9.12305 19.2614 8.76172 18.9128 8.51842 18.6475C8.39656 18.5146 8.30362 18.4018 8.23916 18.3193C8.20692 18.278 8.18173 18.2443 8.16356 18.2193C8.15447 18.2068 8.14713 18.1965 8.14153 18.1886L8.13444 18.1784L8.13186 18.1747L8.13082 18.1731L8.12994 18.1718C7.89697 17.8293 7.98576 17.3628 8.32825 17.1299ZM14 2C7.37258 2 2 7.37258 2 14C2 20.6274 7.37258 26 14 26C20.6274 26 26 20.6274 26 14C26 7.37258 20.6274 2 14 2ZM3.5 14C3.5 8.20101 8.20101 3.5 14 3.5C19.799 3.5 24.5 8.20101 24.5 14C24.5 19.799 19.799 24.5 14 24.5C8.20101 24.5 3.5 19.799 3.5 14Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/emoji-categories/people@2x.png b/resources/icons/emoji-categories/people@2x.png
deleted file mode 100644
index 142ba09e980353b674a4d0c30a30837d67111b65..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/people@2x.png
+++ /dev/null
@@ -1,7 +0,0 @@
-‰PNG
-
-���
IHDR���0���0���Wù‡���bKGD�ÿ�ÿ�ÿ ½§“��{IDAThÍšMlUEÇ}±ÔE%ÑÔ¦-F#´Iã‚H¬[°&®]ؐ–£)¸q#+EŒ+WnLãFH\(Ë"ÚêNÅE…±`?@Hû^]œ{“ygæÎÌýx­ÿd’wïœsæ?÷ÎœsæÜ×A5xö�CÀ@èNú—yàð3p	¸üYÑø…PŽßkÛeàhbkÝÐœî” ®Û2ð>Ð×NâÀq`©BâºÝÞºª&?üè¸Lï�/ÃÀÃɤ;“ßÃÀ(p
-Ù
½€U‘%û©Ï“{õýÀ	àÛ‹À¡’Ü9¬:Œÿôm*;�²\Æ/¥ÇYÆŠ>ì0¸|J{¼Æ`*cÌÜ“Å~ò+Ȥڍ‰d,ý&ÆÄ^ówç«fêÁþdL½'v„7a{›Ö—|ŠýØobñj™˜Ä^ë±l²pÄÁç,á>$"ê
»Ñ8K+§% ×%xF	Î#ža£QGܶÉí=—Îm|Kg�8‡l¬EàdóÇ"¯¾^JË(W~L	Ì‘¤p[I_ù¼ú]Ø{ÂÐ)ñ¤‡À9Çàiû,bEõO*ÙoÓŽ^ it4ð?ÉE…ˆ	Õï£5¸6ž°è0/#K¨Ö
-êÅè_fŒë`_
Ø«¿	òµ§ï«€nYý‹êzoªd¾ÆP
-;ˆl8W†ÚÐ-«ÿ’Ò¹�ð›º9Ab�ÙpI›Š$_Vÿ)Åõ*Ø.í‘DÖåzྺYÅ!¥]袕ë½ÚÆò)–Mt»ÿ'xH]/Õ€Ûê¦3Ó3•ÈDe[(jnÿÔ/d"””Ýô—AÈöº¾ZCj•&vŒ\ËE)B¶ŸV×WjH‘ÉÄHÀÈù\”òáË@ÿsêz ‡|ÉÜ�vÅⵜD7¿(+øƒÙvZ«yÍ„; 	œiìD€ÀÇJþ>ðL$ùNÜ)õG½·”ü´ÙyTuÎá/°öa§Å÷€W$¶"É¢Ëûø¼_’š:ã¦@û@?Ž/à.ÐÎ&yyÚ›‘¬ñCÜ.¸”P|Ð'FëH	RŸ7…æ‘'2ì«2‡Zyû>lÃÎ^ßu	ºÊ*Sã oÂwÊò­˜‚ÙçJoù¤åÄ›Ž&²„
l>À®¤e=õOG|*ZÿuŸB'²†µ{­ÑýÈ„/�?!k~)ù}ÙW±ç†Øîz†@iäˈ^wsL¢
-�þÅ^rOÆ8„»¼~¤j¦wŒ½Šìµ\ý†Ï"ž¡jô`oØ4â¾ZÔèîOL··QÅ×Äw|Û1Î*%ȧ8H¶›¼ŽTÌbJŠÛ‘ôàF†í"–MGH Á$&ìÊèoß#iÂp™\zÚëF¼ÏN$]ARã¬#í,ð2ðk$¿(<€l°"A+¶¥ºÛZXèNcGí2m©ùgFØv ŽläK´ž'b[I‰'(Q‹ŠÝ!lžE²Î!àq$½0ÿnsøÖ¿ÛüUvàÿ��¬.wB»����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/symbols.png b/resources/icons/emoji-categories/symbols.png
deleted file mode 100644
index 08184de1b3117ba0cc38f7c2f6628dce8b4d45a4..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/symbols.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-���
IHDR���������àw=ø���bKGD�ÿ�ÿ�ÿ ½§“��­IDATH‰µÕ½kTAðßÆ,‚ X‰‚ –V6;KkEPÿ±ƒ&`ac![›øѯ±PÒˆÔÂFÑ‚±ÉZÌ}0¾}³ï-&†}3s朙{ÏÌÂp‚Öî;°§×qa½y<ž€»ST'؇7øµ]pߦmmŠòx·ÛUƒvât	Ôæš)\Æ~b=¾;¹­‹À=ÿaç.Àõ1äràT›Z!™{ж¸k
.a€Ñ¸h2§m]ôq_°»91‹ÒÎq°Mà†”’
|ŒïU(à_ø7•Ïkó³˜ËÞð\ôÑ¿PX‹ù3ñ›¿9³™ð©jði\Å~éòq² ð²p‚œüz¾`›RZÞàaéžI5)’Ã.¬d€'˜#PVòW1YÝÐéM‡Ï5nÇäWÝè/ã¸ôÇQ*v¼Ñ¾Ÿp>õ¤§ /â*övØy£}?Eç>vã楢Ø­%-ö½US­Ú¦tñ†qÜ~Ft%Æçköíã>HE^Æ]ÿðBlÆhŒØ÷/MÅæâM(����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/symbols.svg b/resources/icons/emoji-categories/symbols.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c7149c3e0a0d2892d50279003465543d46408b45
--- /dev/null
+++ b/resources/icons/emoji-categories/symbols.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.9184 18C17.3326 18 17.6684 18.3358 17.6684 18.75C17.6684 19.1297 17.3862 19.4435 17.0202 19.4932L16.9184 19.5L15.8819 19.5004C16.4382 20.1218 17.2432 20.5 18.1184 20.5C19.114 20.5 20.0261 20.0123 20.5841 19.2095C20.8204 18.8694 21.2878 18.7853 21.628 19.0217C21.9681 19.2581 22.0522 19.7254 21.8158 20.0656C20.9804 21.2676 19.6105 22 18.1184 22C17.0049 22 15.9672 21.5918 15.1686 20.8989L15.1684 21.25C15.1684 21.6642 14.8326 22 14.4184 22C14.0387 22 13.7249 21.7178 13.6752 21.3518L13.6684 21.25V18.75C13.6684 18.3703 13.9506 18.0565 14.3166 18.0068L14.4184 18H16.9184ZM6.39823 13.0068L6.5 13C6.8797 13 7.19349 13.2822 7.24315 13.6482L7.25 13.75V16.75H10.25C10.6297 16.75 10.9435 17.0322 10.9932 17.3982L11 17.5C11 17.8797 10.7178 18.1935 10.3518 18.2432L10.25 18.25H7.25V21.25C7.25 21.6297 6.96785 21.9435 6.60177 21.9932L6.5 22C6.1203 22 5.80651 21.7178 5.75685 21.3518L5.75 21.25V18.25H2.75C2.3703 18.25 2.05651 17.9678 2.00685 17.6018L2 17.5C2 17.1203 2.28215 16.8065 2.64823 16.7568L2.75 16.75H5.75V13.75C5.75 13.3703 6.03215 13.0565 6.39823 13.0068L6.5 13L6.39823 13.0068ZM17.5 13C18.6135 13 19.6512 13.4082 20.4498 14.1011L20.45 13.75C20.45 13.3358 20.7858 13 21.2 13C21.5797 13 21.8935 13.2822 21.9432 13.6482L21.95 13.75V16.25C21.95 16.6297 21.6678 16.9435 21.3018 16.9932L21.2 17H18.7C18.2858 17 17.95 16.6642 17.95 16.25C17.95 15.8703 18.2322 15.5565 18.5982 15.5068L18.7 15.5L19.7365 15.4996C19.1802 14.8782 18.3752 14.5 17.5 14.5C16.5044 14.5 15.5923 14.9877 15.0343 15.7905C14.798 16.1306 14.3306 16.2147 13.9904 15.9783C13.6503 15.7419 13.5662 15.2746 13.8026 14.9344C14.638 13.7324 16.0079 13 17.5 13ZM6.5 2C8.98528 2 11 4.01472 11 6.5C11 8.98528 8.98528 11 6.5 11C4.01472 11 2 8.98528 2 6.5C2 4.01472 4.01472 2 6.5 2ZM19.2143 2C20.7657 2 22 3.39005 22 5.07903C22 5.94137 21.6773 6.75017 21.1484 7.29305L18.6464 10.4344C18.1272 11.0864 17.183 11.1899 16.5375 10.6656C16.4509 10.5953 16.3724 10.5155 16.3033 10.4277L13.6268 7.02591C13.2233 6.47963 13 5.79699 13 5.07903C13 3.39005 14.2343 2 15.7857 2C16.3504 2 16.8861 2.18641 17.3359 2.51959L17.5004 2.65133L17.6647 2.51961C18.1138 2.18648 18.6496 2 19.2143 2ZM3.91471 4.97713C3.6512 5.42352 3.5 5.9441 3.5 6.5C3.5 8.15685 4.84315 9.5 6.5 9.5C7.0559 9.5 7.57648 9.3488 8.02287 9.08529L3.91471 4.97713ZM19.2143 3.51495C18.8646 3.51495 18.5314 3.68829 18.2869 4.00219L17.5028 5.00858L16.7165 4.004C16.4696 3.68856 16.1356 3.51495 15.7857 3.51495C15.1014 3.51495 14.5 4.19218 14.5 5.07903C14.5 5.47127 14.6193 5.83608 14.8152 6.10176L17.4775 9.485L20.0438 6.27042C20.3292 5.97565 20.5 5.54762 20.5 5.07903C20.5 4.19218 19.8986 3.51495 19.2143 3.51495ZM6.5 3.5C5.9441 3.5 5.42352 3.6512 4.97713 3.91471L9.08529 8.02287C9.3488 7.57648 9.5 7.0559 9.5 6.5C9.5 4.84315 8.15685 3.5 6.5 3.5Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/emoji-categories/symbols@2x.png b/resources/icons/emoji-categories/symbols@2x.png
deleted file mode 100644
index b5e7cc6c2ab6292babcdbbba37b5c41e6511f94b..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/symbols@2x.png
+++ /dev/null
@@ -1,8 +0,0 @@
-‰PNG
-
-���
IHDR���0���0���Wù‡���bKGD�ÿ�ÿ�ÿ ½§“��žIDAThí˜MHUAÇ–YA–YѦEµ)*ZQÖ¢0‹
-´ÚDP›Ñ&‚êчíÓhTh.2‚¾
’쓲¤6‰ö…¦Iš¦-Î}yçΝûî}¾÷ Ã坙ûŸÿ¹ïÌù€á$°¢âõÍÀ`–iaºà@@VD›é$+äû~¼z€å™l�À¹{$UT·ÉJ€¯.]KÊØYˆ×™ZãÒõ¦€—µ˜‚ÂG×=a¼YE$uÎós6é{ˆMòÔy6gê?ðÞyVCæ$2·ÌÚ‘È”‘Lv�dãï«^dÂøøB`'R,ò€!$Æ¿îù¼ßTÙnåž\�
¸‘ÿ£Qæ¯ ž6œA>-èL†™’:½&ÆÓ€k!Þ­	³qT.4xiÀóÏ‘è•r�r‘Ã<`A|�¨¦™�m’Q2Ù|F'²|Gÿ	µõÀU -Äÿ%e’ì‘ÎiÝeøø¤…l�n#¡±¸¬‰ùOfM˜W+° AüãÜcaˆL¸G05 ~±n‘F8í5¹K؁D]ü>Ѐ˜Êè˜kÝÝ‚
-Ø;$ù€„ÌZeþQ@º•÷€µŠî‡ùø(‡Ñ¥ÄL奛.Àaà®24;ªyc�øí³„¼î|üT—máue¾F™¯õc¬H=f÷FÜL%¯[wT·Á6eQ?°Ô™+AZ>÷ü¦€l¶0 8Qò ýq«²¸	ižû½u?ªÈ)ùä}Cmc¿´:ž.™#®ÒãŒûÀÆ(Èǥ‡¼zØ£”˜Ç¾Öä!áSÒNš“/DÊY“ûˆ’±Kbûyf]U]€·Êï!`·æý0g"¦Ù7ùlä6L8‹$º‹Š~	¹qÙ|¶FHÞ]*øV¯¥€
-×ü$À=ßç�Ÿd$jõë"&oU½Ö)mŒ­4s‘¤º“
-Ú
¬ˆˆ¼uõªúy¥Ç¦ùÈ
	°ÿ^Á†<¨^;åC¼ï‹¶ãèî ÷Ÿ‰/׬U«×B<ª×F
`°˜‚Ü ìž¾Ä°2Bò0ÒÎÆÇ*`µ¢ëØo d|Áì>‡‡�Õk毫€}+#w<:)³$«×¹Øõÿ€+H™¼Ö¬i@\ÏK#á×Fl«W@šúR¤‘ù„tK]H’»ìaì!|ЀWÝű±zývº«°D
-º����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/travel.png b/resources/icons/emoji-categories/travel.png
deleted file mode 100644
index 93da773e8f235bbd2ee9642c5a7cdc64325e5a92..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/travel.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-���
IHDR���������àw=ø���bKGD�ÿ�ÿ�ÿ ½§“��lIDATH‰ÝÔ?KQðk„tÚ-"Ab!XkgÀ	¶Yˆ|¡¤~€µÐZ£U$ÐÆÎù³‰°•6‰VÉ®ÅÜÑÙegvFÝÆ—Ë»ïÜsÞ›yïq_QÇW´ÑmãUYñgø_B¸7þa±ŒÁ^4¼ÃH	þÞGÏÞ ò¬dË/³šÀÎÃd®á9š®·Û¨ ž¢‘éo†æ~êþžK70XêÑø‘üœ™øŽÚ
jÑ›êìÃ<Ä&aO$§è6ø†íжªú‘,à(õ[®:‹zhÕpÅÓÈS’óü»x\ ”ÇíÒ\·7QL/Zò¸ocܨ¡ÅÉÈó‘—#/äqS­VÖ`"ò—È[=ã~Èã¦Z-X‘lg=ŠS’­þÁŽÁÿ w#4_“¼ž|*ªŠýÐ\„ûOa‡C?¼]H'óÆ•ù½ÚIâ|/ƒ6ü‹;äß=.ëvÊùÌ×Ïw����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/emoji-categories/travel.svg b/resources/icons/emoji-categories/travel.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f4c401b83e7dc6d498a6154021bd995bd409b105
--- /dev/null
+++ b/resources/icons/emoji-categories/travel.svg
@@ -0,0 +1,6 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.25 16.5C8.94036 16.5 9.5 15.9404 9.5 15.25C9.5 14.5596 8.94036 14 8.25 14C7.55964 14 7 14.5596 7 15.25C7 15.9404 7.55964 16.5 8.25 16.5Z" fill="#212121"/>
+<path d="M21 15.25C21 15.9404 20.4404 16.5 19.75 16.5C19.0596 16.5 18.5 15.9404 18.5 15.25C18.5 14.5596 19.0596 14 19.75 14C20.4404 14 21 14.5596 21 15.25Z" fill="#212121"/>
+<path d="M11.75 16.5C11.3358 16.5 11 16.8358 11 17.25C11 17.6642 11.3358 18 11.75 18H16.25C16.6642 18 17 17.6642 17 17.25C17 16.8358 16.6642 16.5 16.25 16.5H11.75Z" fill="#212121"/>
+<path d="M5.22699 9.5L4.94723 10.619C3.82006 10.9625 3 12.0105 3 13.25V22.25C3 23.7688 4.23122 25 5.75 25H6.75C8.26878 25 9.5 23.7688 9.5 22.25V21.25H18.5V22.25C18.5 23.7688 19.7312 25 21.25 25H22.25C23.7688 25 25 23.7688 25 22.25V13.25C25 12.0105 24.18 10.9626 23.0529 10.6191L22.7732 9.5H23.75C24.1642 9.5 24.5 9.16421 24.5 8.75C24.5 8.33579 24.1642 8 23.75 8H22.3982L21.7958 5.59049C21.3784 3.92111 19.8785 2.75 18.1577 2.75H9.8424C8.12164 2.75 6.62171 3.92111 6.20436 5.59049L5.60199 8H4.25C3.83579 8 3.5 8.33579 3.5 8.75C3.5 9.16421 3.83579 9.5 4.25 9.5H5.22699ZM9.8424 4.25H18.1577C19.1902 4.25 20.0902 4.95267 20.3406 5.95429L21.477 10.5H6.52315L7.65958 5.95429C7.90998 4.95267 8.80994 4.25 9.8424 4.25ZM20 22.25V21.25H23.5V22.25C23.5 22.9404 22.9404 23.5 22.25 23.5H21.25C20.5596 23.5 20 22.9404 20 22.25ZM8 21.25V22.25C8 22.9404 7.44036 23.5 6.75 23.5H5.75C5.05964 23.5 4.5 22.9404 4.5 22.25V21.25H8ZM5.75 12H22.25C22.9404 12 23.5 12.5596 23.5 13.25V19.75H4.5V13.25C4.5 12.5596 5.05964 12 5.75 12Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/emoji-categories/travel@2x.png b/resources/icons/emoji-categories/travel@2x.png
deleted file mode 100644
index 2f72a2813a09d6e697b1a03c5dda346b995b3d07..0000000000000000000000000000000000000000
--- a/resources/icons/emoji-categories/travel@2x.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR���0���0���Wù‡���bKGD�ÿ�ÿ�ÿ ½§“��ýIDAThí™ÏKTQÇ?ómU`$Yd”`mj‚A? —‚¶©UDËÚ.Z$Q;kU»Šlaá*„"ÇMóD`Tj#†ãL;ÇiñÞäõÌ}?ç¾ñ	ó…³xçÜó=ßûÎÜûÞ}
4Ð@ž‹@	(²°�<ºâ?�
Šv³"pÉ´ø^àoÄ«“8mJ¼|®£øŠ}R&&p^—€ë@‹	r-À
ª×Õ9äS‚ô¥	R¼µ¦j%<¬ÒþZI=pVÔZ×BøPÎcèwé‚ðUÔ|† »yôkÔ X7ŒºÔÎŽF-ځŸ.É•vvÆ(¼‚Nª¶ª-ût‰Ï=’ÊÀtÌÂULûhy¦KZõIŠY´Š!-tIK	¿Ö¸U+hujºéYÔ%
8]Âxì’«1î¢ew¥à.°æ’¼¶æhëÑ	ïÞ'@dP{‡òÚ½øž�Qaí°»	¸	ëÚ’p´¿,à¤Ì�}؏õ$YŸ£MÅ)hÎ@6ìí¨²ØÚT4[@N8¸³Ø§¥"Ò„…á=(®s�·Ùº8iï㾘Æj–÷±sàŠpNŠ¤A"‹Ò‰(¼¯E|ªEÒl€BrqAÞ¬ˆ÷tç¼H*ˆøìAõ­E˜@Þ"~ÌÂ>¨èÀûÔeùģ7ì¾ÿ¼mÊ á[ay÷âѝ/"x\‰¥ºaayOˆØœJ&ÔQḷȽâ£ð^ñŒ”ßc®jŠ¥±[Zpl†hw>*ï5¡q6_#äÓ¸CCðÖ1ÓÊ+5åÀ^ù�Ë>ƒ“�©i‹æüTÒlÜ;°°›˜6¶OKhlàl£MŽ£ˆýé®صM¢‚b¸ƒ³z=ºËâZŽõ‹ûÁ¿¥sî$xM  ®å. "¡¶~¯	|!&ÌØzñÓ
¬à¿¯�GÈØßê'Ñÿá‘ÞÔB^þbÇ?ü×®ˆ
-d&Ö����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/add-square-button.png b/resources/icons/ui/add-square-button.png
deleted file mode 100644
index 7b6f1b1915828d60228b1673451043b2bf19e8d1..0000000000000000000000000000000000000000
--- a/resources/icons/ui/add-square-button.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ;:
-#q���EIDATHÇc`À
<þC¡nEL‚QF
&°àÉ(ÆXX€‘áÿPŠ
`Ĉ-PV
ÃYr-ÒF
5€��ce
JZ݇Ç���%tEXtdate:create�2018-07-20T14:59:58+02:00\Êæ£���%tEXtdate:modify�2018-07-20T14:59:58+02:00-—^���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/add-square-button.svg b/resources/icons/ui/add-square-button.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9f444e4da0882cbf9b1dadf842160eccbf067d0b
--- /dev/null
+++ b/resources/icons/ui/add-square-button.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2.5C8 2.22386 7.77614 2 7.5 2C7.22386 2 7 2.22386 7 2.5V7H2.5C2.22386 7 2 7.22386 2 7.5C2 7.77614 2.22386 8 2.5 8H7V12.5C7 12.7761 7.22386 13 7.5 13C7.77614 13 8 12.7761 8 12.5V8H12.5C12.7761 8 13 7.77614 13 7.5C13 7.22386 12.7761 7 12.5 7H8V2.5Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/add-square-button@2x.png b/resources/icons/ui/add-square-button@2x.png
deleted file mode 100644
index 1aeeb2d5ba482461afbd636df9720678d9de1e25..0000000000000000000000000000000000000000
--- a/resources/icons/ui/add-square-button@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ�Q*à���lIDAThÞíØÁ	À ÀKHAé -jIé ™¿ÏEð3{?A<8Ъ,­ÆT-;èË�����������°p„Oª§îiå«7Œ½7°½���Wõhß²A”Æ'�����������À²üZ8Í
c���%tEXtdate:create�2018-07-20T15:00:02+02:00àŽé„���%tEXtdate:modify�2018-07-20T15:00:02+02:00‘ÓQ8���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/angle-arrow-down.png b/resources/icons/ui/angle-arrow-down.png
deleted file mode 100644
index e40ebca54e3d7c27820e67ec65d850a3bafbfd2a..0000000000000000000000000000000000000000
--- a/resources/icons/ui/angle-arrow-down.png
+++ /dev/null
@@ -1,13 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���szzô���sRGB�®Îé���	pHYs��ê��ê¿/G��diTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:CreatorTool>www.inkscape.org</xmp:CreatorTool>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-ÜǦm���ïIDATX	í”±Â0D³‚øÄ�‰oçCX€‰
>î*NmRBjw²¥«“4õ»:USŠˆDú,0\õS·de±ÆìÝ¡cvÇvÂÚdEf\/Ð룲‡	ÖdmqÈ$;‹ºimâ.Ùé�±-ZT¶2Q‚“Iv[\=LŒÁÉÌÂÚÄ_p9±2Ñ—‰SŽc\&Z;ao5a
-—‰ÚãpËÄØq챉þáôáwÄgM¢dâ‰ê” Ê¦p½AÉ„ Ê.ðZ®ð_&f—LÌ
-š¸ar…̾v¯ÍKl¤"¢сæ¼&o«x´����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/angle-arrow-down@2x.png b/resources/icons/ui/angle-arrow-down@2x.png
deleted file mode 100644
index ed095bfea1777f62cf4d99d4832a9371f801bba4..0000000000000000000000000000000000000000
--- a/resources/icons/ui/angle-arrow-down@2x.png
+++ /dev/null
@@ -1,12 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���sRGB�®Îé���	pHYs��ê��ê¿/G��diTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:CreatorTool>www.inkscape.org</xmp:CreatorTool>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-ÜǦm��*IDATxí˜=NÄ0FƒBB\€Šp*@Ã5(à,GàHÐPÒR±âçû£õz'ö&Ž';–;ëìÆïyâ843`Ì€0fÀ˜3`ÌÀØ
0á³Ä!â-Яñ£SúñŽø@´–ô<#~Ÿˆ+„öB²‰ldv¼"x¢Ä7Úš%pìdÖd\“‚—/i•‚¦	Ç0òâY’¥Ö&!/Ld&{óÔ/_øÂynŽ‘c•qÇj²77=OæÕž	}fÞBöfqp;bmJ¸FÔV8&Ž-6v·Ìdÿ+ø›"¡¶Û!%í)¬d^)Z%/&R%L};ä¤ýÚ̼Ô<ááÞ/±öTcê‚L{öëœLà€J•Qá¢V	Eàs%Œýt |ßMNëj/p}ëZ2¡èÌûrr$¹Yeµ÷!»ŽS%u;L’öm2JK¨
-^¤¤JÈÝ,U‘öí×”0æfiÒχm;ÎÉ‚uð1´Uð¹Úž„/¾ÉˆMëM3AåÌûÒr$\âG©ÿÉᵪ,©b¯Ù¡¾¤WÚ©%A¼HZ‚*xWBÊf)”òƒ½ÒÊ J×›f‚Ê™÷%çJ˜¼ÈH•0+øT	³„ï+aÖð]¶Þ•p‡yôÝ¢Íu¢xÙ)~Åå÷Ð<ÿ?|D½XvYË˜3`Ì€0fÀ˜3`F5ðe‚Æ¢´o����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/angle-arrow-left.svg b/resources/icons/ui/angle-arrow-left.svg
new file mode 100644
index 0000000000000000000000000000000000000000..830f62c34f713888d6d0ab875c96e3332f35b379
--- /dev/null
+++ b/resources/icons/ui/angle-arrow-left.svg
@@ -0,0 +1,3 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.0303 22.7803C17.7374 23.0732 17.2626 23.0732 16.9697 22.7803L8.21967 14.0303C8.07902 13.8897 8 13.6989 8 13.5C8 13.3011 8.07902 13.1103 8.21967 12.9697L16.9697 4.21967C17.2626 3.92678 17.7374 3.92678 18.0303 4.21967C18.3232 4.51256 18.3232 4.98744 18.0303 5.28033L9.81066 13.5L18.0303 21.7197C18.3232 22.0126 18.3232 22.4874 18.0303 22.7803Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/angle-pointing-to-left.png b/resources/icons/ui/angle-pointing-to-left.png
deleted file mode 100644
index 7c5432a664d8260b0cf4e6d8236bdc64eb59c72b..0000000000000000000000000000000000000000
--- a/resources/icons/ui/angle-pointing-to-left.png
+++ /dev/null
@@ -1,12 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���szzô���sRGB�®Îé���	pHYs��ê��ê¿/G��diTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:CreatorTool>www.inkscape.org</xmp:CreatorTool>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-ÜǦm���ÌIDATX	íW1
-Ã04›< tiè~¼_éÐ!C¡Ðö1Íi8ðÇrò"ÁaC@w>a9JIÒށ“&ýzÖ>¿€?ð΀[ØÉInàÈ#?9Ém}½š½Dþñ­%ùä*J5ÿ0lW¹žJ¶ÛUÛe¶/õvk¯.¶w š€¼¯Ûþ\]â°Ka’¦%๚^¿A¸F9jN¸<Ç5.]2DЮk·Cþ[^á2˜PÄÒÛá6šQD^÷á”"̉MãùzÈ¥T9¦	����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/angle-pointing-to-left@2x.png b/resources/icons/ui/angle-pointing-to-left@2x.png
deleted file mode 100644
index f2fa93c441598709be07e4461326403871d1a52f..0000000000000000000000000000000000000000
--- a/resources/icons/ui/angle-pointing-to-left@2x.png
+++ /dev/null
@@ -1,11 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���sRGB�®Îé���	pHYs��ê��ê¿/G��diTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:CreatorTool>www.inkscape.org</xmp:CreatorTool>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-ÜǦm��¢IDATxí[Ëm1D9‘´À‰;PäÊZI$MÐFÐåÃ8쓬•v•·á°;3–žByæ}mˋżÆË}œ!ëy-ýÿ«}Â_¼B~Z¹@o £>Hh€žž„þ
 »šš„>ËwIxA+Õø+ø ã™	}ü'ÀoYÈ‚ÿðƒÁ0µü—-O`õ!kyº˜jr¢Ä…¦_÷ö²OðG¯O»½t“/íöÒ	OÞíÝÛ3”»Òá¹É	}Mý½t¶—NxÒà¥ÝÞMC™+ä3²ûyšïÖ?AêZ>ô™*Û×ß%À`î¾ühŠãaŠ‹šÃšäC Iº„—š„ž@Wm<Œ	š‹Ž±9Áá�æLH :¨ÃAöP´&AvÇh‚èl‰tbiTç†áYO ­™Äèp€û˜„6'PîÜ,Áº™œàêІÍðüŽl‰tbm“p»ž£z2sËù
Õ£©,	”Ïæj†š¥71™U÷•H	ðaÔ.	R§ƒ„»?Ÿ¿ðD¶Ç‚����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/arrow-pointing-down.png b/resources/icons/ui/arrow-pointing-down.png
deleted file mode 100644
index b198dcced458ec20cf3f545b6fe4906c158d630a..0000000000000000000000000000000000000000
--- a/resources/icons/ui/arrow-pointing-down.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEá2(!j A���úIDATHÇíÒ1
-Â0@ᧃ ŠÎâMœ<‡ƒC¯àâ<€ƒ'pRàRzœºª£C,MÚ´M‚£É”Ÿ¼¯CÓ¡i͘�1<Ö”AÆ…©;°E({ëÄ×]ëÖý†“`¹þÀÏ€9"zVM€ˆó|°äý}.G…H´‡”(ùñ;ËXɯ¿•‹aŠ\8iÂè¹@p†[i”U šî°®%QL¹`®F"ÕΩ1Dûç¿Æ‡Pr¢”»†Ü…¨Ém‰†Ü†hÉÛ‹¼‰°Ìë‡ÜD8æeÂ#—ÄŽ'/ö~¹\ã¶øÕ y£a‘Ð…���%tEXtdate:create�2017-11-27T22:50:40+01:00Hs���%tEXtdate:modify�2017-11-27T22:50:40+01:009.¾¤���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/arrow-pointing-down@2x.png b/resources/icons/ui/arrow-pointing-down@2x.png
deleted file mode 100644
index 4722f3bcfd255d7073f3631e242ea305d257dd36..0000000000000000000000000000000000000000
--- a/resources/icons/ui/arrow-pointing-down@2x.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEá2"Á¿I_��IDAThÞíÙ½JÃ@�Àñ¿Å±  \œŠZ¿¿ÁEŠOàà;¸ø.Òð!GÔÁ¥ ]*bÕ~‰TΡ~´é%w—\Î%—¥%—ûÿš”RøçÑò¸aÈÒÿýî“;®xv…N±OáÙZì“r(ôĶ‚‹ü–o^ Ø2?¦c'Â^+€\„½V�ƒöZX	 $€�À¿ú;^°Ç"#ÜqÌQ­]òd)sÉõÞÝ›”;­NÈø,S
-|$+ù•á¤cV™Mï„<ž¥n}a�n=ó>Øîþô-Ébr‚9 7ß&ä&¬óŒ`
-çÛ¿$6�†xX°—`ðϏý̐L�Áyàå/A ÎnàM9©› ÐÉš)Š¨Ç§¾÷ùÈpʄƼbŠs­Íºy8ƒ4ESõw!Ô—@ïä÷¤Æy2 ¨�úùW¦ÿNpE›<³bŸé¾Æº;›'ïšðʬü›î†P•ç&ò.UæT·†8	ù8	Uæuo¥“<[Ï×ôóqó�9‹„¦y›„y[„‹aó6õhù¨y€©„:K6òa	óm‹a~ÙfޔаŸ7!Ä”×%4X‰+0­ ÄœW¬Æ"4Ýäýó2B“5—y€QÎ~óŒ…]&ìŸ×ícsL×Ü \~kãÎ'hläqÒn���%tEXtdate:create�2017-11-27T22:50:34+01:00¶ù+���%tEXtdate:modify�2017-11-27T22:50:34+01:00Ǥ“®���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/at-solid.svg b/resources/icons/ui/at-solid.svg
deleted file mode 100644
index 8b72d6f828e20da137f5ed37beaf1e37090b44ae..0000000000000000000000000000000000000000
--- a/resources/icons/ui/at-solid.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="at" class="svg-inline--fa fa-at fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M256 8C118.941 8 8 118.919 8 256c0 137.059 110.919 248 248 248 48.154 0 95.342-14.14 135.408-40.223 12.005-7.815 14.625-24.288 5.552-35.372l-10.177-12.433c-7.671-9.371-21.179-11.667-31.373-5.129C325.92 429.757 291.314 440 256 440c-101.458 0-184-82.542-184-184S154.542 72 256 72c100.139 0 184 57.619 184 160 0 38.786-21.093 79.742-58.17 83.693-17.349-.454-16.91-12.857-13.476-30.024l23.433-121.11C394.653 149.75 383.308 136 368.225 136h-44.981a13.518 13.518 0 0 0-13.432 11.993l-.01.092c-14.697-17.901-40.448-21.775-59.971-21.775-74.58 0-137.831 62.234-137.831 151.46 0 65.303 36.785 105.87 96 105.87 26.984 0 57.369-15.637 74.991-38.333 9.522 34.104 40.613 34.103 70.71 34.103C462.609 379.41 504 307.798 504 232 504 95.653 394.023 8 256 8zm-21.68 304.43c-22.249 0-36.07-15.623-36.07-40.771 0-44.993 30.779-72.729 58.63-72.729 22.292 0 35.601 15.241 35.601 40.77 0 45.061-33.875 72.73-58.161 72.73z"></path></svg>
\ No newline at end of file
diff --git a/resources/icons/ui/attach.svg b/resources/icons/ui/attach.svg
new file mode 100644
index 0000000000000000000000000000000000000000..89503e637a4af7bc9c40d5d1348a2060c4f3a728
--- /dev/null
+++ b/resources/icons/ui/attach.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.7717 3.7431C14.1132 1.39951 17.9121 1.39951 20.2553 3.74266C22.5384 6.02572 22.5969 9.69093 20.4309 12.0449L20.2428 12.2422L11.4427 21.0404L11.4062 21.0707C9.94492 22.3875 7.69092 22.3427 6.28355 20.9353C4.96453 19.6163 4.84241 17.5536 5.9172 16.0969C5.94054 16.0516 5.96879 16.0078 6.002 15.9667L6.05556 15.907L6.14247 15.8193L6.28355 15.6714L6.28647 15.6743L13.7222 8.21998C13.9881 7.95336 14.4047 7.9286 14.6986 8.14607L14.7829 8.21857C15.0495 8.48449 15.0742 8.90112 14.8568 9.19502L14.7843 9.27923L7.18966 16.8923C6.47202 17.7679 6.5219 19.0622 7.3393 19.8796C8.16836 20.7087 9.48801 20.7481 10.3638 19.998L19.1965 11.1676C20.952 9.40992 20.952 6.56068 19.1946 4.80332C17.4922 3.10087 14.765 3.04767 12.9986 4.64371L12.8307 4.80332L12.8181 4.81763L3.28179 14.354C2.9889 14.6468 2.51403 14.6468 2.22113 14.354C1.95487 14.0877 1.93066 13.671 2.14852 13.3774L2.22113 13.2933L11.77 3.74266L11.7717 3.7431Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/ban.svg b/resources/icons/ui/ban.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3de48701aa51014e71cbe988cb39a8af3cd532b1
--- /dev/null
+++ b/resources/icons/ui/ban.svg
@@ -0,0 +1,3 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 2C20.6274 2 26 7.37258 26 14C26 20.6274 20.6274 26 14 26C7.37258 26 2 20.6274 2 14C2 7.37258 7.37258 2 14 2ZM21.9359 7.12432L7.12432 21.9359C8.96644 23.5333 11.3703 24.5 14 24.5C19.799 24.5 24.5 19.799 24.5 14C24.5 11.3703 23.5333 8.96644 21.9359 7.12432ZM14 3.5C8.20101 3.5 3.5 8.20101 3.5 14C3.5 16.6297 4.46669 19.0336 6.0641 20.8757L20.8757 6.0641C19.0336 4.46669 16.6297 3.5 14 3.5Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/black-bubble-speech.png b/resources/icons/ui/black-bubble-speech.png
deleted file mode 100644
index 350189b12d9f58bedfb54ab359f995efb63be8fe..0000000000000000000000000000000000000000
--- a/resources/icons/ui/black-bubble-speech.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ�
#íÊÎ���ÍIDATHÇÅ”-1…¿.Ü€ H(ÔJÌ&œ z‚u=�ÃUP‚‡Â¯]¹þZ±Éd¦É¶¦“ô}óúځ†N1‚Jüe÷ŸG‡i6yÀ8©Ž\š
-—q$µ¨ik2¡i’]ækL8	4[v}€–›�°Š‹Ì!zJfæ‡Hf@šAË] ™0ïq„‚§pµz(yXþeÌð,pâ–S6V×û¿ƒ‘
-pƱ~/u€¡$.LYè|\¼�¤„¯(NwF���%tEXtdate:create�2018-07-20T00:13:35+02:00?æO���%tEXtdate:modify�2018-07-20T00:13:35+02:00pb^ó���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/black-bubble-speech@2x.png b/resources/icons/ui/black-bubble-speech@2x.png
deleted file mode 100644
index ca5ba09d9a4f2f85d5ffb1300227335506ca42f0..0000000000000000000000000000000000000000
--- a/resources/icons/ui/black-bubble-speech@2x.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ�
(zÚF��AIDAThÞ혱NA†¿½„Z+BiBbbB¤¼Æ‡àmh °»°¢²õ	h|�hL,ìl|IràN˜n±˜™ær[üßÌîü{9¨"cÁš‚R!Ö,È8D‡œŠt=wät*€\]|ŸyÕ|ýê]ÈRæÜa06“
-Z†�Û@iÚ[yø�òlx¨3¤+-I.µŠZèJÒ1ßp�ù.PC¿Œd'üä!¢Î”´äNè�Æ!OAQDž´àFdàFä� ;á€Çˆ:â×€;¡8@‡5À«5À³-@Ê·ÜØB\²4û_^¦À7O|ÑçŠT¿úP{¾àšöéL˜ê׌™¼:ñBàþôµæ®ŸEÐ=vg´Ïý	‚þàýB0˜ü&‚@Á †` ú‚nÌ4PèÂï)¤Ù¨*ôÜ���%tEXtdate:create�2018-07-20T00:13:40+02:00YÂÀñ���%tEXtdate:modify�2018-07-20T00:13:40+02:00(ŸxM���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/chat.svg b/resources/icons/ui/chat.svg
new file mode 100644
index 0000000000000000000000000000000000000000..dcc85063f66534bb533e252d9f056f5e7e514181
--- /dev/null
+++ b/resources/icons/ui/chat.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.0002 13.9986C11.0002 13.4464 11.448 12.9987 12.0003 12.9987H20.0005C20.5528 12.9987 21.0005 13.4464 21.0005 13.9986C21.0005 14.5508 20.5528 14.9984 20.0005 14.9984H12.0003C11.448 14.9984 11.0002 14.5508 11.0002 13.9986ZM11.0002 17.998C11.0002 17.4458 11.448 16.9982 12.0003 16.9982H18.0004C18.5527 16.9982 19.0004 17.4458 19.0004 17.998C19.0004 18.5503 18.5527 18.9979 18.0004 18.9979H12.0003C11.448 18.9979 11.0002 18.5503 11.0002 17.998ZM16.0004 3C8.82055 3 3.00009 8.81954 3.00009 15.9983C3.00009 18.0725 3.48673 20.0357 4.35274 21.7775L2.6566 26.8651C2.14576 28.3973 3.56859 29.8717 5.11837 29.4159L10.5717 27.8122C12.2248 28.5728 14.0644 28.9966 16.0004 28.9966C23.1803 28.9966 29.0008 23.1771 29.0008 15.9983C29.0008 8.81954 23.1803 3 16.0004 3ZM5.00015 15.9983C5.00015 9.92397 9.92514 4.99974 16.0004 4.99974C22.0757 4.99974 27.0007 9.92397 27.0007 15.9983C27.0007 22.0726 22.0757 26.9969 16.0004 26.9969C14.239 26.9969 12.5769 26.5837 11.1033 25.8498L10.7519 25.6748L4.55402 27.4974L6.52069 21.5983L6.31495 21.2175C5.4765 19.6656 5.00015 17.8891 5.00015 15.9983Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/checkmark.png b/resources/icons/ui/checkmark.png
deleted file mode 100644
index 281fda3c7aee20cf992c740b318d93a98840510f..0000000000000000000000000000000000000000
--- a/resources/icons/ui/checkmark.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâòþ^Ì���IDATHÇc`Ñ€ƒ2íNÏL)Ñþ•á?Ã{cJ´ÿgøÏ°‡2íç„Fµ#íî”io`øÏ02íÿþ3L$×ï0þ3L"7èFL&7äFL!G;ªSI׎jÄ4gò’
ˆ¿ä¦:„d'ÚÊ´#Œ Z;3†ÈF~†wäÙœ”hr��ïñ–v‡z|���%tEXtdate:create�2018-07-01T14:28:23+02:00è¥Ä«���%tEXtdate:modify�2018-07-01T14:28:23+02:00™ø|���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/checkmark.svg b/resources/icons/ui/checkmark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f644493a19a23aeb9d7172384ee39fbef07a730b
--- /dev/null
+++ b/resources/icons/ui/checkmark.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M29.726 5.31247C30.1058 5.7134 30.0887 6.34634 29.6877 6.72617L10.6877 24.7262C10.4943 24.9095 10.2356 25.0079 9.96926 24.9997C9.70288 24.9916 9.45079 24.8774 9.26895 24.6825L2.26895 17.1825C1.89211 16.7788 1.91393 16.146 2.31769 15.7692C2.72144 15.3923 3.35423 15.4141 3.73106 15.8179L10.0436 22.5814L28.3123 5.27426C28.7132 4.89443 29.3461 4.91154 29.726 5.31247Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/checkmark@2x.png b/resources/icons/ui/checkmark@2x.png
deleted file mode 100644
index 3f85fa3916aa10d193d6002f8c4109880fbdf5ac..0000000000000000000000000000000000000000
--- a/resources/icons/ui/checkmark@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâûHç���õIDAThÞíÏÉ
Â0…á'àD	ˉNXÛ¢Žœ©ƒ%u@H˜B@°ÛÏH0¯ï€N§^WDÍqÃUîôvèKñC00R	O^(áH¨ò[YþŒéóNþ¤¼?°ò3å•ÿyþ¨|…Ÿ+ï»N>oϯ±AO’70‘	d|\BŽž`çñ|X‚/Ãx[€o	Ÿ@ÆÇ%òá	ä|XB–‚÷OHÆû%dØ[ø%
ßœœ¯O`áÝ	c.Þ•Pòñ®F¾9!9_ŸPb•žw'°ñöVþ;ÿLá_	bü#A”€‰,¯Óé’íQWöã.I¤���%tEXtdate:create�2018-07-01T14:28:27+02:00êà¸���%tEXtdate:modify�2018-07-01T14:28:27+02:00m·X���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/clock.png b/resources/icons/ui/clock.png
deleted file mode 100644
index 3d97e35884031bde99ba765ed9decc50f92718b2..0000000000000000000000000000000000000000
--- a/resources/icons/ui/clock.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâÝxAî��ÙIDATHÇ­Õ±NQà«6XlBHH,(x�*&i(,)x+¢Óù�HL„ÄÐhAg,,(5‰nÅòf"!¬¡[-0A‹™e…]w]ÿjrþóÿsÎͽçÈÐȂ)cFQsªê­²óÖԁ–HIlQ!Ƕî
ß:zhÙ°öønËs?ó
J^šÉ¾/Tì:t‚q“æÌWñàz0m_"‘8¶ªØ­:Î2öM·vސï‰Ú6Ù»´(]í}'#Ös¯‰‚õ,sÇ`3¼r)ï
‹•fùÕ¬øë*ñ>§Š´‘ª±aü«wUA]ì†ÅCÁ¶rWr(Û‹†‚H6º–ÆDÁ¨8ëÉàL,S`·'yS1ŒÃž
RÅX0
-Nz6H£á¯‰îv¢ƒÏe¿â¶W^˜háRE-8“¹[–à¾Oýy÷/§A̵©ð³{ž9wËc¯4“*ªÌK$Žr&@w¼ÎÐf):’HÌeuqƒK–Õð%‹Äêéõ_ËæP¤3FÄÙ9DÙlZK‰öÏ9Wžó
üpÓ,F½ëÂà‰Y°éC#Ô÷Hë{¨òÏc½ïÅò_W[£Ž>–k=¬÷ß"ô¿(£sÎ���%tEXtdate:create�2018-07-01T14:26:30+02:00.î���%tEXtdate:modify�2018-07-01T14:26:30+02:00zsV§���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/clock.svg b/resources/icons/ui/clock.svg
new file mode 100644
index 0000000000000000000000000000000000000000..bb53d7e7b647849dabbd47340ee346bb49820de8
--- /dev/null
+++ b/resources/icons/ui/clock.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 9C14 8.44772 14.4477 8 15 8C15.5523 8 16 8.44772 16 9V16H20C20.5523 16 21 16.4477 21 17C21 17.5523 20.5523 18 20 18H15C14.4477 18 14 17.5523 14 17V9ZM16 30C23.732 30 30 23.732 30 16C30 8.26801 23.732 2 16 2C8.26801 2 2 8.26801 2 16C2 23.732 8.26801 30 16 30ZM16 28C9.37258 28 4 22.6274 4 16C4 9.37258 9.37258 4 16 4C22.6274 4 28 9.37258 28 16C28 22.6274 22.6274 28 16 28Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/clock@2x.png b/resources/icons/ui/clock@2x.png
deleted file mode 100644
index 8ba1a54fa7a54175901ddb7514d9d8fceacd7695..0000000000000000000000000000000000000000
--- a/resources/icons/ui/clock@2x.png
+++ /dev/null
@@ -1,14 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ"ò=i��4IDAThÞÍ™LUeÇ?çä‹ýq³‹Î…›ÿ8HFF5e¢…î4mþ£·˜­Õf¦¥.kÀ´¹P«å&4iþhSk×l¤AHLÿ áfþ“H“Ž‰Á˜úãp»ïsî¹Üsνd_v·÷yÞ‡÷ùž÷×ó¾Ï«á©,e>>2¦~0@ÿÔ¯‡vFœ5§9°õRÌK,'e›1.ñ=Í&—€‡øÉC·ÙêWršÉ  QÁNžrÐSaôòA&#PÈ<íÂyרá'·28²œ‡ñ3[éwN —ãøbԍÓÇ�!�|ø˜ƒ¹ÌŠa?@€.gÊ9l9Û‡i¥‘îYÔ¥SD)+H³¨ãÎÛ% ±w-ô-£#îÌöÏŠ,jjù8zJFÐø„µQÚnªhÃ>
-ØË¢(í9¶š)<e´ƒ×Mš»ØC¯÷ÐË)~g±i8²€Žé{ œ£&M'•ö÷5¼Ôó‚ÐLòßÅî\L3ù$orߥ{åf“#>x­üiM ƒ³<®Èãìå ®ÝLÐÌ]
-•MÜÃ*‚ümEà²Ä?ïåxBÎÃèbˆ•ŠœÆ‚Ñ
-MKï$“âÞ à±€þ0ŠáI¨Ñ$öüNÖÇYñÙ4O•N°3.gÄtì¢ÌXá±©îCTÚ	¥ð€JBŠœË£ Oñ“ßPízáÅÆ ÕBލ'B`£ˆ÷Ý‘)’TéV¤L6Fø…aU¼C„KLR%d˜€—<EÝâhÏw†6Z)¯A DœõŽÍ˜{së:%RE9lIFÊT
-:©,WT­I^~f< U‘–“ª³Tœ|gÔ½ÙC
-Kuæ+Šq1If-Œ+Ò|]<û,ÏzÉÅ=úɧ“¡ˆ3îÞì%Cö@Èi[® zù¿õÀOÀg÷¾;2,ÎÖ¶¡K>®Ú(¦‰çØ‹>×ŵÑÈ"ÈažpA _öÀNoò•¶5ÖÓÆk¶Cõ’@Œ°
-~S4éTÓ$B»ã˜Kº
-p…ªEZ*‹óšv0Ò™+{ GgYÞj§Ã8ŸSÈEE£±61£HܽztÚS¥8Çm6à¶øÊyÖÒZõ0F»Î—Õ
-ã¬êMrTĹl¾å^“‡Št‰¡ÓÈwE�F¨âE®*
4˜¬òÅ…½Ñ8’]Ð-.	�\§œ)šý&µõ	.ï"
- 0Éi–qfJ:ËeQ[ &ùU×ÓV)9•�¥‘Ë,f›UôubøŒ_ÃE¿Ð§üùí{‹	Ù&_øè0¦»ÑR¦˜.ækÁÝ
&¸#d/ubîâ:DnÇA®)•s¨w¹c÷G½ˆ]\0
-‘ýª—uŠÁ<fÿ{ÿOð²ß'("nñ<™ŠIwc¥W#À6!7ói¸¨îØmTð˜"2”
->·Ï›¬“T÷éd*tVâãÇ„òd°M¸åUnFD³úéaµÐä°„\¯/'Lc?É[òúoš7ÐLÑ`~îpñs
?u,4ikùR*¢£v™¦|ae”Ðã([\@¨Äý9ö™
­Ž
@¾)‹ìãžá/úâÎÔð~Ôñn’ZöÙI×X͵л}°e«LRÇ#�‹hˆyJvúdb³ÈÙ"�OrbG3ï©ùqû�–°‡ÜœwQm:8$�kØ-6i»¸Å~.$úpià¡>ÝFð¯U$ùùþ…2]§,P���%tEXtdate:create�2018-07-01T14:26:34+02:00ÿaÊ���%tEXtdate:modify�2018-07-01T14:26:34+02:00Ž<r´���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/cloud-storage-uploading-option.png b/resources/icons/ui/cloud-storage-uploading-option.png
deleted file mode 100644
index f679d67646d099f584ec874197ffd57130c8dd2b..0000000000000000000000000000000000000000
--- a/resources/icons/ui/cloud-storage-uploading-option.png
+++ /dev/null
@@ -1,13 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���szzô���sRGB�®Îé���	pHYs��ë��ëåÖDÒ��diTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:CreatorTool>www.inkscape.org</xmp:CreatorTool>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-ÜǦm��%IDATX	í–1KAÇ/DD£‚1¨…"	v‡…UŠ i‚Õ)ø1Ò£…¢$¶ÁBH¾‚`a¡…"AÐDÄ#jˆEÔøû_îÃxw;«žEâƒßÎìÌ{ÿ÷nvvn‰{ûßWàAŒhÁ÷4ÂìÀ:d ¬Öú'P¢?*bž@YlÕ#ðû÷ÛøôÝviµÔ~²b÷?ðMÝVÏ:‰‘ÜŠÚ$¦Âè…VˆmD˜hÜö#±ËpžÓÐÞ™€*²f¼Bžû$~ ´ÀY|ƒÞºþ�Ñ1|d”pH¿ñë‚H{ƒG)AKnBI:31¦7hAÅZ‰½+!æ'7Ð"^[@¡V'Ü°jý¶XrÓŠ*â�ÇÇæ췏X?©îõìF!Ä´'¦ÁÞ�Wï˜ñ9ÐëyÅJ-ûÞ
PõP®)©Æ4'Ÿ&ø
-nr·ÿ“¹È›ÎñCpÜ¾V`vsh¥tИ)ù*Øüwú…VÀÕÔü+ÈÚ�Ww2ª¿…åßÐìU¿\I£âüyéÔUp†8¦ê}+4æûø÷í¤T@³?s‡÷i0u„ZN3·oc¡íS M¥jIÝ3]}é\Ç&,x‘藁
-gø­Àiâñ‹˜®œF¢ƒÎ7ðwj9ïß[rkStvÏäчËkcd2PŽ_¯í-ä?NÜÍÄxÞôÕ	úƒÒ¦»©éœÐ#^ƒý›ŠÝÇÿ[+p	3ÿNøÖì¶(����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/cloud-storage-uploading-option@2x.png b/resources/icons/ui/cloud-storage-uploading-option@2x.png
deleted file mode 100644
index 162bc9549ecfb1a1fb93d7a8b17166d10996f1ee..0000000000000000000000000000000000000000
--- a/resources/icons/ui/cloud-storage-uploading-option@2x.png
+++ /dev/null
@@ -1,20 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���sRGB�®Îé���	pHYs��ë��ëåÖDÒ��diTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:CreatorTool>www.inkscape.org</xmp:CreatorTool>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-ÜǦm��SIDATxíZ[ˆMQƒ™&š\ÌÍä…‰!O^DSäAQx@”2$<))åAžÜ^'æÁu™RÒP<hMx¡Ì1I†·Á÷Î?í³g}]kwö9ë¯oÖ^k¯õÿÿ÷­}Y{)+³f°
-X¬V«@©*0Á ñrøž	TSQ`øŒ�aº˜VmÀZ`PT“¿Àà#ðèz€—@ê­	Î�ï!ð}»Õ@*m"²>pVÃw÷ýƒñy@j¬™^ÜdâÔßÀoŸ‚7ÎÔc Ù|c¿Áï¶BV€3ÿÄy…ˍ…(_m7
“gI¡‰p(!ò"ÂCÄ«0)B˜u@#y
-ðHÒö"XG6à"”ë€�óø	ðÁù Þ:Æì<<ËÌ$Y¾BÜà,ðÈ›“CqŒØxýän²+È ¬_è{Ðn;áQÉßðu¸¬Ñ§37
-¶Ðjðæõ˜ä÷82ãò9ª/¯q¼ZëqbòCæà0È97y&Ň°)N1€›
'qïyÉÍ”ý0E‚Ä)›1x2˪>^ä%/"ðQ'â”\ñéª"çׄ¼ä¦[æ¼XœÇ)1˜?²îóaÈK~:EàU»PG-[1kng¹	zÕ£—u‰ð«ÄiØr†�/¢ªsqÈKž:D¸$ΖÓ1 P‘ókÓA^ò#·Ú¸'ÚøÚ¸
-øU×I^*¯\~»¬x56.TäüÚøUæ\á cT$çGˆ±>@œÌ^gQ†)	³Ï•ˆ¹‘âüšäï9Vž­U äìK=§S€
-_9Ó�S ¸^Æۏ»Ì*c^~ãU㤍~¹{Í…?ìøŒÈ//Ú&àFæ(Ú&7�¨øtzº‡Êgƒë˜phpµ³JQy¾ž
Ö	»~5ŽÙ1)Ü‹¤>à¥ùÖ`|7¯}’/Z`•4*yeøIÊN У�-ÀVJÈfk;ùR€•<(AÛ
-ÎU@ûöQJÄlBž- s/¤$iiòmÕJžéôš2_;(@œ÷ÊøŽKw)x>®¹tú)�7K‡sÓ.
-ÀÿîèÍiÖ_a/ãפ_¯ñQÏõÉÇÏxØÕK€q\iî>äéËÍ‹¤ßFˆÉß;2F!îî5s1×ùyœcËQ㿧3iáö<›sØg+ûKD€#*òÒv²ÈE¸~ü½ÓÓŽã,7ä’)–ò.8U{2wœÜ‚c>)‹…|¸T:ø:œ^ç�.”Ò*WºœL¥ñ‹(ˆÕ¡Ó 
à
-7¸jÏýMÛ(Œ�\oôÝ@0(-¨�ÎÁÜý­ª�߇‰s`ÇÜVã"¼bþÇX\l«€UÀ*`°
-X+ð‹Ü§¡ØýÚ����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/cursor.png b/resources/icons/ui/cursor.png
deleted file mode 100644
index 9b3addee96a2445783e1c69b9fddf898753b96cc..0000000000000000000000000000000000000000
--- a/resources/icons/ui/cursor.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ(Þ‚Öm���ÁIDATHÇÅ•M
-Â0„?‹t%nÜ(J<„‡ÑÃèºÒ½®z’ö"ö¡ð\¨PKªÁ©t²	|0Éûáud¡Ï•­x¸dOª�£âÀ\Ø/,è">u:2}tD ‹pÁ®;PÀ0n]êh„á¹´³Â±Á=Ïé×W+ÉÈñ/@[³̱$	B*Îœ¨B€w¥¬8ǤqçÉÉDõA|Dù{(¤?—²ÔLR;EiÒPƺ¸XäÕ6´îŠ¾=ñðT����%tEXtdate:create�2018-07-19T23:40:26+02:00´X4���%tEXtdate:modify�2018-07-19T23:40:26+02:00Å®ˆ���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/cursor@2x.png b/resources/icons/ui/cursor@2x.png
deleted file mode 100644
index 89a26cad6ba85fbd61ef5cbf9b52236df8783551..0000000000000000000000000000000000000000
--- a/resources/icons/ui/cursor@2x.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ(Ùït��NIDAThÞí™KÁ@†J9v8îÂ]p6€'ÁEâªbÑ)¯™Izæ÷H÷2›¯ú›Ìôô�EÑgö¢Â˜ ÁB¬ÐcDé]ˆ$d€±?!ò"½	‘·¹s/DRÓ±t�ÇBÌ�.BúBl�œ±ˆ„,õ„dP’@IH>€‹. §-€HÈu&@&!Ú�QnÍ…¸°rtˆ` ¤„šhߥõ"2ˆ¦Ø LˆGí§…ªD€æÒâß5ësÂ3lm�žëÓB'g}„ØÄëÓ@ûȼ>W!ù�’êsJ«Oˆ
¦eU€ñu
-¼/BÂoè}#"oÅôÃèŽãŸkH¨-µ)%¶åÔ‹	õjF¼œR¯çÔqDCRQÇtÄA%uTKVÇõÔê“
ùÑŠþlWÄ¿Ç,W<ÜÅTÎ���%tEXtdate:create�2018-07-19T23:40:30+02:00"#���%tEXtdate:modify�2018-07-19T23:40:30+02:00j›,���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/dismiss.svg b/resources/icons/ui/dismiss.svg
new file mode 100644
index 0000000000000000000000000000000000000000..b81abb3ae870dc97eff854a7d1c09ae9a105e008
--- /dev/null
+++ b/resources/icons/ui/dismiss.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.25188 4.27132C4.6424 3.88079 5.27557 3.88079 5.66609 4.27132L15.9999 14.6052L26.3338 4.27132C26.7243 3.88079 27.3575 3.88079 27.748 4.27132C28.1385 4.66184 28.1385 5.29501 27.748 5.68553L17.4142 16.0194L27.7092 26.3145C28.0998 26.705 28.0998 27.3382 27.7092 27.7287C27.3187 28.1192 26.6856 28.1192 26.295 27.7287L15.9999 17.4336L5.70486 27.7287C5.31434 28.1192 4.68117 28.1192 4.29065 27.7287C3.90013 27.3382 3.90013 26.705 4.29065 26.3145L14.5857 16.0194L4.25188 5.68553C3.86135 5.29501 3.86135 4.66184 4.25188 4.27132Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/do-not-disturb-rounded-sign.png b/resources/icons/ui/do-not-disturb-rounded-sign.png
deleted file mode 100644
index 996cccd64c6086ff77da458271795db9f69ba8e1..0000000000000000000000000000000000000000
--- a/resources/icons/ui/do-not-disturb-rounded-sign.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâxÿà��¸IDATHÇ•Õ¿K[QÀñO2$.Ž"A‘ü‚CÅ©…þ9%ÿE‚Ð!{¡Ý”@A‰‹[!ÐÑ …ÐÕ,ZH®CîËËk^â{ç.îûžß÷œŠ<©kû胆&&~ûá§Wd_ϳsžõìo‡k:¦¹pr¦:j«H%cû›“ø=wïÆ£?v455µ–à½Ïþ®[?ö­Ìuí­Ýê›Å?ž¯Gžàcí!¶–*2٨Ƌ+»[r´ãz™áj.:K\A<:©ûÓè|1ë×1iF/¦®]ßÑŠéìA=¶M·0ýØZu.Á,§p›q½
-‚.Á])Á%·‚àKIœ¯‚ඪ7àߝƒŸ¼dîF !–ð´”u8‹¥Œ
-ÎJâœ.TM@³„ó9�“|ïã-$e|(áüBî’2.éÕa)|/6óEÚÊý8Ý´•“Ç4Ó*Œ·ÍÓÇ”>çAA|×8ûœÓRçêÿ²:ÒÞ·žàÃìxO‡ê@kKìãü¡ÊêXŸé/‹ºZ¸nL]f¬oZ,ÿü222òâÀ‘s'ªñnÃbYä¢ôj[—’˵’«¤ÄzgGS,ÇHÜ2���%tEXtdate:create�2018-07-19T23:22:20+02:00;È9p���%tEXtdate:modify�2018-07-19T23:22:20+02:00J•Ì���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/do-not-disturb-rounded-sign@2x.png b/resources/icons/ui/do-not-disturb-rounded-sign@2x.png
deleted file mode 100644
index 24070444de511c49357788f36d66bca78975737b..0000000000000000000000000000000000000000
--- a/resources/icons/ui/do-not-disturb-rounded-sign@2x.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâNœª��IDAThÞÅ™;OA€¿Ã1
N"ÆiHÊTHPƒ%#¥@4ƒK ±høˆŸAKZ°DR,ÑAEGìÆঈDAŒS㛽½ó=ÙêvwöÛçì윁_™ ËgÒï	šï©Æž|·èYL69á™®Kzæ„M̨Ñ㔸 ãŠ¶¦UJŒG7(R÷Œ¶¦:EŒ°ø%nÁû醥àðiÎCÁûéœi·	v’9ŽùèPö—MhÒ¤ƒÉ$&3|ulí7+üô7úu‡ÝÞæˆ
RZ“5h8œŽuïpƒ}m#§äHÕNçR«¿ïmK|×(_“õ5ƒóœiZ9ôÒûèÓ6m[[{ÔÖm*Õv-CEií•U7…9ÛÖ;ð°ên¸³
è‰Y§êÓ4EÕvBÀõøÞ’NéT³¾K—²NaÉ6ùqá»tYPÅæW#^û;e;^©çª¨¬R˜]‡ÏQeÁª2®\¸ÅÈñ�Û"·fõJŠÕ~‹;ãÅ:–j¢ÀŸÑõŽ‡yQvÑÏ6…³u×T§¿Ó¶„R.F<äE­^fÙ’Õxü¼á!!ü…2À„°ÿG±â,µž™€e¡¸3ÖDÍeØ×O*f<˜¼Zê¶6øã_á‹ÈùÅ"÷.-n-_iفfìx€ºsF€‡V43Qt 8Þ6VéŒ�	ëǘµ7/ 9粓#À»v`ø„Ç#ÞÊJfF€GÝöVSüê:~®^R¼HS\³,Æ<zøÆËWM½Ž^ÑŒàH½Ž¥CҐ§4r|R8ço/$é’åcÄCNç’I§ô2F<œêœRÕ-Ÿ
ŸÕ»åêÃä,&¼ÁµÓÃD}šmÇ€Wߟ5Ê•…m2‘ãM%€WÅêó¼1>IU´veªŠ(ñò5ÐE �\"Ãañ;J{e}55HþE´ç¤Ò…鯽:ù.a:Ð*+!:`*[oh t¡Úö›]ð'EMä|h¨5ûàLèá’U¬^/y
-VƒÁžx@®©¼ö²–’$'®œÁäïù‰=­ò¤=
XspÜRlp¤‰÷¶žÃÚ;÷i–cÇí×å–:-i‘ MšiÒ|ΖUîYáÆ×0%|¥à©ì|î‡ËW¡àWz£ëG
-ÔÁkÂÿ¸ìÉýu;X~^ûŸ¢ˆßÿÇPÎ=ò
‚×���%tEXtdate:create�2018-07-19T23:22:25+02:00ið×���%tEXtdate:modify�2018-07-19T23:22:25+02:00­®k���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/double-checkmark.svg b/resources/icons/ui/double-checkmark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..232c37c3f9c551c213a87d9456e0d7a7db1ef665
--- /dev/null
+++ b/resources/icons/ui/double-checkmark.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   fill="none"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="double-checkmark.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="10.864267"
+     inkscape:cx="14.635134"
+     inkscape:cy="15.233426"
+     inkscape:window-width="1918"
+     inkscape:window-height="1042"
+     inkscape:window-x="0"
+     inkscape:window-y="18"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4"
+     showborder="true" />
+  <path
+     id="path2"
+     d="M 8.6085228,22.105707 8.3446663,22.356453 3.0478713,16.681081 C 2.7316747,16.342254 2.2001219,16.323854 1.8613368,16.640109 1.5225433,16.956281 1.5041603,17.486263 1.8203653,17.825006 l 5.8736737,6.293221 c 0.1525813,0.16354 0.3648323,0.260338 0.5883507,0.267134 0.2234854,0.0069 0.4408188,-0.07563 0.6031004,-0.22944 l 0.8685957,-0.822707 z"
+     style="opacity:0.900275;fill:#212121;fill-opacity:1;stroke-width:0.839096" />
+  <path
+     id="path13510"
+     d="M 13.638184,19.653973 24.828319,9.0521891 C 25.164796,8.7334752 25.178146,8.2020735 24.859458,7.8656546 24.540685,7.5292357 24.009316,7.5141635 23.672923,7.8328774 L 12.492621,18.426467 Z"
+     style="opacity:0.900275;fill:#212121;fill-opacity:1;stroke-width:0.839096" />
+  <path
+     d="m 30.17535,7.8768574 c 0.318689,0.3364188 0.304341,0.8675164 -0.03214,1.1862303 L 14.200385,24.166845 c -0.162282,0.153806 -0.379356,0.236373 -0.602841,0.229493 -0.223519,-0.0068 -0.435047,-0.102622 -0.587629,-0.266162 L 7.1362279,17.836954 C 6.8200228,17.498211 6.8383319,16.967231 7.1771249,16.65106 7.51591,16.334804 8.0468817,16.353097 8.3630784,16.69192 L 13.659923,22.367151 28.98912,7.8447955 c 0.336394,-0.3187139 0.867458,-0.304357 1.18623,0.032062 z"
+     fill="#212121"
+     id="path2-9"
+     style="stroke-width:0.839096" />
+</svg>
diff --git a/resources/icons/ui/double-tick-indicator.png b/resources/icons/ui/double-tick-indicator.png
deleted file mode 100644
index 23f45617aae4b7340d0e620a013a444a4f2c86a5..0000000000000000000000000000000000000000
--- a/resources/icons/ui/double-tick-indicator.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâž7¢��IDATHÇíÔ¿NÂP€ñ/jœ\IH‰ƒ‰/ÀÎ3°¹¨«òÇÇ1Æ 1bŒ#«/`œ4°8³8Izz ¹Ð³aÂÙîðûÚÞÛöóßæ0¶òñlü†²‹Õ¯tÈX¸ ¼ãëÕ_„^R~‹ „”•?#?“ñšò
-�6^W~¡¼oã
åU�Òôl¼¹ÂŸlüNù¥ò`=Ïq[Ÿ’àŒ)BÈ�)ºëù1Ÿ¼-%
-Lhiâœ_®•·]7?DEÂgŒ ´5q¢¼å~ö<£X¢ÀAèh<7o+Ñ%
x<lßyW"Àç>ÙÁ¹ãäçîJ^›(RZ:P_úÉÌß«?­¿ëýìäÌ�D‰”Y‹?ŒÒ���%tEXtdate:create�2018-07-17T19:16:04+02:00{i3���%tEXtdate:modify�2018-07-17T19:16:04+02:00
-Jя���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/double-tick-indicator@2x.png b/resources/icons/ui/double-tick-indicator@2x.png
deleted file mode 100644
index 3e99867a07568300b3ba13ca1fa0273bdbabe2ae..0000000000000000000000000000000000000000
--- a/resources/icons/ui/double-tick-indicator@2x.png
+++ /dev/null
@@ -1,9 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ
-yª¥��ŠIDAThÞ혻JA†¿Ò˜xÉz¿…ÄÒ°·×ÇRÚù¶>Žˆ$xCo1ÁvV6‚f,¢$3d6ÎîŒ2·{X¾Ù™s–…›¹Øj‘¬[|™OÊÚê,Ï’w‰o hhJ<!\2î/4
-E¿«‚:%—xà‚T-ðÐVl»Å°$Ug¸—ðUÛ/!?MÝ'~ŠšOü$w>ñÜúďQõ‰åÆ'~„kŸøa®|⇸ð‰8÷‰Ïsæ¿ÜjŠ_a>¦šcœtg7-~Sü*‚W­BŽ
-‚ŠFAÅpœ/´
-M¼Ð(¨ø~Ž’â;+´ð¥ë>Ì·Þšôˆª îfUA–ÝO¶óã¢_*ÈkexðÒ+dÙKwîÓ)ô²›¾í$WÈ°c§ë%SÈ°e¯éš+ô°i·ç›*lØ9f
-N&^2«×\Áú¼—^”s¹þܐÔ‰§*8Á·:áÛœá›
-:ü‚S<tûչƇ„„„„„üA¾�…2RÅ
)‡D���%tEXtdate:create�2018-07-17T19:16:10+02:00CòM¾���%tEXtdate:modify�2018-07-17T19:16:10+02:002¯õ���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/download.svg b/resources/icons/ui/download.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9e46ff1fb8ef29ac5c7ab0a6b604f828b6af9716
--- /dev/null
+++ b/resources/icons/ui/download.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.2498 20.4999C18.664 20.4998 19 20.8355 19 21.2497C19 21.6639 18.6644 21.9998 18.2502 21.9999L5.25022 22.0037C4.836 22.0038 4.5 21.6681 4.5 21.2539C4.5 20.8397 4.83557 20.5038 5.24978 20.5037L18.2498 20.4999ZM11.6482 2.01173L11.75 2.00488C12.1297 2.00488 12.4435 2.28704 12.4932 2.65311L12.5 2.75488L12.499 16.4399L16.2208 12.7196C16.4871 12.4533 16.9038 12.4291 17.1974 12.647L17.2815 12.7197C17.5477 12.986 17.5719 13.4026 17.354 13.6962L17.2814 13.7803L12.2837 18.7769C12.0176 19.043 11.6012 19.0673 11.3076 18.8498L11.2235 18.7772L6.22003 13.7806C5.92694 13.4879 5.92661 13.0131 6.21931 12.72C6.48539 12.4535 6.90204 12.429 7.1958 12.6467L7.27997 12.7192L10.999 16.4329L11 2.75488C11 2.37519 11.2822 2.06139 11.6482 2.01173L11.75 2.00488L11.6482 2.01173Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/edit.png b/resources/icons/ui/edit.png
deleted file mode 100644
index 762da80ebd04528a9a0c3c7b7111ae7be92bdacf..0000000000000000000000000000000000000000
--- a/resources/icons/ui/edit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâËãé��IDATHÇ¥Ôý*DAÇñïep
òBˆˆ$Ò&-!)IR®c·}¹¢½½	ï‹]–cÿLÛžÓ>žgŽùg^Î|~3ÍtbË
š¢](ãÜ!	'ÿá9#FxΈR*@Hüg±êr&¢éã·õЮ¤~&×B¿Úç-&m~=°^5ŒÕ„.ë6¿¢—Úr%Œ×éqhóË„rø¶ló‹!\J¾“?W¸pϨÍÏøQø6?ýƒ;.î˜DáLÙüHåOLÛ¼¨ògfl~À·Êgm¾¯òæl^àKá-æm¾§òWl¾KWå‹6ßQùK6ßæSåŽ?•¿³âá(¼ÝFs´YóòaÏ[§t؈áÙ€6ã8¾ËXx˜žà���%tEXtdate:create�2018-07-22T14:24:24+02:00ÊÊ>ž���%tEXtdate:modify�2018-07-22T14:24:24+02:00»—†"���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/edit.svg b/resources/icons/ui/edit.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f73a2217fd556395c9747ef948718cb0cc9b7d07
--- /dev/null
+++ b/resources/icons/ui/edit.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M27.3138 4.68622C28.8759 6.24832 28.8759 8.78098 27.3138 10.3431L12.5409 25.116C11.9001 25.7568 11.0972 26.2114 10.218 26.4312L5.63602 27.5767C4.90364 27.7598 4.24025 27.0964 4.42335 26.364L5.56885 21.782C5.78864 20.9028 6.24323 20.0999 6.88402 19.4591L21.6569 4.68622C23.219 3.12412 25.7517 3.12412 27.3138 4.68622ZM20.2426 8.92865L8.29824 20.8734C7.91376 21.2578 7.641 21.7396 7.50913 22.2671L6.76786 25.2322L9.73295 24.4909C10.2604 24.359 10.7422 24.0863 11.1267 23.7018L23.0706 11.7566L20.2426 8.92865ZM23.0712 6.10043L21.6566 7.51465L24.4846 10.3426L25.8996 8.92886C26.6806 8.14781 26.6806 6.88148 25.8996 6.10043C25.1185 5.31939 23.8522 5.31939 23.0712 6.10043Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/edit@2x.png b/resources/icons/ui/edit@2x.png
deleted file mode 100644
index 31295e1bf08667edeb3fb4cd9c267cae9e4cd319..0000000000000000000000000000000000000000
--- a/resources/icons/ui/edit@2x.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ"€LJ��(IDAThÞÕÙÛKaÇñïbÙ¹ÌÌÊ¢n¡…F¢ÑA¤(¢ˆ0"B¼ñÖÿGð/ˆˆR"‘"2£(Š
-MM:©3Ûʲ2a»ñBÛÝÙyŸ~ïHÏÜïçË0ÌüOŒFzIÐJ<-er8Mrj£z6ùYHø›8!aB&>¢„ >’„†@>‚„ÍÿGB<ÇcB;…Tî‘Ë-YO1§£PòuL’¤Ù)¡WÇŸbrjQ—„F’ßÓ–
›Ð2c¿˜3ø°	×™§á3‘fùl	=äiøÚ´|¶„aÖjøcü
-8Å2%ŒRªáò™ÆÙ£áð3ëÅ65¡‰Z
8Ÿš šCüÉ{I8èÄË0îÈ'IÒ â÷›ø3ˆnüûønàϪø¾øsÌÑðÕ&¾EÅïeÌÀŸWñ»ùjà/0WÃï⋁oSñ;MüEr5|Ÿ
ü%_IÂÀ·«¶*ødà;TüF
üeækøí&þ
-4|9
üU_ƈ¿ÆB
¿¾SÅo彁ïb‘†/坁¿Áb
_Â[SÅoፁ¿Å
¿™×þ6K5|œWþË4|1/
ü]¿‰aOõ~¿‘!Ÿå
üòU<þ!+t¼{@7JÞ5 ‡•ZÞ-à…jÞ% Ï> ŸU>ø°Yí‡0À_|˜€'ùã³<U}Tµ<c_>8à9ë}óA/Ô¿”ÒÍ`ÒQ[8˜Çê���%tEXtdate:create�2018-07-22T14:24:30+02:00ò/���%tEXtdate:modify�2018-07-22T14:24:30+02:00ƒr¢¯���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/end-call.png b/resources/icons/ui/end-call.png
deleted file mode 100644
index 6cbb983e8d289503098a46f627d8b0cefcd03ea8..0000000000000000000000000000000000000000
--- a/resources/icons/ui/end-call.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���	pHYs�����šœ��5IDATxœíØÍ‹Ma�ðß¹(㣐$ÅJ)ÑH²aa=ÅÚBÄÆÒìåcïÛ_@YÐÌÊRBÙ‰L$_#¢‘ŒÅyOÍæÎœ{ç½Ç<¿zsë>_çÜ;羄B!„B!„ÿKÑ`­±
-+±"|Oñ
“øˆ?M4Õ«¬Á^ìÂÖC¨ùþx‰)á!¾dï4“E8€Kxª¼zÓ™ãOÊ})ÕZÔÈd³(”Wø2ÞË?ð\ñ>Õޥُ²%Á³CäŠg©§Å=œÛ�Nb¢n©Ç¥u‡ªsë8‚‹ØT7qòñ¯ðoÓë?RÀ²«±±;°k;¬ûgpW¹˜®mǘúW`
-÷pBùÍŸã³Y`3Žã~vÐÏXš¡c-œVÔÉ-8ÞM±wØÓTš¥U·Àz<è°H?/ ŠûX7Wò}øÜe~_À4>a¸]âcø5äaÓʏÎLX`tžIÒª8‡b1Φ?þ7£Ê»Á¤<]hwÀ4&[~Žî3E2&ü1W5ÎS> \—ç–:œ±¹veêõŠGó]ÂW寱¦Œ¤šY†¯t»„[j<aõÀ nvØkÛá+-\«™è9ö䞪»Õ?›˜uøJWçHt[ýó½&,Å
†¯´[ÂoœÒŸÿ:åÏðßæ9|¥¥<©’¼ÃþLÍöÒ°òÐ¥êû‚.†Ÿi*ÏòŠåÊ‹5ô¯	!„B!„B!„¾ò÷x³%Ú®����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/end-call.svg b/resources/icons/ui/end-call.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1e97dfb97071e4def418136f7a22647b3a265664
--- /dev/null
+++ b/resources/icons/ui/end-call.svg
@@ -0,0 +1,3 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.9606 11.4819C24.1523 12.0517 24.7074 13.4331 24.3755 14.8712L23.9421 16.7493C23.7936 17.3928 23.1701 17.8098 22.5186 17.7012L19.3715 17.1767C19.0699 17.1264 18.829 16.8981 18.7627 16.5996L17.9822 13.0874C17.9251 12.8303 17.7369 12.6218 17.487 12.5385L17.2501 13.2501C17.4872 12.5386 17.487 12.5385 17.487 12.5385L17.486 12.5382L17.4842 12.5376L17.4789 12.5359L17.4619 12.5304C17.4478 12.5258 17.4279 12.5195 17.4028 12.5118C17.3524 12.4963 17.2807 12.4749 17.19 12.4496C17.0087 12.399 16.7506 12.3325 16.4358 12.2662C15.8092 12.1343 14.9426 12.0001 14.0001 12.0001C13.0576 12.0001 12.1909 12.1343 11.5643 12.2662C11.2495 12.3325 10.9915 12.399 10.8102 12.4496C10.7195 12.4749 10.6477 12.4963 10.5974 12.5118C10.5722 12.5195 10.5524 12.5258 10.5382 12.5304L10.5212 12.5359L10.516 12.5376L10.5129 12.5386C10.5129 12.5386 10.5129 12.5386 10.7501 13.2501L10.5129 12.5386C10.263 12.6219 10.0751 12.8302 10.0179 13.0874L9.23745 16.5996C9.17112 16.8981 8.93022 17.1264 8.62861 17.1767L5.48154 17.7012C4.83007 17.8098 4.20656 17.3928 4.05805 16.7493L3.62933 14.8915C3.29547 13.4447 3.85859 12.0553 5.06187 11.4867C7.01624 10.5632 10.0947 9.51289 14.0025 9.50012C17.9235 9.48729 21.0089 10.5486 22.9606 11.4819ZM16.6147 13.8482L17.2984 16.925C17.4974 17.8205 18.2201 18.5055 19.1249 18.6563L22.272 19.1808C23.7052 19.4197 25.077 18.5023 25.4037 17.0866L25.8371 15.2085C26.2908 13.2424 25.568 11.066 23.6077 10.1286C21.5035 9.12247 18.1947 7.9864 13.9976 8.00012C9.8212 8.01378 6.52504 9.13632 4.42103 10.1305C2.44606 11.0637 1.71118 13.2503 2.16774 15.2288L2.59646 17.0866C2.92318 18.5023 4.29492 19.4197 5.72814 19.1808L8.87521 18.6563C9.78005 18.5055 10.5027 17.8205 10.7017 16.925L11.3855 13.8482C11.5201 13.8134 11.6847 13.7737 11.8733 13.734C12.4342 13.616 13.1926 13.5001 14.0001 13.5001C14.8076 13.5001 15.5659 13.616 16.1268 13.734C16.3155 13.7737 16.48 13.8134 16.6147 13.8482Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/image-failed.svg b/resources/icons/ui/image-failed.svg
new file mode 100644
index 0000000000000000000000000000000000000000..59fef0c6817ccdfee7687d0e4b78a0327699e74d
--- /dev/null
+++ b/resources/icons/ui/image-failed.svg
@@ -0,0 +1,3 @@
+<svg width="256" height="256" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.5 12C9.53757 12 12 9.53757 12 6.5C12 3.46243 9.53757 1 6.5 1C3.46243 1 1 3.46243 1 6.5C1 9.53757 3.46243 12 6.5 12ZM6.5 10.5C5.6665 10.5 4.89255 10.2451 4.25185 9.80892L9.80892 4.25185C10.2451 4.89255 10.5 5.6665 10.5 6.5C10.5 8.70914 8.70914 10.5 6.5 10.5ZM3.19117 8.74828C2.75497 8.10756 2.5 7.33356 2.5 6.5C2.5 4.29086 4.29086 2.5 6.5 2.5C7.33356 2.5 8.10756 2.75497 8.74828 3.19117L3.19117 8.74828ZM4.5 12.6865C3.96653 12.5142 3.46321 12.2747 3 11.9782V17.75C3 19.5449 4.45507 21 6.25 21H17.75C19.5449 21 21 19.5449 21 17.75V6.25C21 4.45507 19.5449 3 17.75 3H11.9782C12.2747 3.46321 12.5142 3.96653 12.6865 4.5H17.75C18.7165 4.5 19.5 5.2835 19.5 6.25V17.75C19.5 17.9588 19.4634 18.159 19.3964 18.3447L13.5742 12.6431L13.4458 12.5266C12.5675 11.7885 11.2589 11.8273 10.4258 12.643L4.60326 18.3437C4.53643 18.1583 4.5 17.9584 4.5 17.75V12.6865ZM12.5247 13.7148L18.3305 19.4014C18.1489 19.4653 17.9535 19.5 17.75 19.5H6.25C6.04613 19.5 5.8504 19.4651 5.66845 19.4011L11.4752 13.7148L11.5588 13.644C11.8501 13.4316 12.2596 13.4553 12.5247 13.7148ZM17.5042 8.75212C17.5042 7.50831 16.4959 6.5 15.2521 6.5C14.0083 6.5 13 7.50831 13 8.75212C13 9.99592 14.0083 11.0042 15.2521 11.0042C16.4959 11.0042 17.5042 9.99592 17.5042 8.75212ZM14.5 8.75212C14.5 8.33673 14.8367 8 15.2521 8C15.6675 8 16.0042 8.33673 16.0042 8.75212C16.0042 9.1675 15.6675 9.50423 15.2521 9.50423C14.8367 9.50423 14.5 9.1675 14.5 8.75212Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/lock.png b/resources/icons/ui/lock.png
deleted file mode 100644
index 82dc604ed0e50896528955e9ab4ca782ec88b96e..0000000000000000000000000000000000000000
--- a/resources/icons/ui/lock.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ“nŸ��(IDATHÇ픿NÂP‡¿+:ð'iXLÜ`'1ÂBdpõ}Â#02ð
-MX]]$1,Ôt…ÉÉÄ•„­·ÇöÞ[mÑÄ…s†žžs~ßi{ï­ÂmG\ÑáŒ6ðÄœ;ÞÈm-"ÃZùÄ%l,yDĆ¥ŸC§8ö¡Ù®ŒûsdÊ+÷„À)—ëÜ;<fO¯²”Y>uÉ×ñ%¿¤š
èKÛت¥ÖÏLtË‚ŠU«°ÐÕI2}jjë«ÏÚ¬ñ.àÑÔQè|¾8ÛÄs²&ÏN@œU4Ü�E^SnÀNökÀ¡D]®%¾áÅÑ{’¨ß2KGßž�—’ò2«Â€å¯oàQ+üòµínøÿUØö€?|ì¤M©Â§Ñøñö˜’Oém…Ÿ¢"Á3ÂDáj���%tEXtdate:create�2018-07-01T14:01:11+02:00UÌ@j���%tEXtdate:modify�2018-07-01T14:01:11+02:00$‘øÖ���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/lock@2x.png b/resources/icons/ui/lock@2x.png
deleted file mode 100644
index 2cfb971a7d04d1ce38ed7987f882cc76fffe82dd..0000000000000000000000000000000000000000
--- a/resources/icons/ui/lock@2x.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ“ö§s��øIDAThÞí™;KA…¿˜>AB`A1XK
-{»€ø+Ò¤);-ìSØi+X(DH-štb¡%UðIŒa¬‚‹3w6»‰ÅÌ­f¹çœ/ٝ0³‰d¬³Mpqq¹áŒF 7£±ÊOM=qÄjtáéjÃÕåLñE:†ªC1Üð8¾Ãu@<¬ø΍ã‚sˆOQ/ÔIP
/TG¯µïÑ AohOe”ø<}í	%6Hfƒ'šÎ>ùà�JË[Êî-ZÊþ‹ ñ¥Ý1‹ZÅ"ÇJM!ÀµÂjÿOÕ¾Bu$~MaÔô±¬R4Ê5s€²dòéóqÊó)iËæ�5Éd×·vWÒÖLã“ŠÕ½ä[½¤øÅHšÈm#}Û/þ”ÆÀ‘®ÜÈÝŽºñßÈ{š;#�¹[³KÒÈ×ûF�r·&iŠ	`,@ì×|–6YaFÚÓ?óaà;­Ð¿óÈ{¼éeYîGÚ„û©{²z€ÓÈã‚SÝ-HóJb·ý‹9ºƒ‰÷!̍%ä~&^€Îq>‡'iâËÐX�`,€°�ÀX�ð¯�¾Æ–êIòž
§y	￾!£ÏüÏQßû
|p9–Ï©Ó°ŒùáÜey]–*‘…?Pýýzâ‹ølOä)���%tEXtdate:create�2018-07-01T14:01:16+02:00k~ä���%tEXtdate:modify�2018-07-01T14:01:16+02:00á6ÆX���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/lowprio.png b/resources/icons/ui/lowprio.png
deleted file mode 100644
index b815d8bb46017f5871553ec0c43acfdb2169929f..0000000000000000000000000000000000000000
--- a/resources/icons/ui/lowprio.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���szzô���bKGD�ÿ�ÿ�ÿ ½§“���	pHYs�����šœ���tIMEâ	ßH��IDATXÃÍ—A
-‚@@Ÿž§ÔAÜh´ªNE¹Ž®Ð&fײÃt…°¨ÍBDþ|ÇɁ¢ßs†ùóû8/ J";ð–ÀZ®]løäçÞ4–D<šD|p	
|0	xp‰›LÂ)à0BÂ)¿Ü)^î-á<¦ý*l9jøL)«PIÔð©ÇRùtJXàV‰Ò·
-üJ”Èqº6nU«�À
-¨R žÄ)ð®kµë»{ŸzŸJNÞ!KNjÙ	‰ä-…<Ûö©‰½ädÀE"kNiŸjè#ñ·H‡ûH%ë	îü±!EK6Š¦tmù(~LÚ$’Øð¦ÄØĆ×ã,Çé8X_ò“ÿš½ùþMõ����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/lowprio.svg b/resources/icons/ui/lowprio.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3a8f4ff68046841ab791ab2a324aa423ab4608e1
--- /dev/null
+++ b/resources/icons/ui/lowprio.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.29289 15.2929C9.68342 14.9024 10.3166 14.9024 10.7071 15.2929L15 19.5858L15 10C15 9.44771 15.4477 9 16 9C16.5523 9 17 9.44771 17 10L17 19.5858L21.2929 15.2929C21.6834 14.9024 22.3166 14.9024 22.7071 15.2929C23.0976 15.6834 23.0976 16.3166 22.7071 16.7071L16.7071 22.7071C16.3166 23.0976 15.6834 23.0976 15.2929 22.7071L9.29289 16.7071C8.90237 16.3166 8.90237 15.6834 9.29289 15.2929ZM2 16C2 8.26801 8.26801 2 16 2C23.732 2 30 8.26801 30 16C30 23.732 23.732 30 16 30C8.26801 30 2 23.732 2 16ZM16 4C9.37258 4 4 9.37258 4 16C4 22.6274 9.37258 28 16 28C22.6274 28 28 22.6274 28 16C28 9.37258 22.6274 4 16 4Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/lowprio@2x.png b/resources/icons/ui/lowprio@2x.png
deleted file mode 100644
index 4581946e60692041a5ac7447bd1ebe38f3642323..0000000000000000000000000000000000000000
--- a/resources/icons/ui/lowprio@2x.png
+++ /dev/null
@@ -1,8 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���bKGD�ÿ�ÿ�ÿ ½§“���	pHYs�����šœ���tIMEâ	ƒa	Ã��˜IDATxÚå›=o1€ŸšÏ‘"5‚Q‡J¨K~@¥ô0ô ñX¨˜˜XX@ê/èЩ,ø(¨%#-PÂÐ7Ò›Srs>Ÿ?^É’ï.ºóóع؎
ÍÄcà#0”Ô6É ®�û
-¼˜z)Ã_Ž€’†ÀàmAÂ^ð߁«êz8NUBþHÎéX�n¤(aød%ØÀ''aød$T^‚øh%¸„NBðÑH¨>x	>àƒ–ðÃ|ö¤�¾àƒ’à
-þ¾¤¨$¸‚¿£
-7	.›ý†*øFS_c	¿*�·€ß§ämï1�–9·j#Á4ï2*I0ð�¿€›ÁW–`,àO€ÛÀß@Ç"sI0ðËÒñnXK0ðƒÀáç’`ƒ·–`„·’`…ŸYÂH@/Aøó$ôF6µDáË$¬	;}ՏnIÿÚGtÕs»‡Ò-õܾÚrñp˜XÍOj	‡œý!ÐÖ/Á?ä—ôKð“ä2þmŠ±�,äx×�/Uóø‚¿©­&àÏêÜ‹Qf÷“›8[Rõ%xÍrÞbÖ‰“ÝhËÏbé[E	‹2j<:îÓ~§ÀõŠ5ÿUUÈà^ñƒ.çøW_öÒ™£t
-÷XqTó¥Ãc—ž#¡L@þ©ø:$l•H˜& ¿åÞ§„I‚€÷%a]¯‡ïC«)ù`à}H˜”‚‚÷-!Hx_‚†¯[BðuHx.)ø:$Dߤ„àÖ	e¿HÊ—„¬×
-f½Z4ëõÂY¯ÏzÏ@Ö»F²Þ7”õαdáË$\T×—R†Ÿ&áx
l“ÁÖY-á dFh‡Lâ	ã»Èߏš(ÈH½<ª‡+T����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/mail-reply.png b/resources/icons/ui/mail-reply.png
deleted file mode 100644
index a9d377d0a7263e7b00e7eb8ffe11d8ec5a7cfd8d..0000000000000000000000000000000000000000
--- a/resources/icons/ui/mail-reply.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���szzô���bKGD�ÿ�ÿ�ÿ ½§“��*IDATX…íÖ½JÃPÆñŸ‚ƒ¸èPw/@ÜôÄÝÍ;pñV\\»y‚k»hA0‹è "H7ÅI­ˆX‡6BÓ6m’ƒÐ^r8„çùŸ|œ÷0Ó?Q
ÎC…_£Û¯ á•
-¯ +¼p€¹Œð&ÖÇôèà¯hãhá!/а•ORö±"<Y·Ø•W»!ºxÇF@™¯ YCwÓª ¶âÀùÀ3¶q3Œ²�팺!ÏF´ˆ¬õpª÷Ñe=æ8”ÓnÅ˨ãg€Çý¸&E4£=|§<^òÑŽS�_y
j¸ÄÙ„�«zý"xšÐg*5�x2ý–©(1n…�h'Æ'!�Þú×;\…�ˆÏõäd•�KøÀq(€.ŽôŽn3Íô§_mìuê]g����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/microphone-mute.png b/resources/icons/ui/microphone-mute.png
deleted file mode 100644
index 0042fbe2babc3815f79c30098e687d321f0b3da6..0000000000000000000000000000000000000000
--- a/resources/icons/ui/microphone-mute.png
+++ /dev/null
@@ -1,8 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���sBIT|dˆ���	pHYs�����šœ��#IDATxœí›É‹I‡¿n—qéÅ}pZO"
-.ƒ6¸‹Ìa^æ0"2Œ0
-"êMýô ¢ øxP¦]Û
E<ˆ(*82.ÓJƒÚ®m·¶‡xe™U•YYå{öâPõ¢¢ò‹Z2+2«‰Àà,ðø|Ú€SÀV`LÁm*DÀ!¶'ź€}ÀˆRZêA󀧤ƒGí0»„öªªx‡;|`o……·ZIÓ€²Ãö˜\pÛs«p•üð]�ê
-%È©5èÁ¶ÚGCë}þôs‰…OpXàáüÖjDÿ꟥œ·	[/ÏfE&'-§\øpRJÖS>|8	óÕÈ,µ)¦1EÃvHÌR	Ђo¦ª‘Y*oN¡ÿ³–½ò$ êá!{j²% fàÁ=5n	8IÁƒ}jìP³ðž€ª‡¯~†Äüž”�_ðCIP4\ª4¢Xfð‰K€/øUÀëÊo­H2¼i[¤1ÿ|L	hÁßmÿ$â³Ùȵ"4:²=Ö☓H9ëm‚OphH‰µ¸Ù7*²í4±â«$Hd&IU> 
ïE¾Pðà'—)>w·××Ñ¿Û°¯?ð!´}%%Fø÷‘í>].]}Çç½ò#Û#
>/]º&à¡aŸmÍM㶿Ùždð‰&)Q®	¸eØ7Ýâ8
økÈ4{X³~wsœ#U€Nô‹6ö»!öñˆO708+œ­ZÐÛÛØM _$vòÂû]ÈEf©?ÐÛÛØ{`¦!þNƒïßÙ±ì5”âà?¿â7 =RØ·‹¯¿J‘ükâ×6øôã*-øâ—Ŭ3ø@Š4¥Êþ	°骢¿=�ö#«Êâ´ˆ/{¡ÀviøÊ><hL¨X\y-¬ÅÀCÜH÷\šlàÿ'û,mð_wy=È‹pJŽ¶ç–
|;²d.‹¦ÿÄÄíD‰ÒäòÂ;/û[Ä­G9AºÁ¸±Á
-
ˆ¬ßÓYÇö¯€sÈGÍàyeÿp¤¾8ø…ä/ÌvàW
-õ™¤ÕÕe±V`œÄxÙ–®7!‹µÀہ
ø/â&ʵn?ØÜI9&Éþ¶�?ú†KSž¹º:`°©&­\Dêÿs)ùŠÒž¨¬Öb¬áË×,íJCœ¥:MvSZÆ·“ÜÕ=EþН®ª¥%`/òÌšTõð>/ЊŒàŽ!oõ@qð}‘JmZbM“ªcI2îcžŸðªfd¦'陏ù3WÛnSÒ_ëæ#ã¾êà>°}ZP.Scç+§á9Ûâ¢"Ïe­EHiÊ÷ÕïDñ?�Ú‹Š¦"‰è£7P72sÏSü^õªWß™>ÖÐëݼ©C����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/microphone-mute.svg b/resources/icons/ui/microphone-mute.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ca8e67e78d87c25efc93a798c52e985531f949ca
--- /dev/null
+++ b/resources/icons/ui/microphone-mute.svg
@@ -0,0 +1,5 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.5 10.5609L2.21967 3.28044C1.92677 2.98754 1.92678 2.51267 2.21967 2.21978C2.51257 1.92689 2.98744 1.92689 3.28033 2.21979L25.7801 24.7199C26.073 25.0128 26.073 25.4877 25.7801 25.7806C25.4872 26.0735 25.0123 26.0735 24.7194 25.7806L19.3694 20.4304C18.1235 21.5591 16.5205 22.3006 14.75 22.4652V25.2499C14.75 25.6641 14.4142 25.9999 14 25.9999C13.5858 25.9999 13.25 25.6641 13.25 25.2499V22.4652C9.18341 22.0871 6 18.6653 6 14.4999V13.7509C6 13.3367 6.33579 13.0005 6.75 13.0005C7.16421 13.0005 7.5 13.3363 7.5 13.7505V14.4995C7.5 18.0893 10.4101 20.9999 14 20.9999C15.6521 20.9999 17.1603 20.3835 18.3071 19.3682L16.8892 17.9502C16.1075 18.6055 15.0998 19 14 19C11.5147 19 9.5 16.9853 9.5 14.5V10.5609ZM15.8223 16.8833L11 12.0609V14.5C11 16.1569 12.3431 17.5 14 17.5C14.6854 17.5 15.3171 17.2701 15.8223 16.8833Z" fill="#212121"/>
+<path d="M9.50347 6.32166L11 7.81822V6.5C11 4.84315 12.3431 3.5 14 3.5C15.6569 3.5 17 4.84315 17 6.5V13.8183L18.4369 15.2552C18.4784 15.0097 18.5 14.7574 18.5 14.5V6.5C18.5 4.01472 16.4853 2 14 2C11.5744 2 9.59711 3.91905 9.50347 6.32166Z" fill="#212121"/>
+<path d="M20.0536 16.872L21.1911 18.0095C21.7092 16.9499 22 15.7589 22 14.4999V13.7505C22 13.3363 21.6642 13.0005 21.25 13.0005C20.8358 13.0005 20.5 13.3365 20.5 13.7507V14.4999C20.5 15.337 20.3418 16.1371 20.0536 16.872Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/microphone-unmute.png b/resources/icons/ui/microphone-unmute.png
deleted file mode 100644
index 27999c70500ed3564c15e3131b3ed7157a79ab78..0000000000000000000000000000000000000000
--- a/resources/icons/ui/microphone-unmute.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���sBIT|dˆ���	pHYs�����šœ��çIDATxœíšIkA€¿$j4F—ãQƒàÅ7Œõ`@^\Pô ŠGу?ÀƒDE/âÁC@‘Ä=ˆxAÜ—`$!·hÆ,㡦u¬©žéš®ê2¦?x‡êyýê½7ݯkƒh™œ�Z€.`0%]@3p˜±O‘P	\†€d©N<µÀJ “܁ËÒ,wà¯QÖ?ÐÞ“ïÀšÈ½6D
ð…üƒ÷ä07bßCSÜ'|ðž´‘F’í˜Þ“-‘F’{˜O@K”„¡óÁ'ŸÐɦ-4mXjÁ&ˆ°Ø´Q	¨²`Óc¦iƒ60΂MÓm$`X'Àµ®‰àÚ×Ä	pí€kâ¸vÀ5qò¸§�±BSjØ—0L�ªÉcÑD7eÀ]àbÑr½n‡Ø|�^wÉ°Æ1þž£¿SèÂÎz@دè¯CÒ9¬î0]jÛœúešÔž¡ss\];àš8l¸\¯Ý·n×FKíDž¾¡Oj+túuê&à³âš¼TÝ¡iS‡÷R{ŠBGå£/º	P'ïÛ=Ô´©ƒl»Z¡#')+º	xª¸¶Dj·4íáb›=e
-½gúþM™‡n(ôö`~¸KÑO“¤3�Œeä]ß™ïb1âŸ0üc2‹m¢à¥ëµé“ÏgðºÔì–®%€hVd@ƒÂÖ^`T߬P…8Ç“žù¨+r=ÁÎùÉ °Ma·qp"]·ŸÌy5®’éìyÝ­@¯B?—|6ùؼ¬Ð¿.$=jGv¢>‹~³BßOnó|l5(ôâàÍ…#}Àjý‚ÔoÀ[Žo€sˆSe~Ô"j‚|ïÉP‘äI	ðDáÌ×”£¹(f§$ÈòZêWé0VËsƒ,D¬z$÷af¢T�$ó“—DÂùúE"`Õ»ÜD8k€›>¶{Ò"aêw3‰(–—ïvqG!¢V\!ós›^k6˜pÜä\~-p
˜”E§hE¼·íü™¹•#Æ‹'C+³Øè6“Ǩ/
-fc爜'­X8'dš"à�bth*ðnÄÐwX-á•GQóƒÊkà01bߍR¬N#^lÃâ^ÄÎÓ)`ÃìJ!°ƒÌà·ã `z×{R¿EÊùˆé0â ¯¨˜°WMîĪ6U«Cßl¯PïO8gf×ýä	š;ÀQшýà=9kÊi“5 Ü ­©¯ÀÔâ?-6)	ÄÀʦwv QdØ®Ç�pxnÉ~LLÌã5!TGï™äÐ����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/microphone-unmute.svg b/resources/icons/ui/microphone-unmute.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4ab9824bbfca13aaf1f2100814e3a0d6f1f4d00b
--- /dev/null
+++ b/resources/icons/ui/microphone-unmute.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 2C12.6863 2 10 4.68629 10 8V16C10 19.3137 12.6863 22 16 22C19.3137 22 22 19.3137 22 16V8C22 4.68629 19.3137 2 16 2ZM20 16C20 18.2091 18.2091 20 16 20C13.7909 20 12 18.2091 12 16V8C12 5.79086 13.7909 4 16 4C18.2091 4 20 5.79086 20 8V16ZM7 15C7.55228 15 8 15.4477 8 16C8 20.4183 11.5817 24 16 24C20.4183 24 24 20.4183 24 16C24 15.4477 24.4477 15 25 15C25.5523 15 26 15.4477 26 16C26 21.1858 22.0527 25.4496 16.9988 25.9507C16.9996 25.9671 17 25.9835 17 26V29C17 29.5523 16.5523 30 16 30C15.4477 30 15 29.5523 15 29V26C15 25.9835 15.0004 25.9671 15.0012 25.9507C9.9473 25.4496 6 21.1858 6 16C6 15.4477 6.44772 15 7 15Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/options.svg b/resources/icons/ui/options.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3faf8ad49b76c5549bfb1ed0131ce88a6205acc4
--- /dev/null
+++ b/resources/icons/ui/options.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 9.5C14.6193 9.5 13.5 8.38071 13.5 7C13.5 5.61929 14.6193 4.5 16 4.5C17.3807 4.5 18.5 5.61929 18.5 7C18.5 8.38071 17.3807 9.5 16 9.5ZM16 18.5C14.6193 18.5 13.5 17.3807 13.5 16C13.5 14.6193 14.6193 13.5 16 13.5C17.3807 13.5 18.5 14.6193 18.5 16C18.5 17.3807 17.3807 18.5 16 18.5ZM13.5 25C13.5 26.3807 14.6193 27.5 16 27.5C17.3807 27.5 18.5 26.3807 18.5 25C18.5 23.6193 17.3807 22.5 16 22.5C14.6193 22.5 13.5 23.6193 13.5 25Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/paper-clip-outline.png b/resources/icons/ui/paper-clip-outline.png
deleted file mode 100644
index 98890e4a7326e291315bee76f039c1ea5ac33998..0000000000000000000000000000000000000000
--- a/resources/icons/ui/paper-clip-outline.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ׈ è��AIDATHÇíÕ±jÚQÇñÑ¹Ð-ÙÒvi ž@²hGéÖ¡Ð>!HÁàStwlAGÅ­t´B׶ Z
-‚4‹§‹­ñºÏ…çwÏùòã^¸‡¬(¸2ôÓ]Ú;‰åš{/¿O{ÁH˜jºðRGïö\	SO–ùðÇi:`(4Wò#ß„×Ûʏ6”çø¼’Ï}³tÀCü^S~-ÔDÀ}\x³¦<60ø·¬°p¦ìëšò@y‰q��ÿ=àOYì·éÈÎQæÚÚæBçB¤h-æÛ�›ÿÁĉcðVßôuÀ1&»t…FæICèî¾Ä1ª£$¯Š/»Í„ú†^fŠ	Ï &Ü©¯¸È«»j)íäô„0ÒPQÑXÌÊž\€œšÙÊ€
3µìöíÌ¢WJJûà{vÙ_:'g9ô#³Ð���%tEXtdate:create�2018-07-20T15:08:02+02:00óY©p���%tEXtdate:modify�2018-07-20T15:08:02+02:00‚Ì���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/paper-clip-outline@2x.png b/resources/icons/ui/paper-clip-outline@2x.png
deleted file mode 100644
index ec54386f56df8db088d8aeac78c9523913c135a8..0000000000000000000000000000000000000000
--- a/resources/icons/ui/paper-clip-outline@2x.png
+++ /dev/null
@@ -1,7 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ§âTg��»IDAThÞ홿kSQÇ?ÑÐT„(DIÕ%)
-©{Éb1ƒC•¥¥ºýºeP•„ºe°U¥…µõG¥KI-Z(%5Bªå9äæä6¿Þ¼§ïÜážwî÷œó½÷Ýû’{o�{’$Å�)’)°JÇ6c8–(¯0šÊþNúûì·Ho`ð‹=^§Ÿn“¼V>vø¬ÅÞ?ý7xÃK¾Rá!eq™×^õ>ª
þ{’ZËEfµQ¸íúÔ{N°©õ'ªõ;¼HŸÔzl‰x*ˆG^ÈÊ\O¶A„ø¦0³öß1E¤T½Æç6ˆ
-y¥Ýò’@¡¦Ö–°¿Í	Ü”h/µ¶�7Ü'pNÕ?;`êmçÝ'à±m{\eDiÏ(·Eõ“QÚãn)ÖÖxV=‰%&˜˜Ø†”%+ùç¯À'àð	ø|>Ÿ€OÀ'àð	øþC¢]k¡ØŠåˆÀšÍ>[M;îxŠÐRìïŽ+¬«ÃÙvx<ýò:ÛñL¥qw£ÚÙà‰ÒŒ
-ÆÓÝñš=Âsöƒ9[ã,6ÙwÊœÀUÇ5Ûi&8”çC&H³§!â
Þ]Ȧz—ù¦–�	Æ#A ©-¯¼6»'°¤BmÙòÚR^Kf@óW°¡ê>"–ÓGèkðî‚À¼hƒ–	¶ðv,!Jj8‹bÕGI.4º’)ù¨ÌXÂÏ~ʍôåHBfLÑÁu‡�LJÐ}
-ízgÒ­ôÐòöÅŸi3ÂÚà,»{•e[^d¸aQF–©g`°muøÖ`@?o¹rÊRd•"%ë¾*;Üá“›ý¯JŒ“ëËjYÑŽ±]–^r”;&/“£×«ôU‰3-Ÿ¦Ó¥Äô©ßLKb}è"Í]®'ì²Ëó¼sò‡ìäžF¢mq*5���%tEXtdate:create�2018-07-20T15:08:07+02:00¡a†×���%tEXtdate:modify�2018-07-20T15:08:07+02:00Ð<>k���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/pause-symbol.png b/resources/icons/ui/pause-symbol.png
deleted file mode 100644
index 923d6d20795ef525e95f4b81507d263f5fbc8638..0000000000000000000000000000000000000000
--- a/resources/icons/ui/pause-symbol.png
+++ /dev/null
@@ -1,4 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEá,.#=/���VIDATHÇí•¡�!w¼ :J¢:j
-&¯þ“(â6æfrY̤ñјaÇ$çŽÓAO;V¨d<AÚ©…C$@	$à6ÁJw¤Åé{luO¿áFž¤���%tEXtdate:create�2017-11-30T19:30:44+01:00µ~A���%tEXtdate:modify�2017-11-30T19:30:44+01:00Ä#ùº���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/pause-symbol.svg b/resources/icons/ui/pause-symbol.svg
new file mode 100644
index 0000000000000000000000000000000000000000..27aa074a6d6f1a6603acb58526192d0efc704653
--- /dev/null
+++ b/resources/icons/ui/pause-symbol.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.74609 3C4.7796 3 3.99609 3.7835 3.99609 4.75V19.25C3.99609 20.2165 4.7796 21 5.74609 21H9.24609C10.2126 21 10.9961 20.2165 10.9961 19.25V4.75C10.9961 3.7835 10.2126 3 9.24609 3H5.74609ZM5.49609 4.75C5.49609 4.61193 5.60802 4.5 5.74609 4.5H9.24609C9.38416 4.5 9.49609 4.61193 9.49609 4.75V19.25C9.49609 19.3881 9.38416 19.5 9.24609 19.5H5.74609C5.60802 19.5 5.49609 19.3881 5.49609 19.25V4.75Z" fill="#212121"/>
+<path d="M14.7461 3C13.7796 3 12.9961 3.7835 12.9961 4.75V19.25C12.9961 20.2165 13.7796 21 14.7461 21H18.2461C19.2126 21 19.9961 20.2165 19.9961 19.25V4.75C19.9961 3.7835 19.2126 3 18.2461 3H14.7461ZM14.4961 4.75C14.4961 4.61193 14.608 4.5 14.7461 4.5H18.2461C18.3842 4.5 18.4961 4.61193 18.4961 4.75V19.25C18.4961 19.3881 18.3842 19.5 18.2461 19.5H14.7461C14.608 19.5 14.4961 19.3881 14.4961 19.25V4.75Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/pause-symbol@2x.png b/resources/icons/ui/pause-symbol@2x.png
deleted file mode 100644
index 33ce6de3452ded8a736ca57e3f8b49b0bbc450cd..0000000000000000000000000000000000000000
--- a/resources/icons/ui/pause-symbol@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEá1M%Qö���ŠIDAThÞíÙ±
À DÑА)؈qX€µØ–H*:‚b))þ¹³dó¨-ye5«*é.IÕ°©)ËKÙ02*NŸ›²L¿U¦€²±©9Ùsºë·1ôj�������������������������������À©oL5CwþƒãõÇçûÉ4ýÕª£ñ{���%tEXtdate:create�2017-11-30T19:30:49+01:00Ô© Æ���%tEXtdate:modify�2017-11-30T19:30:49+01:00¥ô˜z���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/picture-in-picture.svg b/resources/icons/ui/picture-in-picture.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d6002291290d1f25cdce3077c97f43b8cba44acc
--- /dev/null
+++ b/resources/icons/ui/picture-in-picture.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 6.25C2 4.45507 3.45507 3 5.25 3H18.75C20.5449 3 22 4.45507 22 6.25V12H20.5V6.25C20.5 5.2835 19.7165 4.5 18.75 4.5H5.25C4.2835 4.5 3.5 5.2835 3.5 6.25V15.75C3.5 16.7165 4.2835 17.5 5.25 17.5H11V19H5.25C3.45507 19 2 17.5449 2 15.75V6.25ZM14 13C12.8954 13 12 13.8954 12 15V20C12 21.1046 12.8954 22 14 22H21C22.1046 22 23 21.1046 23 20V15C23 13.8954 22.1046 13 21 13H14Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/place-call.png b/resources/icons/ui/place-call.png
deleted file mode 100644
index a820cf3fceafebf30ed5915c48c5f785a931734b..0000000000000000000000000000000000000000
--- a/resources/icons/ui/place-call.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���	pHYs�����šœ��©IDATxœíš=kTA†Ÿ«ñ‚š¤qêEüDe;+í,$­ä/(ùÚè/AÐb!
-QKcaa¡‰ZDü*Äb±	lt-&4Îܝ;w7óÀévξçÝÙ»gÎ,D"‘H$‰˜™ºÀ0°ˆ0$b« ‹]ácFBlôq3྄آl±xMß1÷”㺠ØðÓ1wËq]Pª4 î�jðK`cÀÇÜÛ€]ŽkƒacÀ»ùO•X–Kä?]bm6½6ìí zˆÁ{&¾ánB'¼d{l¾àYÕB¤°1�Ü
x¼r\;R øÖ´%ÄVA,a_ü[`·ˆÒ
-¹Î&.`øM~ñKÀ)!XÀ\ü2
/à"úâ?{ucøÀÿ¬uå2ú]ð˜œÿ}ŸÐ›pAPWP®¢7à0)¨+[—èM¸%¨+(ô}Á/ଠ® ÜA¿zÀ1A]Á˜Þ£7a…†ò8êt&,;䤅cs‹üû¹CmI€»˜Mx�l/™ÿäzŒìŒ1Euƒ&q{&´Q“¥,OxÜ�Î1b7Pã¨BM&¬�Gäk£&KÃf}Ôàö5ðu5?ƒ1-òE÷€3yl‹Ï‹9O5¦…¹S þns˜0¬÷Q|f¶ãÀ¨s„óü»U}Ÿ…()ù¿YÌ£&Ͼ‹7�Ô§;‹¹YÊbø8ä5µ4 ã8êªÝwµ1�ÔÙá6çˍ5 £C~¿Ðx@®`¯5Þ€Œ¸„ùXÝx2ÆP÷ø}FÔ’iàÅ.du±Z¸o`?ê.âð•btmÞ N$¨Ýq8¼‡PÿGœø+Ràê!û]Di$‰D"‘‘ç9~]üÈ����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/place-call.svg b/resources/icons/ui/place-call.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6ce61f3154923009b2dbbbd9f4509993500a8cc7
--- /dev/null
+++ b/resources/icons/ui/place-call.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.42717 10.5159C7.04603 8.00336 8.81925 5.74105 11.5302 4.91194C12.5286 4.6066 13.5923 5.13064 13.9585 6.10832L14.8277 8.42827C15.1137 9.19184 14.9076 10.0526 14.3067 10.6038L11.7217 12.9749C11.4628 13.2124 11.3479 13.5699 11.4183 13.914L11.4413 14.0185C11.4556 14.0809 11.4766 14.1691 11.5049 14.2795C11.5616 14.5001 11.6479 14.8102 11.7686 15.1795C12.0089 15.9141 12.392 16.902 12.962 17.8893C13.532 18.8766 14.1961 19.7023 14.7121 20.2777C14.9715 20.5669 15.197 20.7967 15.3596 20.9561C15.441 21.0358 15.507 21.0981 15.5539 21.1417L15.6341 21.215C15.8969 21.448 16.2628 21.5261 16.5978 21.4206L19.9438 20.3675C20.7216 20.1227 21.5701 20.3746 22.0883 21.0041L23.6713 22.9269C24.3301 23.7273 24.2527 24.902 23.4945 25.609C21.4202 27.5429 18.5683 27.939 16.5831 26.3439C14.6693 24.8061 12.417 22.5209 10.5355 19.2865C8.64962 16.0445 7.79578 12.946 7.42717 10.5159ZM13.5133 14.0455L15.6586 12.0777C16.8604 10.9753 17.2727 9.25376 16.7006 7.72662L15.8314 5.40667C15.0944 3.43944 12.9542 2.385 10.9453 2.99939C7.58006 4.02859 4.87798 7.04628 5.44979 10.8159C5.84912 13.4484 6.77275 16.7956 8.80675 20.2921C10.8325 23.7745 13.2605 26.2398 15.3304 27.9029C18.3053 30.2933 22.2786 29.4769 24.8583 27.0718C26.3894 25.6443 26.5458 23.272 25.2154 21.6558L23.6324 19.733C22.5959 18.4739 20.8989 17.9702 19.3433 18.4598L16.5664 19.3338C16.4596 19.224 16.3359 19.0928 16.201 18.9423C15.7447 18.4336 15.174 17.7207 14.694 16.8893C14.2141 16.058 13.882 15.2072 13.6695 14.5577C13.6067 14.3657 13.5549 14.1929 13.5133 14.0455Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/play-sign.png b/resources/icons/ui/play-sign.png
deleted file mode 100644
index 75b259ef400c989591332201d0c7d3ed20d262c3..0000000000000000000000000000000000000000
--- a/resources/icons/ui/play-sign.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEá
$’Ý^���ÇIDATHÇ­Õ!/ÅQà‡;Û
Â-M¢ùªv7]3YÕUYñ
TÂ-‚@¼QÒ³™	6×^Mæÿ:§?Û9ç=ï8t熁kìMÄ»ã!ÀD~ö£ýˆ¸±ÓñåÜZD¼:¶Ò�ö: âÚvħ3“ˆxvdÔ�s»qi³âéÕˆxr`©"îmu@ÜÂòïßåàŸP]bùŒUª(WŸ©üÎU¡T•V•jYëÕ`4Úªá:‹u3SW¾pIÚëàÏ‹ê���%tEXtdate:create�2017-12-01T13:36:04+01:00XÑ!���%tEXtdate:modify�2017-12-01T13:36:04+01:00)Œ­���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/play-sign.svg b/resources/icons/ui/play-sign.svg
new file mode 100644
index 0000000000000000000000000000000000000000..78bc4c881ac71d976878d646a95bd664ee1d986b
--- /dev/null
+++ b/resources/icons/ui/play-sign.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.2391 6.20312C10.2392 5.63691 9 6.35926 9 7.50839V24.4996C9 25.649 10.2396 26.3713 11.2395 25.8047L26.2373 17.3058C27.2514 16.7311 27.2512 15.2699 26.2368 14.6955L11.2391 6.20312ZM7 7.50839C7 4.82709 9.89137 3.14159 12.2246 4.46277L27.2223 12.9552C29.5891 14.2954 29.5897 17.7049 27.2233 19.0459L12.2256 27.5447C9.89234 28.8669 7 27.1814 7 24.4996V7.50839Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/play-sign@2x.png b/resources/icons/ui/play-sign@2x.png
deleted file mode 100644
index 6a982ae09f6206e17a25bbe95e9e6be31b2cc864..0000000000000000000000000000000000000000
--- a/resources/icons/ui/play-sign@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEá
$bCž��‚IDAThÞåÙ-HdQ‡ñwü„eAD,21™LÛ‹ –…‚Q0FÁ¨L,‚idYŒ6Á$˜dQ,jƒ2‚,îü
:Âàa¹OØsÚ-ïË½ç¼ÐXXå‚*ô¡¬uò²o™§½èð%ª¯€~3Q, Üþyï2R`¨ Ô¨ðÉ„pÍ,m& „#¾º€¶)»€ð‡ezL@—|w!0æBML@w,ÒiB8cÊ„°Ç¨¬ÑkB¸aŽ’	á˜qÂÃ. <°ÂGÂ3ï½Âÿ- „C¾¸€¶táž%ºM@ç|s!ìóÙ„¿lÐoB¨²@‡	á”IÂ/º\@øÑ\@ÍÓrM7ށ¨Sw?©5?(ú#|“Oÿ'¿¡zÉG±z©×±œ¨)™š”ªi¹\˜¨¥™Zœªå¹Ü P[4j“JmÓɍJµU«6«åv½:°PG6êЪÀ±]¹EøB—úèV^kãû'j1‰±HP���%tEXtdate:create�2017-12-01T13:36:11+01:00ÆC:���%tEXtdate:modify�2017-12-01T13:36:11+01:00·‚¤���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/plus-black-symbol.png b/resources/icons/ui/plus-black-symbol.png
deleted file mode 100644
index 4ddfc93f03677701697f155b844124a3241d00aa..0000000000000000000000000000000000000000
--- a/resources/icons/ui/plus-black-symbol.png
+++ /dev/null
@@ -1,13 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���szzô���sRGB�®Îé���	pHYs��°��°È'õT��diTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:CreatorTool>www.inkscape.org</xmp:CreatorTool>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-ÜǦm��IDATX	íWK
-Â@­¢n¥kÁ¸påB¼”'ñ RÏ¢èEÜêBßk;
-q˜2›	¤3Ó÷òi˜ZU~YÃäýü(ßUjx¿Cƒ‡31rF“<‡`ÚJŽY¦ffGœøŽ¸ñ&À¯Ž‰…#>¼	ˆaªMI TÀ[—áòY8âfÖï–X7ÐXoÅRßì�-t¸EÞx> OžVÐT›lc½gLÆ®šÁÃG5“>8É"ÞK˜<É’�+pI^W»Ã6vÖ6dP<ƒèÔ™¨Ï#«ŠvÀ`E¸xSèam%Ç,Þ.ˆX¶p$Aob˜jS(ðV ̍wÐÂ{o 1±pb>T¼’õç”™%ý=ÿ¬“—&S”:����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/plus-black-symbol@2x.png b/resources/icons/ui/plus-black-symbol@2x.png
deleted file mode 100644
index c217b396e06bcf3d38e0e4ca447f7fbdae9ba3c1..0000000000000000000000000000000000000000
--- a/resources/icons/ui/plus-black-symbol@2x.png
+++ /dev/null
@@ -1,15 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���sRGB�®Îé���	pHYs��°��°È'õT��diTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:CreatorTool>www.inkscape.org</xmp:CreatorTool>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-ÜǦm��üIDATxí[KJQŒ?\‡ˆzAàƽk]yŠ7ðÞÂSxADÉJ¼(hdÂh2ÌtÛ=yÝÐÆøæUWW—šy$£ÑÿÄÊÜ ß¿K’×ðZîY‰8FÏÈe/®s÷:öÀ~Š\l®ísî%Æ`ã
-ÌÛ6+]wmÙýº%8°ð0Dk¶ÄÊí40ÄjÖÐÖ}CCä`-€X8ÊB
-e^<Ò^ÊG©›ˆ2	/é�/å£ÔMD™„t€—òQꦢL‹‡µ~ÓÀi¬5Vvñý9’GPÛHƒˆà ûÄ6?ô˜íe¯_ÈGä=ò9?¿ ¥ƒÉUû9{¹Oðäµ æëa²çɾ\"/¥Å
¿ó÷â¹_Z÷³~+
- ñÇn°úYÿ/L
-~DÆÓƇ‡O„‘1A: 2®¾âKaÞnžFfiÈí–ØEßÕâ{;Ü<ựΐEˆÔNÐ~¼`}ÿÝõ‘faý:`S¹†HÃZ�±p”… Ê$¼x¤¼”R7e^<Ò^ÊG©›ˆ2	/é�/å£ÔMD™„k4Oœºö¨!Ö¶à[¬Ü~AC¬f-�ߐÔ740úr輿øÎR9¹ûáéÚ:a?>ÿü…n§æ����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/power-button-off.png b/resources/icons/ui/power-button-off.png
deleted file mode 100644
index 7763de0f5144b135c1d94aa3ac2e476254f6513c..0000000000000000000000000000000000000000
--- a/resources/icons/ui/power-button-off.png
+++ /dev/null
@@ -1,13 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���szzô���sRGB�®Îé���	pHYs��ë��ëq́•��diTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:CreatorTool>www.inkscape.org</xmp:CreatorTool>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-ÜǦm��ËIDATX	½–;kQ…o|!‚Fã”D‚ŠŠ øb'j%h#Hɯ°RRÛˆvZ¤ÐÔÚEmT|€•à³P|®o2{ØsîžÇ@¬Ì>ëì½Ö¹™™Ëíõºc‹F¯ä¤^TlTÚñ_Nj´EÃ	%Y¸]ÑÆ’'æVs‘´•¥®àS§ˆ´´§oÝt€£š¸!^wõMWôò€ÞU·Uïië¼øW´{üTõ°Έ¦Û
ÐC¯éxà…gk\P§øë¡Ü¡î�ôø«/¶MŸ¬0ø,}[nRw�zèµ`Å»»µ
“~ÒMÖ€6z™ñáÔx“Q‰í¤C_¤N&š@;3̦~d„Ø/õ§èþh}*èns�ƘÅÃ{’AVÿòo[‘ëv™UqÍ®ÌâáAFq;í�Ë%Nø.Õ¿ÄéDë²Ä/²ÈìÙxrÇx—ºµ/£w:Ò˜Á/²È,°]õ*‡ûª¹Þb¤Ñ†^d‘Y`ÄïæõÛ@3iNÅ%ñGNê9±
-‘W–¹,ŸXLþ4“¸§S"ÁàÅü¥òoôŸÌ2í�|i¤Ø”
-Áº)ØF6Xá®Y¦=„´‘~â}®y¡eêE™Ö¨z'ú/ŒOZgOjÑÕ­À/ïM™ÅCøUõ=‡µªO»u×¼<È"³„#ZùSRw–º[0‹GêKVVJy,¦Íœv]_w³À³©d…8.5`}GÛbTÌD^dTbH;×Åhð½ô³â°Xöè¡7òÀ›Œ¥E®òÎÞ]åâµ–·Å¢½J[U'Äb„GùÀ3ш1uDÏCô©Úhxá96«{VlP׃^À7å¤øJ¬‰ö˜ac½ΉwÅïbˆÆ=ôŽˆˆ¦!~Lì÷ˆ|BpY|.>_Š­ñ«Ï\�Y„Â����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/power-button-off@2x.png b/resources/icons/ui/power-button-off@2x.png
deleted file mode 100644
index a462944604b6bfe418dabf81f1651d562364ed6f..0000000000000000000000000000000000000000
--- a/resources/icons/ui/power-button-off@2x.png
+++ /dev/null
@@ -1,19 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���sRGB�®Îé���	pHYs��ë��ëq́•��diTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:CreatorTool>www.inkscape.org</xmp:CreatorTool>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-ÜǦm��1IDATxíšK¬^SÇo=R®×½Ò6å"Õ’BZ‰ˆ0д$&Œ$FLÊÀÀˆ)ñ˜HT<Š*ƒ*I£ˆˆDëmô憪”´V¨Gëÿ»¾óuß}÷>{íóú¾\þÉ¿ß9k¯½Ö­óÚçôŽŒó•öñãÙ>AüO`©ªÜ"ñˆ±9ªîÑ/¾ØgŸ9‹‡TYQlìŸ9‹Íª,Vxaǧ3ÓY¦‘‘c•k̐o\>øv‚.0/£¢ߌ°³]»lÀììC`ù¿Cp*á¸ÙYÍÝ)Þ,.w‹ÄÅ¿Ä6€Þ;DVŽg‰?‹oŠkÅCbgX¢Lï‰Å£Ëý]'ûh@	â·Fæ¸ó·É't`ˆIl×·ØFš:ÁµÊ2%ÉC¿”ÔmÀ#‰œhB[«X¥èûÅPÑ®m¯|Îô”Ôi�±ˆéæm£mµ—·±Ýé1”8d»ÎË\§Ä
-åÙÈw¥—;ºk}®P„çÅS¢‘f ®)äÄ:YI¹)¢¹púmCÝŽÙ8Ïö²×9¸ãïËÔ€fÿ2ô$¥wY“¿.Æ
-ÙŸ„®Ó�Â=QAÚk½WÜS!éÛš3&ú¨Û€ÓØ±¦ÇìÔP	çh֏b,pÈþ´üCk�Ôm�1ˆMŽP¨%OiF,hÈþp"C
(R+¤!f£–,\,ïƒb, o-|ü„M6€ØäôuÄö©…šÌà&æÛYžZn4M7€œäöõÄöC7fMŸ3dúIŒrí;å·hvˆ ¥é„Üߊ®¦Ø65QÛ„B7ÉcÁ¯ð‰Öˆ{ÂÝXÉý€ˆ–¨‰ÚJÁ§¨b¬‹®ý]ù…KÐÆ@.4l]m±mj+ýܶX–—ÃòãÝ m5�
hAS¬ðÂNmÔ؇—k„G
-ŸË3`X€4¥@mÔ؇߀ý‘ò
–˜”»t:Š–õÆŒ3jôp©!§Ú;?ߥ8
}»¿oõóç¡	m)̨ÑmÀñš9‘š­qî¼_ü|—¿eà^
-<®ðÍÅך`y"Q#µNÃm�ïú–Çߤü¸™TÁ†IŸP4¡-jì×ðpRj¶Æw‰G~!—geÜèÙç
-Є¶¨1Ø�þ@¡j”DÙ[2–:(‡ÛÄu¢ûéœíWzcøT…E5öÿƒgsÖÖîQØý_W¸?fÙç:½]¼R¼¬7ÏåŸö¶ëüX´QcÿÝÅm�“-wÑÑ:
-¹ÜDÑNÈè·ׇûrøo8äzF¶Ç#öa0[´Q#µNÃmÀY,×ß„üú§Ð¿a†â_4kPBÔ:
¿–ç(IöæÓš88)Pc°,>v¦fkütñrƒ_×.hB[
-ÔØ_h¹g�?KÍ4úuéfÕTZãõRÌ‚"Å)ùœÚeu‰\hASJ7ãÔ§ÐnÑèîh”îî2j¦¶äeò’1Ø6ù(h`!e9hÔ–Ä­ò°Ãçþd´öîËÐKmIð¿«;DKx½½(±=‡e
-Íë³E+5Q›	ÊËŸ-¢å-Ò”8ÃiT¾ï‹VÔdÆ"yþ Zƒ¯•o—«Cr‘ÓªZ¨)kämM€ß3âü¬ÕœÉA®mÔ’
>|)æ$Ú ÿÚ”P¢”ØäÈÑD
ÔR	|oçÕ1'ávù¯ª”­|1‰£íÔPkvNR|‹/ˆ|ô¨b‹˜¹:Ð^<:>s“ãÿ»øªÈó7¹“O|™Ã\bTɍf´—b^éèÑÁ´¹I<ÿ¨){ë{ÍàÐ'"Ïd–¥¿Š€Ç(×÷…âr‘£¾X¬ŠIMdÍoy»5ç@TΣÑrÔ8­«œÚe±il—^°1WÉúX&`chCc«¸DÑy§d¡¡Ü[¥	m€UÕËbHÈ lhÉ^éÕí7Ð{Å=â Š&'¹Ñ`½™Ëµypç~NüSìªä"'¹‡×HÉz±êsÛÒ<b¿&’khq…”=&NŠ–¢,>Ä"&±E›×Θ”^-ÞÐûåt-Ø''K‰ÅÅýbãh³®Xò°Ò;Oœ—‰«Å¥"à%ç-ñqªÇbÑ¥Ýöð9Cw.2íxí����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/power-off.svg b/resources/icons/ui/power-off.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3b2f54b842cf0c9b0a6c41b4a02abbaedff06021
--- /dev/null
+++ b/resources/icons/ui/power-off.svg
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.6904 5.26691C10.8522 5.64823 10.6742 6.08849 10.2929 6.25027C6.88678 7.69533 4.5 11.0698 4.5 15C4.5 20.2467 8.75329 24.5 14 24.5C19.2467 24.5 23.5 20.2467 23.5 15C23.5 11.0698 21.1132 7.69533 17.7071 6.25027C17.3258 6.08849 17.1478 5.64823 17.3096 5.26691C17.4713 4.8856 17.9116 4.70762 18.2929 4.8694C22.2336 6.54125 25 10.4467 25 15C25 21.0751 20.0751 26 14 26C7.92487 26 3 21.0751 3 15C3 10.4467 5.76636 6.54125 9.70708 4.8694C10.0884 4.70762 10.5287 4.8856 10.6904 5.26691Z" fill="#212121"/>
+<path d="M14 2C14.4142 2 14.75 2.33579 14.75 2.75V12.25C14.75 12.6642 14.4142 13 14 13C13.5858 13 13.25 12.6642 13.25 12.25V2.75C13.25 2.33579 13.5858 2 14 2Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/refresh.png b/resources/icons/ui/refresh.png
deleted file mode 100644
index 642682032ab6d6ff73b0769bd2c420e89281d8a9..0000000000000000000000000000000000000000
--- a/resources/icons/ui/refresh.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���	pHYs������rçn���tEXtSoftware�www.inkscape.org›î<��fIDATxœíÛO¨UUÇñÏõ)ùÊY”¤Yf`Ñrâ ÈI4h`“jPTHƒÄH‰ µ‚Ê(Ò0I¡À¢?Ð$5eÑÀHld†¾²’|¥ñÌ÷ž
ö½ê»ïþ9ûœ³¯÷Áý‚÷àìu×oÝskí³vEZúp=nÃÍX€y¸S0#8Ž¿ñ;àG|‡=8–8ÆÒ™ŠåxàtÁ><+$²«Yˆ8ª˜èVö-Ââ\„;qIc¸Û1,ðzÀjôGÄYÁË­ú8Š¥¹W™Šç0T²¸;„{«âÚ‰ßÒ`ý¾¼â—«ó%¼Þvcnño6Y7+¼‚•8Ù¢ëíOÜSï$lk³.3“±µ„¶²Q¬¾¨f·}®LÃg] 0«mÇ[¯mK?>ïQIlrñSð1îÈ’©Œü+<@«6Œé¸T¨g”øY…ÉòjgCøD(`åq+æá>¼+”ǩ<ZÐñ�žÀ¬6‚[яGðC§°H¸Uó8ü«„B©,ú°BñÞ"SúðMNg;qUyºÇq¹ðsJš€Çr:Ú$`¥Ð)–ž€™BOã`¤PÙ‚Šòê’1<¹xTxHu’
-6GÆ™)ÓÄ÷òëR©lBÙâÇ$àñÈ…_èÜož4âÇ$àûˆEƒBÁÒ)R‰?“€["½Në8*x=2¾èlˆXpRó͇¬‰ˆ-wbnÿ·Óimȯ±åJÀg7
-³ØMIåŽg "¶X;<	Wj¿©Xc'ö— *†×úÞX¾Fx{ÓŠcÂÃïP€š±wᢒüÀ|T’¿=zôèÑ£GŽZ)œ¢Ô܉KòÃÕxZØàmƈðõS¨Iªnku™Ê2²#cl‡kRöÛ¿%Úˆdoí÷65ç$h$¡ïF<){k¿»öGÊÝ–5Å0WÜèΙö?•ø­²eðRDl΍-…øÍ:+~¾°UŸ5¾µç.žèâûðeD|§Ô½Ó˜È≟ù^½ƒ‰,~EdŒ£¸µÞIâ¿ÒyñŠŸO~¿‘£²î€MÚ@•Á$¼˜#¾!¡LG™Ï€¯…éñTÌ—0bíxw2pZ8ý±–£aàj•0€•'¦½Â¨oCÊN@ÍŽà\V@øÅBCU¤_Ôæ´IªÔìv	ÃW‹µª˜ŒñpuÍ?{w·_©^ØI†pPøVÎYU[¨ÜùÂÕx¥ÝE©ï€óeë³f)‹³-ø D•.>K¶9{�a}ˆkeÃBuE+‡o_áÝ/®óê”
`Y¬xš—“Ä×X ÿ<q
-Û%Ìçb_¤ø}ÂH}ìhm™vD8[Pˆ¥Â‰«ÓB·´A\c3K˜ù«AYmP8N[ä,ÂfÇI¯+àcºp@"åyŸðT5Þ®f	^UÎIƒB§¹L‚ÑÜNôðsp»0^w­PíÍGÍÊÕBU8€_ð³ÐÀì­þŸŒÿ©žÉ¾æ¯����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/refresh.svg b/resources/icons/ui/refresh.svg
index 17c41496b761b090e2df9e1c8d5e4aa5bed042e6..cf024e407638f7bc5e1989a4d75e1792bf452fcb 100644
--- a/resources/icons/ui/refresh.svg
+++ b/resources/icons/ui/refresh.svg
@@ -1,16 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   viewBox="-10 0 1792 1792"
-   id="svg866"
-   width="1792"
-   height="1792"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs870" />
-  <path
-     fill="currentColor"
-     d="m 1629,1056 q 0,5 -1,7 -64,268 -268,434.5 Q 1156,1664 882,1664 736,1664 599.5,1609 463,1554 356,1452 l -129,129 q -19,19 -45,19 -26,0 -45,-19 -19,-19 -19,-45 v -448 q 0,-26 19,-45 19,-19 45,-19 h 448 q 26,0 45,19 19,19 19,45 0,26 -19,45 l -137,137 q 71,66 161,102 90,36 187,36 134,0 250,-65 116,-65 186,-179 11,-17 53,-117 8,-23 30,-23 h 192 q 13,0 22.5,9.5 9.5,9.5 9.5,22.5 z m 25,-800 v 448 q 0,26 -19,45 -19,19 -45,19 h -448 q -26,0 -45,-19 -19,-19 -19,-45 0,-26 19,-45 L 1235,521 Q 1087,384 886,384 q -134,0 -250,65 -116,65 -186,179 -11,17 -53,117 -8,23 -30,23 H 168 q -13,0 -22.5,-9.5 Q 136,749 136,736 v -7 Q 201,461 406,294.5 611,128 886,128 q 146,0 284,55.5 138,55.5 245,156.5 l 130,-129 q 19,-19 45,-19 26,0 45,19 19,19 19,45 z"
-     id="path864" />
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.2506 5.18011C15.9994 5.50947 16.0627 5.9801 16.3921 6.23128C18.1804 7.59515 19.25 9.70821 19.25 12C19.25 15.736 16.4242 18.812 12.7933 19.2071L13.4697 18.5303C13.7626 18.2374 13.7626 17.7626 13.4697 17.4697C13.2034 17.2034 12.7867 17.1792 12.4931 17.3971L12.409 17.4697L10.409 19.4697C10.1427 19.7359 10.1185 20.1526 10.3364 20.4462L10.409 20.5303L12.409 22.5303C12.7019 22.8232 13.1768 22.8232 13.4697 22.5303C13.7359 22.2641 13.7601 21.8474 13.5423 21.5538L13.4697 21.4697L12.7194 20.7208C17.2154 20.355 20.75 16.5903 20.75 12C20.75 9.23526 19.4582 6.68321 17.3017 5.03856C16.9724 4.78738 16.5017 4.85075 16.2506 5.18011ZM10.5303 1.46967C10.2374 1.76256 10.2374 2.23744 10.5303 2.53033L11.2796 3.27923C6.78409 3.6456 3.25 7.41008 3.25 12C3.25 14.6445 4.43126 17.0974 6.43081 18.7491C6.75016 19.0129 7.22289 18.9679 7.48669 18.6485C7.75048 18.3292 7.70545 17.8564 7.3861 17.5926C5.72793 16.2229 4.75 14.1922 4.75 12C4.75 8.26436 7.57532 5.18861 11.2057 4.79301L10.5303 5.46967C10.2374 5.76256 10.2374 6.23744 10.5303 6.53033C10.8232 6.82322 11.2981 6.82322 11.591 6.53033L13.591 4.53033C13.8839 4.23744 13.8839 3.76256 13.591 3.46967L11.591 1.46967C11.2981 1.17678 10.8232 1.17678 10.5303 1.46967Z" fill="#212121"/>
 </svg>
diff --git a/resources/icons/ui/remove-symbol.png b/resources/icons/ui/remove-symbol.png
deleted file mode 100644
index 0b610853693e4c9d907ad4e732a762fd21bb8690..0000000000000000000000000000000000000000
--- a/resources/icons/ui/remove-symbol.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEá
-&Á���ãIDATHÇ­•Û
ƒ0Eú
™){0C1á±EAr?JÕâÐâ&Ÿö=R|ÞÇ3éqÔŽ£'2àŽ
AÖ
-±îY]Y.‹‚p,IV‚Èå"—'’ÂL›É[æBÖ†‡¡„)A´LJÖ�Q	}º\ˆÐ«A!ÐÐ*}jM鎌•ènù¹¾ßÝÄ«;ˆƒÕ®h“~çs§Ôj]³øB‘¿áRt9@SµMirÁƒ¿ãŒE4Úhl$c+?“ù;›J¼¬õÅH3UóX7/–3âçÕ–#n-W¸½ÞŸ7	…â'Œ���%tEXtdate:create�2017-12-10T21:05:38+01:00VØoö���%tEXtdate:modify�2017-12-10T21:05:38+01:00'…×J���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/remove-symbol@2x.png b/resources/icons/ui/remove-symbol@2x.png
deleted file mode 100644
index aa37086b3e155fd8f814e2db0f16585ae02ba7ff..0000000000000000000000000000000000000000
--- a/resources/icons/ui/remove-symbol@2x.png
+++ /dev/null
@@ -1,7 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEá
-* 3ê��‰IDAThÞՙˑƒ0D_9²œéøÆÕ7bp¸Š»|°ËË–…Q>³GWO?’æŸWÇÈÌÊÌHGî%Gë¹Þ÷>Ë^Ž6°lÀÂ`¶—£}
-rähqAŽ¶/° ÈѾT9Ú±@A£õI‚T„4ûg´ ûµRsÒíŸûB£ 8BÐìfQ² ÛfXeQÁbX-O †`³Ì'¦äÕ½½:.„‹ñÜœÔU{
-ÖÿZÊ>C°Û/?‡sNø‘õ6GUí["˜R’&ö-ÎÓš‰E-!§ª f•¥yuIceQ
-!£¶*SÚ@È´ÏEH°?åòÕ¾œ_óGè¼7"ç­Øù0r>Žç”Ì9)uN˝çÒ̹8u.ÏÝj›.öí£{“ê_¶éŠ6*õ6ݝ3×è/WÎÜÅhÓhV»·ëÓEÕi¢ª#›cQõ¡ÕwQ“±Ý¾¨Ùà2.j:º÷á54ß?�Ñàœ^³	���%tEXtdate:create�2017-12-10T21:05:42+01:00øm9¡���%tEXtdate:modify�2017-12-10T21:05:42+01:00‰0���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/reply.svg b/resources/icons/ui/reply.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7094387f841e0934e326166019acb4558e2e7f69
--- /dev/null
+++ b/resources/icons/ui/reply.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.2773 16.2211C9.57 16.5142 9.56967 16.9891 9.27658 17.2818C8.98349 17.5745 8.50861 17.5742 8.21592 17.2811L3.21931 12.2776C2.92678 11.9847 2.92692 11.5101 3.21962 11.2174L8.21623 6.21972C8.50909 5.9268 8.98396 5.92675 9.27689 6.21962C9.56981 6.51248 9.56986 6.98735 9.277 7.28028L5.557 11H13.3988C14.9936 11 16.2099 11.242 17.2878 11.7645L17.5342 11.89C18.6427 12.4829 19.5171 13.3573 20.11 14.4658C20.7194 15.6053 21 16.8837 21 18.6012C21 19.0154 20.6642 19.3512 20.25 19.3512C19.8358 19.3512 19.5 19.0154 19.5 18.6012C19.5 17.1174 19.2723 16.0802 18.7872 15.1732C18.3342 14.3261 17.6739 13.6658 16.8268 13.2128C15.9895 12.765 15.0414 12.5365 13.7334 12.5041L13.3988 12.5H5.562L9.2773 16.2211Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/round-remove-button.png b/resources/icons/ui/round-remove-button.png
deleted file mode 100644
index b78e177c71c3235adb04f96e44a9968ccc9c147d..0000000000000000000000000000000000000000
--- a/resources/icons/ui/round-remove-button.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ$2;o��aIDATHÇ­•±Ž‚@†?‰ÑŠÒ‹+,|cEq/q/Á[rŸáŠ+m®’g Ô˜KÈÅNª+t¯Ø5p°ü[@˜ýfwf—™eââ1ÃÁb>øä	9£JÆ™q5<À'-…³‘â3¸Gzk¿³÷+[ö|¦¬X`‰-â™ïâêsŽ²Ê•€QÁ>"à*3ŽÌ‹‘gø÷Ï]¹‹‡l؉aƒ]™%›ÌÜÝçÂÏqe.üÛöSÙ¼mäÀ–@Ò,ŒPRçá::!ÀP®M`Œrµ†°F¡¸”\•F\P(Ö�§FND�x3�¶ð1ëã�°Ï
¯5à‹<5á G¸Ì'¨š‘i©Ò¢¥ú$<“üË›!©‰$s0-ÄX'M$1�«Æ{×DÜú"up•[ÿLüέJ%­uQ…—õ‹ÎEãÖVTÃæÚ+uÒ ½ÿÙÙRæÎ���%tEXtdate:create�2018-07-19T23:27:18+02:00`»°���%tEXtdate:modify�2018-07-19T23:27:18+02:00Ü���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/round-remove-button.svg b/resources/icons/ui/round-remove-button.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e0ca9273120965513d505ee743e9764dea0d88ea
--- /dev/null
+++ b/resources/icons/ui/round-remove-button.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 15C21.5523 15 22 15.4477 22 16C22 16.5523 21.5523 17 21 17C15.2069 17 17.4062 17 11 17C10.4477 17 10 16.5523 10 16C10 15.4477 10.4477 15 11 15C17.4062 15 15.2069 15 21 15ZM30 16C30 23.732 23.732 30 16 30C8.26801 30 2 23.732 2 16C2 8.26801 8.26801 2 16 2C23.732 2 30 8.26801 30 16ZM28 16C28 9.37258 22.6274 4 16 4C9.37258 4 4 9.37258 4 16C4 22.6274 9.37258 28 16 28C22.6274 28 28 22.6274 28 16Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/round-remove-button@2x.png b/resources/icons/ui/round-remove-button@2x.png
deleted file mode 100644
index 6bc98e53dbf660d200e531d15b6308ab96019359..0000000000000000000000000000000000000000
--- a/resources/icons/ui/round-remove-button@2x.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ#_ÿv��ÝIDAThÞÍ™¿O"AÇ?K€˜o9‹ÿÀ‰½Ù+‘R+âAü3l½†òD“+ ó¢ç?€
º×jA,î
-™…]vÖáM5;óÞ÷»o~½yãW
-xTpß
-øo¥ÏO†±-F–ûœòÄß)å‰Sö)™†ÎÓ Çh*´XFti7îPç62´Xn©ã$…ßäz.ðI¹fs~ð2‰À'å‚ò4‡É:m>…´½0Àçpq)ã²J6¤ÿ¶ùïïk!³ý‘{µ:Eöhñ²:jÑÁŽ´FΨ’›©£Ê™Vÿ(Ú”tø®Q¾Â‹åA+•“(‚?˜k99Ôl5g©Õ*ÝûZ‰®bmÌÎ4…õÀÔ;Ž0êÓ$DZbqÈZXç2¾Ôõ™ÃDà9äYÒ}GuÛ1ÿJA¶ÜÑuÚ8ߤ¨±¡vp”=¿›pìUÉ)ÓñR]Wue”ŒŸè””E¹+6æ•·n>ø“}1^h(»^âS\+Ž²;6Þ›zRC¼M7ŽxNoò¹$[g©ÁÒ15šÌ´‰W5UU	ëàõcG:ïÍ.?UrR¼Ð(Hû+Ux€–¦2x,	ÍíÔ	ˆKx*‡ÎS'p΋P«dp…ꀇÔ	<0jnV"àk¾&¼	|ñùFà^càwBÁ]UDq33=`^D”E `Y22ŸÁ”|n@V" »Å~3N@DQè<p“®ä!X
¹÷š”"«2¾PͲ•:-)‹Ð·~ƒå€$ü:,ï,Feƒe¡öÙzPj=,_€‹‰õ«™õËé\Ï­'(ÀzŠf’TÖÓt`=Q	ÖSµàpPûÐd584kÔ“¥ëÇ4ãøq‡¡ÆÈüð±ç´F›Ï!mqŸlîØæ:Ö°"ÅJó—NøºŸ-\&¿La9ìÒŸ¼Ï®©ÈÂêÓí»¤òxßE†Ÿïÿ4$¥•‰S���%tEXtdate:create�2018-07-19T23:27:22+02:00J~ã���%tEXtdate:modify�2018-07-19T23:27:22+02:00;#[¡���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/screen-share.png b/resources/icons/ui/screen-share.png
deleted file mode 100644
index d6cee4277f6ba194c43a627532c7b3666f029fab..0000000000000000000000000000000000000000
--- a/resources/icons/ui/screen-share.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���	pHYs�����šœ��·IDATxœíÚÍ«ÌQÇñ×EÈCž•Ñµ@ì(dA±J¬dÁù,lýØyHV.r³‘…§²#Ež
-)åFé’Xxº,Î\Ýr~Ü™9¿ùÍtÏ»N3Íü~ßóù~æüÎùžÓÉd2™L&“›ôŒòºV`Z‰ZRò1Ðj µx‚_]Úau³ÉoÏH¢Õö[M~–0|ªŸª½ÁÌX¢ã
-؁£²ª;¨	9ýE‘M?7̚؇EÔJRÑ]dÀ˜¡“øTE§dÀ
fí2ˆÆí$à(àg»:ì4à,vá[;:ëDà²P‰~I³+‘ÜÄ&|(³“ª
6[§p:òý]lÄÛvŠ‚~åÖæw±ÓG©g	^µØçÅN0àV5"d5<m¡ï± íz±[ð ÉØ€{‰4	)ƒðR˜Ì^'ˆ5XõB¢ÝjÙ#à‰ð«¥Hž ÷¨æ’.ƒeŽ€wØ,Ý>ç°3Q<”gÀöH—ü¡8Ú’(ÞÊ2à8nâº¹˜‡©ÂIîóÈ53pë[ÔÔÐ&«•eð#fGbNÂvÃ}aû;ò¾þÈ=ó„U#ÅÜK´ŒpD˜­‡éÅ!ì7¦ˆ^a‹¼<´¿ImÀwœ¬¿ŸˆÃÂrƒq–	É/J'-Nj®à=ã’檾•¸Žù	uѦe°Oº·ë¯²N˜ð¢gøeÒ€!¡V¿¡¹ä‡ù©	5ý—”¼ÂyÍOZKj‰Qú#Pv¥PõHåжSÙ6Í©È€XIÚí<‹}XdÀ…TEC9õ§²ež¶³]m$ùaz…ÿÙT-¾Õö‹’ÿ>á¾
-uýœúk7ðE8;<ýÂ5J‚a¬ë€ªTM6 jUÓ#ñ1s&“Éd2™L&ÓüXn²ÌÖ×����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/screen-share.svg b/resources/icons/ui/screen-share.svg
new file mode 100644
index 0000000000000000000000000000000000000000..8138d18d556f5740a15802ce86a3f7bdd1d7f473
--- /dev/null
+++ b/resources/icons/ui/screen-share.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M24 14.75C24.3315 14.75 24.6495 14.8817 24.8839 15.1161L30.8839 21.1161C31.372 21.6043 31.372 22.3957 30.8839 22.8839C30.3957 23.372 29.6043 23.372 29.1161 22.8839L25.25 19.0178V31.75C25.25 32.4404 24.6904 33 24 33C23.3096 33 22.75 32.4404 22.75 31.75V19.0178L18.8839 22.8839C18.3957 23.372 17.6043 23.372 17.1161 22.8839C16.628 22.3957 16.628 21.6043 17.1161 21.1161L23.1161 15.1161C23.3505 14.8817 23.6685 14.75 24 14.75ZM8.25 8C5.90279 8 4 9.90279 4 12.25V35.75C4 38.0972 5.90279 40 8.25 40H39.75C42.0972 40 44 38.0972 44 35.75V12.25C44 9.90279 42.0972 8 39.75 8H8.25ZM6.5 12.25C6.5 11.2835 7.2835 10.5 8.25 10.5H39.75C40.7165 10.5 41.5 11.2835 41.5 12.25V35.75C41.5 36.7165 40.7165 37.5 39.75 37.5H8.25C7.2835 37.5 6.5 36.7165 6.5 35.75V12.25Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/search.png b/resources/icons/ui/search.png
deleted file mode 100644
index f101ba9c19b1e0ced98f2fd53ceb9929065643e7..0000000000000000000000000000000000000000
--- a/resources/icons/ui/search.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���szzô���bKGD�ÿ�ÿ�ÿ ½§“��òIDATX…½×1kTAà/»ÄÆÆV´ÓH’N­´ÑÞ¿°(Q"*"þŽ„TúìDW
–ib@b¡ˆ…( d‹ÝXÌ[…Ýy³oÞnrà6Ãœ{λ3sgޔјÃ
\ÇIœ*Æ¿á;ÚxŽí
-¹²po°_1ÞãÒ$„§±†^†x?zX-rÔÂ	¬×Œ·˜ÍŸ.ˆãŠ÷ãŽäXK$ÛÄ}Ìãhx€	ÞJUñ‹âk¾‡;h$¸
,£á÷p¾ŠXé÷p¥êàj‰‰ö(â¹i·3Äû¸[’ëlŠô8BØ”.{šØŠä{TFhnÏ„õËEO#ã1Ø6ìx¾†x‘|ŸR„ÝafÇ"ùvË&7Š	“ÄTÎä~DÆOa Æý™2ð52žÜ4#ã~Nˆ5Š[‘ÊE³àb=EšoË5Ü+ɵ8Š{xt„öZ×ÔlÅ„×Oì2êí5µMᦌ‰wq¹ê¬Fôc…RαXŒÅZoöuÌä$ýØA«ª‰Ù2ÑÃRN%VÔ{”vîØ&/™×âmÿ7ÜΤLÀá>…ÂÅò_ðOŸó–ò
-Ö2Q7…%)3Q§ÑecIº•OÇA™øuR&^–†÷Ćð+x¨há·pzŽÃ_ìY] 2:g����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/search.svg b/resources/icons/ui/search.svg
new file mode 100644
index 0000000000000000000000000000000000000000..27e9e81336b61991cad1a0fb7bd3f0e7ef6787e5
--- /dev/null
+++ b/resources/icons/ui/search.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.5 3C7.70101 3 3 7.70101 3 13.5C3 19.299 7.70101 24 13.5 24C16.0394 24 18.3683 23.0985 20.1841 21.5981L27.293 28.7071C27.6836 29.0976 28.3167 29.0976 28.7073 28.7071C29.0978 28.3166 29.0978 27.6834 28.7073 27.2929L21.5983 20.1839C23.0986 18.3682 24 16.0393 24 13.5C24 7.70101 19.299 3 13.5 3ZM5 13.5C5 8.80558 8.80558 5 13.5 5C18.1944 5 22 8.80558 22 13.5C22 18.1944 18.1944 22 13.5 22C8.80558 22 5 18.1944 5 13.5Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/search@2x.png b/resources/icons/ui/search@2x.png
deleted file mode 100644
index 2604db4596677a88bbf2ecc3f73caea53df70740..0000000000000000000000000000000000000000
--- a/resources/icons/ui/search@2x.png
+++ /dev/null
@@ -1,9 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���bKGD�ÿ�ÿ�ÿ ½§“��IIDATxœí›ÏkUWÇ?ï¢iâ«-
-º1 mIš"hD›(((]‚ºro꯮ŠÁ­þþ
-ø/Xlw–âÒc”lôµR
)vÑÖë3ÏÅÜ+ñ™<gΏ{_Ô/„—óæ;3ïÜ9sΙ[",º€­ÀZ X,>NÿÿxŒàp)ý{Þbpø¨9Êp	ܼ@	ØŒàîô\2ô§M‰àWÂ;^/×€
9ù¤Bp˜&¾ó™LC@kþ5Dp›ü¯—HR-ßb`òØÙ×7Ð<õ4<¤TíQ=žM)aÑN×ËSr˜	]ÀxÁŽ6’ÿ€ŽXηá—ð&€3À^àk`°0•eégû€Ò±®<7ˆ´:œv4è.0€P‹¶ô;GÎ!g/ç@öu¾
-<x‡I#÷`½ïk(a¯ð*ÀêP�½ÀC£
W	T6ï0ÿ†<Ó¡±¸i´¥/±ecS!Žóڱ̈́+¾„ëd“ä³m]­[ãCvÂ@4èCdă]Ç|ˆ´‡wñËöV”Ñ?
-£®$_*	jÀW4ØçTj	&°9¡P+mÜoUž Oh¿ 	0oTóʱæäœ €­Êâ‚rœÖ—WH€Ï”coY•„–[ëË+$ÀbåØûVå¡åþÄEùst	¦ÅEy |ÔÀ®™ò̪8	gcSÀ¼)J€ÿ•c¦W |ªWµ*N5VƒÏ­ÊBË=nUœ O0EÞÛi¹X'èof·Y•Ä7Êq¸(?€.Ã>¹x¢Œä)ßºX6Cî~8c¯Á¾¯\IÆ”ä�3/´�÷”¶ýéBÕ?)Çwß»9âð…rìÏ>DÝè§Y^Gb›ÊNkW·/ᰁìw`¹/a´ìAÚo ¬!WSí!ˆëÐŽìþ,¶ô‡ .!m)â‡Hÿ@(lÄöËאãü`ýDë&‹“ÈémÙƒ·ÅöÌאk¼à}DCF#fΆƒØŠ¥2ðö_=“SÎ^6@+ò|»TCª¶³H…Ù‹$Ë–T–§Ÿ�~D_áÍ&·‰Ø<Õ‰ô丗§L!¹+x×H/ÒÚZ´ƒ–@ì
-„í4gŸÐ\òØ:½À?Mà\¡3¡¿Äè+Öž¥(3¡Y"­u‚L#K]«Ãw£äÞ>F—x½Œðz‘3å #ZJH[Ê•ÀNט»]ÞZ¦GB†5Hs¨£5ä0㍷Ù[Ð_⨃ú¥„ä•™nä¨m%°ye&»ƒGNoï!¿êUàŽRÿNäðÆå–j
-Ø
œsønS¡û¦)“(Kdø>œà“s#|‚0R€½Qà„‰"Œ— \,ÄÒˆ°á	óèMU4«C•bo»££QÞyç3Ì„÷Æù›ëÈó~™Yî_܃X—–‹w����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/send.svg b/resources/icons/ui/send.svg
new file mode 100644
index 0000000000000000000000000000000000000000..cecf4dd2522f69c542732a098baa3136bdccba85
--- /dev/null
+++ b/resources/icons/ui/send.svg
@@ -0,0 +1,3 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.78963 2.77224L24.8609 12.8498C25.4837 13.1477 25.7471 13.894 25.4493 14.5168C25.3261 14.7744 25.1185 14.982 24.8609 15.1052L3.78963 25.1827C3.16684 25.4806 2.4205 25.2172 2.12265 24.5944C1.99321 24.3237 1.96543 24.0156 2.04436 23.7262L4.70309 13.9775L2.04436 4.2288C1.86271 3.56277 2.25539 2.87559 2.92142 2.69395C3.21084 2.61502 3.519 2.6428 3.78963 2.77224ZM3.63523 4.36111L6.058 13.2489L17 13.2499C17.3797 13.2499 17.6935 13.5321 17.7432 13.8981L17.75 13.9999C17.75 14.3796 17.4678 14.6934 17.1018 14.7431L17 14.7499L6.046 14.7489L3.63523 23.5939L23.7422 13.9775L3.63523 4.36111Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/settings.png b/resources/icons/ui/settings.png
deleted file mode 100644
index ba521e27f02bb416701072cb4224fa245935671c..0000000000000000000000000000000000000000
--- a/resources/icons/ui/settings.png
+++ /dev/null
@@ -1,7 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ:.	âòM��ÇIDATHǝ”;,EA†¿ërÅ#…(‘ 	AD¢FA¡ J•F¡S‰B¨J‰A%ž…wABâQ\"žqÆ9vöì¹Ü3ÓìÎüÿvgf˜-},ŧ‰ÑÝâÌç/Ôö$Æ&P¤íƒ.É $ú¹c†�2åS«Å5]�$ÒÁ*aZUz™C8`˜{ÙöuFxøY_¨UYô¤Dó›Þì‹nñD6@Ç>,¦ @/£…}a‹mR¨¥š ¡†<ÔWÈs€uœ1ª Ę!5K@|+•3C
œV¶ó(Rwd¹Ž[Ï—ÀœR*çLMNo¬¾Ï2ä(?
-èžQ`[Y	Kx}5
-¨Qo¼	hµQ VY?RSÅÚ0]ì¢ñ.0û”Û©&®iô ›.Ìý EkíãÊ)rYö·¡xò<~*=´°ð3Êm¤c¶qîû1]‘Ðæ[ Ó>Èš/úÆïM*œB¾0dz'åƒ9§cjÔbL`qD™@3Fú%@2Ýìb1)«G¾Ø»Ÿø¼Ègë£áR�]
“‘[]@·“D¢
-œþ#ò‡-ˆ
-ìb†}Û¾=wÃÍ���%tEXtdate:create�2018-07-20T14:58:46+02:00/ö^���%tEXtdate:modify�2018-07-20T14:58:46+02:00^ÀNâ���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/settings.svg b/resources/icons/ui/settings.svg
new file mode 100644
index 0000000000000000000000000000000000000000..b8df01848e8bb4fa50408415fc059f23bcaa1a6b
--- /dev/null
+++ b/resources/icons/ui/settings.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 11C13.2386 11 11 13.2386 11 16C11 18.7614 13.2386 21 16 21C18.7614 21 21 18.7614 21 16C21 13.2386 18.7614 11 16 11ZM13 16C13 14.3431 14.3431 13 16 13C17.6569 13 19 14.3431 19 16C19 17.6569 17.6569 19 16 19C14.3431 19 13 17.6569 13 16ZM12.8403 29.628C13.8754 29.8753 14.936 30.0002 16.0003 30C17.0633 29.9984 18.1225 29.8725 19.1563 29.625C19.4531 29.5548 19.721 29.3945 19.9231 29.166C20.1252 28.9376 20.2518 28.6522 20.2853 28.349L20.5202 26.219C20.5538 25.868 20.7123 25.5408 20.9669 25.2968C21.2214 25.0529 21.5551 24.9085 21.9072 24.89C22.1404 24.8802 22.3727 24.924 22.5863 25.018L24.5412 25.875C24.728 25.9571 24.9297 25.9995 25.1337 25.9995C25.3377 25.9995 25.5395 25.9571 25.7262 25.875C25.9104 25.7949 26.0759 25.6774 26.2123 25.53C27.6568 23.9736 28.735 22.1139 29.3682 20.087C29.4589 19.7938 29.4561 19.4797 29.3602 19.1882C29.2644 18.8967 29.0802 18.6422 28.8333 18.46L27.1043 17.185C26.8196 16.9778 26.618 16.676 26.5357 16.3337C26.4535 15.9914 26.4958 15.6309 26.6553 15.317C26.7622 15.1078 26.917 14.9269 27.1073 14.789L28.8273 13.518C29.0757 13.3364 29.2611 13.0815 29.3574 12.7892C29.4537 12.4969 29.4561 12.1817 29.3642 11.888C28.7321 9.86076 27.6533 8.00111 26.2073 6.44598C25.9982 6.22242 25.7249 6.0692 25.4251 6.00742C25.1253 5.94563 24.8137 5.97831 24.5332 6.10098L22.5873 6.957C22.374 7.04998 22.1418 7.09146 21.9095 7.07809C21.6772 7.06473 21.4513 6.99689 21.2501 6.88007C21.0488 6.76324 20.8779 6.60071 20.7511 6.40561C20.6244 6.21051 20.5453 5.98832 20.5202 5.75699L20.2843 3.63699C20.2513 3.33005 20.1228 3.04118 19.9171 2.81104C19.7113 2.58089 19.4386 2.42105 19.1372 2.354C18.1104 2.12457 17.0624 2.0029 16.0102 1.991C14.9519 2.00352 13.8976 2.12517 12.8642 2.354C12.5623 2.42036 12.289 2.58029 12.0833 2.811C11.8771 3.03957 11.7488 3.32779 11.7172 3.634L11.4802 5.75598C11.4543 5.98766 11.3746 6.21006 11.2473 6.40536C11.12 6.60067 10.9488 6.76345 10.7473 6.88068C10.5458 6.9979 10.3196 7.06633 10.0869 7.08044C9.85422 7.09456 9.62145 7.05401 9.40725 6.96201L7.46126 6.10498C7.27614 6.02606 7.07698 5.98541 6.87574 5.98541C6.67451 5.98541 6.47536 6.02606 6.29025 6.10498C6.1005 6.18461 5.93001 6.30396 5.79025 6.45499C4.34425 8.01199 3.26489 9.87278 2.63125 11.901C2.54103 12.194 2.54415 12.5078 2.64018 12.799C2.73621 13.0901 2.92041 13.3442 3.16725 13.526L4.89225 14.798C5.17575 15.0066 5.37612 15.3089 5.45778 15.6513C5.53943 15.9937 5.49709 16.3539 5.33825 16.668C5.2334 16.8765 5.08054 17.0571 4.89225 17.195L3.16725 18.47C2.91967 18.6521 2.73507 18.9069 2.63917 19.1989C2.54327 19.4909 2.54085 19.8056 2.63224 20.099C3.26559 22.1285 4.34496 23.9907 5.79126 25.549C5.92796 25.6955 6.0934 25.8123 6.27725 25.892C6.46402 25.9727 6.66532 26.0143 6.86876 26.0143C7.0722 26.0143 7.27348 25.9727 7.46025 25.892L9.41525 25.033C9.62848 24.9409 9.86036 24.9 10.0922 24.9138C10.3241 24.9276 10.5495 24.9955 10.7504 25.1122C10.9512 25.229 11.1219 25.3911 11.2486 25.5858C11.3754 25.7804 11.4547 26.0021 11.4802 26.233L11.7153 28.359C11.7496 28.6605 11.876 28.9441 12.0773 29.1712C12.2786 29.3983 12.545 29.5578 12.8403 29.628ZM18.3413 27.762C16.7983 28.0785 15.2072 28.0785 13.6643 27.762L13.4693 26.022C13.374 25.1708 12.9681 24.3846 12.3292 23.814C11.8291 23.3736 11.2147 23.0836 10.5568 22.9775C9.89898 22.8713 9.22451 22.9533 8.61125 23.214L7.00525 23.914C5.96924 22.7277 5.17199 21.3525 4.65725 19.864L6.08125 18.812C6.52119 18.4878 6.8788 18.0648 7.12526 17.5771C7.37171 17.0893 7.50012 16.5505 7.50012 16.004C7.50012 15.4575 7.37171 14.9187 7.12526 14.4309C6.8788 13.9432 6.52119 13.5202 6.08125 13.196L4.65925 12.147C5.17459 10.66 5.9718 9.2862 7.00725 8.10098L8.60725 8.80099C9.04825 8.99573 9.52516 9.09589 10.0072 9.095C10.8657 9.09231 11.6933 8.77419 12.3325 8.20114C12.9718 7.62809 13.3781 6.84009 13.4743 5.987L13.6683 4.23999C14.4419 4.09044 15.2273 4.01013 16.0152 4C16.7972 4.00992 17.5766 4.08989 18.3443 4.23898L18.5313 5.979C18.6237 6.833 19.0286 7.62264 19.6683 8.19598C20.1687 8.63894 20.7848 8.93054 21.4447 9.03677C22.1045 9.143 22.781 9.05949 23.3952 8.79599L24.9953 8.09601C26.0318 9.281 26.8294 10.6552 27.3442 12.143L25.9223 13.189C25.4801 13.512 25.1203 13.9349 24.8724 14.4232C24.6244 14.9115 24.4951 15.4514 24.4951 15.999C24.4951 16.5466 24.6244 17.0865 24.8724 17.5748C25.1203 18.0631 25.4801 18.4859 25.9223 18.809L27.3442 19.858C26.8292 21.3437 26.0334 22.7166 25.0003 23.902L23.4002 23.202C22.8996 22.9792 22.3534 22.878 21.8062 22.9067C21.259 22.9354 20.7264 23.0932 20.2518 23.3671C19.7773 23.6411 19.3742 24.0234 19.0757 24.4829C18.7772 24.9424 18.5917 25.4661 18.5343 26.011L18.3413 27.762Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/settings@2x.png b/resources/icons/ui/settings@2x.png
deleted file mode 100644
index f77065cacf27113a51e2ec4db70ff7079f6c50e6..0000000000000000000000000000000000000000
--- a/resources/icons/ui/settings@2x.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ:2ã®��½IDAThÞÍ™YHTQÇÓhZ&š´¥-¶ÌCAEX‚ÑòTHQ!™`؃цD=DDEE/Ñ­E+Iõ–K„I¨“h«N9™·‡m¼÷ž{ι£·¾ïe¸ßùÿ¿ÿ=sÖï‚®¦CàïhóiÚ"aòˆ—ëÐl?M×î]%ñÉý-`’$ž«+@×ê$cÀ`Lö@ÙÒ6š‚ž€ñ
-íûU€l�L‰WÀQ*œz`0CÁI\Çà#6ÿõpÒ.‚]œ#Ó‚ö³‚›ü&L¡“€òšN®‘/ú<´)$ïö¯”‘ØÚÅn>ôÄH¥Ï䛉¨†­¤à¥Fòn¯"?˹A§)²W$àŒ-Q»Ãæ#óVÛ§!²ìÒÏà·ëDº~ÞNÀ#ÏÒt1Çœ~¥‡é
*ÍÓ¯Îc«cl÷<½A=ƒ"dr…xmiüäqäçÙ8Þ#D—kìwFE¦ŸŠjN°�~ÒXÄv®Z1?P¬
ë ¿¥Ks¸¯Íô •z-Ð+áÁÓG©ÒvÕíí,Ž�3y º³ÉØY@YB=3þÂüT(„›Öl[”Ò?d¸¸„)l•ÂôòqOÊsŒ;h•Ž°‹Š3<ËqFt°QMät©¢�¸!ä2Ïšê `„²€BËFl>€Ž’ÖÓ¬,à…0báW &íSIBè
mt
-"~³€ t¦†€éöÓÌŽß, IHˆìßJ6[±ð›LBb—N‰ÍFr¬+`¬m&ì0
w)¦È{– Ëìa‰œ”, !ÅòC…t)>e½ä©ÂRis0ÛlËMÈÎß2743æîæì²*X2UŠLìëÞÚ×ðCdf‡C/ŒÓ¼Þ¼$²µï~Ï5€M|×d2(…mÁö‘GZ4±	r׏Á|€® ]Ôr‰û|v‰7¸yƒlB®)âñ0¹‘›ÑW’Y ¸Èô¥ý{:H¡Ñó÷oí]°*ò\@iïî𹪹÷7Ö
{¾§
-ìÅeÏÒ߶•cùiiZC¼v•¦‘õ¬å‰åù/q5uL³.°0úÜO‰ ä&ò0I¢§r˜O1±#â™™J0úÞÛfŠep\¹wÇrrHf]tÃo"Ãiq˜@±Ã¢´D)ý!~EöEJUKQºCçÅ“Bf*—Ñ:„º­j¤-Úhø·jõû^€¼E\ªû ÅÿÕºæ“$e_—㶚…ÉCÐ¥û×ý')·Ú���%tEXtdate:create�2018-07-20T14:58:50+02:00€çÃú���%tEXtdate:modify�2018-07-20T14:58:50+02:00ñº{F���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/shield-filled-checkmark.svg b/resources/icons/ui/shield-filled-checkmark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4f47254602e7da0a4f7b9f4de7d98ca09632f6ac
--- /dev/null
+++ b/resources/icons/ui/shield-filled-checkmark.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M20.25 5c-2.663 0-5.258-.943-7.8-2.85a.75.75 0 0 0-.9 0C9.008 4.057 6.413 5 3.75 5a.75.75 0 0 0-.75.75V11c0 5.001 2.958 8.676 8.725 10.948a.75.75 0 0 0 .55 0C18.042 19.676 21 16 21 11V5.75a.75.75 0 0 0-.75-.75Zm-3.493 4.303-6 5.5a.75.75 0 0 1-1.037-.023l-2.5-2.5a.75.75 0 1 1 1.06-1.06l1.993 1.992 5.47-5.015a.75.75 0 0 1 1.014 1.106Z" fill="#212121"/></svg>
diff --git a/resources/icons/ui/shield-filled-cross.svg b/resources/icons/ui/shield-filled-cross.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a3b1a6a5182ad24fef2f799cae77cce9e1f4df3b
--- /dev/null
+++ b/resources/icons/ui/shield-filled-cross.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12.45 2.15C14.992 4.057 17.587 5 20.25 5a.75.75 0 0 1 .75.75V11c0 5.001-2.958 8.676-8.725 10.948a.75.75 0 0 1-.55 0C5.958 19.676 3 16 3 11V5.75A.75.75 0 0 1 3.75 5c2.663 0 5.258-.943 7.8-2.85a.75.75 0 0 1 .9 0ZM9.28 8.222a.75.75 0 0 0-1.13.975l.072.084 2.723 2.723-2.723 2.725a.749.749 0 1 0 1.059 1.059l2.723-2.724 2.725 2.724a.75.75 0 0 0 .975.073l.084-.073a.75.75 0 0 0 .073-.975l-.073-.084-2.724-2.725 2.724-2.723a.749.749 0 1 0-1.06-1.06l-2.724 2.724-2.723-2.723Z" fill="#212121"/></svg>
diff --git a/resources/icons/ui/shield-filled-exclamation-mark.svg b/resources/icons/ui/shield-filled-exclamation-mark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1fc7ff1f2d1a78bac43ae65f3877a9c972ca62ec
--- /dev/null
+++ b/resources/icons/ui/shield-filled-exclamation-mark.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12.45 2.15C14.992 4.057 17.587 5 20.25 5a.75.75 0 0 1 .75.75V11c0 5.001-2.958 8.676-8.725 10.948a.75.75 0 0 1-.55 0C5.958 19.676 3 16 3 11V5.75A.75.75 0 0 1 3.75 5c2.663 0 5.258-.943 7.8-2.85a.75.75 0 0 1 .9 0ZM12 16a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0-9.018a.75.75 0 0 0-.743.648l-.007.102v6.5l.007.102a.75.75 0 0 0 1.486 0l.007-.102v-6.5l-.007-.102A.75.75 0 0 0 12 6.982Z" fill="#212121"/></svg>
diff --git a/resources/icons/ui/shield-filled.svg b/resources/icons/ui/shield-filled.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d89abdac1d2fe918704d3ee4993b028847c11f94
--- /dev/null
+++ b/resources/icons/ui/shield-filled.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M3 5.75A.75.75 0 0 1 3.75 5c2.663 0 5.258-.943 7.8-2.85a.75.75 0 0 1 .9 0C14.992 4.057 17.587 5 20.25 5a.75.75 0 0 1 .75.75V11c0 5.001-2.958 8.676-8.725 10.948a.75.75 0 0 1-.55 0C5.958 19.676 3 16 3 11V5.75Z" fill="#212121"/></svg>
diff --git a/resources/icons/ui/smile.png b/resources/icons/ui/smile.png
deleted file mode 100644
index 17b3f10338e00ee3e8da8ed49e541a3d9aef3215..0000000000000000000000000000000000000000
--- a/resources/icons/ui/smile.png
+++ /dev/null
@@ -1,7 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâŽ%Ù��ÕIDATHÇ­Õ1K[Qð_Òb¦€ *Ç
-.®‚ƒ‹ˆ‡‚Ž~É$ý! ~†….]
-‚œ.)„àf\ôvx÷½&yϘ×ö¼å½wîÿÜû?÷œÿ©(²šM»>hh §§ë«žLa‹Ú„‚çAÛâdðŒ¦A!8}šf†!•‘½¿Xï/:¾ûé–,Û²®}Ÿô󻯺‹»¼h™Ïùçµ¼ÄwVóÌSø­ÍW)nºÍBŒdcÆytœªOÌRÝi\y>œ‹fŸÆÒÍ?ÇÄÃק
-PD)vL]Ê}ÖŽZV³c6ËE’ÎvâHʦ»}+#ð}Á£ÝøÝŠ¥Uc[<gwžŒ8‰/³K}ÛÕ³ã~*þ©ÝëÄó:G™k:
-	‚3nÁþÐâ·“û‚àF¼ÂR`#¹Êjià˜UõÀRid‚襖KH½÷º6°å3Þù¦ñ°ç£glîx!NÔ£ 8ÄP!—rÕÕDøUÔ¥¡Ro¦ׯ¯-`¬™òí<ç¢~a휔Š=Ýp×^&À9A)–´ª5Ž;°–)ò+’öÏ¢Ê_Ëú,I.J¶¼•®•Â %Æûo£ž]Kyåk���%tEXtdate:create�2018-07-19T23:23:17+02:00Ÿ"k#���%tEXtdate:modify�2018-07-19T23:23:17+02:00îÓŸ���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/smile.svg b/resources/icons/ui/smile.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c135f2d03b6c7a4efe6be40b452d645940aca24e
--- /dev/null
+++ b/resources/icons/ui/smile.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 15C13.1046 15 14 14.1046 14 13C14 11.8954 13.1046 11 12 11C10.8954 11 10 11.8954 10 13C10 14.1046 10.8954 15 12 15ZM22 13C22 14.1046 21.1046 15 20 15C18.8954 15 18 14.1046 18 13C18 11.8954 18.8954 11 20 11C21.1046 11 22 11.8954 22 13ZM9.553 19.1056C10.0445 18.8598 10.6416 19.0568 10.8909 19.5453L10.8944 19.5518C10.8999 19.5618 10.9111 19.5816 10.9282 19.6099C10.9626 19.6666 11.0207 19.7565 11.1049 19.8688C11.2737 20.0938 11.5446 20.4049 11.9374 20.7191C12.7104 21.3375 13.9931 22 16.0002 22C18.0073 22 19.29 21.3375 20.063 20.7191C20.4558 20.4049 20.7268 20.0938 20.8955 19.8688C20.9797 19.7565 21.0378 19.6666 21.0722 19.6099C21.0894 19.5816 21.1005 19.5618 21.1061 19.5518L21.1096 19.5453C21.3589 19.0568 21.9559 18.8598 22.4474 19.1056C22.9414 19.3526 23.1416 19.9532 22.8946 20.4472L22.8941 20.4483L22.8935 20.4495L22.8922 20.452L22.8893 20.4579L22.8815 20.4729C22.8755 20.4843 22.8678 20.4987 22.8585 20.5156C22.8398 20.5495 22.8144 20.5941 22.7818 20.6479C22.7165 20.7553 22.6222 20.8998 22.4955 21.0688C22.2424 21.4062 21.8571 21.8451 21.3124 22.2809C20.2104 23.1625 18.4931 24 16.0002 24C13.5073 24 11.79 23.1625 10.688 22.2809C10.1433 21.8451 9.75802 21.4062 9.5049 21.0688C9.37817 20.8998 9.28388 20.7553 9.21867 20.6479C9.18603 20.5941 9.16059 20.5495 9.14194 20.5156C9.13261 20.4987 9.12497 20.4843 9.11896 20.4729L9.11117 20.4579L9.10818 20.452L9.10691 20.4495L9.10633 20.4483L9.10578 20.4472C8.85881 19.9532 9.05902 19.3526 9.553 19.1056ZM16 2C8.26801 2 2 8.26801 2 16C2 23.732 8.26801 30 16 30C23.732 30 30 23.732 30 16C30 8.26801 23.732 2 16 2ZM4 16C4 9.37258 9.37258 4 16 4C22.6274 4 28 9.37258 28 16C28 22.6274 22.6274 28 16 28C9.37258 28 4 22.6274 4 16Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/smile@2x.png b/resources/icons/ui/smile@2x.png
deleted file mode 100644
index b1bb50982cb486874945dcc40aac8c0ba5690e3e..0000000000000000000000000000000000000000
--- a/resources/icons/ui/smile@2x.png
+++ /dev/null
@@ -1,8 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâãáÀ��öIDAThÞÍ™MK”QÇÏ0#Æ Ì"ÁfrQ}‚„¨¥*
-a †:Ð&!nZ¸DÄE }Aä¢i§	¶0•iú
F
-óiã&QDµ…9Þ{Ÿ{Ÿw_ÎÙ̝{Îùß羜{ιA)Mž{d+v…K̳Ø¢oªã9ŸØãÄ…÷øÄsê↮b€%Ž\¡E>b‘ªâ·(°îZäu
-XQáÛX~Æk´…Ï1	üŒçȹM°‰0Í-C_™
l6±±,Yrdi iÿÃV‚}}¯a·ÿ¥H­N†>Šü5œŽ^ÿàcZ#³´’òÔNÑʬVÌß–´˜Ô(¯’4ƒyV5VÞû‚óë7B'‹[£^j½•Å~­ŽEÅÚ1Ýn
-[oÂǪ»QŠ	Åâ.&á¶$zÈ`$ð3äPYÒz½ êvâ?‚lyF'Ôæ˜ü8I]ˆ&UÀR|þbĵW)¥lÇeõ\”UŠýF§N9”=bg•ráb‡w~dIŒ¯§º»¼æE^¯›sJò‚"_xÍ]¥ÇR¼ãÀy×’Ô¡:ÝgìTú~Ðà
-ßÀŠìϔ޼„³t¾:b°5«(Ýç@R[ a„O° Ép_‘¯©£³Ö/)µ**SçÜn@»CvJ‘h•zûOÿœ‘î{õøm:ŒŽ0âÝT$RR¼0	Ò´Ÿ9ä"éÏB«…t‚<ÕÂ_Ó•ÿ‘ªÉÃKéúÉ8âÝ„‘®¦—ðFh®kÍÆwOItzo’d….[«0É7úyÈ_yKÙu�<¢Ÿfnò·†²¹Sù…ya<¹ú( Î'|Ì@Ü$¢d¯Á�®˜òx.Sšók6€\P[¡HD¹n3Ð`È{㤌äKí$%¡™¤ƒ•V-ãÄqJŽyÅv¥Õ!…u%HKéXQR}ç¸ßÃð;ÉfQèÙ#
nIV¸†ÂòŽ´æš€)lª•r›ñÈ0.í²&j…Öd· ´š_‘¾ÿ—î‚R÷°ü1åÐðeK¶a¹WbòT‰‰üòO%;.‰‰WjÖÉ~`ø}:+.©™wrÚáQ¤VyÅ‚krê'=oæ§oøŸ4+ڞ鹟EƒJGÇ6ƒš:¹gü•hn0Ä–|‹!nh´|•hü©jèb˜IVØ愶Ya’aº¨ÑÊû.R…)Óå<bˆ@e:¸òB%\y©,Þk¶×%«Áb”cz´rý1£Aæ±›]íAû`±kZ{ó˜™æ¶¡/è“Íož°h	¨—b¥ð<c>÷ÞÔÄr$ðe½Ó
B=”B—è‰þpyJWút{Nòx|Šb~¾ÿ‚•>R0y:>���%tEXtdate:create�2018-07-19T23:23:21+02:00r}Yú���%tEXtdate:modify�2018-07-19T23:23:21+02:00 áF���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/speech-bubbles-comment-option.png b/resources/icons/ui/speech-bubbles-comment-option.png
deleted file mode 100644
index 3ec0165dbf07076626228cb4ce49dfd3fb2d36d4..0000000000000000000000000000000000000000
--- a/resources/icons/ui/speech-bubbles-comment-option.png
+++ /dev/null
@@ -1,15 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���szzô���sRGB�®Îé���	pHYs��
��
×B(›x��diTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:CreatorTool>www.inkscape.org</xmp:CreatorTool>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-ÜǦm��—IDATX	í–ËKa‡•¥¥”aZŠBQdK(ZDj
[˜»h_„”H¶‹v-Úô$"-*	Wn"ÒÂKŠ‹T‹2ÒT²ç7ÌæÌùfœæœÃÙøƒg¾ûû¾ße¾™XlCY^œþóéWE«ðæà;DVP�¥Xm€‹pöÁØkðæaÞÂ3ø)«÷á+ÈQXéÛ§ ²jùÂ:5õûÅø;´º4'«‰ª0R÷[Ú®Pª¦×7ˆâ(hÌ­0Þå‹8W`?à H¾«QCã
-Í$•¶NyGÇà6lUÁ­6
-©8XolŸíl©h/ì²ë¬ä_·õzÛñ²tÚÄ6°öå¥2”Îò7’¿	–.ðôFÎòÛÏ!Òß._3äu½[×kª—_Àšy½œ kàí×lµðh14z;G)?Å®^?ñÎàãuq= ʼnߘ÷ØÛk[o%Õjxûê€Æ¥(;!wBv*AÒÞû½iÚ–$]¢Æ}X¼Q•g{¶ÛV÷“~�ÓÝ	ì~	ÉJúá0
2Õ)ØhgÖdcçaLcT÷’>™G©{
ÎÞ©Ï$<„%(ÍNÛ¤×|‚QÐKe wüèò1iˆÊZÐU\ä¾€±ŒÞw0Òsè86L©®K[œénÐïU¼~П[:P‡A†AA‡Ó z]¹~Ò¶vƒ>Ñ:”‘TʨÓì‚ês”“P
-_ÐìÏAès^ªÓ
-,ƒöV««6·žS¸Z´Jg`'h@Ó¼cà^÷ÖS̬Š0za4û³ãõ8UV‚Øpš°ÿ�€­y’¹����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/speech-bubbles-comment-option@2x.png b/resources/icons/ui/speech-bubbles-comment-option@2x.png
deleted file mode 100644
index 8a07321d8dc19ec445d7a5a88380dddfb95fb942..0000000000000000000000000000000000000000
--- a/resources/icons/ui/speech-bubbles-comment-option@2x.png
+++ /dev/null
@@ -1,16 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���sRGB�®Îé���	pHYs��
��
×B(›x��diTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
-         <xmp:CreatorTool>www.inkscape.org</xmp:CreatorTool>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-ÜǦm��cIDATxíškˆUÇ_3³ÔVï«a¦‰‰’VšZHI›dP}YS?HdZaF°Jú(Fn)]è‚H7„#‚D%D³mÛð’„]T4M]ó÷_9{öÌ;—wÞwfløíÌ9s.ÏóÌ9Ï9gÞ-•
-)<Px ð@áÂÿ[ôHÈò¾´3ÆÁ­p†:è
WÁ98Ã!hƒ}ð†T¤ŒDãÙÐ�SAF÷‚¨òö@|ÛádRz¢Õƒðü	ÿ%ÌyÚÛÏÃÈ”<Š6Û i£ýÚû¾š uGLB‰Í54ÜvÈAú^}5—FzTв•J#½=FAMäZzYiZ®Ïvtº§ÚèCfÐxÏ1Z5¨–4Ï6dØxÏ	Z¦UÃ	/åÀxÏ	­è:4I'Ì ±Ó9r€±	*ÙÌQý¢h÷
xÞÍËU§9M¨ìï#94Þ{I-ènïtþˆ$int<Câ^Ïa©Î"¦Œ%ñè(õ”8
-qÈB½U–•šÒ?ƒ¶ÓOYϺ%5‡²`D%:lífU©ôa×îíiÒYEçôªï¬:{ªîŸQ4¯
œ)û„N—oFF‘žè’“ÏDj÷³T×Æ”$Þ„.˦0Ä,•Ó{Ù!LQp´¥‘ŒÅf¦*}mfäôþ_ô¦ØSÂ{ö:7S¼„ð‘—ÈñUÑþ¸¥¿ß6Yß//E9`7¸†‹Õ^¦“? ]‡¥á+m&g“зÌÎy³—ëJäX¾´t¿ôx+ÏN>kf¬ QÉ:œfÝßÐ} i÷÷ƒÎ	åôÒw…aš’f8Òy—¿?o£ò–ÚóHwYî¬çJj”L2ó—’(ç±,>û™F\J뇖0ú®4ëê;`„©˜…2âzÓ¶¼@FXýÚìÊ·±?Ba;ªF¹&[yÒÃA1!l'm”¦“©x¶‘4Ê5£ßÕå•E}pÊLr³:Ö¡Û5­u¦	Šü¶sžv´s9kwYúL¦­î‹àŠîw’õ·Jmþ¦@YÑ	Ksí8ØÞ«ezýk÷æ½(³¨úèiþP²RQ;H¢¼ÚrÐq×%ÈÜqúZéjÐ/ﳘÄQLuZáe¨?¹ NÚ8ôkØΈÍ—8E©£·ý><ýÁOzò`	è¿M¢´o–U,	%z¿€YÙï^Kç6h‡cp\eõã‹Êêú)¼
`ïçÉê&ò[ÀÕnØ<öë¼–]k©÷LÖÃÍ^F™«¦È2ЩRSûl¡¹«@£3‡òÈ9:ˆèKô#C)ô4‚ڍ+‡¨øœ
-j@Žy‚¼ú=e\ÛÑ öÃ>—ó5B’Ø“h™¼7LÇz[o€ŸñZ¿‚ùùê‰æÿà ‘â§G”|½ùYJ4µG6;ÑÛAßÓî€$åzÓÜÖÐÜí`ö]éýw´§öÒÑ«(»î†VÐ&DÆkãÐaå6
-NÍùӠѢà3�êaŒ¹Äp®®í-Ù±E/q-¬mäj.IZˏ@¥o1NýE5·Ø§C½íW¡â·Î'>ú¤–­åëIøj1*ÎÒÏ(+®P¶BB‡ÑŽ‚ét˜£a0ôƒ^`Ëy2´‡Ðª ˆ®Ѝ$mÐÒwد`Z°õÑfI)@j¤(­ )Ã@Äd¼Ð½¢új˜AòæAàæ'¨¡¬=×Ë{v@Pœh¦ŒV·+R´´*¶lÍ{?g4ñL›¼+Z¦b¦ÆNÐ9ÃtÆ	ÒÝ\Y‰è–¨(*NÜ·ÃXø^ƒ(¤ð@áÂ…
-(•.�ù(¤íIl����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/speech-bubbles.svg b/resources/icons/ui/speech-bubbles.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f6046e9aa3dc4d5d771e9ccfba4f4e4421bdf8c7
--- /dev/null
+++ b/resources/icons/ui/speech-bubbles.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.56158 3C5.41944 3 2.06158 6.35786 2.06158 10.5C2.06158 11.6329 2.31325 12.7088 2.76423 13.6734C2.5102 14.6714 2.22638 15.7842 2.03999 16.5147C1.80697 17.428 2.6294 18.2588 3.54374 18.039C4.29396 17.8587 5.44699 17.5819 6.47447 17.337C7.41678 17.7631 8.46241 18 9.56158 18C13.7037 18 17.0616 14.6421 17.0616 10.5C17.0616 6.35786 13.7037 3 9.56158 3ZM3.56158 10.5C3.56158 7.18629 6.24787 4.5 9.56158 4.5C12.8753 4.5 15.5616 7.18629 15.5616 10.5C15.5616 13.8137 12.8753 16.5 9.56158 16.5C8.60084 16.5 7.69487 16.2748 6.89161 15.8749L6.6482 15.7537L6.38368 15.8167C5.46095 16.0363 4.39489 16.2919 3.59592 16.4838C3.79467 15.7047 4.05784 14.6724 4.28601 13.7757L4.35619 13.4998L4.22568 13.2468C3.80145 12.4246 3.56158 11.4914 3.56158 10.5ZM14.5616 21.0001C12.5922 21.0001 10.8001 20.241 9.46191 18.9995C9.49511 18.9999 9.52835 19.0001 9.56163 19.0001C10.2796 19.0001 10.9768 18.911 11.6427 18.7434C12.5067 19.2254 13.5021 19.5001 14.5616 19.5001C15.5223 19.5001 16.4283 19.2748 17.2316 18.8749L17.475 18.7537L17.7395 18.8167C18.6611 19.0361 19.7046 19.2625 20.4787 19.4262C20.3037 18.6757 20.065 17.6711 19.8372 16.7757L19.767 16.4999L19.8975 16.2469C20.3217 15.4247 20.5616 14.4915 20.5616 13.5001C20.5616 11.3853 19.4676 9.52617 17.8146 8.45761C17.6363 7.73435 17.3653 7.04756 17.015 6.41052C19.9523 7.42684 22.0616 10.2171 22.0616 13.5001C22.0616 14.6332 21.8098 15.7094 21.3586 16.6741C21.6117 17.6821 21.8679 18.774 22.0304 19.4773C22.2348 20.3623 21.4554 21.1633 20.563 20.9768C19.8358 20.8248 18.6933 20.581 17.6495 20.3367C16.707 20.763 15.6611 21.0001 14.5616 21.0001Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/star.png b/resources/icons/ui/star.png
deleted file mode 100644
index f2c732435d14925b523be25240c20b01c369cc47..0000000000000000000000000000000000000000
--- a/resources/icons/ui/star.png
+++ /dev/null
@@ -1,7 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���szzô���bKGD�ÿ�ÿ�ÿ ½§“���	pHYs��Ä��Ä•+���tIMEâ	*ÇÑÒ��hIDATXÃÕ•=H1…¿øƒ…ˆ……‡ˆ6Z[ieqV*g¡ç)‚•pµ­`o)ˆØ{`-V‚¥b)X‰"6‚·6	,Kˆ·™l†,IfÞË›dþ¹Mó’]B+Àb™
-<_e�‰öé2JPO}¯•¡ÀCJ÷ØàC)pã1Kа̭ÇTà΢Àk,ð~¸ñJŒ4ky“õ�5ýŽ€n=oF•!™�UG¾m` ÓÖqh3§€{³©éµ(?ȲÞ
-mŸÀŒM>¥ÇV®tyÔ_w£V�øNÞ:<�~F%ïþD�Þ
-Õ|êà{!‘ò ý²ýž{(pòd‰'ñ^à[Z‚er[!ä?sÈÜ–ë—!Ø?cö‘U-	Oû,û7%Ž3É:ˆ™Mýxà"„ü·À`ŽžÑ\KË0§ƒ÷ØÕ9V}‚É�—¸¢ï†—)
-¶_¤žüýײÿ9����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/star.svg b/resources/icons/ui/star.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2aedc371b471d3b27e4fff43bc5f44461be9a750
--- /dev/null
+++ b/resources/icons/ui/star.svg
@@ -0,0 +1,3 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.7013 3.90838C13.2332 2.83067 14.7699 2.83067 15.3018 3.90838L17.9928 9.3609L24.01 10.2353C25.1993 10.4081 25.6742 11.8696 24.8136 12.7085L20.4595 16.9527L21.4874 22.9456C21.6905 24.1301 20.4473 25.0334 19.3835 24.4742L14.0015 21.6447L8.61958 24.4742C7.55582 25.0334 6.31254 24.1301 6.5157 22.9456L7.54357 16.9527L3.18947 12.7085C2.32887 11.8696 2.80376 10.4081 3.99308 10.2353L10.0103 9.3609L12.7013 3.90838ZM14.0015 4.66308L11.3438 10.0483C11.1326 10.4763 10.7243 10.7729 10.252 10.8415L4.30903 11.7051L8.60941 15.8969C8.95115 16.23 9.1071 16.71 9.02642 17.1804L8.01124 23.0993L13.3268 20.3048C13.7492 20.0827 14.2539 20.0827 14.6763 20.3048L19.9918 23.0993L18.9767 17.1804C18.896 16.71 19.0519 16.23 19.3937 15.8969L23.6941 11.7051L17.7511 10.8415C17.2788 10.7729 16.8705 10.4763 16.6593 10.0483L14.0015 4.66308Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/star@2x.png b/resources/icons/ui/star@2x.png
deleted file mode 100644
index 0cde94d8554ff78f3887d32534d2295135e9bada..0000000000000000000000000000000000000000
--- a/resources/icons/ui/star@2x.png
+++ /dev/null
@@ -1,8 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���bKGD�ÿ�ÿ�ÿ ½§“���	pHYs��Ä��Ä•+���tIMEâ	*
-4² š��ÖIDATxÚíš_ˆMAÇ?÷Z+Úˆ"E›$’´ÖåÁŸ‡•mKÑfï^"ÖFyàM"òäe<mùW^¼x’Rþ¥<HZ)ÉŸRKBD«°;SÇÝ{ϝóçÎÌ™ÙoM3çÜßï÷ýõý™;30	ã(zëè�z|N@	Øé³ü?¯äWòÐåc	”C×»}TÀû¼+ƒ%ä Ó§(+ö9‹7Uð×ò«—m“%PNøÌ<PÀO×Éύ /Ûz—K Oá=.+à‰‚F]%?K¼l.–@)£‘"·xC_\#?=yÙVºT»2ž0åw(àƒ+ä§$ /ÛÒF×ÌÆÄuAôÀÔŠûðó0¹bÒ’ý[SÄ7�
-¿ˆ³2Ù_­¯ñÎo © >6€™ø‡Íᛋ)¤š·v[(|º< ?PO­À°ƒÄßmqêã”Cä/%ýH´ßsN¾;‹qüf‰‹rÎrDþL£ÆÍÅÀˆÅÄGµ:&—ó4¶7
-Û-"ÄÔTrðÊ ñ¯ÀræÔCÈßÂü	—ÿ°C#ù£¶þ»êÑ@þ¤ÍKb[4$9Ó
ÔBÆÁý F³XаJíšÈËR³®ú4~kzm,Ob}Q
-6)`™fòr&jMLlb”°o
M…­À¢®ý)~ßiCŽ'|زÑÆÄ“£*íª
	x3èû@K
[WbÚ2~¶p~Ì€)ØìŽis£ÉSrD,§©¢xªhû‚É<Sp(…ýÓ
-ö™"?»N`H·3,±†ú{ëL$àpD@Év·¹܈ðwÞDÕæD}î­áó›nò-T_ \¥Á÷àuÿ«u&`…óë8XÃ9Îï…÷b?a�u9•‡ž^0¾/`ÍÀ]4ªا[nŠ8œÕáhöb“ˆ‡HòÉm²"ÁW����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/sticky-note-solid.svg b/resources/icons/ui/sticky-note-solid.svg
index bc36d474e96ecf2ab116c8daed4ae42762727194..4779ee143a196503851240884d10ecae5436a63a 100644
--- a/resources/icons/ui/sticky-note-solid.svg
+++ b/resources/icons/ui/sticky-note-solid.svg
@@ -1 +1,3 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="sticky-note" class="svg-inline--fa fa-sticky-note fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M312 320h136V56c0-13.3-10.7-24-24-24H24C10.7 32 0 42.7 0 56v400c0 13.3 10.7 24 24 24h264V344c0-13.2 10.8-24 24-24zm129 55l-98 98c-4.5 4.5-10.6 7-17 7h-6V352h128v6.1c0 6.3-2.5 12.4-7 16.9z"></path></svg>
\ No newline at end of file
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.75 3C19.5449 3 21 4.45507 21 6.25V13.1287C21 13.7254 20.7629 14.2977 20.341 14.7197L14.7197 20.341C14.2977 20.7629 13.7254 21 13.1287 21H6.25C4.45507 21 3 19.5449 3 17.75V6.25C3 4.45507 4.45507 3 6.25 3H17.75ZM17.75 4.5H6.25C5.2835 4.5 4.5 5.2835 4.5 6.25V17.75C4.5 18.7165 5.2835 19.5 6.25 19.5H13L13.0009 16.4365C12.7798 16.4695 12.555 16.4914 12.3268 16.502L12.0009 16.5096C10.6524 16.5096 9.41985 16.1277 8.32333 15.3693C7.98266 15.1337 7.89751 14.6665 8.13314 14.3259C8.36876 13.9852 8.83594 13.9 9.1766 14.1357C10.0215 14.72 10.9562 15.0096 12.0009 15.0096C12.4632 15.0096 12.904 14.9529 13.325 14.839C13.8209 13.8102 14.8412 13.0847 16.0382 13.0069L16.2512 13H19.5V6.25C19.5 5.2835 18.7165 4.5 17.75 4.5ZM18.439 14.5H16.2514C15.3332 14.5003 14.58 15.2074 14.5066 16.1066L14.5007 16.2501L14.5 18.439L18.439 14.5ZM9.00045 7.75116C9.69041 7.75116 10.2497 8.31048 10.2497 9.00045C10.2497 9.69041 9.69041 10.2497 9.00045 10.2497C8.31048 10.2497 7.75116 9.69041 7.75116 9.00045C7.75116 8.31048 8.31048 7.75116 9.00045 7.75116ZM15.0004 7.75116C15.6904 7.75116 16.2497 8.31048 16.2497 9.00045C16.2497 9.69041 15.6904 10.2497 15.0004 10.2497C14.3105 10.2497 13.7512 9.69041 13.7512 9.00045C13.7512 8.31048 14.3105 7.75116 15.0004 7.75116Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/tag.png b/resources/icons/ui/tag.png
deleted file mode 100644
index 61ae6b83cb8c983bc04b42e385ca8dddd995d151..0000000000000000000000000000000000000000
--- a/resources/icons/ui/tag.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���szzô���bKGD�ÿ�ÿ�ÿ ½§“���	pHYs��Ã��ÃÇo¨d���tIMEâ	9àé0x��jIDATXÃíÖ½JQàïú·41J
-Â%ÄZ
XRø±ô„€` …¾@Ê>ƒ…>€(’FE’"‚‚,„b›]ƒƒrî8iî‚Ù½÷ÌYë¬ÙóC<>a°Ù:É‘á+>c5â¥:Èç‚l¼ŸüóªˆhâmŒ7x†uü(¹&ÃB1Ù“( ÇÊå–1‚Ml¡…w9AgxQ\¨+¼‰£9âÞc;ìþ«÷㺍pì'†ï¨÷à;F±ˆß…7£ž|ºñ%õìçâ­S1ï¤6]§ÑHeã<wþDäŽ"þqR·÷áäò71_ærcXIÐ;ËÇ
fâøiŠí'mg9ÛŸHèöÓ
-ȯR_2gx™"`­"ò±ÔGn·"òFª€É6É[U|í&ë¶ý.L×i{^?f·W%bL
˜®Óö‡6fËÀ+|)ù!é ƒ$Ü[ 鈣ù“×����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/tag.svg b/resources/icons/ui/tag.svg
new file mode 100644
index 0000000000000000000000000000000000000000..b62a3b983ed6d11cd1a78328af3dc6647e4a5f4f
--- /dev/null
+++ b/resources/icons/ui/tag.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.5 12C23.8807 12 25 10.8807 25 9.5C25 8.11929 23.8807 7 22.5 7C21.1193 7 20 8.11929 20 9.5C20 10.8807 21.1193 12 22.5 12ZM18.6842 3C17.6695 3 16.6927 3.38568 15.9516 4.07892L3.77041 15.4742C2.01578 17.1157 1.96966 19.8841 3.66863 21.5831L9.99455 27.909C11.6543 29.5687 14.3452 29.5687 16.005 27.909L27.8282 16.0858C28.5783 15.3356 28.9998 14.3182 28.9998 13.2574V6.5C28.9998 4.567 27.4328 3 25.4998 3H18.6842ZM17.3179 5.53946C17.6884 5.19284 18.1769 5 18.6842 5H25.4998C26.3282 5 26.9998 5.67157 26.9998 6.5V13.2574C26.9998 13.7878 26.789 14.2965 26.414 14.6716L14.5907 26.4948C13.7121 27.3735 12.2874 27.3735 11.4088 26.4948L5.08284 20.1689C4.18339 19.2694 4.20781 17.8038 5.13673 16.9348L17.3179 5.53946Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/tag@2x.png b/resources/icons/ui/tag@2x.png
deleted file mode 100644
index 5a6769b09e89aa7c25b703b5b6d438b20fedc0d7..0000000000000000000000000000000000000000
--- a/resources/icons/ui/tag@2x.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���bKGD�ÿ�ÿ�ÿ ½§“���	pHYs��Ã��ÃÇo¨d���tIMEâ	87ß+1•��yIDATxÚíšÛKAÆ™£“‰fžÊ LÈ ‹n¢  EºÉ;±º©"’Š(»é*"$ˆèª .*ó€APt²v2É‚ËÓvñ½
ÃwØÏö›Õy`ØÝÙ™Ý}fÞyßgf*Eè[€MÀnà °˜�ú. ø<_;ª¸	x)ÒÐÁŽM‹Àxòjº0ŸÈ¯�Fr£À O)Sœ&•rÇçù!'Õ,OQ¾ø!eǁuQo€ÕâÔ<!Vç£Î)¥ÁND½¶*džø¬S§XÁ= 0]…Ü®ìêÅÌã{˜–±|8 Ô;íóùOa*
ÀR`̶ž=,d“yñ_B SÉÛ´Ÿ€À9`I’çßQêUÛf-Àå4qºP¼ü°¦r€5’¶‹íLPR9_ìÇÓšR›ÍÀEŸ"%¸¯\7�/?JÞŽ¡3Qc„ŠÖ4f¯§½@¹rýXžó˜Uò…Å·roZ¬%thu–É»J$–Èõ*9nÓ,¨,AÝ|9¾~‡=Éj”ð2H#bÆ…Ê<éùbyf‡RvöÞz%vÉ*ðdbrÅÏG$0áïCÊL°TÎUßP¡ÕÝ,“sÝgm€F驹D™
-‰Sb_€A!P«”-׬®RŽ“¢	B1û¦9˜½žŽ&ñêe"lâå:µðyWò¿ÂòöÓÿI>žZµg¯´27´ûñü¡0È7gêü¤Ÿ2^$¹ß­¼ÿš’Ì´Ù·h¦i*
Êû‹4)m\Ûφ@ÞÞË7ÜRòNšÖöa‘÷€ò—$ä}VšÔöc!’םÝ>	ƒVj{
`M†º |€ÕÚ>›éºÉžoyjù“:‡,#ß-Ó^#;@µbl!ÿHÖŒ¡Ã"ò}Ê‚G ð3®±dY­WA§L7ÀmÈ÷ÛKˆE£(ž…ìð
-Âî*àMHc¾�Köû«€çÉ÷(¡Ö LzÅTÏ[‰ÍüÛ|ÈVœÏÇòß\Je•6¯„ˆ`­èñ µ}>C
ð.jÚ>0@„´}¶†Ã\|B_Í>•cÌ$:ôØ$r‚‘~tB¯"'H±”J1>´Yä)›ŠÙ'C5p•ØVõp†ØϏV!Û=‘'¤=à±½+ð<ß{ûŠ°Í
-����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/toggle-camera-view.png b/resources/icons/ui/toggle-camera-view.png
deleted file mode 100644
index a1a6a5137772263bbd97534bb508729c7b001ea2..0000000000000000000000000000000000000000
--- a/resources/icons/ui/toggle-camera-view.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���	pHYs�����šœ��(IDATxœíšËMÃ@“@éh…œé�jH)Ip
-Ő
-rBtÀã`ˆ6Áá°žÄþFZÉÒn¢ùG>Y!„B»Ì€g`|žøÚ|Ïr{èðË#®µ–]Ã?díu_|V<7À+pÑUéÄy¦´1hŠ+†?<À%í¬�LŠë=?¸«ª•ÿÿ7n€5ì8ßsø©ºNÿlgmþ:5À°I�[À&l›°lÀ°I�[À&l›°l&ÝGڏ‡Ceôo@Ø6	`Ø$€-`“�¶€MØ6	`Ø$€-`“�¶€Mà]³èŸí¬e€µ bñò󐋒ÅÆ07ŒzfNLJÞ!_–^Zi¬Îuùÿ¸.B!„qðœùùN‡ÝÆ����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/unlock.png b/resources/icons/ui/unlock.png
deleted file mode 100644
index 90e4602ad885027a149068503c6a088790856cd1..0000000000000000000000000000000000000000
--- a/resources/icons/ui/unlock.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR���$��� ���z‘ÚŽ���bKGD�ÿ�ÿ�ÿ ½§“��6IDATX…í–ÏJÃ@‡¿ÆZõ\½hž¢}¬J/þ¢-}D¡_ÃÄ'hKUˆ‡$¢él¦ivKûƒ!$ìoçc˜ît Ö@¼#àÂaî:€%”Ä
-˜Ç.aº¤))Æ8us<U„Éã
8±
4Þ&©M˜3`!$Y7À%i¯€käþZa±Ñ†}ÃùžjhHê;Ås+xžm½—‡Š'<‘- /áò¶â9<ß-K@‰ðm›»7|A}»ò@š C:%cvŸ²’ŠÏ$ËõWŸ…÷5ÙÁ:#¿JL
-�÷D’=ÇÔ¬LÕø0TóW-Ì%w¥ÒqÐȦn”<&¤Éiò@š	ï1ŸºÄÀã@rm•«Cº§D¸[;LÚ†~�ö¾á&kNXÓ����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/unlock@2x.png b/resources/icons/ui/unlock@2x.png
deleted file mode 100644
index 8df18143680089562e4ed06499c99c2d8ef3cbc6..0000000000000000000000000000000000000000
--- a/resources/icons/ui/unlock@2x.png
+++ /dev/null
@@ -1,8 +0,0 @@
-‰PNG
-
-���
IHDR���H���@���¹¾1*���bKGD�ÿ�ÿ�ÿ ½§“��šIDATxœíœÍjQFO·’.‚®Au”<€» "B +
-"‰ˆO¡Ï¡¢ø
-þ L„@Ä ‹Ä…GÐÑM0è".îmA»î®þ™¦Ô&驺ßÉôÐÓ}IÂp3	\Î]à0ê·¬«Àkàð®†5VÎà6°ìDÖ{à.%¶Š¸|%^ÌÞúŽ“¼¿Ò%rwš³·–€“ÕÅ(‡Àôådµ\©,2WmÊ““Õo`¦¢LjL?)_NV¿€éJ’)0ô©NNV›Àé
-ò"^Q½œ¬–€}e‡,Â5ê““Õ\Ù!¥|&>ÐKàp8ˆ»<åöl€~}ߧq\'.ÈGàb@ß)lLï;J™TyCx€EàHDï1`>¢ÿJá4Êœ |ñŸ€£ÌÖ"æL¦n¾ðË朏˜Ó¨Óìa‹žW˜õ<pÖ“Ta˜ÝÀã+Ìzx\£.¿öW=«0«8«¯0KÐï]‡fÎÚN†i±xœÖšƒæ5é3¨‘˜ $`‚L€	0A&H`· îiã"î¹vÌÍ%
-å¯ßòkŸóYTÞæ¶Zö™òøЧÎv›äì–”÷NºÐã¸Óªî0eÕlŽ Ž—ÔûÇëz^ÎÄݶZÈD‚{šØÊý2¸îCE$8Óm¦Ðí»0A&HÀ	˜ $`‚L€	0A&HÀ	˜ $`‚L€	0A&HÀ	˜ $`‚RÜõ¶²Q´A
-|PXHS)œ-*,¤©<ÒhÒÁm©{£v-ãwgh0Þ2I!¨¢Áí§YÀíø¨;dlmâþ¿Ç,Šïœ?üp[fkXò����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/user-friends-solid.svg b/resources/icons/ui/user-friends-solid.svg
index 1add45ec8574ac7f5381cf50ed7c6eb7b4ad3781..a86c48c2745d3dccfb5f7fe7010b373b7787707d 100644
--- a/resources/icons/ui/user-friends-solid.svg
+++ b/resources/icons/ui/user-friends-solid.svg
@@ -1 +1,3 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="user-friends" class="svg-inline--fa fa-user-friends fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M192 256c61.9 0 112-50.1 112-112S253.9 32 192 32 80 82.1 80 144s50.1 112 112 112zm76.8 32h-8.3c-20.8 10-43.9 16-68.5 16s-47.6-6-68.5-16h-8.3C51.6 288 0 339.6 0 403.2V432c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48v-28.8c0-63.6-51.6-115.2-115.2-115.2zM480 256c53 0 96-43 96-96s-43-96-96-96-96 43-96 96 43 96 96 96zm48 32h-3.8c-13.9 4.8-28.6 8-44.2 8s-30.3-3.2-44.2-8H432c-20.4 0-39.2 5.9-55.7 15.4 24.4 26.3 39.7 61.2 39.7 99.8v38.4c0 2.2-.5 4.3-.6 6.4H592c26.5 0 48-21.5 48-48 0-61.9-50.1-112-112-112z"></path></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.49579 8C9.32421 8 9.99579 8.67157 9.99579 9.5L9.995 10.2484C10.0979 12.0849 8.68334 13.0008 6.06019 13.0008C3.44552 13.0008 2 12.0969 2 10.2746V9.5C2 8.67157 2.67157 8 3.5 8H8.49579ZM12.4964 8C13.3248 8 13.9964 8.67157 13.9964 9.5L13.9956 10.0266C14.0861 11.674 12.8362 12.5 10.5516 12.5C10.2415 12.5 9.94993 12.4849 9.67766 12.4547C9.96832 12.1873 10.1848 11.8681 10.3228 11.4974L10.5516 11.5C12.3358 11.5 13.0491 11.0286 12.9964 10.054V9.5C12.9964 9.22386 12.7725 9 12.4964 9L10.4328 8.99998C10.3315 8.60667 10.1137 8.26018 9.81823 7.99959L12.4964 8ZM8.49579 9H3.5C3.22386 9 3 9.22386 3 9.5V10.2746C3 11.4206 3.92794 12.0008 6.06019 12.0008C8.18397 12.0008 9.05983 11.4337 8.99579 10.2763V9.5C8.99579 9.22386 8.77193 9 8.49579 9ZM6 2C7.38094 2 8.50041 3.11947 8.50041 4.5004C8.50041 5.88134 7.38094 7.00081 6 7.00081C4.61906 7.00081 3.49959 5.88134 3.49959 4.5004C3.49959 3.11947 4.61906 2 6 2ZM11 3C12.1046 3 13 3.89543 13 5C13 6.10457 12.1046 7 11 7C9.89543 7 9 6.10457 9 5C9 3.89543 9.89543 3 11 3ZM6 3C5.17135 3 4.4996 3.67175 4.4996 4.5004C4.4996 5.32906 5.17135 6.00081 6 6.00081C6.82865 6.00081 7.5004 5.32906 7.5004 4.5004C7.5004 3.67175 6.82865 3 6 3ZM11 4C10.4477 4 10 4.44772 10 5C10 5.55228 10.4477 6 11 6C11.5523 6 12 5.55228 12 5C12 4.44772 11.5523 4 11 4Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/vertical-ellipsis.png b/resources/icons/ui/vertical-ellipsis.png
deleted file mode 100644
index 6b3a36e36a9e6a6bd6e9eb1e5cc909f7046654c8..0000000000000000000000000000000000000000
--- a/resources/icons/ui/vertical-ellipsis.png
+++ /dev/null
@@ -1,14 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���szzô���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���	pHYs��
��
×B(›x��YiTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
-         <tiff:Orientation>1</tiff:Orientation>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-LÂ'Y���³IDATX	í•K€0DÇðþñ=/¡}ÆnX` mI“~†
-"c—Ň­Û«¯1go
-tV»„±7%	ÞVok¸á ì- áLXMÞœ=	%SŽÙ¨ð&$]’ áøæó)
-¨qY§¡M.C$'Ám
7è¾”#œ	ž_±)À—³'¢<Tã”c6*¼	I7T†¶z¥÷_+Ú„á2Ì» k_ç]à-g7Þ²ci‘¾-·«����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/vertical-ellipsis@2x.png b/resources/icons/ui/vertical-ellipsis@2x.png
deleted file mode 100644
index 4f28066b1e6357ef69b15abece3455583ac59908..0000000000000000000000000000000000000000
--- a/resources/icons/ui/vertical-ellipsis@2x.png
+++ /dev/null
@@ -1,12 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���	pHYs��
��
×B(›x��YiTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""
-            xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
-         <tiff:Orientation>1</tiff:Orientation>
-      </rdf:Description>
-   </rdf:RDF>
-</x:xmpmeta>
-LÂ'Y��IDATxí™ÁÍÂ0…)Gæ`¦aÆbÆ`ÎlÀòD{©”bõ׊Ÿ¥èýý’úk’Úé°ó·cò\Úil¸ƒûØ®åïz´¡u)íUÚ»Òð?øÀ·+C@·ÒjÏ¯Ã·+xªó ý†¦Ú_šö5Ð@ÛÔöM{ÿvŽ
ï°bh mj�°Û¯5F»v̿랥ÇÚ4ÿuÚ¦æ1šÀvî�IÎZc´¦1Ó0Q"B¿ÉØÌòÔ‰(¥O…'˜	KY¡{1´EÁ‘¶Æ,‰€ˆ€ˆ€Ä! DÈñY�v¸TØ+þôÅPêr8ôˆÇ‘˜¾¾ðLR%`º‘­œ<�0gûŒÖÄ4=�%Ò)ôkŒÍ,ORúTx‚®R9l^År荀!Ç'
-ØáRa¯øÓC©ËáÐ"Gbú.@l4ú.@À3I=–€éF¶rò�Àœí3ZÓô�L”H§Ð¯A26³<u"JéSá	B¸b(}9üaoèyh1����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/video-call.png b/resources/icons/ui/video-call.png
deleted file mode 100644
index f40ce02271c3a208eb56ed065296bc9cf2622c32..0000000000000000000000000000000000000000
--- a/resources/icons/ui/video-call.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-���
IHDR���@���@���ªiqÞ���	pHYs�����šœ��IDATxœíÙ1NA€á_¥f©-½™W¡æÁ[X`		¶FwvæÁðÆÿK¶ÚÉòÞÉ‚$I’$IÒ¹G`€SçëØ\vÝsÛ€Á#¯Oà©pö©véŸná›ÿ}½Ì=û¹C÷Zœ¹¶õÌý	Øs*	Mñò0^€EËÃX/ã¨ZÆP½<äд<äм<ä
²<À]Á™Së‡töçŽYaÐ{€ÞÐ{€ÞÐ{€Þ²x¾"”5À;ðB@„¬ (Bæ�!{�hŒ0B�hˆ0J�¨Œ0R�¨ˆ0Z�X¡$À±iœË8ÌÜûŸ�¾½¹×ãÏKI’$I’¤ÿë«dÔû2ZÚ|����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/video.svg b/resources/icons/ui/video.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6a57608ba3c9cb5944dd56fe7b56b460595e6ba8
--- /dev/null
+++ b/resources/icons/ui/video.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.5 5.5C4.01472 5.5 2 7.51472 2 10V22C2 24.4853 4.01472 26.5 6.5 26.5H18.5C20.9853 26.5 23 24.4853 23 22V20.5L27.1997 23.6498C28.3534 24.515 29.9997 23.6919 29.9997 22.2498V9.74985C29.9997 8.30774 28.3533 7.48458 27.1997 8.34989L23 11.4999V10C23 7.51472 20.9853 5.5 18.5 5.5H6.5ZM23 14L27.9997 10.2499V21.7498L23 18V14ZM21 10V22C21 23.3807 19.8807 24.5 18.5 24.5H6.5C5.11929 24.5 4 23.3807 4 22V10C4 8.61929 5.11929 7.5 6.5 7.5H18.5C19.8807 7.5 21 8.61929 21 10Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/volume-off-indicator.png b/resources/icons/ui/volume-off-indicator.png
deleted file mode 100644
index 0ff3d30e92ad44cbe484045c2c37dd5270e1a30d..0000000000000000000000000000000000000000
--- a/resources/icons/ui/volume-off-indicator.png
+++ /dev/null
@@ -1,6 +0,0 @@
-‰PNG
-
-���
IHDR��� ��� ���Ùs²���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ'@·Î��	IDATHÇ•Ô¿OAÀñ/°Èoµ£°DÐXðXY€
‰6ÆÂB
-+L<5bCr„Ø(–(¿"=„Cˆ?B°ÒBA„ð+±
-ȳØws³Ëp{÷¦Ø›yo>·³;;�Í$9Kæh§ƒ2wª‘„ïT9³1½Æþ2HýÉ’!AøJ¥cú¤øm”Ò`Q!ãšZ¤")â=¢¿@øÁÅӈʭéÓˆ
-¸Ïš!Ö¨cšúbÕ±«:ØÓÑ]n„‰QMÍë=FB�@ÛZ·L~˜x§©9J,"
li݃pÊ3ÄgÎ"•KÇ„?'w†Ç[%’&vÒK‘©KhU7äqOo8E<å<�ŸhãÐŒÇyA’[PÃ*åÀ?ª`ÓzÃÁöÁúO#½4ýgZӐ	¦ÌV~„ sɼ
¿âNf@˜T"õRû(æA艄‰�1oñA‚Ħ&„_Ù�6ñÆ�3ÂÏì€4Q`€]ách?;Â?Z!ëh-Õ�lDí!kz]^Äô¥wuä*\§ÅjÀM<Gøæºå„8xè^u¸	¢	2DˆÙ܉tÔòZ?¡œ?.Я™äJø·&.±’裆eíGXÀ>¯¸¬ýs,!ìИ-p“ÛÖ		PÍÍð$ ”Ç°B���%tEXtdate:create�2018-07-19T23:25:39+02:00€&gD���%tEXtdate:modify�2018-07-19T23:25:39+02:00ñ{ßø���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/volume-off-indicator.svg b/resources/icons/ui/volume-off-indicator.svg
new file mode 100644
index 0000000000000000000000000000000000000000..cc87d7343dcf640e9d272f6365ca96888dec058e
--- /dev/null
+++ b/resources/icons/ui/volume-off-indicator.svg
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.395 3.90219C15.1932 3.1536 16.5 3.71962 16.5 4.814V23.1841C16.5 24.2782 15.1937 24.8443 14.3953 24.0962L9.45832 19.4701C9.134 19.1662 8.70619 18.997 8.26174 18.997H5.25C3.45507 18.997 2 17.542 2 15.747V12.255C2 10.4601 3.45508 9.00505 5.25 9.00505H8.26119C8.70587 9.00505 9.13388 8.83576 9.45826 8.53158L14.395 3.90219ZM15 5.39117L10.4843 9.62575C9.8819 10.1907 9.08703 10.505 8.26119 10.505H5.25C4.2835 10.505 3.5 11.2885 3.5 12.255V15.747C3.5 16.7135 4.2835 17.497 5.25 17.497H8.26174C9.08715 17.497 9.88165 17.8111 10.484 18.3755L15 22.6072V5.39117Z" fill="#212121"/>
+<path d="M19.7824 10.7214C19.4905 10.4274 19.0157 10.4257 18.7217 10.7175C18.4277 11.0093 18.426 11.4842 18.7178 11.7781L20.9359 14.0126L18.7208 16.2183C18.4273 16.5106 18.4263 16.9855 18.7186 17.279C19.0108 17.5725 19.4857 17.5735 19.7792 17.2812L21.9965 15.0732L24.2217 17.282C24.5157 17.5739 24.9906 17.5721 25.2824 17.2781C25.5742 16.9842 25.5724 16.5093 25.2784 16.2175L23.0572 14.0126L25.2815 11.779C25.5738 11.4855 25.5728 11.0106 25.2793 10.7183C24.9858 10.426 24.5109 10.427 24.2186 10.7205L21.9965 12.9519L19.7824 10.7214Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/volume-off-indicator@2x.png b/resources/icons/ui/volume-off-indicator@2x.png
deleted file mode 100644
index 25ebbbbe27d135ee77b3dfa91529b5cd73a31fb0..0000000000000000000000000000000000000000
--- a/resources/icons/ui/volume-off-indicator@2x.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ+IÑå��´IDAThÞ½ÙKlMAÀñ•
-U¢¥õÕ J‰HT$Ò!"*$+„‰…ÄÆ)6b!!±‰D°±"„… z¯’¶A[­ŠÒÞP}Ç93sï¹÷»«Óùf¾ß3wΣ¹ü‰<®ÒG#éÆúèðï–ÇMý¬K@ÐÂYªÈõ-/ô³6ÀŸO#ÛæW^ ècµWÁi� Î&û5RA/+=Ê7…‚§,d"q¥ËwªœË+@ÐË._B+Ë»�‚Ëäû¾±Ü©¼
-h	�ê™Nx©tøÊ2‡ò*`4{ˆÞiKVŠb`©µ¼0f¬ä™‘Ð@±¡›%ZÖT©¼+—ÆõPÇx?B‹µ“s��Lⶁð˜áá„z¥Ã)9¨s@.g„£¡}„N*B¶ØÃe¼Ú¬*Q¢>1_É)â…#�¶2¨Œ#Ï—ð‘y¡Ö�‡µÓpÜÖ¥„WJ—æ*9…Ô:àœ¶=Oô'´3[#<×æÅ#´½ö˜]­Ú(Ór¼egÀh•üR–ö(;a¯B+¥¡=îäœUÆÚg˜ÍÌ°�]Úz(PöÆF€.3'”P¨ùfªh
ŒKžŠJ>k­5’ŽËyÍ¿ß³ÏçMàuíÿw|ÄH­µTY!5€ ‰)€ ÆÐ~CåVê�A“-€Õo§4ÆW†;Ý8c÷(Ñþ:ô&5Ÿ½Zû}騀ÊÔg@ ¨×n0ä‹õÞÿ^awê3�PÎ]eKídñG“Y£õy §€‚¾´È3–.�*B	eZ~g´3`#dF°ÆF&ŒÑ2å'¤OQ‚1-oªtÔÀLØl´G	0z2?qéH'¨!ßM´¥·„ö¤$ˆ…òrç¥À‹P­dDð!œ—²Ú!€;¡YʹÀ•pZÊØ9lY2ËÙbýä!ÜUcã¬R¶Þ¡7¦ñ=|ða\tž÷Y8•l»dýrNR œDðËøìA
7Â	®¹•·ôp#Ú»Lá·;¦I0G	A‘5Bpd‰3éÍ<!86_]GN0Ç4®þn"&èQÁmê3H£š{Ö«GÄ9%3Ep|fÕÊÝ`d;àJ²P†á€VÖiÕ	5>åÌ„`ÀOÎQ ´Ë„›¶·æþ‘H.¸‡ì7¼A’	(Ý<áPøÇ’„Œ”‡éNYÕ\û[þ7ÙNw«qÊ���%tEXtdate:create�2018-07-19T23:25:43+02:00.“1���%tEXtdate:modify�2018-07-19T23:25:43+02:00_Ή¯���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/volume-up.png b/resources/icons/ui/volume-up.png
deleted file mode 100644
index 4a42643f23ae3a55142a0ba0973ccfc5e33ba514..0000000000000000000000000000000000000000
--- a/resources/icons/ui/volume-up.png
+++ /dev/null
@@ -1,5 +0,0 @@
-‰PNG
-
-���
IHDR��� �������½"���bKGD�ÿ�ÿ�ÿ ½§“��IDATH‰Å×Ï‹aðÏü`f4düXÌÂ,äÇÈFÊŽØøµÄŠò7X)"‘äG)V²RƒYÊÂŽÈÚoÑJ¦‹÷y»gnÞëÞ;ïåÔÛ=}Ïyžï÷yßó<Ϲ´Öº0¯Å…Öƒ§˜À~´ÿkýø‰ÉôÜJ¢¦e؍MuæïÄç â.º›%ïĵ4Ñ/Ô9n^W›!Ÿá0É$ÖäLB¶oÂؽÏÄÍ*ò"ý!þÛCl?Rlóë!ïÂÈÈ‹´áFÈ™ÀÆ?bGrp6ÖË
-«ú¹]@^ë´ãxÈ{kLå-Ì„G5Hj=QÀʪ•Â¥{!à'¾E“äQÀBŒ'ìz¾*ÙžÏos>æ8W†€¹øð3aµ‡¾#a²Ä½2À¼Nø7•
-_òO„ü	-ë|~†ÓÉïƪä¿9ýÁK¿}e^mÍ*KÀRìKþw<Nþâ3üü}ê,¼÷eÅU^ñ¶÷0ýv`EòŸSî6VÙ†³T¶áWÙ!kÂgse­8ˆ.‡Üó?ðÍЫµGñ;SâüÌøÞV¡•qmñc!vøoä¹Mç:Þbk“ |õu]ǹ5Ґ5$Ë6€·aìžFÈsk¶%Ä«@~¥òÜò¦´ºâ‹l—©MéÓhJµê¶|D	my#Öƒ'þ㲺魕ð׏ëAf>����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/volume-up.svg b/resources/icons/ui/volume-up.svg
new file mode 100644
index 0000000000000000000000000000000000000000..11a4c5d443632ec1ae78366620acf0bdb9272a8f
--- /dev/null
+++ b/resources/icons/ui/volume-up.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 5.60358C18 4.48995 16.6536 3.93224 15.8661 4.7197L11.1716 9.41424C10.7965 9.78931 10.2878 10 9.75736 10H6C3.79086 10 2 11.7909 2 14V18C2 20.2092 3.79086 22 6 22H9.75736C10.2878 22 10.7965 22.2107 11.1716 22.5858L15.8661 27.2804C16.6536 28.0678 18 27.5101 18 26.3965V5.60358ZM12.5858 10.8285L16 7.41424V24.5858L12.5858 21.1716C11.8356 20.4215 10.8182 20 9.75736 20H6C4.89543 20 4 19.1046 4 18V14C4 12.8955 4.89543 12 6 12H9.75736C10.8182 12 11.8356 11.5786 12.5858 10.8285ZM22.824 9.4335C22.5112 8.97839 21.8886 8.8631 21.4335 9.17598C20.9784 9.48887 20.8631 10.1114 21.176 10.5666C22.4612 12.436 23.0625 14.2421 23.0625 16C23.0625 17.7579 22.4612 19.5641 21.176 21.4335C20.8631 21.8886 20.9784 22.5112 21.4335 22.8241C21.8886 23.137 22.5112 23.0217 22.824 22.5666C24.2888 20.436 25.0625 18.2421 25.0625 16C25.0625 13.7579 24.2888 11.5641 22.824 9.4335ZM25.6897 5.27586C25.2897 4.89498 24.6567 4.91042 24.2759 5.31035C23.895 5.71028 23.9104 6.34325 24.3103 6.72414C26.697 8.99712 27.9375 12.4627 27.9375 16C27.9375 19.5373 26.697 23.0029 24.3103 25.2759C23.9104 25.6567 23.895 26.2897 24.2759 26.6897C24.6567 27.0896 25.2897 27.105 25.6897 26.7241C28.553 23.9971 29.9375 19.9627 29.9375 16C29.9375 12.0373 28.553 8.00289 25.6897 5.27586Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/world.png b/resources/icons/ui/world.png
deleted file mode 100644
index 98876868d8b7ac6c5edd08d53bcf6ee6368a8d3c..0000000000000000000000000000000000000000
--- a/resources/icons/ui/world.png
+++ /dev/null
@@ -1,8 +0,0 @@
-‰PNG
-
-���
IHDR���@���@����`¹U���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ"gôg��šIDAThÞÍ™MhTWÇoœ©5¥Ð´ù0¥`5ŦEY(­Ø
-MKQ"AӍ®WÁ…`©`)­-¶nLÉÒH~TéÂø¡X°‹RÊè"dšÈHëÄÔ2c3ó<ç¼ûÞ¼7‰NÏݼ{ÿçëžwï}ïœë‘”VÑÃZZýY¿eø‘|b±©‰=Œó€Gíãì¡i¹M70Ä$…HÓ²¸Â
ËcÜc€Û±MËv›¼¥šïåfMÆ+í&½µoãÒ’ŒWÚ%Új1ßM6†ò,3±¸º“šß²ÚçLÝU8*»cW’ew8$”ï2¦F¦ð€kjlŒ-œwÊŽ·$=FÂè:(ªÑÍ�t©
Z¤Øȇ–Óq\Îþ>{ËØwj|Ô—9©Æ¿-ös7 k¸ú»·"7x­Œµ°(Æh÷¥šÈ	d‘_âœÑVdGôÊ·Kï+|ô¨BŽ(Ƀ
-;*CFcž®0óm÷¹@Ô,bþ¥<hNÃûÖišÝØcç˜B·›EiIïí
-Ûgï„Ë|¯1ÿ¥ÁO)tg@¾Oá§j£°ÕŠ{æÌÿÙ|ËÒÌ«Ã&ø¥K3+8æIü¢ã4`ÊëF|›Â;_á1ų͠k¸§ð~	6˜îÇå'Þét`ƒÙ?–ž)E±ˆ!Åþˆ[áu<ë?ù7½IÊ^à÷�þ–
-ü'|]yœt›O¾MV"ÐĬðüéQ‘fæR@_]ÌCŠ>HÖÅ<%Ë«˜geXäÅ4=ÊüÜq0~ Nï_¹¡òÞ½<{ýW¾’8 Vf‡SíO‚ãÓÈ9mRÚÖ:yn	Ž)Zô'¿9EÅó‘hô9'ÏUñܪ¸Š›V×èÀj'ύpfBÔƏÀ?äªF@Z1äœ+Ä1\͍»# ­Är Qõ’8àŽ€q`¹)aNœ"+z/8yþR½¢i½x¾ïäV²q(¨ã$ځF^½¿“:–ÅÊD;°NõܐVŒo‡¨•3Iâ€;›Âx)ä(ŽõªçŽ€œf6MF_8?F2hïó|„ï¨Þ°ócô†xÎÔýsœ"Ïå:™‡ËäSÀÙº9pöòS:ÇõºÌÿ:s”3¸Qµ5žVbò¸ÂHÍ¢:5Ûà4ß©x¾	àÎÔ¬B:9½Ç#¬“ÓÏœW<¶B™œÓó‹F\§ç³äT…0Ç3¯’žû
®}v*ü{ƒV-P€-ÑÙ§P]¢H_PøG
-‹U¢q©dt‘꡹”hWÅʼú‹´³-R¹Êt‡ªËt•ä…}%e:p*ω²£,TæDÚYÈ¿¼êK$,T‚«T{×ß2ºT{Ò—Uã#åÑšJµàqÚQÍ8ÃFl±ºPæf3ÇN–T¬a³jKí<[L9òà1¥ÆÆCÊõE†“Ü í ïP¼ŽØmØ°‹|õwo©‹i§*Ýfb]ìLG¯ü0jf"†òêm"|ßW§­æ
'mSîC7	yô“©Éx†þ¥_\–¨®W·é‰\^'Ñ2_ßÿâ`#t¶p¬���%tEXtdate:create�2018-07-22T14:22:25+02:00a£Em���%tEXtdate:modify�2018-07-22T14:22:25+02:00þýÑ���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/icons/ui/world.svg b/resources/icons/ui/world.svg
new file mode 100644
index 0000000000000000000000000000000000000000..94d7ff8342507ade152d2cf946faa83dac3159b2
--- /dev/null
+++ b/resources/icons/ui/world.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 30C23.732 30 30 23.732 30 16C30 8.26801 23.732 2 16 2C8.26801 2 2 8.26801 2 16C2 23.732 8.26801 30 16 30ZM16 4C17.0317 4 18.283 4.94804 19.3347 7.22667C19.7084 8.03639 20.0331 8.9697 20.2941 10H11.7059C11.9669 8.9697 12.2916 8.03639 12.6653 7.22667C13.717 4.94804 14.9683 4 16 4ZM10.8494 6.38855C10.36 7.44883 9.95424 8.66735 9.64867 10H5.60539C6.97928 7.62495 9.1438 5.76448 11.7391 4.77849C11.4088 5.27683 11.1118 5.81994 10.8494 6.38855ZM9.27878 12C9.0968 13.2705 9 14.6141 9 16C9 17.3859 9.0968 18.7295 9.27878 20H4.68282C4.24062 18.7489 4 17.4025 4 16C4 14.5975 4.24062 13.2511 4.68282 12H9.27878ZM9.64867 22C9.95424 23.3327 10.36 24.5512 10.8494 25.6114C11.1118 26.1801 11.4088 26.7232 11.7391 27.2215C9.1438 26.2355 6.97928 24.375 5.60539 22H9.64867ZM11.7059 22H20.2941C20.0331 23.0303 19.7084 23.9636 19.3347 24.7733C18.283 27.052 17.0317 28 16 28C14.9683 28 13.717 27.052 12.6653 24.7733C12.2916 23.9636 11.9669 23.0303 11.7059 22ZM20.6991 20H11.3009C11.1068 18.7518 11 17.4068 11 16C11 14.5932 11.1068 13.2482 11.3009 12H20.6991C20.8932 13.2482 21 14.5932 21 16C21 17.4068 20.8932 18.7518 20.6991 20ZM22.3513 22H26.3946C25.0207 24.375 22.8562 26.2355 20.2609 27.2215C20.5912 26.7232 20.8882 26.1801 21.1506 25.6114C21.64 24.5512 22.0458 23.3327 22.3513 22ZM27.3172 20H22.7212C22.9032 18.7295 23 17.3859 23 16C23 14.6141 22.9032 13.2705 22.7212 12H27.3172C27.7594 13.2511 28 14.5975 28 16C28 17.4025 27.7594 18.7489 27.3172 20ZM20.2609 4.77849C22.8562 5.76448 25.0207 7.62495 26.3946 10H22.3513C22.0458 8.66735 21.64 7.44883 21.1506 6.38855C20.8882 5.81994 20.5912 5.27683 20.2609 4.77849Z" fill="#212121"/>
+</svg>
diff --git a/resources/icons/ui/world@2x.png b/resources/icons/ui/world@2x.png
deleted file mode 100644
index f32cc24e45baf37fcdb5d54f3e3335a937bfca10..0000000000000000000000000000000000000000
--- a/resources/icons/ui/world@2x.png
+++ /dev/null
@@ -1,10 +0,0 @@
-‰PNG
-
-���
IHDR���€���€���i7©@���gAMA��±üa��� cHRM��z&��€„��ú���€è��u0��ê`��:˜��pœºQ<���bKGD��ª#2���	pHYs��
��
×B(›x���tIMEâ
Sh��	ßIDATxÚíkl\ÅÇÞ¬“lÇ1¤’‚”ׄ„R‘U‰#>ô <
-ŽòVE <šF**‰/HQ*µ2ˆª†/(ŽEHq§i”‡*U&RHœGÍÏ4[Û»›~ؽ^{}ϙ߻{m6çÊR²wþçÌ9÷̝¹3sÎTQ>ª%A‚‹i žºü0˜ÿ룛$I’\-W¥ªJ.¡†fÖ°‚óP=$颃NRÓÕ�qšia
+˜€Ë0]tp˜NÒ¥5D¸ÔÄÛ\æzˆ×eÞ¦)jµlh.¯p2TÕÇ^'y…¹Q«(ÓRv3\2å½k˜Ý,ZÕ‰´Œ½dJ®¼weØ˲¨U.Ðrö—Mõ±×~–G­:4ÒF6õ¯s,m4F§|ëèLyïêe]F3>ÔÄ‘È•÷®#åï"7”á}ïr
³¡|Ê7ÒZÅ3!öíåy¬ä\ˆOn';BävŽ•¥V##!Vø"õÔq>DŽ#l,òUÎOëåž�àQµÌyŽ9JÝQš^¡š=NÕ8ÄC$Ô1ÂÁQÞ+¥²$há'Ù{¨[ý›8`->Ë>�à]¥TŠE£Ü0 ”|€ûùÈá…y€›ÂT–‚Óü•{ó¨ÛRJn'áe¥ä·çK-á•çØ«“9á=}[õ²pî-¥d5ãdÄù\)ýÖ˜’wð¡µ	Bñ‚jKç¿Æoƽ|fÓ¯”~q‚œµJé~f•ýÚ²!~TY¾úŽ“(BnQJw÷‘¥½í·•g9Û´G°éøÒüa‚B³¸¨ žö•µZA\dÖ„ò­ªy׎ êo´ð+|ëÄiñ©hm½Où;9dQÃIVZŒúþÆÍ>ÈIó°(±Iéè’Ä|Ul2ÎGŒLn€Üh1æß·Rð˜‚9¡Jݧ 0ë&87™Ï$óKf— >UPÏ©R[äQõ‚qˆÔîªþ£úmbK¾[A]2.“œVÐw‹¨gIêë4_Ðdœîø“Ò½¼©à¶e·*è7Ü“†7Ö°ý¬Q•q²ëŠúU|%âR˳¸"â¿R{õÇ
íˆí˜`A}½gÕZñ{VòßP8´¨ÈG&Xg#¾Ñ0ÓÛ!¾úr´KÁÚ9á<¥=ï2`_WëÞkÓ´©,¾eŠ®VFgg¬ÔøTäÑoÝÇ9¡Ö¿Í$z¹¡Oý¹¿JÁ¾fm€—.«Ø{Õæ¬i5I_ä29 lWÐöKš”ǰ݈ުê°_ƒ.S¡ÝÔ…ѧ­Õèù7bgf•eÕ½
-l$?ͥѭʈìU'lùd¸Õˆþ1)E“½l©: ´iÁO)ø%NX¤pzÊ¿IÁgÆ6Ʊßñ[•.Í]üÙ(Vö‘”óGiªhÒ¬@[XmDÇHûNºäîm¥ÕûOal4—žð'“§(0Ÿ^Ï=S1êC5Ïxÿ,àù¨kUVÕÖkMŽÝÔô§e¹‘©ç/D]Ÿ²S^ãœĹÀmQרÌt…¤=h®8õá6šÁ3@K VÓ•Z
-Xu]"¡5{ÔÐhG÷t¥aHÅ€æŠTfÒœk•Ù�Èißµ½µó{kf›…%OxÞa2¬˜~Ë/„;ké¶ä§Sæç5¿ ~8þÊ¡ªò2ú“V_[ qYW.@ŒZ%–ç3!?~Oq)€¾ïÔ9pù»ðû|jc66¨Ÿ9‘†Rg¹>e
�	Í�GÉ:‘<àKél(øL|ª\@Lœ©f€kbr1À7ü[6ÀböOÌîœuàâ‚w1�â\òâ
"¨×A€<”ú& ¾
Å�’.
1êEû‘<ÚÐ�ý¡@Ò¥>¦0r1ÀñÎw%2@½яdÈ0à à{èß9õß²Lm(àÒ�¦µ„C#!ñ™H³„ßCZň‰-Ýmgœð !`
$üîN/i3cP¸5Çi›ñ x'¨¤)á`Pö€NÍÿÈ”È�‘y€k#=©4È8q™„„õh¤~LœN	ÍúD[®Én	d€ùâ*ÿI—¾˜2³æ/yÀB'.Å$ï,tùTƒŸ¿wÇHŠ DH°È‰K1Ý'Þ¹âÀåq›uR3ÀJ\†I’3€¼£ë?\»tÕ�³G#�mHò€…Â–îï¸xÀOÅ;ÉWéo»4ÉjFÃÝéfÅ\<@2@Wã@Rœÿ™¥QLrâC“^¹Gi„ŠwŒ§8÷wòÞ¯moý~_ÛsŸ±“|>ÓŸ:n,§b@Š®¨ë	u‘òfr*³t€g€ÃQ×%:7¶Éå= ÍQקìôAîƒúÆVÙüÏp*ê••Ny£ÓÂPóý¨ëTVÕ¶â&
-N½ìQöŒ§Ùm±_äñ%Å_+ùK1dæÇŒè­âdìñŸOÒƒ¦6YTZšr›Y¢pzÄo45ž´°¹”½ï‘6·ÙÉ�¯Š|þ+zF&6g
-œ<¦¬{$Nº}oÈi>6bNšBg·…ËsYCØõXZªÔÁÛ tÖ<=dœ%\¥ _²6Àk"´q!`ð´)|þ„òn=|þSkœy˜>ۇϛ(¼nÀË	Ò̳R¿I‘þ²BS
-aC7¤¥ÐxÃÊ�ï)îR‘¡¤Ð0'Qæq-'Q¹"î÷(Ð\¥;©"CK¢bN£3“
-ZK£Ój”½MAkÑ!¦Ñs"¥4ÏŠX-‘’é£{&—´Üƒ‡œH	Ì©´2Ê—ƒ–JKÑ{NA~!¢JJË&™ZÖ7ÅèÉÔö©RµNìצDÉÔlÒéeÙäûbÑÒée”¶ø°"ë2?ðA”0Ø%T<ĝ¾OEF¤U©‰Ô~çƒ(qBE°K©Ùïón×Sj®ö•õ´‚èóÙ³V†”šöIUÛ'Œò´¤ª~qºDqö ²%UµO«û5kÇáô´ºk'ÈyQ)}­("©ŒiuÁ%±ò‡ã6µi‰•?/ú¨ª¡G)½sLɲ'V—ÔÚC¼3š1HO­=þ³FÿŒ~D”Z;çöÉÕ3|”ß“¡%W3A²HÂÊMaGš\ÜÓëB‹!½~arë R*Ë=S!½>L怅c†à	µÌ…©rÀBŽÂ=bã<uÔ«#׫¤Glä(ÜCVv°3Dne8d*þ˜UôAK9ªð£¶ â[ËQE·çQE¸èQE¹éQEºêQE»[ itðrŽ}ãðõ’ @µ$H`1
ÔS—ÿƒó}t“$IR‰F™þ<îﱨ³Ú���%tEXtdate:create�2018-07-22T14:30:23+02:00Ǫ���%tEXtdate:modify�2018-07-22T14:30:23+02:00¶UÇ���tEXtSoftware�www.inkscape.org›î<����IEND®B`‚
\ No newline at end of file
diff --git a/resources/langs/nheko_eo.ts b/resources/langs/nheko_eo.ts
index b0d3c5ddcd9d9842c929baa63593f54772eb600d..e5b1ca9860532967ffc7a8d36936d4b6e7c3c9af 100644
--- a/resources/langs/nheko_eo.ts
+++ b/resources/langs/nheko_eo.ts
@@ -143,12 +143,12 @@
     <message>
         <location line="+13"/>
         <source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
-        <translation type="unfinished"></translation>
+        <translation>La kaŝmemoro sur via disko pli novas, ol tio, kion povas subteni ĉi tiu versio de Nheko. Bonvolu ĝisdatigi Nhekon aŭ vakigi vian kaŝmemoron.</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Failed to open database, logging out!</source>
-        <translation type="unfinished"></translation>
+        <translation>Malsukcesis malfermi datumbazon; adiaÅ­as!</translation>
     </message>
     <message>
         <location line="+314"/>
@@ -809,7 +809,7 @@
     <message>
         <location line="+22"/>
         <source>Room ID or alias</source>
-        <translation type="unfinished">Identigilo aŭ kromnomo de ĉambro</translation>
+        <translation>Identigilo aŭ kromnomo de ĉambro</translation>
     </message>
 </context>
 <context>
@@ -817,12 +817,12 @@
     <message>
         <location filename="../qml/dialogs/LeaveRoomDialog.qml" line="+15"/>
         <source>Leave room</source>
-        <translation type="unfinished">Eliri el ĉambro</translation>
+        <translation>Eliri el ĉambro</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Are you sure you want to leave?</source>
-        <translation type="unfinished">Ĉu vi certas, ke vi volas foriri?</translation>
+        <translation>Ĉu vi certas, ke vi volas eliri?</translation>
     </message>
 </context>
 <context>
@@ -1197,7 +1197,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
     <message>
         <location line="+16"/>
         <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
-        <translation type="unfinished"></translation>
+        <translation>Por lasi aliajn uzantojn vidi, kiuj el viaj aparatoj vere apartenas al vi, vi povas kontroli ilin. Tio ankaŭ permesas, ke savkopiado de ŝlosiloj funkciu memage. Ĉu vi volas kontroli nekontrolitan aparaton nun? (Bonvolu certigi, ke unu el tiaj aparatoj disponeblas al vi.)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1472,7 +1472,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
     <message>
         <location line="+11"/>
         <source>Choose custom homeserver</source>
-        <translation type="unfinished">Elekti propran hejmservilon</translation>
+        <translation>Elekti propran hejmservilon</translation>
     </message>
 </context>
 <context>
@@ -1571,7 +1571,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
     <message>
         <location line="+20"/>
         <source>Close</source>
-        <translation type="unfinished">Fermi</translation>
+        <translation>Fermi</translation>
     </message>
     <message>
         <location line="+65"/>
@@ -1896,7 +1896,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
     <message>
         <location line="+1"/>
         <source>Nheko could not connect to the secure storage to save encryption secrets to. This can have multiple reasons. Check if your D-Bus service is running and you have configured a service like KWallet, Gnome Keyring, KeePassXC or the equivalent for your platform. If you are having trouble, feel free to open an issue here: https://github.com/Nheko-Reborn/nheko/issues</source>
-        <translation type="unfinished"></translation>
+        <translation>Nheko ne povis konektiĝi al la sekura deponejo por deponi sekretojn. Tio povas okazi diverskiale. Kontrolu, ke via servo D-Bus funkcias, kaj ke vi havas agorditan servon kiel KWallet, GNOME Keyring, KeePassXC, aŭ similan por via platformo. Se vi tamen havas problemojn, vi povas raporti ilin tie ĉi: https://github.com/Nheko-Reborn/nheko/issues</translation>
     </message>
 </context>
 <context>
@@ -1904,7 +1904,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
     <message>
         <location filename="../qml/SelfVerificationCheck.qml" line="+39"/>
         <source>This is your recovery key. You will need it to restore access to your encrypted messages and verification keys. Keep this safe. Don&apos;t share it with anyone and don&apos;t lose it! Do not pass go! Do not collect $200!</source>
-        <translation type="unfinished">Jen via rehava ŝlosilo. Vi bezonos ĝin por rehavi aliron al viaj ĉifritaj mesaĝoj kaj kontrolaj ŝlosiloj. Tenu ĝin sekura. Ne havigu ĝin al iu ajn, kaj ne perdu ĝin!</translation>
+        <translation>Jen via rehava ŝlosilo. Vi bezonos ĝin por rehavi aliron al viaj ĉifritaj mesaĝoj kaj kontrolaj ŝlosiloj. Tenu ĝin sekura. Ne havigu ĝin al iu ajn, kaj ne perdu ĝin! Ne paŝu sur la herbotapiŝon!</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -1981,7 +1981,7 @@ Se vi elektos kontrolon, vi devos havi alian aparaton disponeblan. Se vi elektos
     <message>
         <location line="+140"/>
         <source>Identity key changed. This breaks E2EE, so logging out.</source>
-        <translation type="unfinished"></translation>
+        <translation>Identiga ŝlosilo ŝanĝiĝis. Tio rompas tutvojan ĉifradon, kaj tial la programo nun adiaŭas.</translation>
     </message>
 </context>
 <context>
@@ -2284,7 +2284,7 @@ Reason: %4</source>
     <message>
         <location line="+137"/>
         <source>No preview available</source>
-        <translation type="unfinished">Neniu antaÅ­rigardo disponeblas</translation>
+        <translation>Neniu antaÅ­rigardo disponeblas</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2388,7 +2388,7 @@ Reason: %4</source>
     <message>
         <location filename="../../src/ui/UIA.cpp" line="+59"/>
         <source>No available registration flows!</source>
-        <translation type="unfinished"></translation>
+        <translation>Neniuj disponeblaj manieroj de registriĝo!</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -2400,7 +2400,7 @@ Reason: %4</source>
     <message>
         <location line="-27"/>
         <source>Please enter a valid registration token.</source>
-        <translation type="unfinished">Bonvolu enigi validan registran pecon.</translation>
+        <translation>Bonvolu enigi validan registran pecon.</translation>
     </message>
     <message>
         <location line="+165"/>
@@ -2613,7 +2613,7 @@ NE – kvadrataj, JES – rondaj.</translation>
     <message>
         <location line="+1"/>
         <source>Use identicons</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzi identigajn bildojn</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2940,7 +2940,7 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location line="+133"/>
         <source>Display an identicon instead of a letter when no avatar is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>Montras identigan bildon anstataÅ­ litero, kiam ne disponeblas profilbildo.</translation>
     </message>
     <message>
         <location line="+46"/>
@@ -3060,7 +3060,7 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location filename="../../src/encryption/VerificationManager.cpp" line="+105"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
-        <translation type="unfinished">Neniu ĉifrita privata babilo kun ĉi tiu uzanto troviĝis. Kreu ĉifritan privatan babilon kun ĉi tiu uzanto kaj reprovu.</translation>
+        <translation>Neniu ĉifrita privata babilo kun ĉi tiu uzanto troviĝis. Kreu ĉifritan privatan babilon kun ĉi tiu uzanto kaj reprovu.</translation>
     </message>
 </context>
 <context>
diff --git a/resources/langs/nheko_id.ts b/resources/langs/nheko_id.ts
index 9fbc6306bbfbd4ca186928a568b5a6339375aca8..d4c55688226d1823d57cad4a566226574b92a2d6 100644
--- a/resources/langs/nheko_id.ts
+++ b/resources/langs/nheko_id.ts
@@ -143,12 +143,12 @@
     <message>
         <location line="+13"/>
         <source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cache pada disk Anda lebih baru daripada versi yang didukung Nheko ini. Harap perbarui Nheko atau bersihkan cache Anda.</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Failed to open database, logging out!</source>
-        <translation type="unfinished"></translation>
+        <translation>Gagal untuk membuka basisdata! Anda telah dikeluarkan.</translation>
     </message>
     <message>
         <location line="+314"/>
@@ -1976,7 +1976,7 @@ Jika Anda memilih verifikasi, Anda harus memiliki perangkat lain yang tersedia.
     <message>
         <location line="+140"/>
         <source>Identity key changed. This breaks E2EE, so logging out.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kunci identitas telah diubah. Ini merusak enkripsi ujung-ke-ujung, jadi Anda dikeluarkan.</translation>
     </message>
 </context>
 <context>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index ac2f912e495e2d6775c32d630bdea8752847dc1b..ffb206be61c2cc6aaf77313cb7bdf4e2c9fcbfd9 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -143,12 +143,12 @@
     <message>
         <location line="+13"/>
         <source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
-        <translation type="unfinished"></translation>
+        <translation>De opgeslagen gegevens van Nheko zijn nieuwer dan de versie die je nu draait. Update Nheko of verwijder de gegevens.</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Failed to open database, logging out!</source>
-        <translation type="unfinished"></translation>
+        <translation>Kon database niet openen, je wordt uitgelogd!</translation>
     </message>
     <message>
         <location line="+314"/>
@@ -1977,7 +1977,7 @@ Als je &quot;verifieer&quot; kiest, moet je het andere apparaat bij de hand hebb
     <message>
         <location line="+140"/>
         <source>Identity key changed. This breaks E2EE, so logging out.</source>
-        <translation type="unfinished"></translation>
+        <translation>Identiteitssleutel is veranderd. Dit breekt eind-tot-eind versleuteling, dus je wordt uitgelogd.</translation>
     </message>
 </context>
 <context>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index 685147d43091b740ca82931b87a9ca518fb30457..2ebd9e94c2fcfa9feccba25e06c90c4a5e119a17 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -6,7 +6,7 @@
     <message>
         <location filename="../qml/voip/ActiveCallBar.qml" line="+107"/>
         <source>Calling...</source>
-        <translation></translation>
+        <translation>DzwoniÄ™...</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -58,7 +58,7 @@
     <message>
         <location filename="../qml/voip/CallInvite.qml" line="+72"/>
         <source>Video Call</source>
-        <translation>Połączenie Wideo</translation>
+        <translation>Rozmowa Wideo</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -96,7 +96,7 @@
     <message>
         <location line="+12"/>
         <source>Unknown microphone: %1</source>
-        <translation>Nieznany mikrofon: %1</translation>
+        <translation>Niezidentyfikowany mikrofon: %1</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -158,7 +158,7 @@
     <message>
         <location line="+1"/>
         <source>Do you really want to join %1?</source>
-        <translation>Czy na pewno chcesz dołączyć&#xa0;do %1?</translation>
+        <translation>Czy na pewno chcesz dołączyć do %1?</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -2669,7 +2669,7 @@ Ustaw na 3 aby rozmywać natychmiast po stracie fokusu. Maksymalna wartość to
     <message>
         <location line="+2"/>
         <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
-        <translation>Ustaw maksymalną szerokość&#xa0;wiadomości w historii (w pikselach). Może to poprawić czytelność gdy Nheko zostanie zmaksymalizowany na szerokim ekranie</translation>
+        <translation>Ustaw maksymalną szerokość wiadomości w historii (w pikselach). Może to poprawić czytelność gdy Nheko zostanie zmaksymalizowany na szerokim ekranie</translation>
     </message>
     <message>
         <location line="+2"/>
diff --git a/resources/langs/nheko_pt_PT.ts b/resources/langs/nheko_pt_PT.ts
index f4d8f10f6f6dca75c51f313af19435c3c0b8e079..e11477437f5baf0ddd797a0ed23cd407c1c48d62 100644
--- a/resources/langs/nheko_pt_PT.ts
+++ b/resources/langs/nheko_pt_PT.ts
@@ -27,12 +27,12 @@
     <message>
         <location line="+13"/>
         <source>Unmute Mic</source>
-        <translation type="unfinished"></translation>
+        <translation>Ativar microfone</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Mute Mic</source>
-        <translation>Silenciar microfone</translation>
+        <translation>Desativar microfone</translation>
     </message>
 </context>
 <context>
@@ -143,12 +143,12 @@
     <message>
         <location line="+13"/>
         <source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
-        <translation type="unfinished"></translation>
+        <translation>A cache no seu disco é mais recente do que aquela que esta versão do Nheko suporta. Por favor atualize o Nheko ou limpe a sua cache.</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Failed to open database, logging out!</source>
-        <translation type="unfinished"></translation>
+        <translation>Falha ao abrir base de dados. A terminar sessão!</translation>
     </message>
     <message>
         <location line="+314"/>
@@ -310,7 +310,7 @@
     <message>
         <location filename="../qml/CommunitiesList.qml" line="+44"/>
         <source>Hide rooms with this tag or from this space by default.</source>
-        <translation>Ocultar, por defeito, salas com esta etiqueta ou pertencentes a este espaço.</translation>
+        <translation>Ocultar, por norma, salas com esta etiqueta ou pertencentes a este espaço.</translation>
     </message>
 </context>
 <context>
@@ -597,12 +597,12 @@
     <message>
         <location line="+2"/>
         <source>Verification messages received out of order!</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensagens de verificação recebidas fora de ordem!</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Unknown verification error.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro de verificação desconhecido.</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -638,7 +638,7 @@
     <message>
         <location line="+61"/>
         <source>State key</source>
-        <translation type="unfinished"></translation>
+        <translation>Chave de estado</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -648,7 +648,7 @@
     <message>
         <location line="+10"/>
         <source>Attribution</source>
-        <translation type="unfinished"></translation>
+        <translation>Atribuição</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -665,12 +665,12 @@
     <message>
         <location line="-30"/>
         <source>Shortcode</source>
-        <translation type="unfinished">Código</translation>
+        <translation>Código</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Body</source>
-        <translation type="unfinished">Corpo</translation>
+        <translation>Corpo</translation>
     </message>
     <message>
         <location line="+30"/>
@@ -803,12 +803,12 @@
     <message>
         <location filename="../qml/dialogs/JoinRoomDialog.qml" line="+14"/>
         <source>Join room</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrar na sala</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Room ID or alias</source>
-        <translation type="unfinished"></translation>
+        <translation>ID ou alcunha da sala</translation>
     </message>
 </context>
 <context>
@@ -816,12 +816,12 @@
     <message>
         <location filename="../qml/dialogs/LeaveRoomDialog.qml" line="+15"/>
         <source>Leave room</source>
-        <translation type="unfinished">Sair da sala</translation>
+        <translation>Sair da sala</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Are you sure you want to leave?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem a certeza que quer sair?</translation>
     </message>
 </context>
 <context>
@@ -865,7 +865,7 @@ Se o Nheko não conseguir encontrar o seu servidor, irá apresentar um campo ond
     <message>
         <location line="+2"/>
         <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
-        <translation>Um nome para este dispositivo, que será exibido noutros quando os estiver a verificar. Caso nenhum seja fornecido, será usado um pré-definido.</translation>
+        <translation>Um nome para este dispositivo, que será exibido noutros quando os estiver a verificar. Caso nenhum seja fornecido, será usado um predefinido.</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -943,17 +943,17 @@ Exemplo: https://servidor.meu:8787</translation>
     <message>
         <location filename="../qml/dialogs/LogoutDialog.qml" line="+13"/>
         <source>Log out</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminar sessão</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>A call is in progress. Log out?</source>
-        <translation type="unfinished"></translation>
+        <translation>Há uma chamada em curso. Terminar sessão?</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Are you sure you want to log out?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem a certeza que quer terminar a sessão?</translation>
     </message>
 </context>
 <context>
@@ -1193,7 +1193,7 @@ Exemplo: https://servidor.meu:8787</translation>
     <message>
         <location line="+16"/>
         <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
-        <translation type="unfinished"></translation>
+        <translation>Para permitir que outros utilizadores vejam que dispositivos realmente lhe pertencem, pode verificá-los. Este processo permite que a cópia de segurança das chaves funcione automaticamente. Verificar um dispositivo não verificado agora? (Por favor, certifique-se que tem um daqueles dispositivos disponíveis)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -1246,7 +1246,7 @@ Exemplo: https://servidor.meu:8787</translation>
     <message>
         <location filename="../qml/NotificationWarning.qml" line="+32"/>
         <source>You are about to notify the whole room</source>
-        <translation type="unfinished"></translation>
+        <translation>Está prestes a notificar toda a sala</translation>
     </message>
 </context>
 <context>
@@ -1468,7 +1468,7 @@ Exemplo: https://servidor.meu:8787</translation>
     <message>
         <location line="+11"/>
         <source>Choose custom homeserver</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolher servidor personalizado</translation>
     </message>
 </context>
 <context>
@@ -1550,24 +1550,24 @@ Exemplo: https://servidor.meu:8787</translation>
         <location line="+40"/>
         <source>Encryption not set up</source>
         <extracomment>Cross-signing setup has not run yet.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Encriptação não configurada</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Unverified login</source>
         <extracomment>The user just signed in with this device and hasn&apos;t verified their master key.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Sessão não verificada</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Please verify your other devices</source>
         <extracomment>There are unverified devices signed in to this account.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Por favor, verifique os seus outros dispositivos</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Close</source>
-        <translation type="unfinished">Fechar</translation>
+        <translation>Fechar</translation>
     </message>
     <message>
         <location line="+65"/>
@@ -1805,27 +1805,27 @@ Exemplo: https://servidor.meu:8787</translation>
     <message>
         <location filename="../qml/Root.qml" line="+255"/>
         <source>Please enter your login password to continue:</source>
-        <translation type="unfinished"></translation>
+        <translation>Por favor, insira a sua palavra-passe para continuar:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Please enter a valid email address to continue:</source>
-        <translation type="unfinished"></translation>
+        <translation>Por favor, insira um endereço de correio eletrónico válido para continuar:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Please enter a valid phone number to continue:</source>
-        <translation type="unfinished"></translation>
+        <translation>Por favor, insira um número de telefone válido para continuar:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Please enter the token, which has been sent to you:</source>
-        <translation type="unfinished"></translation>
+        <translation>Por favor, insira o código que lhe foi enviado:</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Wait for the confirmation link to arrive, then continue.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aguarde pela chegada da ligação de confirmação, depois continue.</translation>
     </message>
 </context>
 <context>
@@ -1892,7 +1892,7 @@ Exemplo: https://servidor.meu:8787</translation>
     <message>
         <location line="+1"/>
         <source>Nheko could not connect to the secure storage to save encryption secrets to. This can have multiple reasons. Check if your D-Bus service is running and you have configured a service like KWallet, Gnome Keyring, KeePassXC or the equivalent for your platform. If you are having trouble, feel free to open an issue here: https://github.com/Nheko-Reborn/nheko/issues</source>
-        <translation type="unfinished"></translation>
+        <translation>O Nheko não se conseguiu ligar ao armazenamento seguro para guardar os segredos de encriptação. Isto pode-se dever a vários motivos. Verifique se o seu serviço D-Bus está a correr e se configurou um serviço como o KWallet, Gnome Keyring, KeePassXC ou o equivalente da sua plataforma. Caso continue a ter problemas, não hesite em abrir um tópico aqui: https://github.com/Nheko-Reborn/nheko/issues</translation>
     </message>
 </context>
 <context>
@@ -1900,49 +1900,51 @@ Exemplo: https://servidor.meu:8787</translation>
     <message>
         <location filename="../qml/SelfVerificationCheck.qml" line="+39"/>
         <source>This is your recovery key. You will need it to restore access to your encrypted messages and verification keys. Keep this safe. Don&apos;t share it with anyone and don&apos;t lose it! Do not pass go! Do not collect $200!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Esta é a sua chave de recuperação. Irá necessitar dela para restabelecer o acesso às suas mensagens encriptadas e chaves de verificação. Mantenha-a segura. Não a partilhe com ninguém e não a perca! Não aceite dinheiro em troca da chave!</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Encryption setup successfully</source>
-        <translation type="unfinished"></translation>
+        <translation>Encriptação configurada com sucesso</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Failed to setup encryption: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Falha ao configurar encriptação: %1</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Setup Encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar encriptação</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Hello and welcome to Matrix!
 It seems like you are new. Before you can securely encrypt your messages, we need to setup a few small things. You can either press accept immediately or adjust a few basic options. We also try to explain a few of the basics. You can skip those parts, but they might prove to be helpful!</source>
-        <translation type="unfinished"></translation>
+        <translation>Olá, seja bem-vindo à Matrix!
+Parece que é a sua primeira vez aqui. Antes de poder encriptar as suas mensagens de forma segura, é necessário configurar algumas coisas. Pode premir &quot;Aceitar&quot; logo, ou ajustar algumas opções básicas, que tentaremos explicar como funcionam. Poderá saltar essas partes, mas elas podem vir a ser úteis!</translation>
     </message>
     <message>
         <location line="+124"/>
         <source>Activate Encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>Ativar encriptação</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>It seems like you have encryption already configured for this account. To be able to access your encrypted messages and make this device appear as trusted, you can either verify an existing device or (if you have one) enter your recovery passphrase. Please select one of the options below.
 If you choose verify, you need to have the other device available. If you choose &quot;enter passphrase&quot;, you will need your recovery key or passphrase. If you click cancel, you can choose to verify yourself at a later point.</source>
-        <translation type="unfinished"></translation>
+        <translation>Parece que já possui configurações de encriptação nesta conta. Para poder aceder às suas mensagens encriptadas e fazer este dispositivo aparecer como de confiança, pode ou verificar um dispositivo existente, ou inserir a sua palavra-passe de recuperação, caso a tenha. Por favor, escolha uma das opções abaixo.
+Se escolher a verificação, terá que ter o outro dispositivo disponível. Se escolher a palavra-passe, irá necessitar da chave de recuperação. Também pode cancelar e verificar-se mais tarde.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>verify</source>
-        <translation type="unfinished"></translation>
+        <translation>verificar</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>enter passphrase</source>
-        <translation type="unfinished"></translation>
+        <translation>inserir palavra-passe</translation>
     </message>
 </context>
 <context>
@@ -1950,32 +1952,32 @@ If you choose verify, you need to have the other device available. If you choose
     <message>
         <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+42"/>
         <source>Failed to create keys for cross-signing!</source>
-        <translation type="unfinished"></translation>
+        <translation>Falha ao criar chaves para assinatura cruzada!</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Failed to create keys for online key backup!</source>
-        <translation type="unfinished"></translation>
+        <translation>Falha ao criar chaves para a cópia de segurança de chaves online!</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Failed to create keys for secure server side secret storage!</source>
-        <translation type="unfinished"></translation>
+        <translation>Falha ao criar chaves para o armazenamento seguro no servidor!</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>Encryption Setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração de encriptação</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Encryption setup failed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Falha na configuração de encriptação: %1</translation>
     </message>
     <message>
         <location line="+140"/>
         <source>Identity key changed. This breaks E2EE, so logging out.</source>
-        <translation type="unfinished"></translation>
+        <translation>Chave de identificação alterada. Isto quebra a encriptação, portanto, a terminar sessão...</translation>
     </message>
 </context>
 <context>
@@ -2132,17 +2134,17 @@ If you choose verify, you need to have the other device available. If you choose
     <message>
         <location line="+4"/>
         <source>%1 set the room history visible to members from this point on.</source>
-        <translation type="unfinished">%1 tornou o histórico da sala, a partir deste momento, visível a membros</translation>
+        <translation>%1 tornou o histórico da sala, a partir deste momento, visível a membros.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 set the room history visible to members since they were invited.</source>
-        <translation type="unfinished">%1 tornou o histórico visível a membros desde o seu convite.</translation>
+        <translation>%1 tornou o histórico visível a membros desde o seu convite.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 set the room history visible to members since they joined the room.</source>
-        <translation type="unfinished">%1 tornou o histórico da sala visível ao membros desde a sua entrada.</translation>
+        <translation>%1 tornou o histórico da sala visível ao membros desde a sua entrada.</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -2275,7 +2277,7 @@ Reason: %4</source>
     <message>
         <location line="+137"/>
         <source>No preview available</source>
-        <translation type="unfinished">Pré-visualização não disponível</translation>
+        <translation>Pré-visualização não disponível</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2328,7 +2330,7 @@ Reason: %4</source>
     <message>
         <location line="+2"/>
         <source>This room contains verified devices and devices which have never changed their master key.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta sala contém dispositivos verificados e/ou que nunca alteraram a sua chave mestra.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2379,24 +2381,24 @@ Reason: %4</source>
     <message>
         <location filename="../../src/ui/UIA.cpp" line="+59"/>
         <source>No available registration flows!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhum processo de registo disponível!</translation>
     </message>
     <message>
         <location line="+26"/>
         <location line="+24"/>
         <location line="+17"/>
         <source>Registration aborted</source>
-        <translation type="unfinished"></translation>
+        <translation>Registo abortado</translation>
     </message>
     <message>
         <location line="-27"/>
         <source>Please enter a valid registration token.</source>
-        <translation type="unfinished">Por favor, insira um testemunho de registo válido.</translation>
+        <translation>Por favor, insira um código de registo válido.</translation>
     </message>
     <message>
         <location line="+165"/>
         <source>Invalid token</source>
-        <translation type="unfinished"></translation>
+        <translation>Código inválido</translation>
     </message>
 </context>
 <context>
@@ -2470,22 +2472,22 @@ Reason: %4</source>
     <message>
         <location line="+9"/>
         <source>Refresh device list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Atualizar a lista de dispositivos.</translation>
     </message>
     <message>
         <location line="+54"/>
         <source>Sign out this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminar sessão neste dispositivo.</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Change device name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Alterar nome do dispositivo.</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Last seen %1 from %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ativo pela última vez a %1 em %2</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -2495,12 +2497,12 @@ Reason: %4</source>
     <message>
         <location filename="../../src/ui/UserProfile.cpp" line="+152"/>
         <source>Sign out device %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminar sessão no dispositivo %1</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>You signed out this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminou a sessão neste dispositivo.</translation>
     </message>
     <message>
         <location line="+225"/>
@@ -2529,7 +2531,7 @@ Reason: %4</source>
         <location filename="../../src/UserSettingsPage.cpp" line="+374"/>
         <location filename="../../src/UserSettingsPage.h" line="+204"/>
         <source>Default</source>
-        <translation>Padrão</translation>
+        <translation>Predefinido</translation>
     </message>
 </context>
 <context>
@@ -2537,7 +2539,7 @@ Reason: %4</source>
     <message>
         <location line="+567"/>
         <source>Minimize to tray</source>
-        <translation type="unfinished">Minimizar para bandeja</translation>
+        <translation type="unfinished">Minimizar para a bandeja</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2562,7 +2564,7 @@ Reason: %4</source>
     <message>
         <location line="+104"/>
         <source>Default</source>
-        <translation>Padrão</translation>
+        <translation>Predefinido</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -2577,7 +2579,7 @@ Reason: %4</source>
     <message>
         <location line="+4"/>
         <source>REQUEST</source>
-        <translation type="unfinished"></translation>
+        <translation>PEDIR</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2592,13 +2594,14 @@ Reason: %4</source>
     <message>
         <location line="+3"/>
         <source>Start the application in the background without showing the client window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar a aplicação em segundo plano sem mostrar a janela do cliente.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Change the appearance of user avatars in chats.
 OFF - square, ON - Circle.</source>
-        <translation type="unfinished"></translation>
+        <translation>Alterar a aparência de avatares de utilizador nas conversas.
+DESLIGADO - quadrados, LIGADO - circulares.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2608,18 +2611,19 @@ OFF - square, ON - Circle.</source>
     <message>
         <location line="+5"/>
         <source>Show a column containing groups and tags next to the room list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar uma coluna contendo grupos e etiquetas ao lado da lista de salas.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Decrypt messages in sidebar</source>
-        <translation type="unfinished"></translation>
+        <translation>Desencriptar mensagens na barra lateral</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Decrypt the messages shown in the sidebar.
 Only affects messages in encrypted chats.</source>
-        <translation type="unfinished"></translation>
+        <translation>Desencriptar mensagens exibidas na barra lateral.
+Apenas afeta mensagens em conversas encriptadas.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2650,22 +2654,22 @@ Defina como 0 para desfocar imediatamente após perder a atenção. Valor máxim
     <message>
         <location line="+3"/>
         <source>Show buttons in timeline</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar botões na cronologia</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show buttons to quickly reply, react or access additional options next to each message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar botões para resposta rápida, reações ou acesso a opções adicionais junto de cada mensagem.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Limit width of timeline</source>
-        <translation type="unfinished"></translation>
+        <translation>Limitar largura da cronologia</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
-        <translation type="unfinished"></translation>
+        <translation>Definir largura máxima das mensagens na cronologia (em pixeis). Isto pode ajudar na legibilidade em ecrãs largos, quando o Nheko está maximizado.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2714,78 +2718,79 @@ Estado exibido ao lado da data.</translation>
         <location line="+2"/>
         <source>Allow using markdown in messages.
 When disabled, all messages are sent as a plain text.</source>
-        <translation type="unfinished"></translation>
+        <translation>Permitir Markdown em mensagens.
+Quando desativada, todas as mensagens serão enviadas em texto simples.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Play animated images only on hover</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Reproduzir imagens animadas apenas quando lhes passar o rato por cima.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Desktop notifications</source>
-        <translation type="unfinished"></translation>
+        <translation>Notificações de ambiente de trabalho</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Notify about received message when the client is not currently focused.</source>
-        <translation type="unfinished"></translation>
+        <translation>Notificar sobre mensagens recebidas quando o cliente não está focado.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Alert on notification</source>
-        <translation type="unfinished"></translation>
+        <translation>Alertar para notificações</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show an alert when a message is received.
 This usually causes the application icon in the task bar to animate in some fashion.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar alerta quando é recebida uma mensagem.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Highlight message on hover</source>
-        <translation type="unfinished"></translation>
+        <translation>Destacar mensagem quando passar o rato por cima.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Change the background color of messages when you hover over them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Alterar a cor de fundo das mensagens quando passar o rato por cima.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Large Emoji in timeline</source>
-        <translation type="unfinished"></translation>
+        <translation>Emojis grandes na cronologia</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Make font size larger if messages with only a few emojis are displayed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aumentar tamanho do tipo de letra quando apenas alguns emojis são exibidos.</translation>
     </message>
     <message>
         <location line="+55"/>
         <source>Send encrypted messages to verified users only</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar mensagens encriptadas apenas a utilizadores verificados</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Requires a user to be verified to send encrypted messages to them. This improves safety but makes E2EE more tedious.</source>
-        <translation type="unfinished"></translation>
+        <translation>Exigir que um utilizador esteja verificado para lhe enviar mensagens encriptadas. Isto melhora a segurança mas torna a encriptação mais entediante.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Share keys with verified users and devices</source>
-        <translation type="unfinished"></translation>
+        <translation>Partilhar chaves com utilizadores e dispositivos verificados</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn&apos;t have access to those keys otherwise.</source>
-        <translation type="unfinished"></translation>
+        <translation>Automaticamente responde a pedidos de chaves de outros utilizadores, se estiverem verificados, mesmo que de outra forma o dispositivo não deveria ter acesso a essas chaves.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Online Key Backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Cópia de segurança de chave online</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2795,72 +2800,72 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location line="+178"/>
         <source>Enable online key backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Ativar cópia de segurança de chave online</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The Nheko authors recommend not enabling online key backup until symmetric online key backup is available. Enable anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Os autores do Nheko recomendam não ativar a cópia de segurança de chave online até que a cópia simétrica esteja disponível. Deseja ativar ainda assim?</translation>
     </message>
     <message>
         <location line="+253"/>
         <source>CACHED</source>
-        <translation type="unfinished"></translation>
+        <translation>ARMAZENADO EM CACHE</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>NOT CACHED</source>
-        <translation type="unfinished"></translation>
+        <translation>NÃO ARMAZENADO EM CACHE</translation>
     </message>
     <message>
         <location line="-495"/>
         <source>Scale factor</source>
-        <translation type="unfinished"></translation>
+        <translation>Fator de escala</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Change the scale factor of the whole user interface.</source>
-        <translation type="unfinished"></translation>
+        <translation>Alterar o fator de escala para toda a interface.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho da letra</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Font Family</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de letra</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Tema</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Ringtone</source>
-        <translation type="unfinished"></translation>
+        <translation>Toque</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Set the notification sound to play when a call invite arrives</source>
-        <translation type="unfinished"></translation>
+        <translation>Tocar o som de notificação quando chegar um convite de chamada</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Microphone</source>
-        <translation type="unfinished"></translation>
+        <translation>Microfone</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Camera</source>
-        <translation type="unfinished"></translation>
+        <translation>Câmara</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Camera resolution</source>
-        <translation type="unfinished"></translation>
+        <translation>Resolução de câmara</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2870,7 +2875,7 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location line="+14"/>
         <source>Allow fallback call assist server</source>
-        <translation type="unfinished"></translation>
+        <translation>Permitir servidor assistente de chamada</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2880,42 +2885,42 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location line="+4"/>
         <source>Device ID</source>
-        <translation type="unfinished"></translation>
+        <translation>ID do dispositivo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Device Fingerprint</source>
-        <translation type="unfinished"></translation>
+        <translation>Impressão digital do dispositivo</translation>
     </message>
     <message>
         <location line="-166"/>
         <source>Session Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Chave de sessão</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>IMPORT</source>
-        <translation type="unfinished"></translation>
+        <translation>IMPORTAR</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>EXPORT</source>
-        <translation type="unfinished"></translation>
+        <translation>EXPORTAR</translation>
     </message>
     <message>
         <location line="-34"/>
         <source>ENCRYPTION</source>
-        <translation type="unfinished"></translation>
+        <translation>ENCRIPTAÇÃO</translation>
     </message>
     <message>
         <location line="-123"/>
         <source>GENERAL</source>
-        <translation type="unfinished"></translation>
+        <translation>GERAL</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>INTERFACE</source>
-        <translation type="unfinished"></translation>
+        <translation>INTERFACE</translation>
     </message>
     <message>
         <location line="+133"/>
@@ -2925,12 +2930,12 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location line="+46"/>
         <source>Plays media like GIFs or WEBPs only when explicitly hovering over them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Reproduzir média como GIFs e WEBPs apenas quando passar o cursor explicitamente por cima.</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Touchscreen mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo de toque</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2940,42 +2945,42 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location line="+12"/>
         <source>Emoji Font Family</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de letra para emoji</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>Master signing key</source>
-        <translation type="unfinished"></translation>
+        <translation>Chave de assinatura mestra</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Your most important key. You don&apos;t need to have it cached, since not caching it makes it less likely it can be stolen and it is only needed to rotate your other signing keys.</source>
-        <translation type="unfinished"></translation>
+        <translation>A sua chave mais importante. Não necessita de a armazenar na cache, visto que será menos provável que seja roubada e só é necessária para rodar as outras chaves de assinatura.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>User signing key</source>
-        <translation type="unfinished"></translation>
+        <translation>Chave de assinatura de utilizador</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source>
-        <translation type="unfinished"></translation>
+        <translation>A chave para verificar outros utilizadores. Se armazenada em cache, verificar um utilizador irá verificar todos os seus dispositivos.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Self signing key</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Chave de auto-assinatura.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users, that have verified you.</source>
-        <translation type="unfinished"></translation>
+        <translation>A chave para verificar os seus dispositivos. Se armazenada em cache, verificar um dos seus dispositivos irá marcá-lo como tal para todos os seus outros dispositivos e utilizadores que o tenham verificado.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Backup key</source>
-        <translation type="unfinished"></translation>
+        <translation>Chave de cópia de segurança</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -2985,17 +2990,17 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location line="+54"/>
         <source>Select a file</source>
-        <translation type="unfinished">Selecionar um ficheiro</translation>
+        <translation>Selecionar um ficheiro</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>All Files (*)</source>
-        <translation type="unfinished">Todos os ficheiros (*)</translation>
+        <translation>Todos os ficheiros (*)</translation>
     </message>
     <message>
         <location line="+265"/>
         <source>Open Sessions File</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir ficheiro de sessões</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -3005,34 +3010,34 @@ This usually causes the application icon in the task bar to animate in some fash
         <location line="+11"/>
         <location line="+18"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro</translation>
     </message>
     <message>
         <location line="-65"/>
         <location line="+27"/>
         <source>File Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Palavra-passe do ficheiro</translation>
     </message>
     <message>
         <location line="-26"/>
         <source>Enter the passphrase to decrypt the file:</source>
-        <translation type="unfinished"></translation>
+        <translation>Insira a palavra-passe para desencriptar o ficheiro:</translation>
     </message>
     <message>
         <location line="+8"/>
         <location line="+27"/>
         <source>The password cannot be empty</source>
-        <translation type="unfinished"></translation>
+        <translation>A palavra-passe não pode estar vazia</translation>
     </message>
     <message>
         <location line="-8"/>
         <source>Enter passphrase to encrypt your session keys:</source>
-        <translation type="unfinished"></translation>
+        <translation>Insira a palavra-passe para encriptar as suas chaves de sessão:</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>File to save the exported session keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro onde guardar as chaves de sessão exportadas</translation>
     </message>
 </context>
 <context>
@@ -3040,7 +3045,7 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location filename="../../src/encryption/VerificationManager.cpp" line="+105"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
-        <translation type="unfinished">Não foi encontrada nenhuma conversa privada e encriptada com este utilizador. Crie uma e tente novamente.</translation>
+        <translation>Não foi encontrada nenhuma conversa privada e encriptada com este utilizador. Crie uma e tente novamente.</translation>
     </message>
 </context>
 <context>
@@ -3068,7 +3073,7 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location line="+15"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
@@ -3076,7 +3081,7 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bem-vindo(a) ao Nheko! Um cliente de computador para o protocolo Matrix.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3099,7 +3104,7 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location filename="../../src/Utils.cpp" line="+184"/>
         <source>Yesterday</source>
-        <translation type="unfinished"></translation>
+        <translation>Ontem</translation>
     </message>
 </context>
 <context>
@@ -3107,42 +3112,42 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
-        <translation type="unfinished"></translation>
+        <translation>Criar sala</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Name</source>
-        <translation type="unfinished">Nome</translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Topic</source>
-        <translation type="unfinished">Tópico</translation>
+        <translation>Tópico</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Alias</source>
-        <translation type="unfinished"></translation>
+        <translation>Alcunha</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Room Visibility</source>
-        <translation type="unfinished"></translation>
+        <translation>Visibilidade da sala</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Room Preset</source>
-        <translation type="unfinished"></translation>
+        <translation>Predefinição da sala</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Direct Chat</source>
-        <translation type="unfinished"></translation>
+        <translation>Conversa direta</translation>
     </message>
 </context>
 <context>
@@ -3155,12 +3160,12 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Confirm</source>
-        <translation type="unfinished"></translation>
+        <translation>Confirmar</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -3173,12 +3178,12 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Logout. Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminar sessão. Tem a certeza?</translation>
     </message>
 </context>
 <context>
@@ -3186,19 +3191,21 @@ This usually causes the application icon in the task bar to animate in some fash
     <message>
         <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation>Carregar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location line="+93"/>
         <source>Media type: %1
 Media size: %2
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tipo da mídia: %1
+Tamanho da mídia: %2
+</translation>
     </message>
 </context>
 <context>
@@ -3206,17 +3213,17 @@ Media size: %2
     <message>
         <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Confirm</source>
-        <translation type="unfinished"></translation>
+        <translation>Confirmar</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Solve the reCAPTCHA and press the confirm button</source>
-        <translation type="unfinished"></translation>
+        <translation>Solucione o reCAPTCHA e clique no botão de confirmação</translation>
     </message>
 </context>
 <context>
@@ -3224,112 +3231,112 @@ Media size: %2
     <message>
         <location filename="../../src/Utils.h" line="+115"/>
         <source>You sent an audio clip</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviou uma mensagem áudio</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%1 sent an audio clip</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 enviou uma mensagem áudio</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You sent an image</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviou uma imagem</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 sent an image</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 enviou uma mensagem</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You sent a file</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviou um ficheiro</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 sent a file</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 enviou um ficheiro</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You sent a video</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviou um vídeo</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 sent a video</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 enviou um vídeo</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You sent a sticker</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviou um autocolante</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 sent a sticker</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 enviou um autocolante</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You sent a notification</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviou uma notificação</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%1 sent a notification</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 enviou uma notificação</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>You: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Você: %1</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1: %2</source>
-        <translation type="unfinished">%1: %2</translation>
+        <translation>%1: %2</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>You sent an encrypted message</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviou uma mensagem encriptada</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%1 sent an encrypted message</source>
-        <translation type="unfinished">%1 enviou uma mensagem encriptada</translation>
+        <translation>%1 enviou uma mensagem encriptada</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>You placed a call</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciou uma chamada</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 placed a call</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 iniciou uma chamada</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You answered a call</source>
-        <translation type="unfinished"></translation>
+        <translation>Atendeu uma chamada</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 answered a call</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 atendeu uma chamada</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You ended a call</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminou uma chamada</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 ended a call</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 terminou uma chamada</translation>
     </message>
 </context>
 <context>
@@ -3337,7 +3344,7 @@ Media size: %2
     <message>
         <location line="+3"/>
         <source>Unknown Message Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de mensagem desconhecido</translation>
     </message>
 </context>
 </TS>
diff --git a/resources/qml/EncryptionIndicator.qml b/resources/qml/EncryptionIndicator.qml
index f5f4cc761d1fad698eeba3c192d8b85985b13633..0bd0dfa19b1d4fe45421d55b2cd1dadb3d8baa53 100644
--- a/resources/qml/EncryptionIndicator.qml
+++ b/resources/qml/EncryptionIndicator.qml
@@ -12,20 +12,38 @@ Image {
     property bool encrypted: false
     property int trust: Crypto.Unverified
 
+    property string sourceUrl: {
+        if (!encrypted)
+        return "image://colorimage/:/icons/icons/ui/shield-filled-cross.svg?";
+
+        switch (trust) {
+            case Crypto.Verified:
+            return "image://colorimage/:/icons/icons/ui/shield-filled-checkmark.svg?";
+            case Crypto.TOFU:
+            return "image://colorimage/:/icons/icons/ui/shield-filled.svg?";
+            case Crypto.Unverified:
+            return "image://colorimage/:/icons/icons/ui/shield-filled-exclamation-mark.svg?";
+            default:
+            return "image://colorimage/:/icons/icons/ui/shield-filled-cross.svg?";
+        }
+    }
+
     width: 16
     height: 16
+    sourceSize.height: height
+    sourceSize.width: width
     source: {
         if (encrypted) {
             switch (trust) {
             case Crypto.Verified:
-                return "image://colorimage/:/icons/icons/ui/lock.png?green";
+                return sourceUrl + "green";
             case Crypto.TOFU:
-                return "image://colorimage/:/icons/icons/ui/lock.png?" + Nheko.colors.buttonText;
+                return sourceUrl + Nheko.colors.buttonText;
             default:
-                return "image://colorimage/:/icons/icons/ui/lock.png?#d6c020";
+                return sourceUrl + Nheko.theme.error;
             }
         } else {
-            return "image://colorimage/:/icons/icons/ui/unlock.png?#d6c020";
+            return sourceUrl + Nheko.theme.error;
         }
     }
     ToolTip.visible: ma.hovered
diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml
index c95929ce3960ea329ee4870a7c980eb1336aeca3..b27b59c967eeb359888176e512133f40cdc47d6e 100644
--- a/resources/qml/MessageInput.qml
+++ b/resources/qml/MessageInput.qml
@@ -39,7 +39,7 @@ Rectangle {
             hoverEnabled: true
             width: 22
             height: 22
-            image: CallManager.isOnCall ? ":/icons/icons/ui/end-call.png" : ":/icons/icons/ui/place-call.png"
+            image: CallManager.isOnCall ? ":/icons/icons/ui/end-call.svg" : ":/icons/icons/ui/place-call.svg"
             ToolTip.visible: hovered
             ToolTip.text: CallManager.isOnCall ? qsTr("Hang up") : qsTr("Place a call")
             Layout.margins: 8
@@ -62,7 +62,7 @@ Rectangle {
             hoverEnabled: true
             width: 22
             height: 22
-            image: ":/icons/icons/ui/paper-clip-outline.png"
+            image: ":/icons/icons/ui/attach.svg"
             Layout.margins: 8
             onClicked: room.input.openFileSelection()
             ToolTip.visible: hovered
@@ -372,7 +372,7 @@ Rectangle {
             hoverEnabled: true
             width: 22
             height: 22
-            image: ":/icons/icons/ui/smile.png"
+            image: ":/icons/icons/ui/smile.svg"
             ToolTip.visible: hovered
             ToolTip.text: qsTr("Emoji")
             onClicked: emojiPopup.visible ? emojiPopup.close() : emojiPopup.show(emojiButton, function(emoji) {
@@ -387,7 +387,7 @@ Rectangle {
             hoverEnabled: true
             width: 22
             height: 22
-            image: ":/icons/icons/ui/cursor.png"
+            image: ":/icons/icons/ui/send.svg"
             Layout.rightMargin: 8
             ToolTip.visible: hovered
             ToolTip.text: qsTr("Send")
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index b70335bb0eacfb580b562d73e51253d7f2311c2d..868b388516adb79295061bcdd35af0dee9ee13ac 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -83,7 +83,7 @@ ScrollView {
                     buttonTextColor: Nheko.colors.buttonText
                     width: 16
                     hoverEnabled: true
-                    image: ":/icons/icons/ui/edit.png"
+                    image: ":/icons/icons/ui/edit.svg"
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("Edit")
                     onClicked: {
@@ -99,7 +99,7 @@ ScrollView {
                     visible: chat.model ? chat.model.permissions.canSend(MtxEvent.Reaction) : false
                     width: 16
                     hoverEnabled: true
-                    image: ":/icons/icons/ui/smile.png"
+                    image: ":/icons/icons/ui/smile.svg"
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("React")
                     onClicked: emojiPopup.visible ? emojiPopup.close() : emojiPopup.show(reactButton, function(emoji) {
@@ -115,7 +115,7 @@ ScrollView {
                     visible: chat.model ? chat.model.permissions.canSend(MtxEvent.TextMessage) : false
                     width: 16
                     hoverEnabled: true
-                    image: ":/icons/icons/ui/mail-reply.png"
+                    image: ":/icons/icons/ui/reply.svg"
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("Reply")
                     onClicked: chat.model.replyAction(row.model.eventId)
@@ -126,7 +126,7 @@ ScrollView {
 
                     width: 16
                     hoverEnabled: true
-                    image: ":/icons/icons/ui/vertical-ellipsis.png"
+                    image: ":/icons/icons/ui/options.svg"
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("Options")
                     onClicked: messageContextMenu.show(row.model.eventId, row.model.type, row.model.isSender, row.model.isEncrypted, row.model.isEditable, "", row.model.body, optionsButton)
diff --git a/resources/qml/ReplyPopup.qml b/resources/qml/ReplyPopup.qml
index e15b022fa6520fffae2127dc74de31c5f895433d..b9b3a2a413f1134372e72549f4ae5d1f06b3e6f4 100644
--- a/resources/qml/ReplyPopup.qml
+++ b/resources/qml/ReplyPopup.qml
@@ -58,7 +58,7 @@ Rectangle {
         hoverEnabled: true
         width: 16
         height: 16
-        image: ":/icons/icons/ui/remove-symbol.png"
+        image: ":/icons/icons/ui/dismiss.svg"
         ToolTip.visible: closeReplyButton.hovered
         ToolTip.text: qsTr("Close")
         onClicked: room.reply = undefined
diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index 6780a3f70cd92f2e6e7eb5733294d6f00f76ab64..80f162d6dfa24ea378442ef64fc852fabf2f16e0 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -482,7 +482,7 @@ Page {
                     Layout.alignment: Qt.AlignVCenter
                     Layout.preferredWidth: fontMetrics.lineSpacing * 2
                     Layout.preferredHeight: fontMetrics.lineSpacing * 2
-                    image: ":/icons/icons/ui/power-button-off.png"
+                    image: ":/icons/icons/ui/power-off.svg"
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("Logout")
                     onClicked: Nheko.openLogoutDialog()
@@ -544,11 +544,11 @@ Page {
 
                     Layout.rightMargin: Nheko.paddingMedium
                     Layout.topMargin: Nheko.paddingMedium
-                    Layout.alignment: Qt.AlignRight | Qt.AlignTop
+                    Layout.alignment: Qt.AlignRight | Qt.AlignCenter
                     hoverEnabled: true
                     width: fontMetrics.font.pixelSize
                     height: fontMetrics.font.pixelSize
-                    image: ":/icons/icons/ui/remove-symbol.png"
+                    image: ":/icons/icons/ui/dismiss.svg"
                     ToolTip.visible: closeUnverifiedBubble.hovered
                     ToolTip.text: qsTr("Close")
                     onClicked: unverifiedStuffBubble.visible = false
@@ -613,7 +613,7 @@ Page {
                     hoverEnabled: true
                     width: 22
                     height: 22
-                    image: ":/icons/icons/ui/plus-black-symbol.png"
+                    image: ":/icons/icons/ui/add-square-button.svg"
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("Start a new chat")
                     Layout.margins: Nheko.paddingMedium
@@ -642,7 +642,7 @@ Page {
                     hoverEnabled: true
                     width: 22
                     height: 22
-                    image: ":/icons/icons/ui/speech-bubbles-comment-option.png"
+                    image: ":/icons/icons/ui/speech-bubbles.svg"
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("Room directory")
                     Layout.margins: Nheko.paddingMedium
@@ -658,7 +658,7 @@ Page {
                     hoverEnabled: true
                     width: 22
                     height: 22
-                    image: ":/icons/icons/ui/settings.png"
+                    image: ":/icons/icons/ui/settings.svg"
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("User settings")
                     Layout.margins: Nheko.paddingMedium
diff --git a/resources/qml/StatusIndicator.qml b/resources/qml/StatusIndicator.qml
index 0af02b3c9055c3a5e0f87e05c315ca83e0a7a9dc..bee3c3c9875f983473c76fa5d9560ff30ab3c02b 100644
--- a/resources/qml/StatusIndicator.qml
+++ b/resources/qml/StatusIndicator.qml
@@ -40,13 +40,13 @@ ImageButton {
     image: {
         switch (status) {
         case MtxEvent.Failed:
-            return ":/icons/icons/ui/remove-symbol.png";
+            return ":/icons/icons/ui/dismiss.svg";
         case MtxEvent.Sent:
-            return ":/icons/icons/ui/clock.png";
+            return ":/icons/icons/ui/clock.svg";
         case MtxEvent.Received:
-            return ":/icons/icons/ui/checkmark.png";
+            return ":/icons/icons/ui/checkmark.svg";
         case MtxEvent.Read:
-            return ":/icons/icons/ui/double-tick-indicator.png";
+            return ":/icons/icons/ui/double-checkmark.svg";
         default:
             return "";
         }
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index 3a94506288ccbbf785daa400be2156d0c5ab0921..b56fbe5bae91dbe46ff9907f026a43fb04d04d2b 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -169,7 +169,7 @@ Item {
             width: 16
             sourceSize.width: 16
             sourceSize.height: 16
-            source: "image://colorimage/:/icons/icons/ui/edit.png?" + ((eventId == chat.model.edit) ? Nheko.colors.highlight : Nheko.colors.buttonText)
+            source: "image://colorimage/:/icons/icons/ui/edit.svg?" + ((eventId == chat.model.edit) ? Nheko.colors.highlight : Nheko.colors.buttonText)
             ToolTip.visible: editHovered.hovered
             ToolTip.text: qsTr("Edited")
 
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 8214d9de1602d0980b76c1981baaf8b457059cde..8d30fc4788b5652bc8f203634310235915245048 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -242,7 +242,7 @@ Item {
         height: Nheko.avatarSize
         visible: (room == null || room.isSpace) && showBackButton
         enabled: visible
-        image: ":/icons/icons/ui/angle-pointing-to-left.png"
+        image: ":/icons/icons/ui/angle-arrow-left.svg"
         ToolTip.visible: hovered
         ToolTip.text: qsTr("Back to room list")
         onClicked: Rooms.resetCurrentRoom()
diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml
index aec99f4318548c139476012a29493a94d02b0138..45ce289aaadcdf4e916342690f2673a9badc489a 100644
--- a/resources/qml/TopBar.qml
+++ b/resources/qml/TopBar.qml
@@ -67,7 +67,7 @@ Rectangle {
             Layout.preferredHeight: Nheko.avatarSize - Nheko.paddingMedium
             Layout.preferredWidth: Nheko.avatarSize - Nheko.paddingMedium
             visible: showBackButton
-            image: ":/icons/icons/ui/angle-pointing-to-left.png"
+            image: ":/icons/icons/ui/angle-arrow-left.svg"
             ToolTip.visible: hovered
             ToolTip.text: qsTr("Back to room list")
             onClicked: Rooms.resetCurrentRoom()
@@ -117,6 +117,8 @@ Rectangle {
             Layout.rowSpan: 2
             Layout.preferredHeight: Nheko.avatarSize - Nheko.paddingMedium
             Layout.preferredWidth: Nheko.avatarSize - Nheko.paddingMedium
+            sourceSize.height: Layout.preferredHeight
+            sourceSize.width: Layout.preferredWidth
             visible: isEncrypted
             encrypted: isEncrypted
             trust: trustlevel
@@ -145,7 +147,7 @@ Rectangle {
             Layout.alignment: Qt.AlignVCenter
             Layout.preferredHeight: Nheko.avatarSize - Nheko.paddingMedium
             Layout.preferredWidth: Nheko.avatarSize - Nheko.paddingMedium
-            image: ":/icons/icons/ui/vertical-ellipsis.png"
+            image: ":/icons/icons/ui/options.svg"
             ToolTip.visible: hovered
             ToolTip.text: qsTr("Room options")
             onClicked: roomOptionsMenu.open(roomOptionsButton)
diff --git a/resources/qml/delegates/FileMessage.qml b/resources/qml/delegates/FileMessage.qml
index 4f2a2836e356b29aa217173e3789db592ff66336..daee0d8b00fb32bad456e69cfcdadecf7d0d63bb 100644
--- a/resources/qml/delegates/FileMessage.qml
+++ b/resources/qml/delegates/FileMessage.qml
@@ -33,7 +33,7 @@ Item {
                 id: img
 
                 anchors.centerIn: parent
-                source: "qrc:/icons/icons/ui/arrow-pointing-down.png"
+                source: "qrc:/icons/icons/ui/download.svg"
                 fillMode: Image.Pad
             }
 
diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml
index 64e365c8be1355611b796d7623c50e83cda95fcf..4caa89ab2e64824adf4b099be3046a453c940e9b 100644
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@@ -28,7 +28,7 @@ Item {
 
         anchors.fill: parent
         visible: img.status != Image.Ready
-        source: blurhash ? ("image://blurhash/" + blurhash) : ("image://colorimage/:/icons/icons/ui/do-not-disturb-rounded-sign@2x.png?" + Nheko.colors.buttonText)
+        source: blurhash ? ("image://blurhash/" + blurhash) : ("image://colorimage/:/icons/icons/ui/image-failed.svg?" + Nheko.colors.buttonText)
         asynchronous: true
         fillMode: Image.PreserveAspectFit
         sourceSize.width: parent.width
@@ -46,15 +46,6 @@ Item {
         smooth: true
         mipmap: true
 
-        TapHandler {
-            enabled: type == MtxEvent.ImageMessage && img.status == Image.Ready
-            onSingleTapped: {
-                TimelineManager.openImageOverlay(url, room.data.eventId);
-                eventPoint.accepted = true;
-            }
-            gesturePolicy: TapHandler.ReleaseWithinBounds
-        }
-
     }
 
     MxcAnimatedImage {
@@ -67,6 +58,16 @@ Item {
         eventId: parent.eventId
     }
 
+    TapHandler {
+        // TODO(Nico): Replace this with a qml thingy, that also can show animated images
+        enabled: type == MtxEvent.ImageMessage && (img.status == Image.Ready || mxcimage.loaded)
+        onSingleTapped: {
+            TimelineManager.openImageOverlay(url, room.data.eventId);
+            eventPoint.accepted = true;
+        }
+        gesturePolicy: TapHandler.ReleaseWithinBounds
+    }
+
     HoverHandler {
         id: mouseArea
     }
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index c738e5b4dae7c56892c01cb419e3e9775cdcffd4..351313fe6910b3a436a2bdd793accf0ed014eb6b 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -67,6 +67,7 @@ Item {
                 fillMode: VideoOutput.PreserveAspectFit
                 source: mxcmedia
                 flushMode: VideoOutput.FirstFrame
+                orientation: mxcmedia.orientation
             }
 
         }
diff --git a/resources/qml/dialogs/RoomMembers.qml b/resources/qml/dialogs/RoomMembers.qml
index b28062924625c053ef8810b1517fa8fa12002a56..6c8d138330f8c2ba9faf381bbe5fe051cd6be7e7 100644
--- a/resources/qml/dialogs/RoomMembers.qml
+++ b/resources/qml/dialogs/RoomMembers.qml
@@ -56,7 +56,7 @@ ApplicationWindow {
 
         ImageButton {
             Layout.alignment: Qt.AlignHCenter
-            image: ":/icons/icons/ui/add-square-button.png"
+            image: ":/icons/icons/ui/add-square-button.svg"
             hoverEnabled: true
             ToolTip.visible: hovered
             ToolTip.text: qsTr("Invite more people")
diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml
index 32357690c57c362001dab5caf5179f6080046c00..1eeef98b5869831ff29a7d7ff2e06523eab3e1d3 100644
--- a/resources/qml/dialogs/RoomSettings.qml
+++ b/resources/qml/dialogs/RoomSettings.qml
@@ -87,7 +87,7 @@ ApplicationWindow {
 
         Connections {
             target: roomSettings
-            onDisplayError: {
+            function onDisplayError(errorMessage) {
                 errorText.text = errorMessage;
                 errorText.opacity = 1;
                 hideErrorAnimation.restart();
@@ -122,7 +122,7 @@ ApplicationWindow {
 
         ImageButton {
             Layout.alignment: Qt.AlignHCenter
-            image: ":/icons/icons/ui/edit.png"
+            image: ":/icons/icons/ui/edit.svg"
             visible: roomSettings.canChangeNameAndTopic
             onClicked: roomSettings.openEditModal()
         }
@@ -229,7 +229,7 @@ ApplicationWindow {
                 title: qsTr("End-to-End Encryption")
                 text: qsTr("Encryption is currently experimental and things might break unexpectedly. <br>
                             Please take note that it can't be disabled afterwards.")
-                modality: Qt.Modal
+                modality: Qt.NonModal
                 onAccepted: {
                     if (roomSettings.isEncryptionEnabled)
                         return ;
diff --git a/resources/qml/dialogs/UserProfile.qml b/resources/qml/dialogs/UserProfile.qml
index e32a4595fcb241d00a465b30499e7952a4a9081b..ba3f3a45d929ead6e9fcdcc684b3f9a31afa0f52 100644
--- a/resources/qml/dialogs/UserProfile.qml
+++ b/resources/qml/dialogs/UserProfile.qml
@@ -80,7 +80,7 @@ ApplicationWindow {
                     anchors.leftMargin: Nheko.paddingMedium
                     anchors.topMargin: Nheko.paddingMedium
                     visible: profile.isSelf
-                    image: ":/icons/icons/ui/edit.png"
+                    image: ":/icons/icons/ui/edit.svg"
                     onClicked: profile.changeAvatar()
                 }
 
@@ -155,7 +155,7 @@ ApplicationWindow {
                     hoverEnabled: true
                     ToolTip.visible: hovered
                     ToolTip.text: profile.isGlobalUserProfile ? qsTr("Change display name globally.") : qsTr("Change display name. Will only apply to this room.")
-                    image: displayUsername.isUsernameEditingAllowed ? ":/icons/icons/ui/checkmark.png" : ":/icons/icons/ui/edit.png"
+                    image: displayUsername.isUsernameEditingAllowed ? ":/icons/icons/ui/checkmark.svg" : ":/icons/icons/ui/edit.svg"
                     onClicked: {
                         if (displayUsername.isUsernameEditingAllowed) {
                             profile.changeUsername(displayUsername.text);
@@ -194,7 +194,7 @@ ApplicationWindow {
                 }
 
                 ImageButton {
-                    image: ":/icons/icons/ui/world.png"
+                    image: ":/icons/icons/ui/world.svg"
                     hoverEnabled: true
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("Open the global profile for this user.")
@@ -213,17 +213,18 @@ ApplicationWindow {
                 onClicked: profile.verify()
             }
 
-            Image {
+            EncryptionIndicator {
                 Layout.preferredHeight: 16
                 Layout.preferredWidth: 16
-                source: "image://colorimage/:/icons/icons/ui/lock.png?" + ((profile.userVerified == Crypto.Verified) ? "green" : Nheko.colors.buttonText)
-                visible: profile.userVerified != Crypto.Unverified
+                encrypted: profile.userVerificationEnabled
+                trust: profile.userVerified
                 Layout.alignment: Qt.AlignHCenter
+                ToolTip.visible: false
             }
 
             RowLayout {
                 // ImageButton{
-                //     image:":/icons/icons/ui/volume-off-indicator.png"
+                //     image:":/icons/icons/ui/volume-off-indicator.svg"
                 //     Layout.margins: {
                 //         left: 5
                 //         right: 5
@@ -240,7 +241,7 @@ ApplicationWindow {
                 spacing: Nheko.paddingSmall
 
                 ImageButton {
-                    image: ":/icons/icons/ui/black-bubble-speech.png"
+                    image: ":/icons/icons/ui/chat.svg"
                     hoverEnabled: true
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("Start a private chat.")
@@ -248,7 +249,7 @@ ApplicationWindow {
                 }
 
                 ImageButton {
-                    image: ":/icons/icons/ui/round-remove-button.png"
+                    image: ":/icons/icons/ui/round-remove-button.svg"
                     hoverEnabled: true
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("Kick the user.")
@@ -257,7 +258,7 @@ ApplicationWindow {
                 }
 
                 ImageButton {
-                    image: ":/icons/icons/ui/do-not-disturb-rounded-sign.png"
+                    image: ":/icons/icons/ui/ban.svg"
                     hoverEnabled: true
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("Ban the user.")
@@ -266,7 +267,7 @@ ApplicationWindow {
                 }
 
                 ImageButton {
-                    image: ":/icons/icons/ui/refresh.png"
+                    image: ":/icons/icons/ui/refresh.svg"
                     hoverEnabled: true
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("Refresh device list.")
@@ -304,23 +305,25 @@ ApplicationWindow {
                         Layout.preferredHeight: 16
                         Layout.preferredWidth: 16
                         visible: profile.isSelf && verificationStatus != VerificationStatus.NOT_APPLICABLE
+                        sourceSize.height: 16
+                        sourceSize.width: 16
                         source: {
                             switch (verificationStatus) {
                             case VerificationStatus.VERIFIED:
-                                return "image://colorimage/:/icons/icons/ui/lock.png?green";
+                                return "image://colorimage/:/icons/icons/ui/shield-filled-checkmark.svg?green";
                             case VerificationStatus.UNVERIFIED:
-                                return "image://colorimage/:/icons/icons/ui/unlock.png?#d6c020";
+                                return "image://colorimage/:/icons/icons/ui/shield-filled-exclamation-mark.svg?#d6c020";
                             case VerificationStatus.SELF:
-                                return "image://colorimage/:/icons/icons/ui/checkmark.png?green";
+                                return "image://colorimage/:/icons/icons/ui/checkmark.svg?green";
                             default:
-                                return "image://colorimage/:/icons/icons/ui/unlock.png?red";
+                                return "image://colorimage/:/icons/icons/ui/shield-filled-cross.svg?#d6c020";
                             }
                         }
                     }
 
                     ImageButton {
                         Layout.alignment: Qt.AlignTop
-                        image: ":/icons/icons/ui/power-button-off.png"
+                        image: ":/icons/icons/ui/power-off.svg"
                         hoverEnabled: true
                         ToolTip.visible: hovered
                         ToolTip.text: qsTr("Sign out this device.")
@@ -355,7 +358,7 @@ ApplicationWindow {
                         hoverEnabled: true
                         ToolTip.visible: hovered
                         ToolTip.text: qsTr("Change device name.")
-                        image: deviceNameRow.isEditingAllowed ? ":/icons/icons/ui/checkmark.png" : ":/icons/icons/ui/edit.png"
+                        image: deviceNameRow.isEditingAllowed ? ":/icons/icons/ui/checkmark.svg" : ":/icons/icons/ui/edit.svg"
                         onClicked: {
                             if (deviceNameRow.isEditingAllowed) {
                                 profile.changeDeviceName(deviceId, deviceNameField.text);
@@ -388,13 +391,13 @@ ApplicationWindow {
                 source: {
                     switch (verificationStatus) {
                     case VerificationStatus.VERIFIED:
-                        return "image://colorimage/:/icons/icons/ui/lock.png?green";
+                        return "image://colorimage/:/icons/icons/ui/shield-filled-checkmark.svg?green";
                     case VerificationStatus.UNVERIFIED:
-                        return "image://colorimage/:/icons/icons/ui/unlock.png?#d6c020";
+                        return "image://colorimage/:/icons/icons/ui/shield-filled-exclamation-mark.svg?#d6c020";
                     case VerificationStatus.SELF:
-                        return "image://colorimage/:/icons/icons/ui/checkmark.png?green";
+                        return "image://colorimage/:/icons/icons/ui/checkmark.svg?green";
                     default:
-                        return "image://colorimage/:/icons/icons/ui/unlock.png?red";
+                        return "image://colorimage/:/icons/icons/ui/shield-filled.svg?red";
                     }
                 }
             }
diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml
index e83f8a5e16aa5e19e3d3c964f96ebab2569c51ee..77dbf713444feefd894b559f54c995f537f5f32a 100644
--- a/resources/qml/emoji/EmojiPicker.qml
+++ b/resources/qml/emoji/EmojiPicker.qml
@@ -90,7 +90,7 @@ Menu {
                     id: clearSearch
 
                     visible: emojiSearch.text !== ''
-                    icon.source: "image://colorimage/:/icons/icons/ui/round-remove-button.png?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText)
+                    icon.source: "image://colorimage/:/icons/icons/ui/round-remove-button.svg?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText)
                     focusPolicy: Qt.NoFocus
                     onClicked: emojiSearch.clear()
                     hoverEnabled: true
@@ -105,7 +105,7 @@ Menu {
                     Image {
                         height: parent.height - 2 * Nheko.paddingSmall
                         width: height
-                        source: "image://colorimage/:/icons/icons/ui/round-remove-button.png?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText)
+                        source: "image://colorimage/:/icons/icons/ui/round-remove-button.svg?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText)
 
                         anchors {
                             verticalCenter: parent.verticalCenter
@@ -204,42 +204,42 @@ Menu {
                     model: ListModel {
                         // TODO: Would like to get 'simple' icons for the categories
                         ListElement {
-                            image: ":/icons/icons/emoji-categories/people.png"
+                            image: ":/icons/icons/emoji-categories/people.svg"
                             category: Emoji.Category.People
                         }
 
                         ListElement {
-                            image: ":/icons/icons/emoji-categories/nature.png"
+                            image: ":/icons/icons/emoji-categories/nature.svg"
                             category: Emoji.Category.Nature
                         }
 
                         ListElement {
-                            image: ":/icons/icons/emoji-categories/foods.png"
+                            image: ":/icons/icons/emoji-categories/foods.svg"
                             category: Emoji.Category.Food
                         }
 
                         ListElement {
-                            image: ":/icons/icons/emoji-categories/activity.png"
+                            image: ":/icons/icons/emoji-categories/activity.svg"
                             category: Emoji.Category.Activity
                         }
 
                         ListElement {
-                            image: ":/icons/icons/emoji-categories/travel.png"
+                            image: ":/icons/icons/emoji-categories/travel.svg"
                             category: Emoji.Category.Travel
                         }
 
                         ListElement {
-                            image: ":/icons/icons/emoji-categories/objects.png"
+                            image: ":/icons/icons/emoji-categories/objects.svg"
                             category: Emoji.Category.Objects
                         }
 
                         ListElement {
-                            image: ":/icons/icons/emoji-categories/symbols.png"
+                            image: ":/icons/icons/emoji-categories/symbols.svg"
                             category: Emoji.Category.Symbols
                         }
 
                         ListElement {
-                            image: ":/icons/icons/emoji-categories/flags.png"
+                            image: ":/icons/icons/emoji-categories/flags.svg"
                             category: Emoji.Category.Flags
                         }
 
diff --git a/resources/qml/emoji/StickerPicker.qml b/resources/qml/emoji/StickerPicker.qml
index 3731a94847fc0d0a7b5f26c9e8cec45aba5dba52..7f9daca65734212263f4f0cb68f67acf59d1716c 100644
--- a/resources/qml/emoji/StickerPicker.qml
+++ b/resources/qml/emoji/StickerPicker.qml
@@ -88,7 +88,7 @@ Menu {
                     id: clearSearch
 
                     visible: emojiSearch.text !== ''
-                    icon.source: "image://colorimage/:/icons/icons/ui/round-remove-button.png?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText)
+                    icon.source: "image://colorimage/:/icons/icons/ui/round-remove-button.svg?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText)
                     focusPolicy: Qt.NoFocus
                     onClicked: emojiSearch.clear()
                     hoverEnabled: true
@@ -103,7 +103,7 @@ Menu {
                     Image {
                         height: parent.height - 2 * Nheko.paddingSmall
                         width: height
-                        source: "image://colorimage/:/icons/icons/ui/round-remove-button.png?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText)
+                        source: "image://colorimage/:/icons/icons/ui/round-remove-button.svg?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText)
 
                         anchors {
                             verticalCenter: parent.verticalCenter
diff --git a/resources/qml/ui/media/MediaControls.qml b/resources/qml/ui/media/MediaControls.qml
index 7216e5529736ae77a22654823e6f237b3607b764..c6b50fe5ebea379c5efcffab6cda47dadf55edef 100644
--- a/resources/qml/ui/media/MediaControls.qml
+++ b/resources/qml/ui/media/MediaControls.qml
@@ -101,11 +101,11 @@ Rectangle {
                 image: {
                     if (control.mediaLoaded) {
                         if (control.mediaState == MediaPlayer.PlayingState)
-                            return ":/icons/icons/ui/pause-symbol.png";
+                            return ":/icons/icons/ui/pause-symbol.svg";
                         else
-                            return ":/icons/icons/ui/play-sign.png";
+                            return ":/icons/icons/ui/play-sign.svg";
                     } else {
-                        return ":/icons/icons/ui/arrow-pointing-down.png";
+                        return ":/icons/icons/ui/download.svg";
                     }
                 }
                 onClicked: control.mediaLoaded ? control.playPauseActivated() : control.loadActivated()
@@ -120,9 +120,9 @@ Rectangle {
                 Layout.preferredWidth: 24
                 image: {
                     if (control.muted || control.desiredVolume <= 0)
-                        return ":/icons/icons/ui/volume-off-indicator.png";
+                        return ":/icons/icons/ui/volume-off-indicator.svg";
                     else
-                        return ":/icons/icons/ui/volume-up.png";
+                        return ":/icons/icons/ui/volume-up.svg";
                 }
                 onClicked: control.muted = !control.muted
             }
diff --git a/resources/qml/voip/ActiveCallBar.qml b/resources/qml/voip/ActiveCallBar.qml
index be69835655cfc0d6bbb646248249dd3460305777..c4c99f995f6cff4771f983b3c48e29b28e64b433 100644
--- a/resources/qml/voip/ActiveCallBar.qml
+++ b/resources/qml/voip/ActiveCallBar.qml
@@ -62,7 +62,7 @@ Rectangle {
 
                     PropertyChanges {
                         target: callTypeIcon
-                        source: "qrc:/icons/icons/ui/place-call.png"
+                        source: "qrc:/icons/icons/ui/place-call.svg"
                     }
 
                 },
@@ -72,7 +72,7 @@ Rectangle {
 
                     PropertyChanges {
                         target: callTypeIcon
-                        source: "qrc:/icons/icons/ui/video-call.png"
+                        source: "qrc:/icons/icons/ui/video.svg"
                     }
 
                 },
@@ -82,7 +82,7 @@ Rectangle {
 
                     PropertyChanges {
                         target: callTypeIcon
-                        source: "qrc:/icons/icons/ui/screen-share.png"
+                        source: "qrc:/icons/icons/ui/screen-share.svg"
                     }
 
                 }
@@ -205,7 +205,7 @@ Rectangle {
             width: 24
             height: 24
             buttonTextColor: "#000000"
-            image: ":/icons/icons/ui/toggle-camera-view.png"
+            image: ":/icons/icons/ui/picture-in-picture.svg"
             hoverEnabled: true
             ToolTip.visible: hovered
             ToolTip.text: qsTr("Hide/Show Picture-in-Picture")
@@ -218,7 +218,7 @@ Rectangle {
             width: 24
             height: 24
             buttonTextColor: "#000000"
-            image: CallManager.isMicMuted ? ":/icons/icons/ui/microphone-unmute.png" : ":/icons/icons/ui/microphone-mute.png"
+            image: CallManager.isMicMuted ? ":/icons/icons/ui/microphone-unmute.svg" : ":/icons/icons/ui/microphone-mute.svg"
             hoverEnabled: true
             ToolTip.visible: hovered
             ToolTip.text: CallManager.isMicMuted ? qsTr("Unmute Mic") : qsTr("Mute Mic")
diff --git a/resources/qml/voip/CallDevices.qml b/resources/qml/voip/CallDevices.qml
index 824bb2e02b9714685d409a3be3e931c276f0eb55..0e62cbc44a0639062d33c7db768ef988adc4d7bd 100644
--- a/resources/qml/voip/CallDevices.qml
+++ b/resources/qml/voip/CallDevices.qml
@@ -31,7 +31,7 @@ Popup {
                 Image {
                     Layout.preferredWidth: 22
                     Layout.preferredHeight: 22
-                    source: "image://colorimage/:/icons/icons/ui/microphone-unmute.png?" + Nheko.colors.windowText
+                    source: "image://colorimage/:/icons/icons/ui/microphone-unmute.svg?" + Nheko.colors.windowText
                 }
 
                 ComboBox {
@@ -49,7 +49,7 @@ Popup {
                 Image {
                     Layout.preferredWidth: 22
                     Layout.preferredHeight: 22
-                    source: "image://colorimage/:/icons/icons/ui/video-call.png?" + Nheko.colors.windowText
+                    source: "image://colorimage/:/icons/icons/ui/video-call.svg?" + Nheko.colors.windowText
                 }
 
                 ComboBox {
diff --git a/resources/qml/voip/CallInvite.qml b/resources/qml/voip/CallInvite.qml
index 1bd5eb265c2a27cc570ee02e3635a3497ff282e3..9b3a41b13242dd0e3a2772c5d31f2d18bee9993e 100644
--- a/resources/qml/voip/CallInvite.qml
+++ b/resources/qml/voip/CallInvite.qml
@@ -59,7 +59,7 @@ Popup {
             Layout.bottomMargin: msgView.height / 25
 
             Image {
-                property string image: CallManager.callType == CallType.VIDEO ? ":/icons/icons/ui/video-call.png" : ":/icons/icons/ui/place-call.png"
+                property string image: CallManager.callType == CallType.VIDEO ? ":/icons/icons/ui/video.svg" : ":/icons/icons/ui/place-call.svg"
 
                 Layout.alignment: Qt.AlignCenter
                 Layout.preferredWidth: msgView.height / 10
@@ -90,7 +90,7 @@ Popup {
                 Image {
                     Layout.preferredWidth: deviceCombos.imageSize
                     Layout.preferredHeight: deviceCombos.imageSize
-                    source: "image://colorimage/:/icons/icons/ui/microphone-unmute.png?" + Nheko.colors.windowText
+                    source: "image://colorimage/:/icons/icons/ui/microphone-unmute.svg?" + Nheko.colors.windowText
                 }
 
                 ComboBox {
@@ -109,7 +109,7 @@ Popup {
                 Image {
                     Layout.preferredWidth: deviceCombos.imageSize
                     Layout.preferredHeight: deviceCombos.imageSize
-                    source: "image://colorimage/:/icons/icons/ui/video-call.png?" + Nheko.colors.windowText
+                    source: "image://colorimage/:/icons/icons/ui/video.svg?" + Nheko.colors.windowText
                 }
 
                 ComboBox {
@@ -132,7 +132,7 @@ Popup {
                 if (CallManager.mics.length == 0) {
                     var dialog = deviceError.createObject(timelineRoot, {
                         "errorString": qsTr("No microphone found."),
-                        "image": ":/icons/icons/ui/place-call.png"
+                        "image": ":/icons/icons/ui/place-call.svg"
                     });
                     dialog.open();
                     return false;
@@ -157,7 +157,7 @@ Popup {
                 }
 
                 contentItem: Image {
-                    source: "image://colorimage/:/icons/icons/ui/end-call.png?#ffffff"
+                    source: "image://colorimage/:/icons/icons/ui/end-call.svg?#ffffff"
                 }
 
             }
@@ -165,7 +165,7 @@ Popup {
             RoundButton {
                 id: acceptButton
 
-                property string image: CallManager.callType == CallType.VIDEO ? ":/icons/icons/ui/video-call.png" : ":/icons/icons/ui/place-call.png"
+                property string image: CallManager.callType == CallType.VIDEO ? ":/icons/icons/ui/video.svg" : ":/icons/icons/ui/place-call.svg"
 
                 implicitWidth: buttonLayout.buttonSize
                 implicitHeight: buttonLayout.buttonSize
diff --git a/resources/qml/voip/CallInviteBar.qml b/resources/qml/voip/CallInviteBar.qml
index 10f8367a7361084268ef6a9fcb4c9818f6a9ebb0..349bd02fe9cc37fd5a36d08bcaab164d57982777 100644
--- a/resources/qml/voip/CallInviteBar.qml
+++ b/resources/qml/voip/CallInviteBar.qml
@@ -57,7 +57,7 @@ Rectangle {
             Layout.leftMargin: 4
             Layout.preferredWidth: 24
             Layout.preferredHeight: 24
-            source: CallManager.callType == CallType.VIDEO ? "qrc:/icons/icons/ui/video-call.png" : "qrc:/icons/icons/ui/place-call.png"
+            source: CallManager.callType == CallType.VIDEO ? "qrc:/icons/icons/ui/video.svg" : "qrc:/icons/icons/ui/place-call.svg"
         }
 
         Label {
@@ -75,7 +75,7 @@ Rectangle {
             width: 20
             height: 20
             buttonTextColor: "#000000"
-            image: ":/icons/icons/ui/settings.png"
+            image: ":/icons/icons/ui/settings.svg"
             hoverEnabled: true
             ToolTip.visible: hovered
             ToolTip.text: qsTr("Devices")
@@ -87,21 +87,21 @@ Rectangle {
 
         Button {
             Layout.rightMargin: 4
-            icon.source: CallManager.callType == CallType.VIDEO ? "qrc:/icons/icons/ui/video-call.png" : "qrc:/icons/icons/ui/place-call.png"
+            icon.source: CallManager.callType == CallType.VIDEO ? "qrc:/icons/icons/ui/video.svg" : "qrc:/icons/icons/ui/place-call.svg"
             text: qsTr("Accept")
             palette: Nheko.colors
             onClicked: {
                 if (CallManager.mics.length == 0) {
                     var dialog = deviceError.createObject(timelineRoot, {
                         "errorString": qsTr("No microphone found."),
-                        "image": ":/icons/icons/ui/place-call.png"
+                        "image": ":/icons/icons/ui/place-call.svg"
                     });
                     dialog.open();
                     return ;
                 } else if (!CallManager.mics.includes(Settings.microphone)) {
                     var dialog = deviceError.createObject(timelineRoot, {
                         "errorString": qsTr("Unknown microphone: %1").arg(Settings.microphone),
-                        "image": ":/icons/icons/ui/place-call.png"
+                        "image": ":/icons/icons/ui/place-call.svg"
                     });
                     dialog.open();
                     return ;
@@ -109,7 +109,7 @@ Rectangle {
                 if (CallManager.callType == CallType.VIDEO && CallManager.cameras.length > 0 && !CallManager.cameras.includes(Settings.camera)) {
                     var dialog = deviceError.createObject(timelineRoot, {
                         "errorString": qsTr("Unknown camera: %1").arg(Settings.camera),
-                        "image": ":/icons/icons/ui/video-call.png"
+                        "image": ":/icons/icons/ui/video.svg"
                     });
                     dialog.open();
                     return ;
@@ -120,7 +120,7 @@ Rectangle {
 
         Button {
             Layout.rightMargin: 16
-            icon.source: "qrc:/icons/icons/ui/end-call.png"
+            icon.source: "qrc:/icons/icons/ui/end-call.svg"
             text: qsTr("Decline")
             palette: Nheko.colors
             onClicked: {
diff --git a/resources/qml/voip/PlaceCall.qml b/resources/qml/voip/PlaceCall.qml
index c733012caddb7e5026fe488a05440dbeac319aed..0ad546df2a383233891dc91278cfbd436085faf7 100644
--- a/resources/qml/voip/PlaceCall.qml
+++ b/resources/qml/voip/PlaceCall.qml
@@ -62,7 +62,7 @@ Popup {
                 if (CallManager.mics.length == 0) {
                     var dialog = deviceError.createObject(timelineRoot, {
                         "errorString": qsTr("No microphone found."),
-                        "image": ":/icons/icons/ui/place-call.png"
+                        "image": ":/icons/icons/ui/place-call.svg"
                     });
                     dialog.open();
                     return false;
@@ -85,7 +85,7 @@ Popup {
 
             Button {
                 text: qsTr("Voice")
-                icon.source: "qrc:/icons/icons/ui/place-call.png"
+                icon.source: "qrc:/icons/icons/ui/place-call.svg"
                 onClicked: {
                     if (buttonLayout.validateMic()) {
                         Settings.microphone = micCombo.currentText;
@@ -98,7 +98,7 @@ Popup {
             Button {
                 visible: CallManager.cameras.length > 0
                 text: qsTr("Video")
-                icon.source: "qrc:/icons/icons/ui/video-call.png"
+                icon.source: "qrc:/icons/icons/ui/video.svg"
                 onClicked: {
                     if (buttonLayout.validateMic()) {
                         Settings.microphone = micCombo.currentText;
@@ -112,7 +112,7 @@ Popup {
             Button {
                 visible: CallManager.screenShareSupported
                 text: qsTr("Screen")
-                icon.source: "qrc:/icons/icons/ui/screen-share.png"
+                icon.source: "qrc:/icons/icons/ui/screen-share.svg"
                 onClicked: {
                     var dialog = screenShareDialog.createObject(timelineRoot);
                     dialog.open();
@@ -140,7 +140,7 @@ Popup {
                 Image {
                     Layout.preferredWidth: 22
                     Layout.preferredHeight: 22
-                    source: "image://colorimage/:/icons/icons/ui/microphone-unmute.png?" + Nheko.colors.windowText
+                    source: "image://colorimage/:/icons/icons/ui/microphone-unmute.svg?" + Nheko.colors.windowText
                 }
 
                 ComboBox {
@@ -161,7 +161,7 @@ Popup {
                 Image {
                     Layout.preferredWidth: 22
                     Layout.preferredHeight: 22
-                    source: "image://colorimage/:/icons/icons/ui/video-call.png?" + Nheko.colors.windowText
+                    source: "image://colorimage/:/icons/icons/ui/video-call.svg?" + Nheko.colors.windowText
                 }
 
                 ComboBox {
diff --git a/resources/qml/voip/ScreenShare.qml b/resources/qml/voip/ScreenShare.qml
index 8cd43b1c40edd88f06b1bcd012ba56ed9d69605f..26d81819622340fab6afe585fa6787b169876a2b 100644
--- a/resources/qml/voip/ScreenShare.qml
+++ b/resources/qml/voip/ScreenShare.qml
@@ -125,7 +125,7 @@ Popup {
 
             Button {
                 text: qsTr("Share")
-                icon.source: "qrc:/icons/icons/ui/screen-share.png"
+                icon.source: "qrc:/icons/icons/ui/screen-share.svg"
                 onClicked: {
                     if (buttonLayout.validateMic()) {
                         Settings.microphone = micCombo.currentText;
diff --git a/resources/res.qrc b/resources/res.qrc
index e0ecf99242fa70cf487e277b37e1828b1f97b526..1c7a49c0dd00577e865cb64475f5c19517f90c0e 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -1,32 +1,7 @@
 <RCC>
     <qresource prefix="/icons">
-        <file>icons/ui/at-solid.svg</file>
-        <file>icons/ui/volume-off-indicator.png</file>
-        <file>icons/ui/volume-off-indicator@2x.png</file>
-        <file>icons/ui/volume-up.png</file>
-        <file>icons/ui/black-bubble-speech.png</file>
-        <file>icons/ui/black-bubble-speech@2x.png</file>
-        <file>icons/ui/do-not-disturb-rounded-sign.png</file>
-        <file>icons/ui/do-not-disturb-rounded-sign@2x.png</file>
-        <file>icons/ui/round-remove-button.png</file>
-        <file>icons/ui/round-remove-button@2x.png</file>
-        <file>icons/ui/double-tick-indicator.png</file>
-        <file>icons/ui/double-tick-indicator@2x.png</file>
-        <file>icons/ui/lock.png</file>
-        <file>icons/ui/lock@2x.png</file>
-        <file>icons/ui/unlock.png</file>
-        <file>icons/ui/unlock@2x.png</file>
-        <file>icons/ui/clock.png</file>
-        <file>icons/ui/clock@2x.png</file>
-        <file>icons/ui/checkmark.png</file>
-        <file>icons/ui/checkmark@2x.png</file>
-        <file>icons/ui/cursor.png</file>
-        <file>icons/ui/cursor@2x.png</file>
-        <file>icons/ui/search.png</file>
-        <file>icons/ui/search@2x.png</file>
-        <file>icons/ui/settings.png</file>
-        <file>icons/ui/settings@2x.png</file>
         <file>icons/ui/sticky-note-solid.svg</file>
+<<<<<<< HEAD
         <file>icons/ui/smile.png</file>
         <file>icons/ui/smile@2x.png</file>
         <file>icons/ui/speech-bubbles-comment-option.png</file>
@@ -91,6 +66,58 @@
         <file>icons/emoji-categories/symbols@2x.png</file>
         <file>icons/emoji-categories/flags.png</file>
         <file>icons/emoji-categories/flags@2x.png</file>
+=======
+        <file>icons/ui/add-square-button.svg</file>
+        <file>icons/ui/send.svg</file>
+        <file>icons/ui/smile.svg</file>
+        <file>icons/ui/user-friends-solid.svg</file>
+        <file>icons/ui/place-call.svg</file>
+        <file>icons/ui/attach.svg</file>
+        <file>icons/ui/angle-arrow-left.svg</file>
+        <file>icons/ui/chat.svg</file>
+        <file>icons/ui/checkmark.svg</file>
+        <file>icons/ui/clock.svg</file>
+        <file>icons/ui/edit.svg</file>
+        <file>icons/ui/end-call.svg</file>
+        <file>icons/ui/lowprio.svg</file>
+        <file>icons/ui/microphone-mute.svg</file>
+        <file>icons/ui/microphone-unmute.svg</file>
+        <file>icons/ui/pause-symbol.svg</file>
+        <file>icons/ui/play-sign.svg</file>
+        <file>icons/ui/power-off.svg</file>
+        <file>icons/ui/refresh.svg</file>
+        <file>icons/ui/reply.svg</file>
+        <file>icons/ui/round-remove-button.svg</file>
+        <file>icons/ui/screen-share.svg</file>
+        <file>icons/ui/search.svg</file>
+        <file>icons/ui/settings.svg</file>
+        <file>icons/ui/speech-bubbles.svg</file>
+        <file>icons/ui/star.svg</file>
+        <file>icons/ui/tag.svg</file>
+        <file>icons/ui/video.svg</file>
+        <file>icons/ui/volume-off-indicator.svg</file>
+        <file>icons/ui/volume-up.svg</file>
+        <file>icons/ui/world.svg</file>
+        <file>icons/ui/picture-in-picture.svg</file>
+        <file>icons/ui/options.svg</file>
+        <file>icons/ui/double-checkmark.svg</file>
+        <file>icons/ui/ban.svg</file>
+        <file>icons/ui/image-failed.svg</file>
+        <file>icons/ui/dismiss.svg</file>
+        <file>icons/ui/download.svg</file>
+        <file>icons/emoji-categories/activity.svg</file>
+        <file>icons/emoji-categories/flags.svg</file>
+        <file>icons/emoji-categories/foods.svg</file>
+        <file>icons/emoji-categories/nature.svg</file>
+        <file>icons/emoji-categories/objects.svg</file>
+        <file>icons/emoji-categories/people.svg</file>
+        <file>icons/emoji-categories/symbols.svg</file>
+        <file>icons/emoji-categories/travel.svg</file>
+        <file>icons/ui/shield-filled.svg</file>
+        <file>icons/ui/shield-filled-exclamation-mark.svg</file>
+        <file>icons/ui/shield-filled-checkmark.svg</file>
+        <file>icons/ui/shield-filled-cross.svg</file>
+>>>>>>> nheko-im/master
     </qresource>
     <qresource prefix="/logos">
         <file>nheko.png</file>
diff --git a/src/Cache.cpp b/src/Cache.cpp
index 0fdf8dd391aac75f137ce02d6f6318a0c2dde974..c22cd0d694cd4cf1ddf5d8be1de132736eed5111 100644
--- a/src/Cache.cpp
+++ b/src/Cache.cpp
@@ -3828,17 +3828,24 @@ Cache::getMembersWithKeys(const std::string &room_id, bool verified_only)
 QString
 Cache::displayName(const QString &room_id, const QString &user_id)
 {
-    if (auto info = getMember(room_id.toStdString(), user_id.toStdString());
-        info && !info->name.empty())
-        return QString::fromStdString(info->name);
+    return QString::fromStdString(displayName(room_id.toStdString(), user_id.toStdString()));
+}
 
-    return user_id;
+static bool
+isDisplaynameSafe(const std::string &s)
+{
+    for (QChar c : QString::fromStdString(s).toUcs4()) {
+        if (c.isPrint() && !c.isSpace())
+            return false;
+    }
+
+    return true;
 }
 
 std::string
 Cache::displayName(const std::string &room_id, const std::string &user_id)
 {
-    if (auto info = getMember(room_id, user_id); info && !info->name.empty())
+    if (auto info = getMember(room_id, user_id); info && !isDisplaynameSafe(info->name))
         return info->name;
 
     return user_id;
diff --git a/src/JdenticonProvider.cpp b/src/JdenticonProvider.cpp
index e282828637a5d6f981ac4d988492d1d59e937151..e421c932c9101d02d4ef63d67edd26fcaed2b3f3 100644
--- a/src/JdenticonProvider.cpp
+++ b/src/JdenticonProvider.cpp
@@ -88,20 +88,16 @@ getJdenticonInterface()
     if (interface == nullptr && interfaceExists) {
         QDir pluginsDir(qApp->applicationDirPath());
 
-        bool plugins = pluginsDir.cd("plugins");
-        if (plugins) {
-            for (const QString &fileName : pluginsDir.entryList(QDir::Files)) {
-                QPluginLoader pluginLoader(pluginsDir.absoluteFilePath(fileName));
-                QObject *plugin = pluginLoader.instance();
-                if (plugin) {
-                    interface = qobject_cast<JdenticonInterface *>(plugin);
-                    if (interface) {
-                        nhlog::ui()->info("Loaded jdenticon plugin.");
-                        break;
-                    }
-                }
+        QPluginLoader pluginLoader("qtjdenticon");
+        QObject *plugin = pluginLoader.instance();
+        if (plugin) {
+            interface = qobject_cast<JdenticonInterface *>(plugin);
+            if (interface) {
+                nhlog::ui()->info("Loaded jdenticon plugin.");
             }
-        } else {
+        }
+
+        if (!interface) {
             nhlog::ui()->info("jdenticon plugin not found.");
             interfaceExists = false;
         }
diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp
index 7d3e7446040cd4955464b880bf14dbf0222ade12..656ee2d9f54b9cc761b48310d2530862e0de97d7 100644
--- a/src/LoginPage.cpp
+++ b/src/LoginPage.cpp
@@ -49,7 +49,7 @@ LoginPage::LoginPage(QWidget *parent)
     top_bar_layout_->addStretch(1);
 
     QIcon icon;
-    icon.addFile(":/icons/icons/ui/angle-pointing-to-left.png");
+    icon.addFile(":/icons/icons/ui/angle-arrow-left.svg");
 
     back_button_->setIcon(icon);
     back_button_->setIconSize(QSize(32, 32));
diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
index 271a7fc2cfec711e63cb67cab238a3d1186fdf6b..062a04aba341c267a4540e391a61ee5b7d6181ec 100644
--- a/src/RegisterPage.cpp
+++ b/src/RegisterPage.cpp
@@ -46,7 +46,7 @@ RegisterPage::RegisterPage(QWidget *parent)
     back_button_->setMinimumSize(QSize(30, 30));
 
     QIcon icon;
-    icon.addFile(":/icons/icons/ui/angle-pointing-to-left.png");
+    icon.addFile(":/icons/icons/ui/angle-arrow-left.svg");
 
     back_button_->setIcon(icon);
     back_button_->setIconSize(QSize(32, 32));
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index 525672896f04eace631f16f7445e2a57001a7e28..f1ef688c7117a8e49e08bbfaf41a7ebb1f0ee74d 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -715,7 +715,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
     topLayout_ = new QVBoxLayout{this};
 
     QIcon icon;
-    icon.addFile(":/icons/icons/ui/angle-pointing-to-left.png");
+    icon.addFile(":/icons/icons/ui/angle-arrow-left.svg");
 
     auto backBtn_ = new FlatButton{this};
     backBtn_->setMinimumSize(QSize(24, 24));
diff --git a/src/Utils.cpp b/src/Utils.cpp
index b0fb01b150dbf0f6a20ea32fb4a38b9e2fd8a5e6..b838a971a739c01b994c47ca0df9ec8980945577 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -59,11 +59,14 @@ std::string
 utils::stripReplyFromBody(const std::string &bodyi)
 {
     QString body = QString::fromStdString(bodyi);
-    QRegularExpression plainQuote("^>.*?$\n?", QRegularExpression::MultilineOption);
-    while (body.startsWith(">"))
-        body.remove(plainQuote);
-    if (body.startsWith("\n"))
-        body.remove(0, 1);
+    if (body.startsWith("> <")) {
+        auto segments = body.split('\n');
+        while (!segments.isEmpty() && segments.begin()->startsWith('>'))
+            segments.erase(segments.begin());
+        if (!segments.empty() && segments.first().isEmpty())
+            segments.erase(segments.begin());
+        body = segments.join('\n');
+    }
 
     body.replace("@room", QString::fromUtf8("@\u2060room"));
     return body.toStdString();
diff --git a/src/timeline/CommunitiesModel.cpp b/src/timeline/CommunitiesModel.cpp
index 77bed3871a17f1b9e9b5f4d107745e2849841d6f..47ff521d490f9cef246cee1e3abfa30d7f171f39 100644
--- a/src/timeline/CommunitiesModel.cpp
+++ b/src/timeline/CommunitiesModel.cpp
@@ -32,7 +32,7 @@ CommunitiesModel::data(const QModelIndex &index, int role) const
     if (index.row() == 0) {
         switch (role) {
         case CommunitiesModel::Roles::AvatarUrl:
-            return QString(":/icons/icons/ui/world.png");
+            return QString(":/icons/icons/ui/world.svg");
         case CommunitiesModel::Roles::DisplayName:
             return tr("All rooms");
         case CommunitiesModel::Roles::Tooltip:
@@ -64,7 +64,7 @@ CommunitiesModel::data(const QModelIndex &index, int role) const
         if (tag == "m.favourite") {
             switch (role) {
             case CommunitiesModel::Roles::AvatarUrl:
-                return QString(":/icons/icons/ui/star.png");
+                return QString(":/icons/icons/ui/star.svg");
             case CommunitiesModel::Roles::DisplayName:
                 return tr("Favourites");
             case CommunitiesModel::Roles::Tooltip:
@@ -73,7 +73,7 @@ CommunitiesModel::data(const QModelIndex &index, int role) const
         } else if (tag == "m.lowpriority") {
             switch (role) {
             case CommunitiesModel::Roles::AvatarUrl:
-                return QString(":/icons/icons/ui/lowprio.png");
+                return QString(":/icons/icons/ui/lowprio.svg");
             case CommunitiesModel::Roles::DisplayName:
                 return tr("Low Priority");
             case CommunitiesModel::Roles::Tooltip:
@@ -82,7 +82,7 @@ CommunitiesModel::data(const QModelIndex &index, int role) const
         } else if (tag == "m.server_notice") {
             switch (role) {
             case CommunitiesModel::Roles::AvatarUrl:
-                return QString(":/icons/icons/ui/tag.png");
+                return QString(":/icons/icons/ui/tag.svg");
             case CommunitiesModel::Roles::DisplayName:
                 return tr("Server Notices");
             case CommunitiesModel::Roles::Tooltip:
@@ -91,7 +91,7 @@ CommunitiesModel::data(const QModelIndex &index, int role) const
         } else {
             switch (role) {
             case CommunitiesModel::Roles::AvatarUrl:
-                return QString(":/icons/icons/ui/tag.png");
+                return QString(":/icons/icons/ui/tag.svg");
             case CommunitiesModel::Roles::DisplayName:
             case CommunitiesModel::Roles::Tooltip:
                 return tag.mid(2);
diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp
index 179c63af642f81e6da9560536de3b4672567fc50..cc9ff8002c41d1efda182b912391b595a9377683 100644
--- a/src/timeline/RoomlistModel.cpp
+++ b/src/timeline/RoomlistModel.cpp
@@ -651,14 +651,6 @@ RoomlistModel::setCurrentRoom(QString roomid)
         }
 
         emit currentRoomChanged();
-    } else {
-        currentRoom_ = nullptr;
-
-        RoomPreview p;
-        p.roomid_           = roomid;
-        currentRoomPreview_ = std::move(p);
-        emit currentRoomChanged();
-        nhlog::ui()->debug("Switched to (empty): {}", roomid.toStdString());
     }
 }
 
diff --git a/src/ui/MxcMediaProxy.cpp b/src/ui/MxcMediaProxy.cpp
index df0298dab895cc633f502097d40b934c209e27c3..a93d0fc0b63ef9fc119b7e234b7432c887e83a46 100644
--- a/src/ui/MxcMediaProxy.cpp
+++ b/src/ui/MxcMediaProxy.cpp
@@ -7,6 +7,7 @@
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
+#include <QMediaMetaData>
 #include <QMediaObject>
 #include <QMediaPlayer>
 #include <QMimeDatabase>
@@ -23,6 +24,28 @@
 #include "MatrixClient.h"
 #include "timeline/TimelineModel.h"
 
+MxcMediaProxy::MxcMediaProxy(QObject *parent)
+  : QMediaPlayer(parent)
+{
+    connect(this, &MxcMediaProxy::eventIdChanged, &MxcMediaProxy::startDownload);
+    connect(this, &MxcMediaProxy::roomChanged, &MxcMediaProxy::startDownload);
+    connect(this,
+            qOverload<QMediaPlayer::Error>(&MxcMediaProxy::error),
+            [this](QMediaPlayer::Error error) {
+                nhlog::ui()->info("Media player error {} and errorStr {}",
+                                  error,
+                                  this->errorString().toStdString());
+            });
+    connect(this, &MxcMediaProxy::mediaStatusChanged, [this](QMediaPlayer::MediaStatus status) {
+        nhlog::ui()->info("Media player status {} and error {}", status, this->error());
+    });
+    connect(this,
+            qOverload<const QString &, const QVariant &>(&MxcMediaProxy::metaDataChanged),
+            [this](QString t, QVariant) {
+                if (t == QMediaMetaData::Orientation)
+                    emit orientationChanged();
+            });
+}
 void
 MxcMediaProxy::setVideoSurface(QAbstractVideoSurface *surface)
 {
@@ -37,6 +60,15 @@ MxcMediaProxy::getVideoSurface()
     return m_surface;
 }
 
+int
+MxcMediaProxy::orientation() const
+{
+    nhlog::ui()->debug("metadata: {}", availableMetaData().join(",").toStdString());
+    auto orientation = metaData(QMediaMetaData::Orientation).toInt();
+    nhlog::ui()->debug("Video orientation: {}", orientation);
+    return orientation;
+}
+
 void
 MxcMediaProxy::startDownload()
 {
diff --git a/src/ui/MxcMediaProxy.h b/src/ui/MxcMediaProxy.h
index 18152c756030ca130677fb8e82c2e4d4332dec94..e33fc10579245a75e30924424eb4b2bd7905386f 100644
--- a/src/ui/MxcMediaProxy.h
+++ b/src/ui/MxcMediaProxy.h
@@ -25,23 +25,10 @@ class MxcMediaProxy : public QMediaPlayer
     Q_PROPERTY(QString eventId READ eventId WRITE setEventId NOTIFY eventIdChanged)
     Q_PROPERTY(QAbstractVideoSurface *videoSurface READ getVideoSurface WRITE setVideoSurface)
     Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
+    Q_PROPERTY(int orientation READ orientation NOTIFY orientationChanged)
+
 public:
-    MxcMediaProxy(QObject *parent = nullptr)
-      : QMediaPlayer(parent)
-    {
-        connect(this, &MxcMediaProxy::eventIdChanged, &MxcMediaProxy::startDownload);
-        connect(this, &MxcMediaProxy::roomChanged, &MxcMediaProxy::startDownload);
-        connect(this,
-                qOverload<QMediaPlayer::Error>(&MxcMediaProxy::error),
-                [this](QMediaPlayer::Error error) {
-                    nhlog::ui()->info("Media player error {} and errorStr {}",
-                                      error,
-                                      this->errorString().toStdString());
-                });
-        connect(this, &MxcMediaProxy::mediaStatusChanged, [this](QMediaPlayer::MediaStatus status) {
-            nhlog::ui()->info("Media player status {} and error {}", status, this->error());
-        });
-    }
+    MxcMediaProxy(QObject *parent = nullptr);
 
     bool loaded() const { return buffer.size() > 0; }
     QString eventId() const { return eventId_; }
@@ -59,12 +46,16 @@ public:
     void setVideoSurface(QAbstractVideoSurface *surface);
     QAbstractVideoSurface *getVideoSurface();
 
+    int orientation() const;
+
 signals:
     void roomChanged();
     void eventIdChanged();
     void loadedChanged();
     void newBuffer(QMediaContent, QIODevice *buf);
 
+    void orientationChanged();
+
 private slots:
     void startDownload();
 
diff --git a/src/ui/Theme.h b/src/ui/Theme.h
index 4fef897d3394aa68d52ad2a7ac02e804a2b570c8..4dbe03f9231e636f10fbda045e9f4cf3d1512784 100644
--- a/src/ui/Theme.h
+++ b/src/ui/Theme.h
@@ -62,6 +62,7 @@ class Theme : public QPalette
     Q_PROPERTY(QColor alternateButton READ alternateButton CONSTANT)
     Q_PROPERTY(QColor separator READ separator CONSTANT)
     Q_PROPERTY(QColor red READ red CONSTANT)
+    Q_PROPERTY(QColor error READ error CONSTANT)
     Q_PROPERTY(QColor orange READ orange CONSTANT)
 public:
     Theme() {}
@@ -72,6 +73,7 @@ public:
     QColor alternateButton() const { return alternateButton_; }
     QColor separator() const { return separator_; }
     QColor red() const { return red_; }
+    QColor error() const { return QColor(0xdd, 0x3d, 0x3d); }
     QColor orange() const { return orange_; }
 
 private: