Use new icons in other key related activites, delete old icons

OpenKeychain/src/main/res/layout/certify_key_activity.xml

@@ -106,7 +106,6 @@
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
             android:layout_marginTop="14dp"
             android:text="@string/section_uids_to_certify" />
 
@@ -149,21 +148,35 @@
             android:text="@string/section_actions"
             android:layout_weight="1" />
 
-        <TextView
-            android:id="@+id/sign_key_sign_button"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:layout_marginBottom="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+        <LinearLayout
+            android:id="@+id/certify_key_certify_button"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/key_view_action_certify"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_good"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical"
+            android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            style="@style/SelectableItem" />
+            android:paddingRight="4dp"
+            android:layout_marginBottom="8dp"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_certify"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/certify_key_action_certify_image"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/status_signature_verified_cutout"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
 
     </LinearLayout>
 

OpenKeychain/src/main/res/layout/view_key_main_fragment.xml

@@ -35,21 +35,6 @@
             android:layout_height="1dip"
             android:background="?android:attr/listDivider" />
 
-        <!--<TextView-->
-            <!--android:id="@+id/view_key_action_certify"-->
-            <!--android:paddingLeft="8dp"-->
-            <!--android:paddingRight="8dp"-->
-            <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="match_parent"-->
-            <!--android:text="@string/key_view_action_certify"-->
-            <!--android:minHeight="?android:attr/listPreferredItemHeight"-->
-            <!--android:drawableRight="@drawable/ic_action_good"-->
-            <!--android:drawablePadding="8dp"-->
-            <!--android:gravity="center_vertical"-->
-            <!--android:clickable="true"-->
-            <!--style="@style/SelectableItem" />-->
-
         <LinearLayout
             android:id="@+id/view_key_action_certify"
             android:layout_width="match_parent"

OpenKeychain/src/main/res/layout/view_key_user_id_item.xml

@@ -64,9 +64,9 @@
     </LinearLayout>
 
     <ImageView
+        android:id="@+id/edit_image"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:id="@+id/edit_image"
         android:src="@drawable/ic_action_edit"
         android:padding="8dp"
         android:layout_gravity="center_horizontal" />