diff --git a/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentApps.kt b/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentApps.kt
index 380a1c6..bd785d5 100644
--- a/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentApps.kt
+++ b/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentApps.kt
@@ -6,16 +6,17 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.fragment.app.Fragment
 import com.finnmglas.launcher.ChooseActivity
 import com.finnmglas.launcher.R
 import com.finnmglas.launcher.extern.*
 import kotlinx.android.synthetic.main.fragment_settings_apps.*
 
+
 /** The 'Apps' Tab associated Fragment in Settings */
 
 class SettingsFragmentApps : Fragment() {
@@ -48,15 +49,117 @@ class SettingsFragmentApps : Fragment() {
             setButtonColor(fragment_settings_apps_install_btn, vibrantColor)
         }
 
-        // Action - selecting buttons
-        fragment_settings_apps_choose_up_btn.setOnClickListener{ chooseApp("upApp") }
-        fragment_settings_apps_choose_down_btn.setOnClickListener{ chooseApp("downApp") }
-        fragment_settings_apps_choose_left_btn.setOnClickListener{ chooseApp("leftApp") }
-        fragment_settings_apps_choose_right_btn.setOnClickListener{ chooseApp("rightApp") }
-        fragment_settings_apps_choose_vol_up_btn.setOnClickListener{ chooseApp("volumeUpApp")}
-        fragment_settings_apps_choose_vol_down_btn.setOnClickListener{ chooseApp("volumeDownApp")}
-        fragment_settings_apps_choose_double_click_btn.setOnClickListener { chooseApp("doubleClickApp") }
-        fragment_settings_apps_choose_long_click_btn.setOnClickListener { chooseApp("longClickApp") }
+        /* TODO: Simplify and put all this repetitive stuff in a loop */
+
+        if (upApp != "") {
+            val appIcon = context!!.packageManager.getApplicationIcon(upApp)
+            fragment_settings_apps_up_icon.setImageDrawable(appIcon)
+
+            fragment_settings_apps_up_icon.visibility = View.VISIBLE
+            fragment_settings_apps_choose_up_btn.visibility = View.GONE
+
+            fragment_settings_apps_up_icon.setOnClickListener{ chooseApp("upApp") }
+        } else {
+            fragment_settings_apps_choose_up_btn.setOnClickListener{ chooseApp("upApp") }
+        }
+
+        if (upApp != "") {
+            val appIcon = context!!.packageManager.getApplicationIcon(upApp)
+            fragment_settings_apps_up_icon.setImageDrawable(appIcon)
+
+            fragment_settings_apps_up_icon.visibility = View.VISIBLE
+            fragment_settings_apps_choose_up_btn.visibility = View.GONE
+
+            fragment_settings_apps_up_icon.setOnClickListener{ chooseApp("upApp") }
+        } else {
+            fragment_settings_apps_choose_up_btn.setOnClickListener{ chooseApp("upApp") }
+        }
+
+        if (downApp != "") {
+            val appIcon = context!!.packageManager.getApplicationIcon(downApp)
+            fragment_settings_apps_down_icon.setImageDrawable(appIcon)
+
+            fragment_settings_apps_down_icon.visibility = View.VISIBLE
+            fragment_settings_apps_choose_down_btn.visibility = View.GONE
+
+            fragment_settings_apps_down_icon.setOnClickListener{ chooseApp("downApp") }
+        } else {
+            fragment_settings_apps_choose_down_btn.setOnClickListener{ chooseApp("downApp") }
+        }
+
+        if (leftApp != "") {
+            val appIcon = context!!.packageManager.getApplicationIcon(leftApp)
+            fragment_settings_apps_left_icon.setImageDrawable(appIcon)
+
+            fragment_settings_apps_left_icon.visibility = View.VISIBLE
+            fragment_settings_apps_choose_left_btn.visibility = View.GONE
+
+            fragment_settings_apps_left_icon.setOnClickListener{ chooseApp("leftApp") }
+        } else {
+            fragment_settings_apps_choose_left_btn.setOnClickListener{ chooseApp("leftApp") }
+        }
+
+        if (rightApp != "") {
+            val appIcon = context!!.packageManager.getApplicationIcon(rightApp)
+            fragment_settings_apps_right_icon.setImageDrawable(appIcon)
+
+            fragment_settings_apps_right_icon.visibility = View.VISIBLE
+            fragment_settings_apps_choose_right_btn.visibility = View.GONE
+
+            fragment_settings_apps_right_icon.setOnClickListener{ chooseApp("rightApp") }
+        } else {
+            fragment_settings_apps_choose_right_btn.setOnClickListener{ chooseApp("rightApp") }
+        }
+
+        if (volumeUpApp != "") {
+            val appIcon = context!!.packageManager.getApplicationIcon(volumeUpApp)
+            fragment_settings_apps_vol_up_icon.setImageDrawable(appIcon)
+
+            fragment_settings_apps_vol_up_icon.visibility = View.VISIBLE
+            fragment_settings_apps_choose_vol_up_btn.visibility = View.GONE
+
+            fragment_settings_apps_vol_up_icon.setOnClickListener{ chooseApp("volumeUpApp") }
+        } else {
+            fragment_settings_apps_choose_vol_up_btn.setOnClickListener{ chooseApp("volumeUpApp") }
+        }
+
+        if (volumeDownApp != "") {
+            val appIcon = context!!.packageManager.getApplicationIcon(volumeDownApp)
+            fragment_settings_apps_vol_down_icon.setImageDrawable(appIcon)
+
+            fragment_settings_apps_vol_down_icon.visibility = View.VISIBLE
+            fragment_settings_apps_choose_vol_down_btn.visibility = View.GONE
+
+            fragment_settings_apps_vol_down_icon.setOnClickListener{ chooseApp("volumeDownApp") }
+        } else {
+            fragment_settings_apps_choose_vol_down_btn.setOnClickListener{ chooseApp("volumeDownApp") }
+        }
+
+        if (doubleClickApp != "") {
+            val appIcon = context!!.packageManager.getApplicationIcon(doubleClickApp)
+            fragment_settings_apps_double_click_icon.setImageDrawable(appIcon)
+
+            fragment_settings_apps_double_click_icon.visibility = View.VISIBLE
+            fragment_settings_apps_choose_double_click_btn.visibility = View.GONE
+
+            fragment_settings_apps_double_click_icon.setOnClickListener{ chooseApp("doubleClickApp") }
+        } else {
+            fragment_settings_apps_choose_double_click_btn.setOnClickListener{ chooseApp("doubleClickApp") }
+        }
+
+        if (longClickApp != "") {
+            val appIcon = context!!.packageManager.getApplicationIcon(longClickApp)
+            fragment_settings_apps_long_click_icon.setImageDrawable(appIcon)
+
+            fragment_settings_apps_long_click_icon.visibility = View.VISIBLE
+            fragment_settings_apps_choose_long_click_btn.visibility = View.GONE
+
+            fragment_settings_apps_long_click_icon.setOnClickListener{ chooseApp("longClickApp") }
+        } else {
+            fragment_settings_apps_choose_long_click_btn.setOnClickListener{ chooseApp("longClickApp") }
+        }
+
+        /* TODO * End * */
 
         // App management buttons
         fragment_settings_apps_btn.setOnClickListener{
diff --git a/app/src/main/res/layout/fragment_settings_apps.xml b/app/src/main/res/layout/fragment_settings_apps.xml
index 7a11651..a12bd43 100644
--- a/app/src/main/res/layout/fragment_settings_apps.xml
+++ b/app/src/main/res/layout/fragment_settings_apps.xml
@@ -25,7 +25,8 @@
         <TableRow
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center">
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/app_action_height">
 
             <TextView
                 android:id="@+id/fragment_settings_apps_text_up"
@@ -36,18 +37,28 @@
                 android:text="@string/settings_choose_up"
                 android:textSize="20sp" />
 
+            <ImageView
+                android:id="@+id/fragment_settings_apps_up_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:visibility="gone"
+                tools:ignore="ContentDescription" />
+
             <Button
                 android:id="@+id/fragment_settings_apps_choose_up_btn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_choose_btn"
-                android:textAllCaps="false" />
+                android:textAllCaps="false"
+                android:visibility="visible" />
+
         </TableRow>
 
         <TableRow
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center">
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/app_action_height">
 
             <TextView
                 android:id="@+id/fragment_settings_apps_choose_down_text"
@@ -58,6 +69,13 @@
                 android:text="@string/settings_choose_down"
                 android:textSize="20sp" />
 
+            <ImageView
+                android:id="@+id/fragment_settings_apps_down_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/app_icon_side"
+                android:visibility="gone"
+                tools:ignore="ContentDescription" />
+
             <Button
                 android:id="@+id/fragment_settings_apps_choose_down_btn"
                 android:layout_width="wrap_content"
@@ -70,7 +88,8 @@
         <TableRow
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center">
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/app_action_height">
 
             <TextView
                 android:id="@+id/fragment_settings_apps_choose_left_text"
@@ -81,6 +100,13 @@
                 android:text="@string/settings_choose_left"
                 android:textSize="20sp" />
 
+            <ImageView
+                android:id="@+id/fragment_settings_apps_left_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/app_icon_side"
+                android:visibility="gone"
+                tools:ignore="ContentDescription" />
+
             <Button
                 android:id="@+id/fragment_settings_apps_choose_left_btn"
                 android:layout_width="wrap_content"
@@ -92,7 +118,8 @@
         <TableRow
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center">
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/app_action_height">
 
             <TextView
                 android:id="@+id/fragment_settings_apps_choose_right_text"
@@ -103,6 +130,13 @@
                 android:text="@string/settings_choose_right"
                 android:textSize="20sp" />
 
+            <ImageView
+                android:id="@+id/fragment_settings_apps_right_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/app_icon_side"
+                android:visibility="gone"
+                tools:ignore="ContentDescription" />
+
             <Button
                 android:id="@+id/fragment_settings_apps_choose_right_btn"
                 android:layout_width="match_parent"
@@ -115,7 +149,8 @@
         <TableRow
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center">
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/app_action_height">
 
             <TextView
                 android:id="@+id/fragment_settings_apps_choose_vol_up_text"
@@ -126,6 +161,13 @@
                 android:text="@string/settings_choose_vol_up"
                 android:textSize="20sp" />
 
+            <ImageView
+                android:id="@+id/fragment_settings_apps_vol_up_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/app_icon_side"
+                android:visibility="gone"
+                tools:ignore="ContentDescription" />
+
             <Button
                 android:id="@+id/fragment_settings_apps_choose_vol_up_btn"
                 android:layout_width="wrap_content"
@@ -137,7 +179,8 @@
         <TableRow
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center">
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/app_action_height">
 
             <TextView
                 android:id="@+id/fragment_settings_apps_choose_vol_down_text"
@@ -148,6 +191,13 @@
                 android:text="@string/settings_choose_vol_down"
                 android:textSize="20sp" />
 
+            <ImageView
+                android:id="@+id/fragment_settings_apps_vol_down_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/app_icon_side"
+                android:visibility="gone"
+                tools:ignore="ContentDescription" />
+
             <Button
                 android:id="@+id/fragment_settings_apps_choose_vol_down_btn"
                 android:layout_width="wrap_content"
@@ -160,7 +210,8 @@
         <TableRow
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center">
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/app_action_height">
 
             <TextView
                 android:id="@+id/fragment_settings_apps_choose_double_click_text"
@@ -171,6 +222,13 @@
                 android:text="@string/settings_choose_double_click"
                 android:textSize="20sp" />
 
+            <ImageView
+                android:id="@+id/fragment_settings_apps_double_click_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/app_icon_side"
+                android:visibility="gone"
+                tools:ignore="ContentDescription" />
+
             <Button
                 android:id="@+id/fragment_settings_apps_choose_double_click_btn"
                 android:layout_width="wrap_content"
@@ -183,7 +241,8 @@
         <TableRow
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center">
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/app_action_height">
 
             <TextView
                 android:id="@+id/fragment_settings_apps_choose_long_click_text"
@@ -194,6 +253,13 @@
                 android:text="@string/settings_choose_long_click"
                 android:textSize="20sp" />
 
+            <ImageView
+                android:id="@+id/fragment_settings_apps_long_click_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/app_icon_side"
+                android:visibility="gone"
+                tools:ignore="ContentDescription" />
+
             <Button
                 android:id="@+id/fragment_settings_apps_choose_long_click_btn"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1927bee..bdf620a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,4 +5,7 @@
     <dimen name="appbar_padding">16dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="appbar_padding_top">8dp</dimen>
+
+    <dimen name="app_icon_side">40dip</dimen>
+    <dimen name="app_action_height">48dip</dimen>
 </resources>