diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index af999f9..76949c9 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 228f017..ab8a24c 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingAddressFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingAddressFragment.java
index 7476dd6..5db1f56 100644
--- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingAddressFragment.java
+++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingAddressFragment.java
@@ -20,6 +20,7 @@ import ch.pizzaleu.android.activity.AddAddressActivity;
 import ch.pizzaleu.android.activity.BaseActivity;
 import ch.pizzaleu.android.activity.CreateOrderActivity;
 import ch.pizzaleu.android.adapter.recycler.ShippingAddressesRecyclerAdapter;
+import ch.pizzaleu.android.api.ApiConstants;
 import ch.pizzaleu.android.api.ApiErrorUtils;
 import ch.pizzaleu.android.api.ApiService;
 import ch.pizzaleu.android.api.ResponseArray;
@@ -110,6 +111,13 @@ public class ShippingAddressFragment extends CreateOrderBaseFragment {
 
     private void initViews(){
         initRecyclerView();
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
+        if(createOrderActivity.getSelectedShippingMethod().getCode().toLowerCase().equals(ApiConstants.SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE)){
+            addNewAddressButton.setText(R.string.add_new_shipping_address_for_self_pick_up);
+        }
+        else {
+            addNewAddressButton.setText(R.string.add_new_shipping_address_for_free_shipping);
+        }
     }
 
     private void getCustomerShippingAddresses(){
diff --git a/app/src/main/res/layout/fragment_shipping_address.xml b/app/src/main/res/layout/fragment_shipping_address.xml
index 7d6f8e8..a0d6d3c 100644
--- a/app/src/main/res/layout/fragment_shipping_address.xml
+++ b/app/src/main/res/layout/fragment_shipping_address.xml
@@ -20,7 +20,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
         style="@style/PizzappGrayButton"
-        android:text="@string/add_new_shipping_address"
+        android:text="@string/add_new_shipping_address_for_free_shipping"
         android:layout_above="@+id/ordersBottomLayout"/>
 
     <include layout="@layout/layout_orders_bottom"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b323e71..9637748 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -155,7 +155,8 @@
     <!-- ShippingMethodFragment-->
         
     <!-- ShippingAddressFragment-->
-    <string name="add_new_shipping_address">ABWEICHENDE LIEFERADRESSE</string>
+    <string name="add_new_shipping_address_for_free_shipping">ABWEICHENDE LIEFERADRESSE</string>
+    <string name="add_new_shipping_address_for_self_pick_up">ABWEICHENDE ADRESSE</string>
     <string name="alert_choose_shipping_address">Bitte wählen Sie eine Lieferungsadresse aus oder fügen Sie eine neue Lieferungsadresse hinzu.</string>
     <!-- ShippingAddressFragment-->