diff --git a/src/java/kp2akeytransform/bin/kp2akeytransform.jar b/src/java/kp2akeytransform/bin/kp2akeytransform.jar
index b79edbb4..3b4dfc37 100644
Binary files a/src/java/kp2akeytransform/bin/kp2akeytransform.jar and b/src/java/kp2akeytransform/bin/kp2akeytransform.jar differ
diff --git a/src/keepass2android/Resources/layout-v14/entry_view.xml b/src/keepass2android/Resources/layout-v14/entry_view.xml
index 055aa7ce..c8065d13 100644
--- a/src/keepass2android/Resources/layout-v14/entry_view.xml
+++ b/src/keepass2android/Resources/layout-v14/entry_view.xml
@@ -17,7 +17,7 @@
         android:dividerPadding="12dp">
    
         <FrameLayout
-            style="@style/BottomBarActionButton"
+            style="?android:attr/actionButtonStyle"
             android:id="@+id/entry_edit"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/src/keepass2android/Resources/layout-v14/generate_password.xml b/src/keepass2android/Resources/layout-v14/generate_password.xml
index a9a26404..ba091eb2 100644
--- a/src/keepass2android/Resources/layout-v14/generate_password.xml
+++ b/src/keepass2android/Resources/layout-v14/generate_password.xml
@@ -14,7 +14,7 @@
         android:baselineAligned="false">
         <FrameLayout
             android:id="@+id/accept_button"
-            style="@style/BottomBarActionButton"
+            style="?android:attr/actionButtonStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1">
@@ -31,7 +31,7 @@
         </FrameLayout>
         <FrameLayout
             android:id="@+id/cancel_button"
-            style="@style/BottomBarActionButton"
+            style="?android:attr/actionButtonStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1">
diff --git a/src/keepass2android/Resources/layout-v14/group_add_entry.xml b/src/keepass2android/Resources/layout-v14/group_add_entry.xml
index fcce2fa0..6222cccb 100644
--- a/src/keepass2android/Resources/layout-v14/group_add_entry.xml
+++ b/src/keepass2android/Resources/layout-v14/group_add_entry.xml
@@ -19,7 +19,7 @@
         android:baselineAligned="false">
         <FrameLayout
             android:id="@+id/add_group"
-            style="@style/BottomBarActionButton"
+            style="?android:attr/actionButtonStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1">
@@ -36,7 +36,7 @@
         </FrameLayout>
         <FrameLayout
             android:id="@+id/add_entry"
-            style="@style/BottomBarActionButton"
+            style="?android:attr/actionButtonStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
 			android:background="?android:attr/selectableItemBackground"
@@ -55,7 +55,7 @@
         </FrameLayout>
 		<FrameLayout
             android:id="@+id/insert_element"
-            style="@style/BottomBarActionButton"
+            style="?android:attr/actionButtonStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1">
@@ -72,7 +72,7 @@
 		</FrameLayout>
 		<FrameLayout
             android:id="@+id/cancel_insert_element"
-            style="@style/BottomBarActionButton"
+            style="?android:attr/actionButtonStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1">
diff --git a/src/keepass2android/Resources/layout-v14/searchurlresults.xml b/src/keepass2android/Resources/layout-v14/searchurlresults.xml
index 6ec840e4..1165b132 100644
--- a/src/keepass2android/Resources/layout-v14/searchurlresults.xml
+++ b/src/keepass2android/Resources/layout-v14/searchurlresults.xml
@@ -19,7 +19,7 @@
         android:baselineAligned="false">
         <FrameLayout
             android:id="@+id/select_other_entry"
-            style="@style/BottomBarActionButton"
+            style="?android:attr/actionButtonStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1">
@@ -34,7 +34,7 @@
         </FrameLayout>
         <FrameLayout
             android:id="@+id/add_url_entry"
-            style="@style/BottomBarActionButton"
+            style="?android:attr/actionButtonStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1">
diff --git a/src/keepass2android/Resources/layout-v14/searchurlresults_empty.xml b/src/keepass2android/Resources/layout-v14/searchurlresults_empty.xml
index 08d51a40..5bd65218 100644
--- a/src/keepass2android/Resources/layout-v14/searchurlresults_empty.xml
+++ b/src/keepass2android/Resources/layout-v14/searchurlresults_empty.xml
@@ -19,7 +19,7 @@
         android:baselineAligned="false">
         <FrameLayout
             android:id="@+id/select_other_entry"
-            style="@style/BottomBarActionButton"
+            style="?android:attr/actionButtonStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1">
@@ -34,7 +34,7 @@
         </FrameLayout>
         <FrameLayout
             android:id="@+id/add_url_entry"
-            style="@style/BottomBarActionButton"
+            style="?android:attr/actionButtonStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1">