diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionPlaySound.java b/app/src/main/java/com/jens/automation2/ActivityManageActionPlaySound.java
index 229df671..257c9444 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageActionPlaySound.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionPlaySound.java
@@ -8,7 +8,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
@@ -27,7 +26,7 @@ public class ActivityManageActionPlaySound extends Activity
     protected void onCreate(@Nullable Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_manage_play_sound);
+        setContentView(R.layout.activity_manage_action_play_sound);
 
         chkPlaySoundAlwaysPlay = (CheckBox)findViewById(R.id.chkPlaySoundAlwaysPlay);
         etSelectedSoundFile = (EditText)findViewById(R.id.etSelectedSoundFile);
diff --git a/app/src/main/res/layout/activity_manage_play_sound.xml b/app/src/main/res/layout/activity_manage_action_play_sound.xml
similarity index 96%
rename from app/src/main/res/layout/activity_manage_play_sound.xml
rename to app/src/main/res/layout/activity_manage_action_play_sound.xml
index f5c2d56d..cb57682e 100644
--- a/app/src/main/res/layout/activity_manage_play_sound.xml
+++ b/app/src/main/res/layout/activity_manage_action_play_sound.xml
@@ -27,7 +27,7 @@
     <EditText
         android:id="@+id/etSelectedSoundFile"
         android:layout_marginVertical="@dimen/default_margin"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
     <Button
diff --git a/app/src/main/res/layout/activity_manage_action_send_textmessage.xml b/app/src/main/res/layout/activity_manage_action_send_textmessage.xml
index 79def1af..06081f11 100644
--- a/app/src/main/res/layout/activity_manage_action_send_textmessage.xml
+++ b/app/src/main/res/layout/activity_manage_action_send_textmessage.xml
@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:layout_margin="10dp" >
+    android:layout_margin="@dimen/default_margin" >
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_manage_trigger_bluetooth.xml b/app/src/main/res/layout/activity_manage_trigger_bluetooth.xml
index e6f08cb1..11792c58 100644
--- a/app/src/main/res/layout/activity_manage_trigger_bluetooth.xml
+++ b/app/src/main/res/layout/activity_manage_trigger_bluetooth.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+	android:layout_margin="@dimen/default_margin">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -9,7 +10,6 @@
         android:orientation="vertical" >
 
 	    <LinearLayout
-		    android:layout_marginTop="10dp"
 		    android:orientation="horizontal"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
@@ -92,7 +92,7 @@
 	
 	        <Button
 	            android:id="@+id/bSaveBluetoothTrigger"
-	            android:layout_marginTop="10dp"
+	            android:layout_marginTop="@dimen/default_margin"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
 	            android:text="@string/save" />
diff --git a/app/src/main/res/layout/activity_manage_trigger_nfc.xml b/app/src/main/res/layout/activity_manage_trigger_nfc.xml
index cb8f4c34..48353482 100644
--- a/app/src/main/res/layout/activity_manage_trigger_nfc.xml
+++ b/app/src/main/res/layout/activity_manage_trigger_nfc.xml
@@ -3,7 +3,8 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+	android:layout_margin="@dimen/default_margin" >
 		
 	<LinearLayout
 	    android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_manage_trigger_notification.xml b/app/src/main/res/layout/activity_manage_trigger_notification.xml
index 9167bd68..46b1f79a 100644
--- a/app/src/main/res/layout/activity_manage_trigger_notification.xml
+++ b/app/src/main/res/layout/activity_manage_trigger_notification.xml
@@ -55,13 +55,13 @@
 					android:text="@string/application" />
 
 				<LinearLayout
-					android:orientation="horizontal"
+					android:orientation="vertical"
+					android:layout_marginHorizontal="@dimen/default_margin"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content">
 
 					<TextView
 						android:id="@+id/etActivityOrActionPath"
-						android:layout_marginHorizontal="@dimen/default_margin"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:text="@string/anyApp"
@@ -69,6 +69,7 @@
 
 					<Button
 						android:id="@+id/bSelectApp"
+						android:layout_marginTop="10dp"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:text="@string/selectApplication" />
diff --git a/app/src/main/res/layout/activity_manage_trigger_phone_call.xml b/app/src/main/res/layout/activity_manage_trigger_phone_call.xml
index b4629864..7eab1dc5 100644
--- a/app/src/main/res/layout/activity_manage_trigger_phone_call.xml
+++ b/app/src/main/res/layout/activity_manage_trigger_phone_call.xml
@@ -172,6 +172,7 @@
 
                 <Button
                     android:id="@+id/bTriggerPhoneCallImportFromContacts"
+                    android:drawableLeft="@drawable/contacts"
                     android:layout_marginVertical="@dimen/default_margin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_manage_trigger_timeframe.xml b/app/src/main/res/layout/activity_manage_trigger_timeframe.xml
index e1feafac..a85659ac 100644
--- a/app/src/main/res/layout/activity_manage_trigger_timeframe.xml
+++ b/app/src/main/res/layout/activity_manage_trigger_timeframe.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="fill_parent"
     android:layout_weight="30" 
-    android:layout_margin="10dp" >
+    android:layout_margin="@dimen/default_margin" >
 	    
 	<LinearLayout
 	    android:layout_width="match_parent"
@@ -34,18 +34,18 @@
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content" />
     
-	<ImageView
-	  android:layout_width="match_parent"
-	  android:layout_height="1dp"
-	  android:layout_margin="10dp"
-	  android:background="#aa000000" />
+		<ImageView
+		  android:layout_width="match_parent"
+		  android:layout_height="1dp"
+		  android:layout_margin="10dp"
+		  android:background="#aa000000" />
 
-	<TextView
-	    android:id="@+id/textView2"
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:text="@string/insideOrOutsideTimeFrames"
-	    android:textAppearance="?android:attr/textAppearanceLarge" />
+		<TextView
+			android:id="@+id/textView2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/insideOrOutsideTimeFrames"
+			android:textAppearance="?android:attr/textAppearanceLarge" />
 
 	    <RadioGroup
 	        android:layout_width="match_parent" 
@@ -65,18 +65,18 @@
 		        android:text="@string/leaving" />
 		</RadioGroup>
     
-	<ImageView
-	  android:layout_width="match_parent"
-	  android:layout_height="1dp"
-	  android:layout_margin="10dp"
-	  android:background="#aa000000" />
+		<ImageView
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_margin="10dp"
+			android:background="#aa000000" />
 
-	<TextView
-	    android:id="@+id/tvCurrentNfcIdValue"
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:text="@string/timeFrameWhichDays"
-	    android:textAppearance="?android:attr/textAppearanceLarge" />
+			<TextView
+				android:id="@+id/tvCurrentNfcIdValue"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/timeFrameWhichDays"
+				android:textAppearance="?android:attr/textAppearanceLarge" />
 			
 	    <CheckBox
 	        android:id="@+id/checkMonday"
@@ -122,6 +122,7 @@
 	
 	    <Button
 	        android:id="@+id/bSaveTimeFrame"
+			android:layout_marginTop="@dimen/default_margin"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
 	        android:text="@string/save" />
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 21af20e5..90af0cf6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -271,7 +271,7 @@
     <string name="with">mit</string>
     <string name="phoneNumber">Telefonnummer</string>
     <string name="enterPhoneNumber">Geben Sie eine Telefonnummer ein. Leer lassen für irgendeine Nummer.</string>
-    <string name="phoneDirection">Wählen Sie die Gesprächsrichtung</string>
+    <string name="phoneDirection">Wählen Sie die\nGesprächsrichtung</string>
     <string name="any">egal</string>
     <string name="incoming">eingehend</string>
     <string name="outgoing">ausgehend</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d049f2f1..80eaa2fa 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -255,7 +255,7 @@
     <string name="phoneCall">Llamada</string>
     <string name="phoneNumber">Número de teléfono</string>
     <string name="enterPhoneNumber">Inserte numero de teléfono. Vacio para algún número.</string>
-    <string name="phoneDirection">Elija llamada entrante o saliente</string>
+    <string name="phoneDirection">Elija llamada\nentrante o saliente</string>
     <string name="headphoneSimple">Auriculares</string>
     <string name="headphoneSelectType">Elija tipo de auriculares</string>
     <string name="accelerometer">"  Acelerómetro"</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f73568ad..33e6e596 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -353,7 +353,7 @@
     <string name="permissionsExplanationSmall">Per attivare la funzione che hai appena tentato di utilizzare, sono necessari ulteriori permessi. Clicca \"Continua\" per richiederli.</string>
     <string name="permissionsTitle">Permessi necessari</string>
     <string name="phoneCall">Chiamata</string>
-    <string name="phoneDirection">Seleziona se entrante o uscente</string>
+    <string name="phoneDirection">Seleziona se\nentrante o uscente</string>
     <string name="phoneNrReplacementError">Non ho l\'ultimo numero di telefono e quindi non posso inserirlo nella variabile.</string>
     <string name="phoneNumber">Numero di telefono</string>
     <string name="phoneNumberExplanation">È possibile inserire un numero di telefono specifico, ma non è necessario. Se vuoi specificarne uno, puoi sceglierlo dalla tua rubrica o inserirlo manualmente. Inoltre puoi usare espressioni regolari. Per testare un\'espressione regolare mi piace questa pagina:</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88291c60..659d424c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -339,7 +339,7 @@
     <string name="with">with</string>
     <string name="phoneNumber">Phone number</string>
     <string name="enterPhoneNumber">Enter phone number. Leave empty for any number.</string>
-    <string name="phoneDirection">Select call direction</string>
+    <string name="phoneDirection">Select call\ndirection</string>
     <string name="any">any</string>
     <string name="incoming">incoming</string>
     <string name="outgoing">outgoing</string>