3 files changed, 5 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 34d4dbd57..bce194438 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -26,14 +26,10 @@
                 android:layout_marginTop="14dp"
                 android:text="@string/section_certification_key" />
 
-            <fragment
-                android:id="@+id/sign_key_select_key_fragment"
-                android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginTop="4dp"
-                tools:layout="@layout/select_secret_key_layout_fragment" />
+            <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
+                    android:id="@+id/certify_key_spinner"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
             <TextView
                 style="@style/SectionHeader"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index 4d82477bc..2189a1f34 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -24,7 +24,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/label_asymmetric_from" />
 
-        <Spinner
+        <org.sufficientlysecure.keychain.ui.widget.SignKeySpinner
             android:id="@+id/sign"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml b/OpenKeychain/src/main/res/layout/keyspinner_key.xml
index 703f9133b..703f9133b 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml
+++ b/OpenKeychain/src/main/res/layout/keyspinner_key.xml