diff --git a/images/siteicons/draggable.png b/images/siteicons/draggable.png
deleted file mode 100644
index 55d8da3e8..000000000
Binary files a/images/siteicons/draggable.png and /dev/null differ
diff --git a/images/siteicons/editavatar.png b/images/siteicons/editavatar.png
deleted file mode 100644
index f61b882d1..000000000
Binary files a/images/siteicons/editavatar.png and /dev/null differ
diff --git a/images/siteicons/filter.png b/images/siteicons/filter.png
deleted file mode 100644
index 5cbc99104..000000000
Binary files a/images/siteicons/filter.png and /dev/null differ
diff --git a/images/siteicons/plusicon.png b/images/siteicons/plusicon.png
deleted file mode 100644
index 308b5cf5e..000000000
Binary files a/images/siteicons/plusicon.png and /dev/null differ
diff --git a/images/siteicons/sort.png b/images/siteicons/sort.png
deleted file mode 100644
index 1c5661a17..000000000
Binary files a/images/siteicons/sort.png and /dev/null differ
diff --git a/includes/version.php b/includes/version.php
index 736063a9f..cbed1a69a 100644
--- a/includes/version.php
+++ b/includes/version.php
@@ -1,3 +1,3 @@
 <?php
-    $version = "v2.0.0";
+    $version = "v2.1.0";
 ?>
diff --git a/index.php b/index.php
index fc94e88c1..ec606e56c 100644
--- a/index.php
+++ b/index.php
@@ -39,7 +39,7 @@
     <section class="contain">
       <header class="<?= $headerClass ?>" id="main-actions">
         <button class="button" onClick="addSubscription()">
-          <img class="button-icon" src="images/siteicons/plusicon.png">
+          <i class="fa-solid fa-circle-plus"></i>
           <?= translate('new_subscription', $i18n) ?>
         </button>
         <div class="top-actions">
@@ -49,7 +49,7 @@
           </div>  
 
           <div class="filtermenu on-dashboard">
-            <button class="button" id="filtermenu-button" title="<?= translate("filter", $i18n) ?>">
+            <button class="button secondary-button" id="filtermenu-button" title="<?= translate("filter", $i18n) ?>">
               <i class="fa-solid fa-filter"></i>
             </button>
             <div class="filtermenu-content">
@@ -128,8 +128,8 @@
           </div>
 
           <div class="sort-container">
-            <button class="button" value="Sort" onClick="toggleSortOptions()" id="sort-button" title="<?= translate('sort', $i18n) ?>">
-              <img src="images/siteicons/sort.png" class="button-icon" />
+            <button class="button secondary-button" value="Sort" onClick="toggleSortOptions()" id="sort-button" title="<?= translate('sort', $i18n) ?>">
+              <i class="fa-solid fa-arrow-down-wide-short"></i>
             </button>
             <div class="sort-options" id="sort-options">
               <ul>
@@ -195,7 +195,7 @@
                   <?= translate('no_subscriptions_yet', $i18n) ?>
                 </p>
                 <button class="button" onClick="addSubscription()">
-                  <img class="button-icon" src="images/siteicons/plusicon.png">
+                  <i class="fa-solid fa-circle-plus"></i>
                   <?= translate('add_first_subscription', $i18n) ?>
                 </button>
               </div>
diff --git a/service-worker.js b/service-worker.js
index 29ced3cd6..b4614c6db 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -41,6 +41,9 @@ self.addEventListener('install', function(event) {
                 'scripts/i18n/pt.js',
                 'scripts/i18n/pt_br.js',
                 'scripts/i18n/ru.js',
+                'scripts/i18n/sl.js',
+                'scripts/i18n/sr_lat.js',
+                'scripts/i18n/sr.js',
                 'scripts/i18n/tr.js',
                 'scripts/i18n/zh_cn.js',
                 'scripts/i18n/zh_tw.js',
diff --git a/settings.php b/settings.php
index 8b40556aa..710641b48 100644
--- a/settings.php
+++ b/settings.php
@@ -19,8 +19,8 @@
                         <div>
                             <div class="user-avatar">
                                 <img src="<?= $userData['avatar'] ?>" alt="avatar" class="avatar" id="avatarImg" onClick="toggleAvatarSelect()"/>
-                                <span class="edit-avatar" onClick="toggleAvatarSelect()">
-                                    <img src="images/siteicons/editavatar.png" title="Change avatar" />
+                                <span class="edit-avatar" onClick="toggleAvatarSelect()" title="Change Avatar">
+                                    <i class="fa-solid fa-pencil"></i>
                                 </span>
                             </div>
 
@@ -623,7 +623,7 @@
                         }
                     ?>
                     <div class="form-group-inline" data-categoryid="<?= $category['id'] ?>">
-                        <div class="drag-icon"></div>
+                        <div class=" drag-icon"><i class="fa-solid fa-grip-vertical"></i></div>
                         <input type="text" name="category" value="<?= $category['name'] ?>" placeholder="Category">
                         <button class="image-button medium"  onClick="editCategory(<?= $category['id'] ?>)" name="save">
                             <img src="images/siteicons/<?= $colorTheme ?>/save.png" title="<?= translate('save_category', $i18n) ?>">
@@ -861,7 +861,9 @@
                              data-in-use="<?= $inUse ? 'yes' : 'no' ?>"
                              data-paymentid="<?= $payment['id'] ?>"
                              title="<?= $inUse ? translate('cant_delete_payment_method_in_use', $i18n) : ($payment['enabled'] ? translate('disable', $i18n) : translate('enable', $i18n)) ?>">
-                            <div class="drag-icon" title=""></div>
+                            <div class="drag-icon" title="">
+                                <i class="fa-solid fa-grip-vertical"></i>
+                            </div>
                             <img src="<?= $paymentIconFolder.$payment['icon'] ?>"  alt="Logo" />
                             <span class="payment-name" contenteditable="true" title="<?= translate("rename_payment_method", $i18n) ?>"><?= $payment['name'] ?></span>
                             <?php
diff --git a/stats.php b/stats.php
index 7dbded6c4..7267650a7 100644
--- a/stats.php
+++ b/stats.php
@@ -23,7 +23,7 @@ function getPricePerMonth($cycle, $frequency, $price) {
   }
 
 
-  function getPriceConverted($price, $currency, $database) {
+  function getPriceConverted($price, $currency, $database, $userId) {
       $query = "SELECT rate FROM currencies WHERE id = :currency AND user_id = :userId";
       $stmt = $database->prepare($query);
       $stmt->bindParam(':currency', $currency, SQLITE3_INTEGER);
@@ -153,7 +153,7 @@ function getPriceConverted($price, $currency, $database) {
       $categoryId = $subscription['category_id'];
       $paymentMethodId = $subscription['payment_method_id'];
       $inactive = $subscription['inactive'];
-      $originalSubscriptionPrice = getPriceConverted($price, $currency, $db);
+      $originalSubscriptionPrice = getPriceConverted($price, $currency, $db, $userId);
       $price = getPricePerMonth($cycle, $frequency, $originalSubscriptionPrice);
 
       if ($inactive == 0) {
@@ -229,7 +229,7 @@ function getPriceConverted($price, $currency, $database) {
       <?= translate('general_statistics', $i18n) ?> <span class="header-subtitle"><?= $statsSubtitle ?></span>
     </h2>
     <div class="filtermenu">
-      <button class="button" id="filtermenu-button">
+      <button class="button secondary-button" id="filtermenu-button">
         <i class="fa-solid fa-filter"></i>
         <?= translate("filter", $i18n) ?>
       </button>
diff --git a/styles/styles.css b/styles/styles.css
index 90275da6b..c8caa2bdb 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -541,6 +541,8 @@ header #avatar {
     background-color: rgba(0,0,0,0.6);
     border-radius: 39px;
     cursor: pointer;
+    color: #FFFFFF;
+    font-size: 30px;
 }
 
 .user-form .user-avatar:hover > .edit-avatar {
@@ -553,10 +555,6 @@ header #avatar {
   }
 }
 
-.user-form .user-avatar .edit-avatar > img {
-  width: 30px;
-}
-
 .avatar-select {
   display: none;
   background-color: white;
@@ -784,8 +782,8 @@ header #avatar {
 
 .payments-list .payments-payment .drag-icon {
   height: 20px;
-  width: 12px;
-  background-size: contain;
+  width: 14px;
+  font-size: 14px;
 }
 
 .payments-list .payments-payment > img {
@@ -1616,16 +1614,17 @@ textarea.thin {
   width: 28px;
   height: 50px;
   cursor: grab;
-  background-image: url(../images/siteicons/draggable.png);
-  background-repeat: no-repeat;
-  background-position: center;
-  background-size: 14px auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 20px;
 }
 
 .sortable-list .sortable-ghost {
-  border-radius: 16px;
+  border-radius: 8px;
   background-color: rgba(var(--accent-color-rgb), 0.6);
   border: 1px solid var(--accent-color);
+  padding: 5px;
 }
 
 /* Fitler dropdown */
@@ -1865,6 +1864,7 @@ textarea.thin {
   display: flex;
   flex-direction: row;
   flex-grow: 1;
+  flex-wrap: wrap;
 }
 
 .user-list .user-list-row {
@@ -1873,6 +1873,12 @@ textarea.thin {
   flex-grow: 1;
 }
 
+@media (max-width: 768px) {
+  .user-list .user-list-row  {
+    flex-direction: column;
+  }
+}
+
 .user-list .user-list-row:last-of-type {
   flex-grow: 0;
 }