diff --git a/src/components/CscSendFax.vue b/src/components/CscSendFax.vue
index 73f08e7d..a08236fa 100644
--- a/src/components/CscSendFax.vue
+++ b/src/components/CscSendFax.vue
@@ -58,11 +58,10 @@
                     {{ $t('communication.label.faxFile') }}
                 </div>
                 <q-btn
-                    class="upload-button"
                     flat
-                    dark
-                    @click="$refs.faxUpload.click()"
                     icon="cloud_upload"
+                    class="upload-button"
+                    @click="$refs.faxUpload.click()"
                 >
                     {{ $t('buttons.select') }}
                 </q-btn>
@@ -70,12 +69,11 @@
                     {{ selectedFile }}
                 </span>
                 <q-btn
+                    flat
+                    icon="cancel"
                     class="reset-button"
                     v-if="selectedFile.length > 0"
-                    flat
-                    dark
                     @click="resetFile"
-                    icon-right="cancel"
                 />
             </label>
             <input
@@ -97,7 +95,7 @@
         </div>
         <q-btn
             flat
-            dark
+            icon="clear"
             @click="hideModal"
         >
             {{ $t('communication.cancel') }}
@@ -106,7 +104,7 @@
             flat
             color="primary"
             @click="sendFax"
-            icon-right="insert drive file"
+            icon="insert drive file"
             :disable="formDisabled"
         >
             {{ $t('communication.send') }}
diff --git a/src/components/Login.vue b/src/components/Login.vue
index ddc560b4..3c45970b 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -21,7 +21,7 @@
                         </form>
                     </q-card-main>
                     <q-card-actions class="pull-right">
-                        <q-btn flat icon-right="fa-arrow-right"
+                        <q-btn flat icon="fa-arrow-right"
                                color="primary" @click="login()">{{ $t('pages.login.button') }}</q-btn>
                     </q-card-actions>
                 </q-card>
diff --git a/src/components/pages/CallBlocking/CscCallBlocking.vue b/src/components/pages/CallBlocking/CscCallBlocking.vue
index 2c326a51..c6f81d50 100644
--- a/src/components/pages/CallBlocking/CscCallBlocking.vue
+++ b/src/components/pages/CallBlocking/CscCallBlocking.vue
@@ -25,15 +25,15 @@
         <div id="add-number-form">
             <q-field v-if="!addFormEnabled">
                 <q-btn color="primary"
-                   icon="fa-plus" flat
+                   flat icon="add"
                    @click="enableAddForm()">{{ $t('pages.callBlocking' + suffix + '.addNumberButton') }}</q-btn>
             </q-field>
             <div v-if="addFormEnabled">
                 <q-field :error="addFormError" :error-label="$t('pages.callBlocking' + suffix + '.addInputError')">
                     <q-input type="text" :float-label="$t('callBlocking.number')" v-model="newNumber" clearable @keyup.enter="addNumber()" />
                 </q-field>
-                <q-btn flat @click="disableAddForm()">{{ $t('buttons.cancel') }}</q-btn>
-                <q-btn flat color="primary" icon-right="fa-save" @click="addNumber()">{{ $t('buttons.save') }}</q-btn>
+                <q-btn flat icon="clear" @click="disableAddForm()">{{ $t('buttons.cancel') }}</q-btn>
+                <q-btn flat icon="check" color="primary" @click="addNumber()">{{ $t('buttons.save') }}</q-btn>
             </div>
         </div>
         <div>
@@ -46,7 +46,7 @@
                     <q-input autofocus v-if="editing && editingIndex == index" type="text" :float-label="$t('callBlocking.number')"
                              v-model="editingNumber" @keyup.enter="saveNumber(index)" />
                     <q-btn color="primary" flat v-if="editing && editingIndex == index" slot="right"
-                           icon="fa-save" @click="saveNumber(index)" class="cursor-pointer"><span class="gt-sm">{{ $t('buttons.save') }}</span></q-btn>
+                           icon="check" @click="saveNumber(index)" class="cursor-pointer"><span class="gt-sm">{{ $t('buttons.save') }}</span></q-btn>
                     <q-btn flat v-if="editing && editingIndex == index" slot="right"
                            icon="clear" @click="cancelEdit()" class="cursor-pointer"><span class="gt-sm">{{ $t('buttons.cancel') }}</span></q-btn>
                     <q-btn color="primary" flat v-if="!(editing && editingIndex == index)" slot="right"
diff --git a/src/components/pages/CallForward/CscAddDestinationForm.vue b/src/components/pages/CallForward/CscAddDestinationForm.vue
index d8e9c217..e59b23d1 100644
--- a/src/components/pages/CallForward/CscAddDestinationForm.vue
+++ b/src/components/pages/CallForward/CscAddDestinationForm.vue
@@ -4,7 +4,7 @@
             v-if="!isFormEnabled"
             flat
             color="primary"
-            icon="fa-plus"
+            icon="add"
         >
             {{ $t('pages.callForward.addDestinationButton') }}
             <q-popover ref="popover">
@@ -62,15 +62,15 @@
             </q-field>
             <q-btn
                 flat
-                dark
+                icon="clear"
                 @click="disableForm()"
             >
                 {{ $t('buttons.cancel') }}
             </q-btn>
             <q-btn
                 flat
+                icon="check"
                 color="primary"
-                icon-right="fa-save"
                 @click="addDestination()"
                 :disable="$v.destinationForm.destination.$error || $v.destinationForm.timeout.$error"
             >
diff --git a/src/components/pages/CallForward/CscAddTimeForm.vue b/src/components/pages/CallForward/CscAddTimeForm.vue
index db6a1328..593443fa 100644
--- a/src/components/pages/CallForward/CscAddTimeForm.vue
+++ b/src/components/pages/CallForward/CscAddTimeForm.vue
@@ -22,10 +22,19 @@
                     format24h />
             </q-item-tile>
             <q-item-tile>
-                <q-btn flat dark @click="disableForm()">
+                <q-btn
+                    flat
+                    icon="clear"
+                    @click="disableForm()"
+                >
                     {{ $t('buttons.cancel') }}
                 </q-btn>
-                <q-btn flat color="primary" icon-right="fa-save" @click="addTime()">
+                <q-btn
+                    flat
+                    icon="check"
+                    color="primary"
+                    @click="addTime()"
+                >
                     {{ $t('buttons.save') }}
                 </q-btn>
             </q-item-tile>
diff --git a/src/components/pages/CallForward/CscCallForwardTime.vue b/src/components/pages/CallForward/CscCallForwardTime.vue
index 1ea5ec22..a66aa4cd 100644
--- a/src/components/pages/CallForward/CscCallForwardTime.vue
+++ b/src/components/pages/CallForward/CscCallForwardTime.vue
@@ -108,14 +108,14 @@
                         html: self.$t('pages.callForward.times.removeLastDialogText'),
                         icon: 'warning',
                         actions: [
+                            {
+                                label: self.$t('buttons.cancel')
+                            },
                             {
                                 label: self.$t('buttons.remove'),
                                 handler () {
                                     store.dispatch('callForward/deleteTimesetById')
                                 }
-                            },
-                            {
-                                label: self.$t('buttons.cancel')
                             }
                         ]
                     });
diff --git a/src/components/pages/CallForward/CscCallForwardTimes.vue b/src/components/pages/CallForward/CscCallForwardTimes.vue
index 9e39425c..fb1168c2 100644
--- a/src/components/pages/CallForward/CscCallForwardTimes.vue
+++ b/src/components/pages/CallForward/CscCallForwardTimes.vue
@@ -19,9 +19,10 @@
             />
             <q-btn
                 v-else
+                flat
+                icon="add"
                 color="primary"
                 class="add-time"
-                icon="fa-plus" flat
                 @click="enableAddForm()"
             >
                 {{ $t('pages.callForward.times.addTimeButton') }}
diff --git a/src/components/pages/CallForward/CscDestinations.vue b/src/components/pages/CallForward/CscDestinations.vue
index b864cc67..cbf0ea27 100644
--- a/src/components/pages/CallForward/CscDestinations.vue
+++ b/src/components/pages/CallForward/CscDestinations.vue
@@ -177,13 +177,14 @@
             </q-field>
             <q-btn
                 flat
-                dark
+                icon="clear"
                 @click="hideModal"
             >
                 {{ $t('buttons.cancel') }}
             </q-btn>
             <q-btn
                 flat
+                icon="clear"
                 color="negative"
                 @click="resetTimeout"
             >
@@ -191,9 +192,9 @@
             </q-btn>
             <q-btn
                 flat
+                icon="check"
                 color="primary"
                 @click="updateTimeout"
-                icon-right="fa-save"
                 :disable="$v.editTimeout.$error"
             >
                 {{ $t('buttons.save') }}
diff --git a/src/components/pages/CallForward/CscSourcesets.vue b/src/components/pages/CallForward/CscSourcesets.vue
index 3867e6ff..f0b3c462 100644
--- a/src/components/pages/CallForward/CscSourcesets.vue
+++ b/src/components/pages/CallForward/CscSourcesets.vue
@@ -19,7 +19,7 @@
             slot="title"
             label="Add new"
             name="addnew"
-            icon="fa-plus"
+            icon="add"
         />
         <q-tab-pane
             v-for="sourceset in destinations"
@@ -73,7 +73,7 @@
                     v-if="!sourcesetsFormEnabled"
                     flat
                     color="primary"
-                    icon="fa-plus"
+                    icon="add"
                     @click="openForm()"
                 >
                     {{ $t('pages.callForward.sources.addSourceButton') }}
@@ -121,8 +121,8 @@
                         <q-item-tile>
                             <q-btn
                                 flat
+                                icon="check"
                                 color="primary"
-                                icon-right="fa-save"
                                 @click="addSourceset()"
                                 :disable="!isValid"
                                 class="sourceset-add-button">
diff --git a/src/components/pages/CallForward/CscSourcesetsForm.vue b/src/components/pages/CallForward/CscSourcesetsForm.vue
index 75a1db6f..0add06db 100644
--- a/src/components/pages/CallForward/CscSourcesetsForm.vue
+++ b/src/components/pages/CallForward/CscSourcesetsForm.vue
@@ -10,15 +10,15 @@
         </q-field>
         <q-btn
             flat
-            dark
+            icon="clear"
             @click="disableForm()"
         >
             {{ $t('buttons.cancel') }}
         </q-btn>
         <q-btn
             flat
+            icon="check"
             color="primary"
-            icon-right="fa-save"
             @click="addSource()"
             :disable="!isValid"
         >