diff --git a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
index 4a2efac4a..cfb0fdee5 100644
--- a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
@@ -32,11 +32,6 @@
             android:text="@string/linked_select_2"
             android:layout_weight="1" />
 
-        <org.sufficientlysecure.keychain.ui.widget.FixedListView
-            android:id="@+id/view_key_user_ids"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
@@ -44,7 +39,7 @@
             android:background="?android:attr/listDivider" />
 
         <LinearLayout
-            android:id="@+id/linked_create_https_button"
+            android:id="@+id/linked_create_github_button"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
@@ -53,12 +48,12 @@
 
             <!-- separate ImageView required for recoloring -->
             <ImageView
-                android:id="@+id/certify_key_action_certify_image"
                 android:layout_width="60dip"
                 android:layout_height="60dip"
                 android:padding="8dp"
-                android:src="@drawable/linked_https"
-                android:layout_gravity="center_vertical" />
+                android:src="@drawable/linked_github"
+                android:layout_gravity="center"
+                />
 
             <TextView
                 android:paddingLeft="8dp"
@@ -66,7 +61,42 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="0dip"
                 android:layout_height="match_parent"
-                android:text="@string/linked_title_https"
+                android:text="@string/linked_title_github"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_marginBottom="4dp"
+            android:background="?android:attr/listDivider" />
+
+        <LinearLayout
+            android:id="@+id/linked_create_twitter_button"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:background="?android:selectableItemBackground"
+            android:orientation="horizontal">
+
+            <!-- separate ImageView required for recoloring -->
+            <ImageView
+                android:layout_width="60dip"
+                android:layout_height="60dip"
+                android:padding="8dp"
+                android:src="@drawable/linked_twitter"
+                android:layout_gravity="center"
+                />
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/linked_title_twitter"
                 android:layout_weight="1"
                 android:gravity="center_vertical" />
 
@@ -116,7 +146,7 @@
             android:background="?android:attr/listDivider" />
 
         <LinearLayout
-            android:id="@+id/linked_create_twitter_button"
+            android:id="@+id/linked_create_https_button"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
@@ -125,12 +155,12 @@
 
             <!-- separate ImageView required for recoloring -->
             <ImageView
+                android:id="@+id/certify_key_action_certify_image"
                 android:layout_width="60dip"
                 android:layout_height="60dip"
                 android:padding="8dp"
-                android:src="@drawable/linked_twitter"
-                android:layout_gravity="center"
-                />
+                android:src="@drawable/linked_https"
+                android:layout_gravity="center_vertical" />
 
             <TextView
                 android:paddingLeft="8dp"
@@ -138,42 +168,7 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="0dip"
                 android:layout_height="match_parent"
-                android:text="@string/linked_title_twitter"
-                android:layout_weight="1"
-                android:gravity="center_vertical" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:layout_marginBottom="4dp"
-            android:background="?android:attr/listDivider" />
-
-        <LinearLayout
-            android:id="@+id/linked_create_github_button"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            android:background="?android:selectableItemBackground"
-            android:orientation="horizontal">
-
-            <!-- separate ImageView required for recoloring -->
-            <ImageView
-                android:layout_width="60dip"
-                android:layout_height="60dip"
-                android:padding="8dp"
-                android:src="@drawable/linked_github"
-                android:layout_gravity="center"
-                />
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/linked_title_github"
+                android:text="@string/linked_title_https"
                 android:layout_weight="1"
                 android:gravity="center_vertical" />