diff --git a/src/app/pages/dashboard/solar/solar.component.ts b/src/app/pages/dashboard/solar/solar.component.ts
index 9f386939..77393c25 100644
--- a/src/app/pages/dashboard/solar/solar.component.ts
+++ b/src/app/pages/dashboard/solar/solar.component.ts
@@ -64,7 +64,8 @@ export class SolarComponent implements AfterViewInit {
                     textStyle: {
                       fontSize: '22',
                       fontFamily: config.variables.fontSecondary,
-                      color: config.variables.colorFgHeading,
+                      fontWeight: '600',
+                      color: config.variables.fgHeading,
                     },
                   },
                 },
diff --git a/src/app/pages/dashboard/temperature/temperature.component.html b/src/app/pages/dashboard/temperature/temperature.component.html
index 59b3986c..534b6f54 100644
--- a/src/app/pages/dashboard/temperature/temperature.component.html
+++ b/src/app/pages/dashboard/temperature/temperature.component.html
@@ -22,16 +22,16 @@
       <div [(ngModel)]="temperatureMode" ngbRadioGroup data-toggle="buttons"
            class="btn-group btn-divided-group btn-outline-divided-group btn-group-full-width">
         <label class="btn btn-icon">
-          <input type="radio" value="cool"/><i class="ion-ios-snowy"></i>
+          <input type="radio" value="cool"/><i class="nb-snowy"></i>
         </label>
         <label class="btn btn-icon">
-          <input type="radio" value="warm"/><i class="ion-ios-sunny-outline"></i>
+          <input type="radio" value="warm"/><i class="nb-sunny"></i>
         </label>
         <label class="btn btn-icon">
-          <input type="radio" value="heat"/><i class="ion-ios-flame-outline"></i>
+          <input type="radio" value="heat"/><i class="nb-flame"></i>
         </label>
         <label class="btn btn-icon">
-          <input type="radio" value="fan"/><i class="ion-ios-loop"></i>
+          <input type="radio" value="fan"/><i class="nb-loop"></i>
         </label>
       </div>
     </nb-tab>
@@ -54,16 +54,16 @@
       <div [(ngModel)]="humidityMode" ngbRadioGroup data-toggle="buttons"
            class="btn-group btn-divided-group btn-outline-divided-group btn-group-full-width">
         <label class="btn btn-icon">
-          <input type="radio" value="cool"/><i class="ion-ios-snowy"></i>
+          <input type="radio" value="cool"/><i class="nb-snowy"></i>
         </label>
         <label class="btn btn-icon">
-          <input type="radio" value="warm"/><i class="ion-ios-sunny-outline"></i>
+          <input type="radio" value="warm"/><i class="nb-sunny"></i>
         </label>
         <label class="btn btn-icon">
-          <input type="radio" value="heat"/><i class="ion-ios-flame-outline"></i>
+          <input type="radio" value="heat"/><i class="nb-flame"></i>
         </label>
         <label class="btn btn-icon">
-          <input type="radio" value="fan"/><i class="ion-ios-loop"></i>
+          <input type="radio" value="fan"/><i class="nb-loop"></i>
         </label>
       </div>
     </nb-tab>
diff --git a/src/app/pages/dashboard/temperature/temperature.component.scss b/src/app/pages/dashboard/temperature/temperature.component.scss
index 743da2ea..30404089 100644
--- a/src/app/pages/dashboard/temperature/temperature.component.scss
+++ b/src/app/pages/dashboard/temperature/temperature.component.scss
@@ -108,20 +108,8 @@
     }
 
     i {
-      font-size: 2rem;
-      line-height: 1;
-    }
-    .ion-ios-snowy {
-      font-size: 2.5rem;
-    }
-    .ion-ios-sunny-outline {
-      font-size: 2.5rem;
-    }
-    .ion-ios-flame-outline {
-      font-size: 2.25rem;
-    }
-    .ion-ios-loop {
       font-size: 1.75rem;
+      line-height: 1;
     }
   }