diff --git a/frontend/src/app/app.constants.ts b/frontend/src/app/app.constants.ts
index 0456f2647..5cc446dbf 100644
--- a/frontend/src/app/app.constants.ts
+++ b/frontend/src/app/app.constants.ts
@@ -159,19 +159,11 @@ export const specialBlocks = {
 };
 
 export const fiatCurrencies = {
-  AED: {
-    name: 'UAE Dirham',
-    code: 'AED'
-  },
   AUD: {
     name: 'Australian Dollar',
     code: 'AUD',
     indexed: true,
   },
-  BRL: {
-    name: 'Brazilian Real',
-    code: 'BRL'
-  },
   CAD: {
     name: 'Canadian Dollar',
     code: 'CAD',
@@ -192,62 +184,14 @@ export const fiatCurrencies = {
     code: 'GBP',
     indexed: true,
   },
-  HKD: {
-    name: 'Hong Kong Dollar',
-    code: 'HKD'
-  },
-  IDR: {
-    name: 'Indonesian Rupiah',
-    code: 'IDR'
-  },
   JPY: {
     name: 'Japanese Yen',
     code: 'JPY',
     indexed: true,
   },
-  KRW: {
-    name: 'Korean Won',
-    code: 'KRW'
-  },
-  MYR: {
-    name: 'Malaysian Ringgit',
-    code: 'MYR'
-  },
-  NGN: {
-    name: 'Nigerian Naira',
-    code: 'NGN'
-  },
-  NZD: {
-    name: 'New Zealand Dollar',
-    code: 'NZD'
-  },
-  PLN: {
-    name: 'Polish Złoty',
-    code: 'PLN'
-  },
-  RUB: {
-    name: 'Russian Ruble',
-    code: 'RUB'
-  },
-  SGD: {
-    name: 'Singapore Dollar',
-    code: 'SGD'
-  },
-  TRY: {
-    name: 'Turkish Lira',
-    code: 'TRY'
-  },
-  UAH: {
-    name: 'Ukrainian Hryvnia',
-    code: 'UAH'
-  },
   USD: {
     name: 'US Dollar',
     code: 'USD',
     indexed: true,
   },
-  ZAR: {
-    name: 'South African Rand',
-    code: 'ZAR'
-  },
 };
\ No newline at end of file
diff --git a/frontend/src/app/components/fiat-selector/fiat-selector.component.html b/frontend/src/app/components/fiat-selector/fiat-selector.component.html
index 7fa8c0d00..dd32b1815 100644
--- a/frontend/src/app/components/fiat-selector/fiat-selector.component.html
+++ b/frontend/src/app/components/fiat-selector/fiat-selector.component.html
@@ -1,5 +1,5 @@
 <div [formGroup]="fiatForm" class="text-small text-center">
-    <select formControlName="fiat" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 180px;" (change)="changeFiat()">
-        <option *ngFor="let currency of currencyList" [value]="currency">{{ currencies[currency].name }}</option>
+    <select formControlName="fiat" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 200px;" (change)="changeFiat()">
+        <option *ngFor="let currency of currencies" [value]="currency[1].code">{{ currency[1].name + " (" + currency[1].code + ")" }}</option>
     </select>
 </div>
diff --git a/frontend/src/app/components/fiat-selector/fiat-selector.component.ts b/frontend/src/app/components/fiat-selector/fiat-selector.component.ts
index f967b7d77..337ef11f3 100644
--- a/frontend/src/app/components/fiat-selector/fiat-selector.component.ts
+++ b/frontend/src/app/components/fiat-selector/fiat-selector.component.ts
@@ -12,8 +12,15 @@ import { StateService } from '../../services/state.service';
 })
 export class FiatSelectorComponent implements OnInit {
   fiatForm: UntypedFormGroup;
-  currencies = fiatCurrencies;
-  currencyList = Object.keys(fiatCurrencies).sort();
+  currencies = Object.entries(fiatCurrencies).sort((a: any, b: any) => {
+    if (a[1].name < b[1].name) {
+      return -1;
+    }
+    if (a[1].name > b[1].name) {
+      return 1;
+    }
+    return 0;
+  });
 
   constructor(
     private formBuilder: UntypedFormBuilder,
diff --git a/frontend/src/app/components/language-selector/language-selector.component.html b/frontend/src/app/components/language-selector/language-selector.component.html
index b23b2b7b7..22839441c 100644
--- a/frontend/src/app/components/language-selector/language-selector.component.html
+++ b/frontend/src/app/components/language-selector/language-selector.component.html
@@ -1,5 +1,5 @@
 <div [formGroup]="languageForm" class="text-small text-center">
-    <select formControlName="language" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 180px;" (change)="changeLanguage()">
+    <select formControlName="language" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 200px;" (change)="changeLanguage()">
         <option *ngFor="let lang of languages" [value]="lang.code">{{ lang.name }}</option>
     </select>
 </div>