diff --git a/app/src/main/java/com/fitworkoutfast/MainActivity.kt b/app/src/main/java/com/fitworkoutfast/MainActivity.kt
index 57d2cee..456164d 100644
--- a/app/src/main/java/com/fitworkoutfast/MainActivity.kt
+++ b/app/src/main/java/com/fitworkoutfast/MainActivity.kt
@@ -238,9 +238,8 @@ class MainActivity : AppCompatActivity() {
                 val mDbCardio = DAOCardio(this)
                 val mList = mDbOldCardio.allRecords
                 for (record in mList) {
-                    var exerciseName = ""
                     val m = lDAOMachine.getMachine(record.exercice)
-                    exerciseName = record.exercice
+                    var exerciseName = record.exercice
                     if (m != null) { // if a machine exists
                         if (m.type == DAOMachine.TYPE_FONTE) { // if it is not a Cardio type
                             exerciseName = "$exerciseName-Cardio" // add a suffix to
@@ -741,7 +740,7 @@ class MainActivity : AppCompatActivity() {
             return mpWeightFrag
         }
     private val programsFragment: ProgramsPagerFragment
-        private get() {
+        get() {
             if (mpProgramPagerFrag == null) mpProgramPagerFrag = supportFragmentManager.findFragmentByTag(PROGRAMS) as ProgramsPagerFragment?
             if (mpProgramPagerFrag == null) mpProgramPagerFrag = newInstance(PROGRAMS, Integer.valueOf(11))
             return mpProgramPagerFrag!!
diff --git a/app/src/main/res/drawable-hdpi/done_check_green_800_24dp.png b/app/src/main/res/drawable-hdpi/done_check_green_800_24dp.png
deleted file mode 100644
index 77d635d..0000000
Binary files a/app/src/main/res/drawable-hdpi/done_check_green_800_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/fail_clear_red_600_24dp.png b/app/src/main/res/drawable-hdpi/fail_clear_red_600_24dp.png
deleted file mode 100644
index 46d201f..0000000
Binary files a/app/src/main/res/drawable-hdpi/fail_clear_red_600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/round_arrow_back_white_36dp.png b/app/src/main/res/drawable-hdpi/round_arrow_back_white_36dp.png
new file mode 100644
index 0000000..31e6cce
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_arrow_back_white_36dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_arrow_forward_white_36dp.png b/app/src/main/res/drawable-hdpi/round_arrow_forward_white_36dp.png
new file mode 100644
index 0000000..b33591e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_arrow_forward_white_36dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_cancel_white_36dp.png b/app/src/main/res/drawable-hdpi/round_cancel_white_36dp.png
new file mode 100644
index 0000000..0a64235
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_cancel_white_36dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_check_white_48dp.png b/app/src/main/res/drawable-hdpi/round_check_white_48dp.png
new file mode 100644
index 0000000..6964b72
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_check_white_48dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/done_check_green_800_24dp.png b/app/src/main/res/drawable-mdpi/done_check_green_800_24dp.png
deleted file mode 100644
index f8e3817..0000000
Binary files a/app/src/main/res/drawable-mdpi/done_check_green_800_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/fail_clear_red_600_24dp.png b/app/src/main/res/drawable-mdpi/fail_clear_red_600_24dp.png
deleted file mode 100644
index 35c06df..0000000
Binary files a/app/src/main/res/drawable-mdpi/fail_clear_red_600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/round_arrow_back_white_36dp.png b/app/src/main/res/drawable-mdpi/round_arrow_back_white_36dp.png
new file mode 100644
index 0000000..bc4af50
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_arrow_back_white_36dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_arrow_forward_white_36dp.png b/app/src/main/res/drawable-mdpi/round_arrow_forward_white_36dp.png
new file mode 100644
index 0000000..282940a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_arrow_forward_white_36dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_cancel_white_36dp.png b/app/src/main/res/drawable-mdpi/round_cancel_white_36dp.png
new file mode 100644
index 0000000..5b59fe1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_cancel_white_36dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_check_white_48dp.png b/app/src/main/res/drawable-mdpi/round_check_white_48dp.png
new file mode 100644
index 0000000..632d623
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_check_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/done_check_green_800_24dp.png b/app/src/main/res/drawable-xhdpi/done_check_green_800_24dp.png
deleted file mode 100644
index 96ee793..0000000
Binary files a/app/src/main/res/drawable-xhdpi/done_check_green_800_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/fail_clear_red_600_24dp.png b/app/src/main/res/drawable-xhdpi/fail_clear_red_600_24dp.png
deleted file mode 100644
index 893631d..0000000
Binary files a/app/src/main/res/drawable-xhdpi/fail_clear_red_600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/round_arrow_back_white_36dp.png b/app/src/main/res/drawable-xhdpi/round_arrow_back_white_36dp.png
new file mode 100644
index 0000000..0f1730a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_arrow_back_white_36dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_arrow_forward_white_36dp.png b/app/src/main/res/drawable-xhdpi/round_arrow_forward_white_36dp.png
new file mode 100644
index 0000000..68cafc7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_arrow_forward_white_36dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_cancel_white_36dp.png b/app/src/main/res/drawable-xhdpi/round_cancel_white_36dp.png
new file mode 100644
index 0000000..0e915da
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_cancel_white_36dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_check_white_48dp.png b/app/src/main/res/drawable-xhdpi/round_check_white_48dp.png
new file mode 100644
index 0000000..5673aad
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_check_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/done_check_green_800_24dp.png b/app/src/main/res/drawable-xxhdpi/done_check_green_800_24dp.png
deleted file mode 100644
index 1ceb782..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/done_check_green_800_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/fail_clear_red_600_24dp.png b/app/src/main/res/drawable-xxhdpi/fail_clear_red_600_24dp.png
deleted file mode 100644
index 7d42cda..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/fail_clear_red_600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_arrow_back_white_36dp.png b/app/src/main/res/drawable-xxhdpi/round_arrow_back_white_36dp.png
new file mode 100644
index 0000000..1a0da6f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_arrow_back_white_36dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_arrow_forward_white_36dp.png b/app/src/main/res/drawable-xxhdpi/round_arrow_forward_white_36dp.png
new file mode 100644
index 0000000..29651c0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_arrow_forward_white_36dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_cancel_white_36dp.png b/app/src/main/res/drawable-xxhdpi/round_cancel_white_36dp.png
new file mode 100644
index 0000000..ce85753
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_cancel_white_36dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_check_white_48dp.png b/app/src/main/res/drawable-xxhdpi/round_check_white_48dp.png
new file mode 100644
index 0000000..f9d9693
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_check_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/done_check_green_800_24dp.png b/app/src/main/res/drawable-xxxhdpi/done_check_green_800_24dp.png
deleted file mode 100644
index e3d35f5..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/done_check_green_800_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/fail_clear_red_600_24dp.png b/app/src/main/res/drawable-xxxhdpi/fail_clear_red_600_24dp.png
deleted file mode 100644
index 96c1149..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/fail_clear_red_600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_arrow_back_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/round_arrow_back_white_36dp.png
new file mode 100644
index 0000000..4cc3c92
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_arrow_back_white_36dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_arrow_forward_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/round_arrow_forward_white_36dp.png
new file mode 100644
index 0000000..11c9c02
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_arrow_forward_white_36dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_cancel_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/round_cancel_white_36dp.png
new file mode 100644
index 0000000..f206436
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_cancel_white_36dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_check_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/round_check_white_48dp.png
new file mode 100644
index 0000000..42b44b8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_check_white_48dp.png differ
diff --git a/app/src/main/res/layout/tab_program_runner.xml b/app/src/main/res/layout/tab_program_runner.xml
index 3610a40..9bead4f 100644
--- a/app/src/main/res/layout/tab_program_runner.xml
+++ b/app/src/main/res/layout/tab_program_runner.xml
@@ -135,7 +135,6 @@
                         android:inputType="none"
                         android:imeOptions="actionNext"
                         android:singleLine="true" />
-                    <!--                        android:inputType="text|textCapWords|textAutoComplete|textNoSuggestions|textVisiblePassword"-->
 
                     <ImageButton
                         android:id="@+id/exercisesListButton"
@@ -561,7 +560,7 @@
                 <ImageButton
                     android:id="@+id/previousExerciseArrow"
                     style="@style/AddImageButton"
-                    android:src="@drawable/ic_previous"
+                    android:src="@drawable/round_arrow_back_white_36dp"
                     android:layout_marginStart="8dp"
                     android:layout_width="64dp"
                     android:minHeight="68dp"
@@ -581,13 +580,14 @@
                 <ImageButton
                     android:id="@+id/failButton"
                     style="@style/AddImageButton"
+                    android:backgroundTint="@color/redWarn"
                     android:layout_width="0dp"
                     android:minHeight="68dp"
                     android:layout_height="wrap_content"
                     android:layout_toStartOf="@+id/addButton"
                     android:layout_toEndOf="@+id/previousExerciseArrow"
                     android:contentDescription="@string/failedToDoReps"
-                    android:src="@drawable/fail_clear_red_600_24dp"
+                    android:src="@drawable/round_cancel_white_36dp"
                     android:text="@string/FailLabel"
                     android:clickable="true"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -598,13 +598,14 @@
                 <ImageButton
                     android:id="@+id/addButton"
                     style="@style/AddImageButton"
+                    android:backgroundTint="@color/main_green_color"
                     android:layout_width="0dp"
                     android:minHeight="68dp"
                     android:layout_height="wrap_content"
                     android:layout_alignParentTop="true"
                     android:layout_toStartOf="@+id/nextExerciseArrow"
                     android:contentDescription="@string/DoneLabel"
-                    android:src="@drawable/done_check_green_800_24dp"
+                    android:src="@drawable/round_check_white_48dp"
                     android:text="@string/DoneLabel"
                     android:clickable="true"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -616,7 +617,7 @@
                 <ImageButton
                     android:id="@+id/nextExerciseArrow"
                     style="@style/AddImageButton"
-                    android:src="@drawable/ic_next"
+                    android:src="@drawable/round_arrow_forward_white_36dp"
                     android:layout_width="64dp"
                     android:minHeight="68dp"
                     android:layout_marginEnd="8dp"
@@ -642,7 +643,7 @@
                 app:fpl_progressDirection="top_to_bottom"
                 app:fpl_shouldRestart="false"
                 app:fpl_gradientDirection="bottom_to_top"
-                app:fpl_gradientColors="@color/cardview_shadow_end_color"
+                app:fpl_gradientColors="@array/gradientColorsBlue"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:visibility="gone">
@@ -675,7 +676,7 @@
                 app:fpl_progressDirection="top_to_bottom"
                 app:fpl_shouldRestart="false"
                 app:fpl_gradientDirection="bottom_to_top"
-                app:fpl_gradientColors="@color/cardview_shadow_end_color"
+                app:fpl_gradientColors="@array/gradientColors"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:visibility="gone">
diff --git a/app/src/main/res/values-night/color.xml b/app/src/main/res/values-night/color.xml
index d360cc1..8be7adf 100644
--- a/app/src/main/res/values-night/color.xml
+++ b/app/src/main/res/values-night/color.xml
@@ -13,5 +13,14 @@
     <color name="add_button_background">#7C7C7C</color>
     <color name="dark_icon_background">#C0C0C0</color>
     <color name="colorSecondary">#FFFFFF</color>
-    <color name="colorAccent">#FFFFFF</color>
+    <color name="colorAccent">#60bf04</color>
+    <color name="redWarn">#D50000</color>
+    <array name="gradientColors">
+        <item>#5E5E5E</item>
+        <item>#388E3C</item>
+    </array>
+    <array name="gradientColorsBlue">
+        <item>#3c40c6</item>
+        <item>#5E5E5E</item>
+    </array>
 </resources>
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index d22c023..fcfc117 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -17,4 +17,13 @@
     <color name="colorPrimary">@color/text_color</color>
     <color name="colorSecondary">#FFFFFF</color>
     <color name="colorAccent">#FFFFFF</color>
+    <color name="redWarn">#D50000</color>
+    <array name="gradientColors">
+        <item>#5E5E5E</item>
+        <item>#388E3C</item>
+    </array>
+    <array name="gradientColorsBlue">
+        <item>#3c40c6</item>
+        <item>#5E5E5E</item>
+    </array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 29616f0..94f8d90 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -376,5 +376,5 @@
     <string name="saved_into_program">Saved into program</string>
     <string name="SaveRepsLabel">Save reps into program</string>
     <string name="add_exercise_to_program_first">Add exercise to program first. No program without exercises allowed.</string>
-    <string name="emptyExercisesInProgram"><![CDATA[Go to Program -> Exercise in program and add exercise to program first]]></string>
+    <string name="emptyExercisesInProgram"><![CDATA[Go to Side Menu(Toggle button), press "Program" -> add exercise to program first]]></string>
 </resources>