diff --git a/Android.bp b/Android.bp
index e2c2a1cb20ea266b6a70662c4b1ac567ea7e4a70..ef62148fbe89692c523c35559d98f08291d1168d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,5 +31,6 @@ android_app {
         "com.google.android.material_material",
         "ExactCalculator_com.hp_crcalc",
         "kotlin-stdlib",
+        "elib",
     ],
 }
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..7a4a3ea2424c09fbe48d455aed1eaa94d9124835
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
index 4b7005db14836158ea3622d986534674d230f6ba..001de406275c055bd19c94832a77c5f84285b9c8 100644
--- a/res/drawable/ic_launcher_background.xml
+++ b/res/drawable/ic_launcher_background.xml
@@ -1,47 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright Murena SAS 2024
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <path
-      android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M42,30L66,30A4,4 0,0 1,70 34L70,74A4,4 0,0 1,66 78L42,78A4,4 0,0 1,38 74L38,34A4,4 0,0 1,42 30z"
-      android:fillColor="#551E22"/>
-  <path
-      android:pathData="M38,34C38,31.791 39.791,30 42,30H66C68.209,30 70,31.791 70,34V46H38V34Z"
-      android:fillColor="#2A3232"/>
-  <path
-      android:pathData="M44,52m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#AD2F3C"/>
-  <path
-      android:pathData="M44,62m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#AD2F3C"/>
-  <path
-      android:pathData="M44,72m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#AD2F3C"/>
-  <path
-      android:pathData="M54,52m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#AD2F3C"/>
-  <path
-      android:pathData="M54,62m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#AD2F3C"/>
-  <path
-      android:pathData="M54,72m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#AD2F3C"/>
-  <path
-      android:pathData="M64,52m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#AD2F3C"/>
-  <path
-      android:pathData="M64,62m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#AD2F3C"/>
-  <path
-      android:pathData="M64,72m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#AD2F3C"/>
+  <group>
+    <clip-path
+        android:pathData="M0,0h108v108h-108z"/>
+    <path
+        android:pathData="M0,0h108v108h-108z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="54.06"
+            android:startY="0"
+            android:endX="54.06"
+            android:endY="108"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFFFFF"/>
+          <item android:offset="1" android:color="#FFE8E9F6"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M0,0h108v108h-108z"
+        android:fillColor="#708F97"/>
+    <path
+        android:pathData="M0,0h108v108h-108z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="54"
+            android:startY="9.88"
+            android:endX="54"
+            android:endY="105.89"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFF7300"/>
+          <item android:offset="1" android:color="#FFFF3D00"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M0,0h108v108h-108z"
+        android:fillColor="#2D313E"/>
+    <path
+        android:pathData="M0,0h108v108h-108z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="54"
+            android:startY="0"
+            android:endX="54"
+            android:endY="108"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF4E5261"/>
+          <item android:offset="1" android:color="#FF26282D"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M54.31,-0L54.31,108"
+        android:strokeAlpha="0.25"
+        android:strokeWidth="0.62069"
+        android:fillColor="#00000000"
+        android:strokeColor="#ffffff"/>
+    <path
+        android:pathData="M54,54H108V108H54V54Z"
+        android:fillColor="#D9D9D9"/>
+    <path
+        android:pathData="M54,54H108V108H54V54Z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="81"
+            android:startY="58.94"
+            android:endX="81"
+            android:endY="106.94"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFF7300"/>
+          <item android:offset="1" android:color="#FFFF3D00"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M0,53.69L108,53.69"
+        android:strokeAlpha="0.25"
+        android:strokeWidth="0.62069"
+        android:fillColor="#00000000"
+        android:strokeColor="#ffffff"/>
+  </group>
 </vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
index e2f10e21febbc49eb4d7e78e7b77bd71942e79c3..3b3724facf9808161fc5bc660ef6ee96a9f43de1 100644
--- a/res/drawable/ic_launcher_foreground.xml
+++ b/res/drawable/ic_launcher_foreground.xml
@@ -1,57 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright Murena SAS 2024
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group>
-    <clip-path
-        android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:pathData="M41,48L47,48A1,1 0,0 1,48 49L48,55A1,1 0,0 1,47 56L41,56A1,1 0,0 1,40 55L40,49A1,1 0,0 1,41 48z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M41,58L47,58A1,1 0,0 1,48 59L48,65A1,1 0,0 1,47 66L41,66A1,1 0,0 1,40 65L40,59A1,1 0,0 1,41 58z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M40,69C40,68.448 40.448,68 41,68H47C47.552,68 48,68.448 48,69V75C48,75.552 47.552,76 47,76H42C40.895,76 40,75.105 40,74V69Z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M51,48L57,48A1,1 0,0 1,58 49L58,55A1,1 0,0 1,57 56L51,56A1,1 0,0 1,50 55L50,49A1,1 0,0 1,51 48z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M61,48L67,48A1,1 0,0 1,68 49L68,55A1,1 0,0 1,67 56L61,56A1,1 0,0 1,60 55L60,49A1,1 0,0 1,61 48z"
-        android:fillColor="#F93B4F"/>
-    <path
-        android:pathData="M51,58L57,58A1,1 0,0 1,58 59L58,65A1,1 0,0 1,57 66L51,66A1,1 0,0 1,50 65L50,59A1,1 0,0 1,51 58z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M61,58L67,58A1,1 0,0 1,68 59L68,65A1,1 0,0 1,67 66L61,66A1,1 0,0 1,60 65L60,59A1,1 0,0 1,61 58z"
-        android:fillColor="#F93B4F"/>
-    <path
-        android:pathData="M51,68L57,68A1,1 0,0 1,58 69L58,75A1,1 0,0 1,57 76L51,76A1,1 0,0 1,50 75L50,69A1,1 0,0 1,51 68z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M60,69C60,68.448 60.448,68 61,68H67C67.552,68 68,68.448 68,69V74C68,75.105 67.105,76 66,76H61C60.448,76 60,75.552 60,75V69Z"
-        android:fillColor="#F93B4F"/>
-    <path
-        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
-        android:fillAlpha="0.6">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:gradientRadius="72"
-            android:centerX="28.54"
-            android:centerY="28.54"
-            android:type="radial">
-          <item android:offset="0" android:color="#19FFFFFF"/>
-          <item android:offset="1" android:color="#00FFFFFF"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
+  <path
+      android:pathData="M34.75,43.1V30.05H37.25V43.1H34.75ZM29.33,37.77V35.41H42.67V37.77H29.33Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M29.33,74.61V72.26H42.67V74.61H29.33Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M66.57,40.77L75.95,31.29L77.56,33.02L68.15,42.49L66.57,40.77ZM66.57,33.02L68.15,31.29L77.56,40.77L75.95,42.49L66.57,33.02Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M65.33,70.89V68.53H78.67V70.89H65.33ZM65.33,77.95V75.59H78.67V77.95H65.33Z"
+      android:fillColor="#ffffff"/>
 </vector>
diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index e8f78b9280ee0fb22ae3282fb30a97fbbd41c19c..0000000000000000000000000000000000000000
--- a/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M43,32C40.791,32 39,33.791 39,36V72C39,74.209 40.791,76 43,76H65C67.209,76 69,74.209 69,72V36C69,33.791 67.209,32 65,32H43ZM48,49H42V55H48V49ZM48,58H42V64H48V58ZM42,67H48V73H43C42.448,73 42,72.552 42,72V67ZM57,49H51V55H57V49ZM51,58H57V64H51V58ZM57,67H51V73H57V67ZM60,49H66V55H60V49ZM66,58H60V64H66V58ZM60,67H66V72C66,72.552 65.552,73 65,73H60V67Z"
-      android:fillColor="#ffffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/res/layout/advanced_pad.xml b/res/layout/advanced_pad.xml
index 4fe91d5edf7781a8aff9f6cbb350d63015c63a89..e3474a45d9a1ac32f8267bcab3f6bcd6987d9a45 100644
--- a/res/layout/advanced_pad.xml
+++ b/res/layout/advanced_pad.xml
@@ -10,7 +10,7 @@
     style="@style/PadLayoutStyle.Advanced"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?colorSurface">
+    android:background="@color/num_background">
 
     <com.android.calculator2.HapticButton
         android:id="@+id/op_sqrt"
diff --git a/res/layout/fragment_history.xml b/res/layout/fragment_history.xml
index 396274e8cc73276bc902d80f101568839be54e03..df4a0458b4f7df84fce182e03b34c622d238dc4e 100644
--- a/res/layout/fragment_history.xml
+++ b/res/layout/fragment_history.xml
@@ -18,6 +18,7 @@
         android:minHeight="?attr/actionBarSize"
         android:navigationContentDescription="@string/desc_navigate_up"
         app:navigationIcon="?attr/homeAsUpIndicator"
+        android:background="@color/e_action_bar"
         app:title="@string/title_history" />
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/res/layout/input_pad.xml b/res/layout/input_pad.xml
index a9ec4ea416bdc5e60a5afbde01f9c52254bf1977..e0e9769dc54709d8bd057d53295dfd6e36070b94 100644
--- a/res/layout/input_pad.xml
+++ b/res/layout/input_pad.xml
@@ -10,14 +10,14 @@
     style="@style/PadLayoutStyle"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?colorSurface">
+    android:background="@color/num_background">
 
     <com.android.calculator2.HapticButton
         android:id="@+id/lparen"
         style="@style/PadButtonStyle"
         android:contentDescription="@string/desc_lparen"
         android:text="@string/lparen"
-        android:theme="@style/Theme.Button.Operator"
+        android:theme="@style/Theme.Button.Numeric"
         app:layout_constraintBottom_toTopOf="@id/rowGuide1"
         app:layout_constraintEnd_toStartOf="@id/columnGuide1"
         app:layout_constraintStart_toStartOf="parent"
@@ -28,7 +28,7 @@
         style="@style/PadButtonStyle"
         android:contentDescription="@string/desc_rparen"
         android:text="@string/rparen"
-        android:theme="@style/Theme.Button.Operator"
+        android:theme="@style/Theme.Button.Numeric"
         app:layout_constraintBottom_toTopOf="@id/rowGuide1"
         app:layout_constraintEnd_toStartOf="@id/columnGuide2"
         app:layout_constraintStart_toStartOf="@id/columnGuide1"
@@ -39,7 +39,7 @@
         style="@style/PadButtonStyle"
         android:contentDescription="@string/desc_op_pct"
         android:text="@string/op_pct"
-        android:theme="@style/Theme.Button.Operator"
+        android:theme="@style/Theme.Button.Numeric"
         app:layout_constraintBottom_toTopOf="@id/rowGuide1"
         app:layout_constraintEnd_toStartOf="@id/columnGuide3"
         app:layout_constraintStart_toEndOf="@id/columnGuide2"
diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml
index afc6770eebd053cf3377f62d1c8ee5c1a40b5f8b..0c8cd2252986ee1b7c82d4144d4e2a5d6e76c777 100644
--- a/res/layout/toolbar.xml
+++ b/res/layout/toolbar.xml
@@ -7,7 +7,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
+    android:layout_height="@dimen/toolbar_height"
     android:layout_gravity="top">
 
     <TextView
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index b58c81ff94fc2cd9353409539d491f43b91966a5..4b6f4091fc06368abc8f782076dc4af7361fe5cc 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright Murena SAS 2024
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index a4225a66aa0f051c82c60f264b52594811380c23..880cd4af0200f6ffed9d740c8f92701f23d78e6a 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -4,9 +4,12 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
+    <!-- Dimens for toolbar -->
+    <dimen name="toolbar_height">40dip</dimen>
+   
     <!-- Dimens for display formula. -->
     <dimen name="formula_padding_top">8dip</dimen>
-    <dimen name="formula_padding_bottom">28dip</dimen>
+    <dimen name="formula_padding_bottom">10dip</dimen>
     <dimen name="formula_padding_start">16dip</dimen>
     <dimen name="formula_padding_end">16dip</dimen>
     <dimen name="formula_min_textsize">42dip</dimen>
@@ -15,7 +18,7 @@
 
     <!-- Dimens for display result. -->
     <dimen name="result_padding_top">8dip</dimen>
-    <dimen name="result_padding_bottom">28dip</dimen>
+    <dimen name="result_padding_bottom">10dip</dimen>
     <dimen name="result_padding_start">16dip</dimen>
     <dimen name="result_padding_end">16dip</dimen>
     <dimen name="result_textsize">42dip</dimen>
diff --git a/res/values-land/ratios.xml b/res/values-land/ratios.xml
index 582d191a7115b43e7d4b2cb9a5a6dc1e28f24145..d69e9fc26c59c1248452df0d96e8a3b8211f7dda 100644
--- a/res/values-land/ratios.xml
+++ b/res/values-land/ratios.xml
@@ -5,8 +5,8 @@
 -->
 <resources>
     <!-- layout_display_ratio + layout_pads_ratio = 1 -->
-    <item type="dimen" format="float" name="layout_display_ratio">0.4</item>
-    <item type="dimen" format="float" name="layout_pads_ratio">0.6</item>
+    <item type="dimen" format="float" name="layout_display_ratio">0.45</item>
+    <item type="dimen" format="float" name="layout_pads_ratio">0.55</item>
 
     <item type="dimen" format="float" name="layout_advanced_pad_ratio">0.33</item>
 </resources>
diff --git a/res/values-night/color.xml b/res/values-night/color.xml
index b9c8a3c968605e330a56546d79186b7adf778665..d94dd45b90ed41dd169edd0b3dc1d64eb8affd00 100644
--- a/res/values-night/color.xml
+++ b/res/values-night/color.xml
@@ -4,14 +4,6 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
-
-    <!-- Display background -->
-    <color name="history_background_color">@color/material_dynamic_neutral30</color>
-    <color name="display_background_color">@color/material_dynamic_neutral20</color>
-
-    <!-- Display text -->
-    <color name="display_formula_text_color">@color/material_dynamic_neutral90</color>
-    <color name="display_result_text_color">@color/material_dynamic_neutral70</color>
-    <color name="display_result_exponent_text_color">@color/material_dynamic_secondary60</color>
-
+    <color name="num_key_background">#343434</color>
+    <color name="opt_key_background">#405262</color>
 </resources>
diff --git a/res/values/color.xml b/res/values/color.xml
index d49facddd82ff5598a83f9724c234ac11fb8e832..d58dbc671f2f8c37ee655f2e486c12bb390acba5 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -6,12 +6,17 @@
 <resources>
 
     <!-- Display background -->
-    <color name="history_background_color">@color/material_dynamic_neutral95</color>
-    <color name="display_background_color">@color/material_dynamic_neutral90</color>
+    <color name="history_background_color">@color/e_background</color>
+    <color name="display_background_color">@color/e_background_variant</color>
 
     <!-- Display text -->
-    <color name="display_formula_text_color">@color/material_dynamic_neutral20</color>
-    <color name="display_result_text_color">@color/material_dynamic_neutral40</color>
-    <color name="display_result_exponent_text_color">@color/material_dynamic_neutral40</color>
+    <color name="display_formula_text_color">@color/e_primary_text_color</color>
+    <color name="display_result_text_color">@color/e_primary_text_color</color>
+    <color name="display_result_exponent_text_color">@color/e_primary_text_color</color>
 
+    <color name="num_key_background">#FAFAFA</color>
+    <color name="opt_key_background">#C9E5FF</color>
+    <color name="num_background">@color/e_action_bar</color>
+    <color name="eq_key_background">@color/e_accent</color>
+    <color name="eq_key_icon">@color/e_background</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 257776c3a60ba222c8368e08cbb4af4fd90bf34f..fe11ecf6bbd94bee8f53597320b91ee8ff45e7bc 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -4,6 +4,8 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
+    <!-- Dimens for toolbar -->
+    <dimen name="toolbar_height">56dip</dimen>
 
     <dimen name="history_divider_padding">14dip</dimen>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3131ad1bd11c7b3d514b57ac39befb4beeb1ad43..fe29c920ce94dc7e902289804c3031f5660e94f5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -53,6 +53,10 @@
         <item name="android:includeFontPadding">false</item>
         <item name="android:padding">0dp</item>
         <item name="android:textSize">@dimen/button_textsize</item>
+        <item name="android:autoSizeTextType">uniform</item>
+        <item name="android:autoSizeMinTextSize">10sp</item>
+        <item name="android:autoSizeMaxTextSize">@dimen/button_textsize</item>
+        <item name="android:lineHeight">0sp</item>
         <item name="android:onClick">onButtonClick</item>
         <item name="android:fontFeatureSettings">tnum, cv03, cv04</item>
         <item name="android:layout_marginHorizontal">@dimen/button_horizontal_margin</item>
@@ -71,11 +75,13 @@
     <style name="PadButtonStyle.SmallCaps">
         <item name="textAllCaps">true</item>
         <item name="android:textSize">@dimen/button_smallcaps_textsize</item>
+        <item name="android:autoSizeMaxTextSize">@dimen/button_smallcaps_textsize</item>
         <item name="android:layout_marginHorizontal">@dimen/button_small_horizontal_margin</item>
     </style>
 
     <style name="PadButtonStyle.SmallText">
         <item name="android:textSize">@dimen/button_small_textsize</item>
+        <item name="android:autoSizeMaxTextSize">@dimen/button_small_textsize</item>
         <item name="android:layout_marginHorizontal">@dimen/button_small_horizontal_margin</item>
     </style>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index a19a1c7de481087ff98a4faef4df79be30e67b67..6aa902c15bc1d39545dc0d7b9e3f81a032615d50 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -6,10 +6,23 @@
 <resources>
 
     <style name="Theme" parent="Theme.Material3.DayNight">
-        <item name="android:statusBarColor">@color/display_background_color</item>
+        <item name="android:statusBarColor">@color/e_action_bar</item>
         <item name="android:windowLightStatusBar">?isLightTheme</item>
-        <item name="android:navigationBarColor">?colorSurface</item>
+        <item name="android:navigationBarColor">@color/e_action_bar</item>
         <item name="android:windowLightNavigationBar">?isLightTheme</item>
+        <item name="popupMenuBackground">@color/e_floating_background</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog</item>
+    </style>
+
+    <style name="ThemeOverlay.App.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="elevationOverlayEnabled">false</item>
+        <item name="colorSurface">@color/e_floating_background</item>
+        <item name="buttonBarPositiveButtonStyle">@style/Widget.App.Button</item>
+        <item name="buttonBarNegativeButtonStyle">@style/Widget.App.Button</item>
+    </style>
+
+    <style name="Widget.App.Button" parent="Widget.Material3.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/e_accent</item>
     </style>
 
     <style name="Theme.Calculator">
@@ -30,18 +43,18 @@
     </style>
 
     <style name="Theme.Button.Advanced">
-        <item name="colorContainer">?colorSurface</item>
-        <item name="colorOnContainer">?colorOnSurface</item>
+        <item name="colorContainer">@color/num_background</item>
+        <item name="colorOnContainer">@color/e_primary_text_color</item>
     </style>
 
     <style name="Theme.Button.Numeric">
-        <item name="colorContainer">?colorSurfaceContainer</item>
-        <item name="colorOnContainer">?colorOnSurface</item>
+        <item name="colorContainer">@color/num_key_background</item>
+        <item name="colorOnContainer">@color/e_primary_text_color</item>
     </style>
 
     <style name="Theme.Button.Operator">
-        <item name="colorContainer">?colorSecondaryContainer</item>
-        <item name="colorOnContainer">?colorOnSecondaryContainer</item>
+        <item name="colorContainer">@color/opt_key_background</item>
+        <item name="colorOnContainer">@color/e_primary_text_color</item>
     </style>
 
     <style name="Theme.Button.Clear">
@@ -50,8 +63,8 @@
     </style>
 
     <style name="Theme.Button.Action">
-        <item name="colorContainer">?colorPrimaryContainer</item>
-        <item name="colorOnContainer">?colorOnPrimaryContainer</item>
+        <item name="colorContainer">@color/e_accent_light</item>
+        <item name="colorOnContainer">@android:color/white</item>
     </style>
 
 </resources>