From 2162c85c125a2155f29ddcd436d36ff9a472c3d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 9 Jan 2014 15:12:41 +0100
Subject: use bootstrap buttons

---
 OpenPGP-Keychain/assets/fontawesome-webfont.ttf    | Bin 0 -> 80776 bytes
 .../res/drawable-finger/btn_circle.xml             |  32 ----------
 .../drawable-hdpi-finger/btn_circle_disable.png    | Bin 2631 -> 0 bytes
 .../btn_circle_disable_focused.png                 | Bin 3001 -> 0 bytes
 .../res/drawable-hdpi-finger/btn_circle_normal.png | Bin 1974 -> 0 bytes
 .../drawable-hdpi-finger/btn_circle_pressed.png    | Bin 2624 -> 0 bytes
 .../drawable-hdpi-finger/btn_circle_selected.png   | Bin 2554 -> 0 bytes
 .../drawable-hdpi-finger/ic_btn_round_minus.png    | Bin 536 -> 0 bytes
 .../res/drawable-hdpi-finger/ic_btn_round_plus.png | Bin 1316 -> 0 bytes
 .../drawable-mdpi-finger/btn_circle_disable.png    | Bin 938 -> 0 bytes
 .../btn_circle_disable_focused.png                 | Bin 1436 -> 0 bytes
 .../res/drawable-mdpi-finger/btn_circle_normal.png | Bin 1249 -> 0 bytes
 .../drawable-mdpi-finger/btn_circle_pressed.png    | Bin 1613 -> 0 bytes
 .../drawable-mdpi-finger/btn_circle_selected.png   | Bin 1645 -> 0 bytes
 .../drawable-mdpi-finger/ic_btn_round_minus.png    | Bin 288 -> 0 bytes
 .../res/drawable-mdpi-finger/ic_btn_round_plus.png | Bin 526 -> 0 bytes
 .../res/drawable/btn_circle_disable.png            | Bin 938 -> 0 bytes
 .../res/drawable/btn_circle_disable_focused.png    | Bin 1436 -> 0 bytes
 .../res/drawable/btn_circle_normal.png             | Bin 1249 -> 0 bytes
 .../res/drawable/btn_circle_pressed.png            | Bin 1613 -> 0 bytes
 .../res/drawable/btn_circle_selected.png           | Bin 1645 -> 0 bytes
 OpenPGP-Keychain/res/layout/decrypt.xml            |  43 +++++++------
 OpenPGP-Keychain/res/layout/edit_key.xml           |   7 ++-
 OpenPGP-Keychain/res/layout/edit_key_key_item.xml  |  28 +++++----
 OpenPGP-Keychain/res/layout/edit_key_section.xml   |  36 ++++-------
 .../res/layout/edit_key_user_id_item.xml           |  29 +++------
 OpenPGP-Keychain/res/layout/encrypt.xml            |  69 ++++++++++++---------
 OpenPGP-Keychain/res/layout/file_dialog.xml        |   9 ++-
 OpenPGP-Keychain/res/layout/import_keys.xml        |  20 +++---
 .../res/layout/import_keys_clipboard_fragment.xml  |  12 ++--
 .../res/layout/import_keys_file_fragment.xml       |   9 ++-
 .../res/layout/import_keys_keyserver_fragment.xml  |  10 ++-
 .../res/layout/import_keys_nfc_fragment.xml        |  10 ++-
 .../res/layout/import_keys_qr_code_fragment.xml    |  11 +++-
 .../res/layout/key_list_public_fragment.xml        |  13 ++--
 OpenPGP-Keychain/res/layout/key_server_editor.xml  |  60 +++++++-----------
 .../res/layout/key_server_preference.xml           |  26 +++-----
 OpenPGP-Keychain/res/layout/key_view_activity.xml  |  10 ++-
 OpenPGP-Keychain/res/raw/help_about.html           |   8 +--
 OpenPGP-Keychain/res/values/styles.xml             |  12 +---
 .../keychain/ui/DecryptActivity.java               |   6 +-
 .../keychain/ui/EditKeyActivity.java               |  12 ++--
 .../keychain/ui/EncryptActivity.java               |  15 +++--
 .../keychain/ui/ImportKeysActivity.java            |  27 +++++++-
 .../keychain/ui/ImportKeysClipboardFragment.java   |   7 ++-
 .../keychain/ui/ImportKeysFileFragment.java        |   7 ++-
 .../keychain/ui/ImportKeysNFCFragment.java         |   7 ++-
 .../keychain/ui/ImportKeysQrCodeFragment.java      |   6 +-
 .../keychain/ui/ImportKeysServerFragment.java      |   9 +--
 .../keychain/ui/KeyListPublicFragment.java         |  15 ++---
 .../keychain/ui/KeyViewActivity.java               |   6 +-
 .../keychain/ui/dialog/FileDialogFragment.java     |  22 +++----
 .../keychain/ui/widget/KeyEditor.java              |  48 +++++++-------
 .../keychain/ui/widget/KeyServerEditor.java        |   7 ++-
 .../keychain/ui/widget/SectionView.java            |  10 ++-
 .../keychain/ui/widget/UserIdEditor.java           |   7 ++-
 56 files changed, 334 insertions(+), 331 deletions(-)
 create mode 100644 OpenPGP-Keychain/assets/fontawesome-webfont.ttf
 delete mode 100644 OpenPGP-Keychain/res/drawable-finger/btn_circle.xml
 delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable_focused.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_normal.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_pressed.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_selected.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_minus.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_plus.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable_focused.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_normal.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_pressed.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_selected.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_minus.png
 delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_plus.png
 delete mode 100644 OpenPGP-Keychain/res/drawable/btn_circle_disable.png
 delete mode 100644 OpenPGP-Keychain/res/drawable/btn_circle_disable_focused.png
 delete mode 100644 OpenPGP-Keychain/res/drawable/btn_circle_normal.png
 delete mode 100644 OpenPGP-Keychain/res/drawable/btn_circle_pressed.png
 delete mode 100644 OpenPGP-Keychain/res/drawable/btn_circle_selected.png

diff --git a/OpenPGP-Keychain/assets/fontawesome-webfont.ttf b/OpenPGP-Keychain/assets/fontawesome-webfont.ttf
new file mode 100644
index 000000000..7ec2e1de8
Binary files /dev/null and b/OpenPGP-Keychain/assets/fontawesome-webfont.ttf differ
diff --git a/OpenPGP-Keychain/res/drawable-finger/btn_circle.xml b/OpenPGP-Keychain/res/drawable-finger/btn_circle.xml
deleted file mode 100644
index 6c3c7fc1a..000000000
--- a/OpenPGP-Keychain/res/drawable-finger/btn_circle.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/btn_circle_normal" />
-    <item android:state_window_focused="false" android:state_enabled="false"
-        android:drawable="@drawable/btn_circle_disable" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/btn_circle_pressed" />
-    <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/btn_circle_selected" />
-    <item android:state_enabled="true"
-        android:drawable="@drawable/btn_circle_normal" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/btn_circle_disable_focused" />
-    <item
-         android:drawable="@drawable/btn_circle_disable" />
-</selector>
diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable.png
deleted file mode 100644
index ae063b545..000000000
Binary files a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable_focused.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable_focused.png
deleted file mode 100644
index 7a5d4fe4e..000000000
Binary files a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable_focused.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_normal.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_normal.png
deleted file mode 100644
index 5eda66883..000000000
Binary files a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_normal.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_pressed.png
deleted file mode 100644
index 88848bac2..000000000
Binary files a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_pressed.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_selected.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_selected.png
deleted file mode 100644
index 74690705f..000000000
Binary files a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_selected.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_minus.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_minus.png
deleted file mode 100644
index 27af3faf4..000000000
Binary files a/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_minus.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_plus.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_plus.png
deleted file mode 100644
index b24168c32..000000000
Binary files a/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_plus.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable.png
deleted file mode 100644
index 33b74a66c..000000000
Binary files a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable_focused.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable_focused.png
deleted file mode 100644
index 005ad8dca..000000000
Binary files a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable_focused.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_normal.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_normal.png
deleted file mode 100644
index fc5af1c9f..000000000
Binary files a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_normal.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_pressed.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_pressed.png
deleted file mode 100644
index 8f40afdfc..000000000
Binary files a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_pressed.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_selected.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_selected.png
deleted file mode 100644
index c74fac227..000000000
Binary files a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_selected.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_minus.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_minus.png
deleted file mode 100644
index 96dbb17d2..000000000
Binary files a/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_minus.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_plus.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_plus.png
deleted file mode 100644
index 1ec8a956a..000000000
Binary files a/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_plus.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable/btn_circle_disable.png b/OpenPGP-Keychain/res/drawable/btn_circle_disable.png
deleted file mode 100644
index 33b74a66c..000000000
Binary files a/OpenPGP-Keychain/res/drawable/btn_circle_disable.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable/btn_circle_disable_focused.png b/OpenPGP-Keychain/res/drawable/btn_circle_disable_focused.png
deleted file mode 100644
index 005ad8dca..000000000
Binary files a/OpenPGP-Keychain/res/drawable/btn_circle_disable_focused.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable/btn_circle_normal.png b/OpenPGP-Keychain/res/drawable/btn_circle_normal.png
deleted file mode 100644
index fc5af1c9f..000000000
Binary files a/OpenPGP-Keychain/res/drawable/btn_circle_normal.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable/btn_circle_pressed.png b/OpenPGP-Keychain/res/drawable/btn_circle_pressed.png
deleted file mode 100644
index 8f40afdfc..000000000
Binary files a/OpenPGP-Keychain/res/drawable/btn_circle_pressed.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/drawable/btn_circle_selected.png b/OpenPGP-Keychain/res/drawable/btn_circle_selected.png
deleted file mode 100644
index c74fac227..000000000
Binary files a/OpenPGP-Keychain/res/drawable/btn_circle_selected.png and /dev/null differ
diff --git a/OpenPGP-Keychain/res/layout/decrypt.xml b/OpenPGP-Keychain/res/layout/decrypt.xml
index 0533e6d72..c52d873f1 100644
--- a/OpenPGP-Keychain/res/layout/decrypt.xml
+++ b/OpenPGP-Keychain/res/layout/decrypt.xml
@@ -16,18 +16,19 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:fillViewport="true"
     android:orientation="vertical" >
 
     <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:fillViewport="true" >
 
         <LinearLayout
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:paddingLeft="10dp"
@@ -35,7 +36,7 @@
 
             <LinearLayout
                 android:id="@+id/signature"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:clickable="true"
                 android:orientation="horizontal"
@@ -85,7 +86,7 @@
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal" >
 
@@ -99,7 +100,7 @@
                     android:id="@+id/sourceLabel"
                     style="@style/SectionHeader"
                     android:layout_width="0dip"
-                    android:layout_height="fill_parent"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:gravity="center_horizontal|center_vertical"
                     android:text="@string/label_message"
@@ -114,21 +115,21 @@
 
             <ViewFlipper
                 android:id="@+id/source"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="0dip"
                 android:layout_weight="1" >
 
                 <LinearLayout
                     android:id="@+id/sourceMessage"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:orientation="vertical"
                     android:padding="4dp" >
 
                     <EditText
                         android:id="@+id/message"
-                        android:layout_width="fill_parent"
-                        android:layout_height="fill_parent"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
                         android:gravity="top"
                         android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
                         android:scrollHorizontally="true" />
@@ -136,13 +137,13 @@
 
                 <LinearLayout
                     android:id="@+id/sourceFile"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:orientation="vertical"
                     android:padding="4dp" >
 
                     <LinearLayout
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal" >
 
@@ -153,15 +154,19 @@
                             android:layout_weight="1"
                             android:inputType="textNoSuggestions" />
 
-                        <ImageButton
+                        <com.beardedhen.androidbootstrap.BootstrapButton
                             android:id="@+id/btn_browse"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:src="@drawable/ic_menu_filebrowser" />
+                            android:layout_margin="4dp"
+                            bootstrapbutton:bb_icon_left="fa-folder-open"
+                            bootstrapbutton:bb_roundedCorners="true"
+                            bootstrapbutton:bb_size="default"
+                            bootstrapbutton:bb_type="default" />
                     </LinearLayout>
 
                     <LinearLayout
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal" >
 
diff --git a/OpenPGP-Keychain/res/layout/edit_key.xml b/OpenPGP-Keychain/res/layout/edit_key.xml
index 20cc9f2ac..f8597b0df 100644
--- a/OpenPGP-Keychain/res/layout/edit_key.xml
+++ b/OpenPGP-Keychain/res/layout/edit_key.xml
@@ -16,6 +16,7 @@
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:fillViewport="true"
@@ -41,12 +42,14 @@
             android:layout_height="wrap_content"
             android:text="@string/label_no_passphrase" />
 
-        <Button
+        <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/edit_key_btn_change_pass_phrase"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="4dp"
-            android:text="@string/btn_set_passphrase" />
+            android:text="@string/btn_set_passphrase"
+            bootstrapbutton:bb_icon_left="fa-pencil"
+            bootstrapbutton:bb_type="info" />
 
         <LinearLayout
             android:id="@+id/edit_key_container"
diff --git a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml
index 521e8ce2c..06bff2f9e 100644
--- a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml
+++ b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml
@@ -16,12 +16,13 @@
 -->
 
 <org.sufficientlysecure.keychain.ui.widget.KeyEditor xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal" >
 
@@ -80,7 +81,7 @@
 
                 <TextView
                     android:id="@+id/creation"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </TableRow>
 
@@ -94,10 +95,12 @@
                     android:paddingRight="10dip"
                     android:text="@string/label_expiry" />
 
-                <Button
+                <com.beardedhen.androidbootstrap.BootstrapButton
                     android:id="@+id/expiry"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/none"
+                    bootstrapbutton:bb_type="default" />
             </TableRow>
 
             <TableRow>
@@ -112,22 +115,25 @@
 
                 <Spinner
                     android:id="@+id/usage"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </TableRow>
         </TableLayout>
 
-        <ImageButton
+        <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/delete"
-            style="@style/MinusButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical" />
+            android:layout_margin="10dp"
+            bootstrapbutton:bb_icon_left="fa-minus"
+            bootstrapbutton:bb_roundedCorners="true"
+            bootstrapbutton:bb_size="small"
+            bootstrapbutton:bb_type="danger" />
     </LinearLayout>
 
     <View
         android:id="@+id/separator"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="1dip"
         android:background="?android:attr/listDivider" />
 
diff --git a/OpenPGP-Keychain/res/layout/edit_key_section.xml b/OpenPGP-Keychain/res/layout/edit_key_section.xml
index dd0a5d4bd..9f10ff8c1 100644
--- a/OpenPGP-Keychain/res/layout/edit_key_section.xml
+++ b/OpenPGP-Keychain/res/layout/edit_key_section.xml
@@ -1,31 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
-
-     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.
--->
-
 <org.sufficientlysecure.keychain.ui.widget.SectionView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
     <LinearLayout
         android:id="@+id/header"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:clickable="true"
-        android:focusable="true"
         android:gravity="center_vertical"
         android:orientation="horizontal" >
 
@@ -40,19 +23,22 @@
             android:singleLine="true"
             android:text="Section Name" />
 
-        <ImageView
+        <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/plusbutton"
-            style="@style/PlusButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:duplicateParentState="true" />
+            android:layout_margin="10dp"
+            bootstrapbutton:bb_icon_left="fa-plus"
+            bootstrapbutton:bb_roundedCorners="true"
+            bootstrapbutton:bb_size="small"
+            bootstrapbutton:bb_type="success" />
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/editors"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingBottom="6dip" />
 
-</org.sufficientlysecure.keychain.ui.widget.SectionView>
+</org.sufficientlysecure.keychain.ui.widget.SectionView>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml
index a3955389f..74f929bf6 100644
--- a/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml
+++ b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml
@@ -1,21 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
-
-     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.
--->
-
 <org.sufficientlysecure.keychain.ui.widget.UserIdEditor xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
@@ -90,12 +75,18 @@
             </TableRow>
         </TableLayout>
 
-        <ImageButton
+        <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/delete"
-            style="@style/MinusButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical" />
+            android:layout_gravity="center_vertical"
+            android:layout_margin="10dp"
+            android:layout_marginLeft="4dip"
+            android:layout_marginRight="6dip"
+            bootstrapbutton:bb_icon_left="fa-minus"
+            bootstrapbutton:bb_roundedCorners="true"
+            bootstrapbutton:bb_size="small"
+            bootstrapbutton:bb_type="danger" />
     </LinearLayout>
 
     <View
diff --git a/OpenPGP-Keychain/res/layout/encrypt.xml b/OpenPGP-Keychain/res/layout/encrypt.xml
index c9c6be5df..1fb3bc589 100644
--- a/OpenPGP-Keychain/res/layout/encrypt.xml
+++ b/OpenPGP-Keychain/res/layout/encrypt.xml
@@ -16,19 +16,20 @@
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:fillViewport="true" >
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="10dp"
         android:paddingRight="10dp" >
 
         <LinearLayout
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:padding="4dp" >
@@ -43,7 +44,7 @@
                 android:id="@+id/modeLabel"
                 style="@style/SectionHeader"
                 android:layout_width="0dip"
-                android:layout_height="fill_parent"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center_horizontal|center_vertical"
                 android:text="@string/label_asymmetric" />
@@ -57,18 +58,18 @@
 
         <ViewFlipper
             android:id="@+id/mode"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" >
 
             <LinearLayout
                 android:id="@+id/modeAsymmetric"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:padding="4dp" >
 
                 <LinearLayout
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal" >
 
@@ -80,7 +81,7 @@
                         android:text="@string/label_sign" />
 
                     <LinearLayout
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
                         android:paddingLeft="16dp" >
@@ -108,7 +109,7 @@
                 </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:paddingBottom="3dip" >
@@ -122,18 +123,22 @@
                         android:text="@string/label_select_public_keys"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                    <Button
+                    <com.beardedhen.androidbootstrap.BootstrapButton
                         android:id="@+id/btn_selectEncryptKeys"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:text="@string/btn_select_encrypt_keys" />
+                        android:layout_margin="4dp"
+                        android:text="@string/btn_select_encrypt_keys"
+                        bootstrapbutton:bb_icon_left="fa-key"
+                        bootstrapbutton:bb_size="default"
+                        bootstrapbutton:bb_type="default" />
                 </LinearLayout>
             </LinearLayout>
 
             <TableLayout
                 android:id="@+id/modeSymmetric"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="4dp"
                 android:stretchColumns="1" >
@@ -151,7 +156,7 @@
 
                     <EditText
                         android:id="@+id/passPhrase"
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="textPassword" />
                 </TableRow>
@@ -169,7 +174,7 @@
 
                     <EditText
                         android:id="@+id/passPhraseAgain"
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="textPassword" />
                 </TableRow>
@@ -177,7 +182,7 @@
         </ViewFlipper>
 
         <LinearLayout
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:padding="4dp" >
@@ -192,7 +197,7 @@
                 android:id="@+id/sourceLabel"
                 style="@style/SectionHeader"
                 android:layout_width="0dip"
-                android:layout_height="fill_parent"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center_horizontal|center_vertical"
                 android:text="@string/label_message"
@@ -207,34 +212,34 @@
 
         <ViewFlipper
             android:id="@+id/source"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1" >
 
             <LinearLayout
                 android:id="@+id/sourceMessage"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:orientation="vertical"
                 android:padding="4dp" >
 
                 <EditText
                     android:id="@+id/message"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:gravity="top"
                     android:inputType="text|textCapSentences|textMultiLine|textLongMessage" />
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/sourceFile"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:orientation="vertical"
                 android:padding="4dp" >
 
                 <LinearLayout
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal" >
 
@@ -245,15 +250,19 @@
                         android:layout_weight="1"
                         android:inputType="textNoSuggestions" />
 
-                    <ImageButton
+                    <com.beardedhen.androidbootstrap.BootstrapButton
                         android:id="@+id/btn_browse"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@drawable/ic_menu_filebrowser" />
+                        android:layout_margin="4dp"
+                        bootstrapbutton:bb_icon_left="fa-folder-open"
+                        bootstrapbutton:bb_roundedCorners="true"
+                        bootstrapbutton:bb_size="default"
+                        bootstrapbutton:bb_type="default" />
                 </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal" >
 
@@ -275,7 +284,7 @@
                 </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal" >
 
@@ -288,7 +297,7 @@
                 </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal" >
 
diff --git a/OpenPGP-Keychain/res/layout/file_dialog.xml b/OpenPGP-Keychain/res/layout/file_dialog.xml
index ce3b1ea60..87816067f 100644
--- a/OpenPGP-Keychain/res/layout/file_dialog.xml
+++ b/OpenPGP-Keychain/res/layout/file_dialog.xml
@@ -16,6 +16,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -39,13 +40,17 @@
             android:minLines="2"
             android:scrollbars="vertical" />
 
-        <ImageButton
+        <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/btn_browse"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:layout_margin="4dp"
             android:contentDescription="@string/filemanager_title_open"
-            android:src="@drawable/ic_menu_filebrowser" />
+            bootstrapbutton:bb_icon_left="fa-folder-open"
+            bootstrapbutton:bb_roundedCorners="true"
+            bootstrapbutton:bb_size="default"
+            bootstrapbutton:bb_type="default" />
     </LinearLayout>
 
     <CheckBox
diff --git a/OpenPGP-Keychain/res/layout/import_keys.xml b/OpenPGP-Keychain/res/layout/import_keys.xml
index ae391e2fd..1b40bad58 100644
--- a/OpenPGP-Keychain/res/layout/import_keys.xml
+++ b/OpenPGP-Keychain/res/layout/import_keys.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_centerHorizontal="true" >
@@ -22,19 +23,22 @@
         android:paddingLeft="10dp"
         android:paddingRight="10dp" >
 
-        <Button
+        <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/import_import"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="importOnClick"
-            android:text="@string/import_import" />
+            android:layout_height="60dp"
+            android:padding="4dp"
+            android:text="@string/import_import"
+            bootstrapbutton:bb_icon_left="fa-download"
+            bootstrapbutton:bb_type="info" />
 
-        <Button
+        <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/import_sign_and_upload"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="signAndUploadOnClick"
-            android:text="@string/import_sign_and_upload" />
+            android:layout_height="60dp"
+            android:padding="4dp"
+            android:text="@string/import_sign_and_upload"
+            bootstrapbutton:bb_type="info" />
     </LinearLayout>
 
     <FrameLayout
diff --git a/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml
index bb3b8a1cb..961c6523a 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal" >
 
-    <Button
+    <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/import_clipboard_button"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/import_from_clipboard" />
+        android:layout_height="60dp"
+        android:layout_margin="10dp"
+        android:text="@string/import_from_clipboard"
+        bootstrapbutton:bb_size="default"
+        bootstrapbutton:bb_type="default" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml
index 896be3989..126bcd8a6 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal" >
@@ -16,12 +17,16 @@
         android:minLines="2"
         android:scrollbars="vertical" />
 
-    <ImageButton
+    <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/import_keys_file_browse"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
+        android:layout_margin="4dp"
         android:contentDescription="@string/filemanager_title_open"
-        android:src="@drawable/ic_menu_filebrowser" />
+        bootstrapbutton:bb_icon_left="fa-folder-open"
+        bootstrapbutton:bb_roundedCorners="true"
+        bootstrapbutton:bb_size="default"
+        bootstrapbutton:bb_type="default" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml
index 18e87205b..74a2d7853 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml
@@ -1,13 +1,17 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
-    <Button
+    <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/import_keyserver_button"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/menu_key_server" />
+        android:layout_height="60dp"
+        android:layout_margin="10dp"
+        android:text="@string/menu_key_server"
+        bootstrapbutton:bb_size="default"
+        bootstrapbutton:bb_type="default" />
 
     <!-- <Spinner -->
     <!-- android:id="@+id/import_keys_server_key_server" -->
diff --git a/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml
index b34bb80c3..6d70578af 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal" >
 
-    <Button
+    <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/import_nfc_button"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/menu_import_from_nfc" />
+        android:layout_height="60dp"
+        android:layout_margin="10dp"
+        android:text="@string/menu_import_from_nfc"
+        bootstrapbutton:bb_size="default"
+        bootstrapbutton:bb_type="default" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml
index 0a49b014a..f3c09a41d 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
-    <Button
+    <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/import_qrcode_button"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/menu_import_from_qr_code" />
+        android:layout_height="60dp"
+        android:layout_margin="10dp"
+        android:text="@string/menu_import_from_qr_code"
+        bootstrapbutton:bb_icon_left="fa-barcode"
+        bootstrapbutton:bb_size="default"
+        bootstrapbutton:bb_type="default" />
 
     <TextView
         android:id="@+id/import_qrcode_text"
diff --git a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
index 06719749c..828809601 100644
--- a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
@@ -45,12 +46,14 @@
             android:text="@string/key_list_empty_text2"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
-        <Button
+        <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/key_list_empty_button_create"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_margin="10dp"
             android:text="@string/key_list_empty_button_create"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+            bootstrapbutton:bb_icon_left="fa-plus"
+            bootstrapbutton:bb_type="default" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -59,12 +62,14 @@
             android:text="@string/key_list_empty_text3"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
-        <Button
+        <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/key_list_empty_button_import"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_margin="10dp"
             android:text="@string/key_list_empty_button_import"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+            bootstrapbutton:bb_icon_left="fa-download"
+            bootstrapbutton:bb_type="default" />
     </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/key_server_editor.xml b/OpenPGP-Keychain/res/layout/key_server_editor.xml
index 51ff8a663..058a43eaf 100644
--- a/OpenPGP-Keychain/res/layout/key_server_editor.xml
+++ b/OpenPGP-Keychain/res/layout/key_server_editor.xml
@@ -1,52 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
-
-     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.
--->
-
-<org.sufficientlysecure.keychain.ui.widget.KeyServerEditor
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+<org.sufficientlysecure.keychain.ui.widget.KeyServerEditor xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical" >
 
     <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="horizontal"
-        android:layout_marginLeft="3dip">
+        android:layout_marginLeft="3dip"
+        android:orientation="horizontal" >
 
         <EditText
             android:id="@+id/server"
-            android:layout_weight="1"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:inputType="textUri"/>
-
-        <ImageButton
-                android:id="@+id/delete"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/MinusButton"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="3dip"/>
+            android:layout_weight="1"
+            android:inputType="textUri" />
 
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="10dp"
+            android:layout_marginRight="3dip"
+            bootstrapbutton:bb_icon_left="fa-minus"
+            bootstrapbutton:bb_roundedCorners="true"
+            bootstrapbutton:bb_size="small"
+            bootstrapbutton:bb_type="danger" />
     </LinearLayout>
 
     <View
         android:id="@+id/separator"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="1dip"
-        android:background="?android:attr/listDivider"/>
+        android:background="?android:attr/listDivider" />
 
-</org.sufficientlysecure.keychain.ui.widget.KeyServerEditor>
+</org.sufficientlysecure.keychain.ui.widget.KeyServerEditor>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/key_server_preference.xml b/OpenPGP-Keychain/res/layout/key_server_preference.xml
index e9b1d5a95..8b99e5d2f 100644
--- a/OpenPGP-Keychain/res/layout/key_server_preference.xml
+++ b/OpenPGP-Keychain/res/layout/key_server_preference.xml
@@ -1,21 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
-
-     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.
--->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
@@ -57,15 +42,18 @@
                 android:textAppearance="?android:attr/textAppearanceSmall" />
         </RelativeLayout>
 
-        <ImageView
+        <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/add"
-            style="@style/PlusButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:layout_margin="10dp"
             android:layout_marginLeft="4dip"
             android:layout_marginRight="6dip"
-            android:clickable="true" />
+            bootstrapbutton:bb_icon_left="fa-plus"
+            bootstrapbutton:bb_roundedCorners="true"
+            bootstrapbutton:bb_size="small"
+            bootstrapbutton:bb_type="success" />
     </LinearLayout>
 
     <View
diff --git a/OpenPGP-Keychain/res/layout/key_view_activity.xml b/OpenPGP-Keychain/res/layout/key_view_activity.xml
index 8c6281d5b..ffb2400f1 100644
--- a/OpenPGP-Keychain/res/layout/key_view_activity.xml
+++ b/OpenPGP-Keychain/res/layout/key_view_activity.xml
@@ -1,4 +1,5 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_marginRight="?android:attr/scrollbarSize"
@@ -120,10 +121,13 @@
         android:padding="4dp"
         android:text="@string/section_actions" />
 
-    <Button
+    <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/action_encrypt"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/key_view_action_encrypt" />
+        android:layout_height="60dp"
+        android:padding="4dp"
+        android:text="@string/key_view_action_encrypt"
+        bootstrapbutton:bb_icon_left="fa-lock"
+        bootstrapbutton:bb_type="info" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/raw/help_about.html b/OpenPGP-Keychain/res/raw/help_about.html
index 8b412ded0..54af42b16 100644
--- a/OpenPGP-Keychain/res/raw/help_about.html
+++ b/OpenPGP-Keychain/res/raw/help_about.html
@@ -12,15 +12,15 @@ And don't add newlines before or after p tags because of transifex -->
 <h2>Developers OpenPGP Keychain</h2>
 <ul>
 <li>Dominik Schürmann (Lead developer)</li>
-<li>Ash Hughes</li>
+<li>Ash Hughes (crypto patches)</li>
 <li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
+<li>Bahtiar 'kalkin' Gadimov (UI)</li>
 
 </ul>
 <h2>Developers APG 1.x</h2>
 <ul>
-<li>Thialfihar (Lead developer)</li>
-<li>Senecaso (QRCode, sign key, upload key)</li>
+<li>'Thialfihar' (Lead developer)</li>
+<li>'Senecaso' (QRCode, sign key, upload key)</li>
 <li>Oliver Runge</li>
 <li>Markus Doits</li>
 </ul>
diff --git a/OpenPGP-Keychain/res/values/styles.xml b/OpenPGP-Keychain/res/values/styles.xml
index ef3ff63f6..15214fa62 100644
--- a/OpenPGP-Keychain/res/values/styles.xml
+++ b/OpenPGP-Keychain/res/values/styles.xml
@@ -18,16 +18,6 @@
 
 <resources>
 
-    <style name="MinusButton">
-        <item name="android:background">@drawable/btn_circle</item>
-        <item name="android:src">@drawable/ic_btn_round_minus</item>
-    </style>
-
-    <style name="PlusButton">
-        <item name="android:background">@drawable/btn_circle</item>
-        <item name="android:src">@drawable/ic_btn_round_plus</item>
-    </style>
-
     <style name="DashboardButton">
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:layout_width">wrap_content</item>
@@ -44,7 +34,7 @@
         <item name="android:drawablePadding">4dp</item>
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:paddingLeft">4dp</item>
-        <item name="android:textAllCaps">true</item>
+<!--         <item name="android:textAllCaps">true</item> -->
         <item name="android:textColor">@color/emphasis</item>
         <item name="android:textSize">14sp</item>
     </style>
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java
index 78ad4c9be..f7fc49083 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -60,7 +60,6 @@ import android.view.View.OnClickListener;
 import android.view.animation.AnimationUtils;
 import android.widget.CheckBox;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -70,6 +69,7 @@ import android.widget.ViewFlipper;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
+import com.beardedhen.androidbootstrap.BootstrapButton;
 
 @SuppressLint("NewApi")
 public class DecryptActivity extends SherlockFragmentActivity {
@@ -107,7 +107,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
 
     private EditText mFilename = null;
     private CheckBox mDeleteAfter = null;
-    private ImageButton mBrowse = null;
+    private BootstrapButton mBrowse = null;
 
     private String mInputFilename = null;
     private String mOutputFilename = null;
@@ -216,7 +216,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
         mMessage.setMinimumHeight(height);
 
         mFilename = (EditText) findViewById(R.id.filename);
-        mBrowse = (ImageButton) findViewById(R.id.btn_browse);
+        mBrowse = (BootstrapButton) findViewById(R.id.btn_browse);
         mBrowse.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 FileHelper.openFile(DecryptActivity.this, mFilename.getText().toString(), "*/*",
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index d141fbe3a..569a16c41 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -55,7 +55,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -64,6 +63,7 @@ import android.widget.Toast;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
+import com.beardedhen.androidbootstrap.BootstrapButton;
 
 public class EditKeyActivity extends KeyActivity {
 
@@ -91,7 +91,7 @@ public class EditKeyActivity extends KeyActivity {
     private String mCurrentPassPhrase = null;
     private String mNewPassPhrase = null;
 
-    private Button mChangePassPhrase;
+    private BootstrapButton mChangePassPhrase;
 
     private CheckBox mNoPassphrase;
 
@@ -336,7 +336,7 @@ public class EditKeyActivity extends KeyActivity {
                     }
                 }
             };
-            
+
             deleteKey(mDataUri, Id.type.secret_key, returnHandler);
             return true;
         }
@@ -426,7 +426,7 @@ public class EditKeyActivity extends KeyActivity {
         setContentView(R.layout.edit_key);
 
         // find views
-        mChangePassPhrase = (Button) findViewById(R.id.edit_key_btn_change_pass_phrase);
+        mChangePassPhrase = (BootstrapButton) findViewById(R.id.edit_key_btn_change_pass_phrase);
         mNoPassphrase = (CheckBox) findViewById(R.id.edit_key_no_passphrase);
 
         // Build layout based on given userIds and keys
@@ -653,7 +653,7 @@ public class EditKeyActivity extends KeyActivity {
     }
 
     private void updatePassPhraseButtonText() {
-        mChangePassPhrase.setText(isPassphraseSet() ? R.string.btn_change_passphrase
-                : R.string.btn_set_passphrase);
+        mChangePassPhrase.setText(isPassphraseSet() ? getString(R.string.btn_change_passphrase)
+                : getString(R.string.btn_set_passphrase));
     }
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index 2dfdf254e..681548c9b 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -55,10 +55,8 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.animation.AnimationUtils;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -68,6 +66,7 @@ import android.widget.ViewFlipper;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
+import com.beardedhen.androidbootstrap.BootstrapButton;
 
 public class EncryptActivity extends SherlockFragmentActivity {
 
@@ -87,7 +86,7 @@ public class EncryptActivity extends SherlockFragmentActivity {
     private long mEncryptionKeyIds[] = null;
 
     private EditText mMessage = null;
-    private Button mSelectKeysButton = null;
+    private BootstrapButton mSelectKeysButton = null;
 
     private boolean mEncryptEnabled = false;
     private String mEncryptString = "";
@@ -117,7 +116,7 @@ public class EncryptActivity extends SherlockFragmentActivity {
 
     private EditText mFilename = null;
     private CheckBox mDeleteAfter = null;
-    private ImageButton mBrowse = null;
+    private BootstrapButton mBrowse = null;
 
     private String mInputFilename = null;
     private String mOutputFilename = null;
@@ -825,7 +824,7 @@ public class EncryptActivity extends SherlockFragmentActivity {
         mModeLabel.setOnClickListener(nextModeClickListener);
 
         mMessage = (EditText) findViewById(R.id.message);
-        mSelectKeysButton = (Button) findViewById(R.id.btn_selectEncryptKeys);
+        mSelectKeysButton = (BootstrapButton) findViewById(R.id.btn_selectEncryptKeys);
         mSign = (CheckBox) findViewById(R.id.sign);
         mMainUserId = (TextView) findViewById(R.id.mainUserId);
         mMainUserIdRest = (TextView) findViewById(R.id.mainUserIdRest);
@@ -841,7 +840,7 @@ public class EncryptActivity extends SherlockFragmentActivity {
         mMessage.setMinimumHeight(height);
 
         mFilename = (EditText) findViewById(R.id.filename);
-        mBrowse = (ImageButton) findViewById(R.id.btn_browse);
+        mBrowse = (BootstrapButton) findViewById(R.id.btn_browse);
         mBrowse.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 FileHelper.openFile(EncryptActivity.this, mFilename.getText().toString(), "*/*",
@@ -896,9 +895,9 @@ public class EncryptActivity extends SherlockFragmentActivity {
 
     private void updateView() {
         if (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0) {
-            mSelectKeysButton.setText(R.string.no_keys_selected);
+            mSelectKeysButton.setText(getString(R.string.no_keys_selected));
         } else if (mEncryptionKeyIds.length == 1) {
-            mSelectKeysButton.setText(R.string.one_key_selected);
+            mSelectKeysButton.setText(getString(R.string.one_key_selected));
         } else {
             mSelectKeysButton.setText("" + mEncryptionKeyIds.length + " "
                     + getResources().getString(R.string.n_keys_selected));
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index f83d469ac..94b5304a1 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.ui;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.ActionBarHelper;
@@ -28,6 +29,7 @@ import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListEntry;
 import org.sufficientlysecure.keychain.ui.dialog.DeleteFileDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.FileDialogFragment;
 import org.sufficientlysecure.keychain.util.Log;
+
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -43,12 +45,15 @@ import android.os.Parcelable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Toast;
+
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
+import com.beardedhen.androidbootstrap.BootstrapButton;
 
 public class ImportKeysActivity extends SherlockFragmentActivity implements OnNavigationListener {
     public static final String ACTION_IMPORT_KEY = Constants.INTENT_PREFIX + "IMPORT_KEY";
@@ -74,12 +79,30 @@ public class ImportKeysActivity extends SherlockFragmentActivity implements OnNa
     OnNavigationListener mOnNavigationListener;
     String[] mNavigationStrings;
 
+    BootstrapButton mImportButton;
+    BootstrapButton mImportSignUploadButton;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.import_keys);
 
+        mImportButton = (BootstrapButton) findViewById(R.id.import_import);
+        mImportButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                importKeys();
+            }
+        });
+        mImportSignUploadButton = (BootstrapButton) findViewById(R.id.import_sign_and_upload);
+        mImportSignUploadButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                signAndUploadOnClick();
+            }
+        });
+
         // set actionbar without home button if called from another app
         ActionBarHelper.setBackButton(this);
 
@@ -398,11 +421,11 @@ public class ImportKeysActivity extends SherlockFragmentActivity implements OnNa
         }
     }
 
-    public void importOnClick(View view) {
+    public void importOnClick() {
         importKeys();
     }
 
-    public void signAndUploadOnClick(View view) {
+    public void signAndUploadOnClick() {
         // first, import!
         // importOnClick(view);
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
index dcb7dbcc6..31f758395 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
@@ -26,12 +26,13 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.Button;
+
+import com.beardedhen.androidbootstrap.BootstrapButton;
 
 public class ImportKeysClipboardFragment extends Fragment {
 
     private ImportKeysActivity mImportActivity;
-    private Button mButton;
+    private BootstrapButton mButton;
 
     /**
      * Creates new instance of this fragment
@@ -52,7 +53,7 @@ public class ImportKeysClipboardFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.import_keys_clipboard_fragment, container, false);
 
-        mButton = (Button) view.findViewById(R.id.import_clipboard_button);
+        mButton = (BootstrapButton) view.findViewById(R.id.import_clipboard_button);
         mButton.setOnClickListener(new OnClickListener() {
 
             @Override
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
index fbca9013b..ea76d2898 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
@@ -31,14 +31,15 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
-import android.widget.ImageButton;
+
+import com.beardedhen.androidbootstrap.BootstrapButton;
 
 public class ImportKeysFileFragment extends Fragment {
     public static final String ARG_PATH = "path";
 
     private ImportKeysActivity mImportActivity;
     private EditText mFilename;
-    private ImageButton mBrowse;
+    private BootstrapButton mBrowse;
 
     /**
      * Creates new instance of this fragment
@@ -61,7 +62,7 @@ public class ImportKeysFileFragment extends Fragment {
         View view = inflater.inflate(R.layout.import_keys_file_fragment, container, false);
 
         mFilename = (EditText) view.findViewById(R.id.import_keys_file_input);
-        mBrowse = (ImageButton) view.findViewById(R.id.import_keys_file_browse);
+        mBrowse = (BootstrapButton) view.findViewById(R.id.import_keys_file_browse);
 
         mBrowse.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java
index 2d756dde6..83af8cf48 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java
@@ -26,11 +26,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.Button;
+
+import com.beardedhen.androidbootstrap.BootstrapButton;
 
 public class ImportKeysNFCFragment extends Fragment {
 
-    private Button mButton;
+    private BootstrapButton mButton;
 
     /**
      * Creates new instance of this fragment
@@ -51,7 +52,7 @@ public class ImportKeysNFCFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.import_keys_nfc_fragment, container, false);
 
-        mButton = (Button) view.findViewById(R.id.import_nfc_button);
+        mButton = (BootstrapButton) view.findViewById(R.id.import_nfc_button);
         mButton.setOnClickListener(new OnClickListener() {
 
             @Override
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
index 62b59b4f7..f9ead3a94 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
@@ -30,18 +30,18 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.beardedhen.androidbootstrap.BootstrapButton;
 import com.google.zxing.integration.android.IntentIntegratorSupportV4;
 import com.google.zxing.integration.android.IntentResult;
 
 public class ImportKeysQrCodeFragment extends Fragment {
 
     private ImportKeysActivity mImportActivity;
-    private Button mButton;
+    private BootstrapButton mButton;
     private TextView mText;
     private ProgressBar mProgress;
 
@@ -66,7 +66,7 @@ public class ImportKeysQrCodeFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.import_keys_qr_code_fragment, container, false);
 
-        mButton = (Button) view.findViewById(R.id.import_qrcode_button);
+        mButton = (BootstrapButton) view.findViewById(R.id.import_qrcode_button);
         mText = (TextView) view.findViewById(R.id.import_qrcode_text);
         mProgress = (ProgressBar) view.findViewById(R.id.import_qrcode_progress);
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
index 106c8ebef..c985f1f60 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
@@ -24,12 +24,13 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
-import android.widget.Button;
+import android.view.ViewGroup;
+
+import com.beardedhen.androidbootstrap.BootstrapButton;
 
 public class ImportKeysServerFragment extends Fragment {
-    private Button mButton;
+    private BootstrapButton mButton;
 
     /**
      * Creates new instance of this fragment
@@ -50,7 +51,7 @@ public class ImportKeysServerFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.import_keys_keyserver_fragment, container, false);
 
-        mButton = (Button) view.findViewById(R.id.import_keyserver_button);
+        mButton = (BootstrapButton) view.findViewById(R.id.import_keyserver_button);
         mButton.setOnClickListener(new OnClickListener() {
 
             @Override
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
index 3ce1d08d0..88503a5c4 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
@@ -22,9 +22,9 @@ import java.util.Set;
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
-import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.ui.adapter.KeyListPublicAdapter;
 import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
 
@@ -45,13 +45,14 @@ import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.AbsListView.MultiChoiceModeListener;
 import android.widget.AdapterView;
-import android.widget.Button;
 import android.widget.ListView;
 
+import com.beardedhen.androidbootstrap.BootstrapButton;
+
 /**
  * Public key list with sticky list headers. It does _not_ extend ListFragment because it uses
  * StickyListHeaders library which does not extend upon ListView.
@@ -63,8 +64,8 @@ public class KeyListPublicFragment extends Fragment implements AdapterView.OnIte
     private StickyListHeadersListView mStickyList;
 
     // empty layout
-    private Button mButtonEmptyCreate;
-    private Button mButtonEmptyImport;
+    private BootstrapButton mButtonEmptyCreate;
+    private BootstrapButton mButtonEmptyImport;
 
     /**
      * Load custom layout with StickyListView from library
@@ -73,7 +74,7 @@ public class KeyListPublicFragment extends Fragment implements AdapterView.OnIte
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.key_list_public_fragment, container, false);
 
-        mButtonEmptyCreate = (Button) view.findViewById(R.id.key_list_empty_button_create);
+        mButtonEmptyCreate = (BootstrapButton) view.findViewById(R.id.key_list_empty_button_create);
         mButtonEmptyCreate.setOnClickListener(new OnClickListener() {
 
             @Override
@@ -86,7 +87,7 @@ public class KeyListPublicFragment extends Fragment implements AdapterView.OnIte
             }
         });
 
-        mButtonEmptyImport = (Button) view.findViewById(R.id.key_list_empty_button_import);
+        mButtonEmptyImport = (BootstrapButton) view.findViewById(R.id.key_list_empty_button_import);
         mButtonEmptyImport.setOnClickListener(new OnClickListener() {
 
             @Override
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java
index 7d51c2ff4..fb04bb1f8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java
@@ -52,12 +52,12 @@ import android.os.Message;
 import android.text.format.DateFormat;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
+import com.beardedhen.androidbootstrap.BootstrapButton;
 
 @SuppressLint("NewApi")
 public class KeyViewActivity extends KeyActivity implements CreateNdefMessageCallback,
@@ -70,7 +70,7 @@ public class KeyViewActivity extends KeyActivity implements CreateNdefMessageCal
     private TextView mFingerint;
     private TextView mExpiry;
     private TextView mCreation;
-    private Button mActionEncrypt;
+    private BootstrapButton mActionEncrypt;
 
     // NFC
     private NfcAdapter mNfcAdapter;
@@ -90,7 +90,7 @@ public class KeyViewActivity extends KeyActivity implements CreateNdefMessageCal
         mExpiry = (TextView) this.findViewById(R.id.expiry);
         mCreation = (TextView) this.findViewById(R.id.creation);
         mAlgorithm = (TextView) this.findViewById(R.id.algorithm);
-        mActionEncrypt = (Button) this.findViewById(R.id.action_encrypt);
+        mActionEncrypt = (BootstrapButton) this.findViewById(R.id.action_encrypt);
 
         Intent intent = getIntent();
         mDataUri = intent.getData();
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
index 730fcc520..e65da2aa8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
@@ -18,9 +18,9 @@
 package org.sufficientlysecure.keychain.ui.dialog;
 
 import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.FileHelper;
 import org.sufficientlysecure.keychain.util.Log;
-import org.sufficientlysecure.keychain.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -36,7 +36,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.EditText;
-import android.widget.ImageButton;
+
+import com.beardedhen.androidbootstrap.BootstrapButton;
 
 // TODO: return result from file manager activity to this dialog! not the activity!
 // do it like in ImportFileFragment!
@@ -55,6 +56,10 @@ public class FileDialogFragment extends DialogFragment {
 
     private Messenger mMessenger;
 
+    private EditText mFilename;
+    private BootstrapButton mBrowse;
+    private CheckBox mCheckBox;
+
     /**
      * Creates new instance of this file dialog fragment
      */
@@ -90,10 +95,6 @@ public class FileDialogFragment extends DialogFragment {
         String checkboxText = getArguments().getString(ARG_CHECKBOX_TEXT);
         final int requestCode = getArguments().getInt(ARG_REQUEST_CODE);
 
-        final EditText mFilename;
-        final ImageButton mBrowse;
-        final CheckBox mCheckBox;
-
         LayoutInflater inflater = (LayoutInflater) activity
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         AlertDialog.Builder alert = new AlertDialog.Builder(activity);
@@ -105,13 +106,13 @@ public class FileDialogFragment extends DialogFragment {
 
         mFilename = (EditText) view.findViewById(R.id.input);
         mFilename.setText(defaultFile);
-        mBrowse = (ImageButton) view.findViewById(R.id.btn_browse);
+        mBrowse = (BootstrapButton) view.findViewById(R.id.btn_browse);
         mBrowse.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 // only .asc or .gpg files
-                // setting it to text/plain prevents Cynaogenmod's file manager from selecting asc or gpg types!
-                FileHelper.openFile(activity, mFilename.getText().toString(), "*/*",
-                        requestCode);
+                // setting it to text/plain prevents Cynaogenmod's file manager from selecting asc
+                // or gpg types!
+                FileHelper.openFile(activity, mFilename.getText().toString(), "*/*", requestCode);
             }
         });
 
@@ -196,4 +197,3 @@ public class FileDialogFragment extends DialogFragment {
         }
     }
 }
-
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
index 5748839bc..0f5d26644 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
@@ -16,12 +16,18 @@
 
 package org.sufficientlysecure.keychain.ui.widget;
 
+import java.text.DateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Vector;
+
 import org.spongycastle.openpgp.PGPPublicKey;
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.util.Choice;
-import org.sufficientlysecure.keychain.R;
 
 import android.app.DatePickerDialog;
 import android.app.Dialog;
@@ -32,18 +38,12 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.DatePicker;
-import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import java.text.DateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Vector;
+import com.beardedhen.androidbootstrap.BootstrapButton;
 
 public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
     private PGPSecretKey mKey;
@@ -51,12 +51,12 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
     private EditorListener mEditorListener = null;
 
     private boolean mIsMasterKey;
-    ImageButton mDeleteButton;
+    BootstrapButton mDeleteButton;
     TextView mAlgorithm;
     TextView mKeyId;
     Spinner mUsage;
     TextView mCreationDate;
-    Button mExpiryDateButton;
+    BootstrapButton mExpiryDateButton;
     GregorianCalendar mExpiryDate;
 
     private int mDatePickerResultCount = 0;
@@ -87,7 +87,7 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
         mAlgorithm = (TextView) findViewById(R.id.algorithm);
         mKeyId = (TextView) findViewById(R.id.keyId);
         mCreationDate = (TextView) findViewById(R.id.creation);
-        mExpiryDateButton = (Button) findViewById(R.id.expiry);
+        mExpiryDateButton = (BootstrapButton) findViewById(R.id.expiry);
         mUsage = (Spinner) findViewById(R.id.usage);
         Choice choices[] = {
                 new Choice(Id.choice.usage.sign_only, getResources().getString(
@@ -101,7 +101,7 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         mUsage.setAdapter(adapter);
 
-        mDeleteButton = (ImageButton) findViewById(R.id.delete);
+        mDeleteButton = (BootstrapButton) findViewById(R.id.delete);
         mDeleteButton.setOnClickListener(this);
 
         setExpiryDate(null);
@@ -118,16 +118,18 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
                         date.get(Calendar.DAY_OF_MONTH));
                 mDatePickerResultCount = 0;
                 dialog.setCancelable(true);
-                dialog.setButton(Dialog.BUTTON_NEGATIVE, getContext()
-                        .getString(R.string.btn_no_date), new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (mDatePickerResultCount++ == 0) // Note: Ignore results after the first
-                                                           // one - android sends multiples.
-                        {
-                            setExpiryDate(null);
-                        }
-                    }
-                });
+                dialog.setButton(Dialog.BUTTON_NEGATIVE,
+                        getContext().getString(R.string.btn_no_date),
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                if (mDatePickerResultCount++ == 0) // Note: Ignore results after the
+                                                                   // first
+                                                                   // one - android sends multiples.
+                                {
+                                    setExpiryDate(null);
+                                }
+                            }
+                        });
                 dialog.show();
             }
         });
@@ -237,7 +239,7 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
     private void setExpiryDate(GregorianCalendar date) {
         mExpiryDate = date;
         if (date == null) {
-            mExpiryDateButton.setText(R.string.none);
+            mExpiryDateButton.setText(getContext().getString(R.string.none));
         } else {
             mExpiryDateButton.setText(DateFormat.getDateInstance().format(date.getTime()));
         }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
index 5fdb2c9c8..01259ccd1 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
@@ -23,14 +23,15 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.beardedhen.androidbootstrap.BootstrapButton;
+
 public class KeyServerEditor extends LinearLayout implements Editor, OnClickListener {
     private EditorListener mEditorListener = null;
 
-    ImageButton mDeleteButton;
+    BootstrapButton mDeleteButton;
     TextView mServer;
 
     public KeyServerEditor(Context context) {
@@ -48,7 +49,7 @@ public class KeyServerEditor extends LinearLayout implements Editor, OnClickList
 
         mServer = (TextView) findViewById(R.id.server);
 
-        mDeleteButton = (ImageButton) findViewById(R.id.delete);
+        mDeleteButton = (BootstrapButton) findViewById(R.id.delete);
         mDeleteButton.setOnClickListener(this);
 
         super.onFinishInflate();
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index 99190e9c7..91e3831b7 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
@@ -45,17 +45,16 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.beardedhen.androidbootstrap.BootstrapButton;
 
 public class SectionView extends LinearLayout implements OnClickListener, EditorListener {
     private LayoutInflater mInflater;
-    private View mAdd;
-    private ImageView mPlusButton;
+    private BootstrapButton mPlusButton;
     private ViewGroup mEditors;
     private TextView mTitle;
     private int mType = 0;
@@ -103,7 +102,6 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
 
     public void setCanEdit(boolean bCanEdit) {
         canEdit = bCanEdit;
-        mPlusButton = (ImageView) findViewById(R.id.plusbutton);
         if (!canEdit) {
             mPlusButton.setVisibility(View.INVISIBLE);
         }
@@ -117,8 +115,8 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
         setDrawingCacheEnabled(true);
         setAlwaysDrawnWithCacheEnabled(true);
 
-        mAdd = findViewById(R.id.header);
-        mAdd.setOnClickListener(this);
+        mPlusButton = (BootstrapButton) findViewById(R.id.plusbutton);
+        mPlusButton.setOnClickListener(this);
 
         mEditors = (ViewGroup) findViewById(R.id.editors);
         mTitle = (TextView) findViewById(R.id.title);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
index 6c65e840c..5428b626e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
@@ -27,14 +27,15 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 
+import com.beardedhen.androidbootstrap.BootstrapButton;
+
 public class UserIdEditor extends LinearLayout implements Editor, OnClickListener {
     private EditorListener mEditorListener = null;
 
-    private ImageButton mDeleteButton;
+    private BootstrapButton mDeleteButton;
     private RadioButton mIsMainUserId;
     private EditText mName;
     private EditText mEmail;
@@ -95,7 +96,7 @@ public class UserIdEditor extends LinearLayout implements Editor, OnClickListene
         setDrawingCacheEnabled(true);
         setAlwaysDrawnWithCacheEnabled(true);
 
-        mDeleteButton = (ImageButton) findViewById(R.id.delete);
+        mDeleteButton = (BootstrapButton) findViewById(R.id.delete);
         mDeleteButton.setOnClickListener(this);
         mIsMainUserId = (RadioButton) findViewById(R.id.isMainUserId);
         mIsMainUserId.setOnClickListener(this);
-- 
cgit v1.2.3