diff --git a/app/src/main/res/drawable/divide.xml b/app/src/main/res/drawable/divide.xml
deleted file mode 100644
index 63153145..00000000
--- a/app/src/main/res/drawable/divide.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector android:height="24dp" android:tint="?attr/text_color"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group
-        android:scaleX="@dimen/icon_scale"
-        android:scaleY="@dimen/icon_scale"
-        android:translateX="@dimen/icon_translate"
-        android:translateY="@dimen/icon_translate">
-        <path android:fillColor="@android:color/white" android:pathData="M 23.75,14.028217 H 0.25 v -3.956434 h 23.5 v 3.956434 M 11.95,0.05 c 1.8,0 3.17,1.33 3.17,3.17 0,1.8 -1.33,3.17 -3.17,3.17 -1.8,0 -3.17,-1.33 -3.17,-3.17 0,-1.8 1.33,-3.17 3.17,-3.17 m 0,17.46 c 1.8,0 3.22,1.38 3.22,3.22 0,1.8 -1.38,3.22 -3.22,3.22 -1.8,0 -3.22,-1.38 -3.22,-3.22 0,-1.8 1.38,-3.22 3.22,-3.22 z"/>
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/equals.xml b/app/src/main/res/drawable/equals.xml
deleted file mode 100644
index a939ff0c..00000000
--- a/app/src/main/res/drawable/equals.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector android:height="24dp" android:tint="?attr/text_color"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group
-        android:scaleX="@dimen/icon_scale"
-        android:scaleY="@dimen/icon_scale"
-        android:translateX="@dimen/icon_translate"
-        android:translateY="@dimen/icon_translate">
-        <path android:fillColor="@android:color/white" android:pathData="M 24,8.7 H 0 V 4.7 h 24 z"/>
-        <path android:fillColor="@android:color/white" android:pathData="M 24,19.29167 H 0 v -4 h 24 z"/>
-    </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/exponent.xml b/app/src/main/res/drawable/exponent.xml
deleted file mode 100644
index b5c12991..00000000
--- a/app/src/main/res/drawable/exponent.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector android:height="24dp" android:tint="?attr/text_color"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group
-        android:scaleX="@dimen/icon_scale"
-        android:scaleY="@dimen/icon_scale"
-        android:translateX="@dimen/icon_translate"
-        android:translateY="@dimen/icon_translate">
-        <path android:fillColor="@android:color/white" android:pathData="m 21.320833,18.195 h -4.56 l -4.59,-7.78 -4.5899997,7.82 h -4.56 L 10.320833,6.1066667 h 3.68 z"/>
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/subtract.xml b/app/src/main/res/drawable/subtract.xml
deleted file mode 100644
index 240dbb3f..00000000
--- a/app/src/main/res/drawable/subtract.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector android:height="24dp" android:tint="?attr/text_color"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group
-        android:scaleX="@dimen/icon_scale"
-        android:scaleY="@dimen/icon_scale"
-        android:translateX="@dimen/icon_translate"
-        android:translateY="@dimen/icon_translate">
-        <path android:fillColor="@android:color/white" android:pathData="M 24,14 H 0 v -4 h 24 z"/>
-    </group>
-</vector>
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 9688bd6a..39c217e7 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -5,8 +5,8 @@
     android:id="@+id/mainConstraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
-    android:animateLayoutChanges="true">
+    android:animateLayoutChanges="true"
+    tools:context=".MainActivity">
 
     <com.sothree.slidinguppanel.SlidingUpPanelLayout
         android:id="@+id/sliding_layout"
@@ -23,16 +23,15 @@
             android:id="@+id/constraintLayout2"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            tools:context=".MainActivity"
-            >
+            tools:context=".MainActivity">
 
             <TableLayout
                 android:id="@+id/tableLayout"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:padding="8dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:padding="8dp">
+                app:layout_constraintTop_toTopOf="parent">
 
                 <TableRow
                     android:layout_width="match_parent"
@@ -93,7 +92,7 @@
                         android:onClick="keyDigitPadMappingToDisplay"
                         android:text="@string/nine" />
 
-                    <ImageButton
+                    <Button
                         android:id="@+id/divideButton"
                         style="@style/CalculatorButton.Small"
                         android:layout_width="0dp"
@@ -101,7 +100,7 @@
                         android:layout_weight="1"
                         android:backgroundTint="?attr/button_symbol_color"
                         android:onClick="divideButton"
-                        app:srcCompat="@drawable/divide" />
+                        android:text="@string/divide" />
 
                     <Button
                         android:id="@+id/clearButton"
@@ -111,9 +110,8 @@
                         android:layout_weight="1"
                         android:backgroundTint="?attr/button_clear_color"
                         android:onClick="clearButton"
-                        android:textSize="18sp"
                         android:text="@string/clear"
-                         />
+                        android:textSize="18sp" />
 
                 </TableRow>
 
@@ -195,7 +193,7 @@
                         android:layout_weight="1"
                         android:backgroundTint="?attr/button_symbol_color"
                         android:onClick="parenthesesButton"
-                        android:text= "@string/parentheses" />
+                        android:text="@string/parentheses" />
 
                 </TableRow>
 
@@ -258,9 +256,9 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:onClick="keyDigitPadMappingToDisplay"
-                        android:text="@string/three"/>
+                        android:text="@string/three" />
 
-                    <ImageButton
+                    <Button
                         android:id="@+id/subtractButton"
                         style="@style/CalculatorButton.Small"
                         android:layout_width="0dp"
@@ -268,17 +266,17 @@
                         android:layout_weight="1"
                         android:backgroundTint="?attr/button_symbol_color"
                         android:onClick="subtractButton"
-                        app:srcCompat="@drawable/subtract" />
+                        android:text="@string/subtract" />
 
-                    <ImageButton
+                    <Button
                         android:id="@+id/exponentButton"
                         style="@style/CalculatorButton.Small"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
+                        android:layout_margin="0dp"
                         android:layout_weight="1"
-                        android:backgroundTint="?attr/button_symbol_color"
                         android:onClick="exponentButton"
-                        app:srcCompat="@drawable/exponent" />
+                        android:text="@string/exponent" />
 
                 </TableRow>
 
@@ -352,7 +350,7 @@
                         android:onClick="addButton"
                         app:srcCompat="@drawable/add" />
 
-                    <ImageButton
+                    <Button
                         android:id="@+id/equalsButton"
                         style="@style/CalculatorButton.Small"
                         android:layout_width="0dp"
@@ -360,10 +358,8 @@
                         android:layout_weight="1"
                         android:backgroundTint="?attr/button_equals_color"
                         android:onClick="equalsButton"
-                        app:srcCompat="@drawable/equals"/>
-
+                        android:text="@string/equals" />
                 </TableRow>
-
             </TableLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -372,8 +368,8 @@
             android:id="@+id/constraintLayout3"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            tools:context=".MainActivity"
-            android:background="@drawable/display_background">
+            android:background="@drawable/display_background"
+            tools:context=".MainActivity">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/history_recylcle_view"
@@ -381,17 +377,17 @@
                 android:layout_height="0dp"
                 android:layout_marginBottom="15dp"
                 android:background="?attr/history_background_color"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toTopOf="@+id/sliding_layout_button"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/sliding_layout_button"/>
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <View
                 android:id="@+id/sliding_layout_button"
                 android:layout_width="30dp"
                 android:layout_height="4dp"
-                android:layout_marginBottom="12dp"
                 android:layout_marginTop="18dp"
+                android:layout_marginBottom="12dp"
                 android:background="?attr/text_color"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -406,11 +402,11 @@
         android:id="@+id/inputHorizontalScrollView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/guideline1"
-        app:layout_constraintTop_toTopOf="parent"
         android:background="?attr/foreground_color"
+        android:overScrollMode="never"
         android:scrollbars="none"
-        android:overScrollMode="never">
+        app:layout_constraintBottom_toTopOf="@+id/guideline1"
+        app:layout_constraintTop_toTopOf="parent">
 
         <EditText
             android:id="@+id/input"
@@ -419,6 +415,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="right"
             android:autofillHints="false"
+            android:background="?attr/foreground_color"
             android:inputType="textNoSuggestions"
             android:paddingHorizontal="30sp"
             android:singleLine="true"
@@ -426,7 +423,6 @@
             android:textAlignment="textEnd"
             android:textColor="?attr/text_color"
             android:textSize="55sp"
-            android:background="?attr/foreground_color"
             tools:ignore="RtlCompat" />
 
     </HorizontalScrollView>
@@ -457,34 +453,34 @@
         android:id="@+id/resultDisplayHorizontalScrollView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/guideline2"
-        app:layout_constraintTop_toTopOf="@+id/guideline1"
         android:background="?attr/foreground_color"
-        android:scrollbars="none"
+        android:fillViewport="true"
         android:overScrollMode="never"
-        android:fillViewport="true">
+        android:scrollbars="none"
+        app:layout_constraintBottom_toTopOf="@+id/guideline2"
+        app:layout_constraintTop_toTopOf="@+id/guideline1">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:gravity="end">
+            android:gravity="end"
+            android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/resultDisplay"
                 style="@style/RobotoFontCondensedMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:background="?attr/foreground_color"
+                android:paddingStart="18dp"
+                android:paddingEnd="30sp"
                 android:scrollHorizontally="true"
-                android:textIsSelectable="true"
                 android:singleLine="true"
-                android:background="?attr/foreground_color"
                 android:text=""
-                android:textColor="?attr/text_second_color"
                 android:textAlignment="textEnd"
-                android:textSize="30sp"
-                android:paddingStart="18dp"
-                android:paddingEnd="30sp"/>
+                android:textColor="?attr/text_second_color"
+                android:textIsSelectable="true"
+                android:textSize="30sp" />
 
         </LinearLayout>
 
@@ -518,15 +514,15 @@
 
     <TextView
         android:id="@+id/degreeTextView"
+        style="@style/RobotoFontCondensedMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="visible"
         android:layout_marginStart="12dp"
         android:layout_marginTop="8dp"
-        style="@style/RobotoFontCondensedMedium"
-        android:textSize="25sp"
         android:text="DEG"
         android:textColor="?attr/text_third_color"
+        android:textSize="25sp"
+        android:visibility="visible"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout-sw720dp-land/activity_main.xml b/app/src/main/res/layout-sw720dp-land/activity_main.xml
index cac19874..3dcce4bd 100644
--- a/app/src/main/res/layout-sw720dp-land/activity_main.xml
+++ b/app/src/main/res/layout-sw720dp-land/activity_main.xml
@@ -344,17 +344,17 @@
                         android:onClick="parenthesesButton"
                         android:text= "@string/parentheses" />
 
-                    <ImageButton
+                    <Button
                         android:id="@+id/exponentButton"
                         style="@style/CalculatorButton.Small"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
+                        android:layout_margin="0dp"
                         android:layout_weight="1"
-                        android:backgroundTint="?attr/button_symbol_color"
                         android:onClick="exponentButton"
-                        app:srcCompat="@drawable/exponent" />
+                        android:text="@string/exponent" />
 
-                    <ImageButton
+                    <Button
                         android:id="@+id/divideButton"
                         style="@style/CalculatorButton.Small"
                         android:layout_width="0dp"
@@ -362,7 +362,7 @@
                         android:layout_weight="1"
                         android:backgroundTint="?attr/button_symbol_color"
                         android:onClick="divideButton"
-                        app:srcCompat="@drawable/divide" />
+                        android:text="@string/divide" />
                 </TableRow>
 
                 <TableRow
@@ -447,7 +447,7 @@
                         android:text="@string/six"
                         android:textSize="@dimen/button_text_size"/>
 
-                    <ImageButton
+                    <Button
                         android:id="@+id/subtractButton"
                         style="@style/CalculatorButton.Small"
                         android:layout_width="0dp"
@@ -455,7 +455,7 @@
                         android:layout_weight="1"
                         android:backgroundTint="?attr/button_symbol_color"
                         android:onClick="subtractButton"
-                        app:srcCompat="@drawable/subtract" />
+                        android:text="@string/subtract" />
                 </TableRow>
 
                 <TableRow
@@ -540,7 +540,7 @@
                         app:srcCompat="@drawable/backspace_720dp"
                         tools:ignore="SpeakableTextPresentCheck" />
 
-                    <ImageButton
+                    <Button
                         android:id="@+id/equalsButton"
                         style="@style/CalculatorButton.Small"
                         android:layout_width="0dp"
@@ -548,11 +548,9 @@
                         android:layout_weight="1"
                         android:backgroundTint="?attr/button_equals_color"
                         android:onClick="equalsButton"
-                        app:srcCompat="@drawable/equals" />
+                        android:text="@string/equals" />
                 </TableRow>
             </TableLayout>
-
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2b5920b3..701317af 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -154,7 +154,7 @@
                         android:text="@string/pi"
                         android:textSize="26sp" />
 
-                    <ImageButton
+                    <Button
                         android:id="@+id/exponentButton"
                         style="@style/CalculatorButton.Function"
                         android:layout_width="0dp"
@@ -162,7 +162,8 @@
                         android:layout_margin="0dp"
                         android:layout_weight="1"
                         android:onClick="exponentButton"
-                        app:srcCompat="@drawable/exponent" />
+                        android:text="@string/exponent"
+                        android:textSize="26sp" />
 
                     <Button
                         android:id="@+id/factorialButton"
@@ -563,8 +564,7 @@
                         android:layout_weight="1"
                         android:backgroundTint="?attr/button_equals_color"
                         android:onClick="equalsButton"
-                        android:text="@string/equals"
-                        android:textSize="32sp" />
+                        android:text="@string/equals" />
                 </TableRow>
             </TableLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a1068cfc..6ede2cb0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,6 +30,7 @@
     <string name="squareInv" translatable="false">x²</string>
     <string name="squareInvModuloVersion" translatable="false">#</string>
     <string name="pi" translatable="false">π</string>
+    <string name="exponent" translatable="false">^</string>
     <string name="factorial" translatable="false">!</string>
 
     <string name="degree" translatable="false">DEG</string>