diff --git a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/camera/CameraActivity.java b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/camera/CameraActivity.java
index 4f6c0ed2..62817522 100644
--- a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/camera/CameraActivity.java
+++ b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/camera/CameraActivity.java
@@ -140,7 +140,7 @@ private void handleButtonCapture()
         {
             captureButton.setVisibility(View.GONE);
             photoCaptured = true;
-            captureButton.setImageResource(R.drawable.ic_check_white_48dp);
+            captureButton.setImageResource(R.drawable.ic_check_white_48sp);
             flashButton.animate().alpha(0.0f).setDuration(500L);
             camera.takePicture(null, null, mPicture);
         }
@@ -180,7 +180,7 @@ private void handleButtonRetake()
             photoCaptured = false;
             retakeButton.setVisibility(View.GONE);
             flashButton.animate().alpha(1.0f).setDuration(500L);
-            captureButton.setImageResource(R.drawable.ic_camera_alt_white_48dp);
+            captureButton.setImageResource(R.drawable.ic_camera_alt_white_48sp);
             camera.startPreview();
         }
     }
@@ -216,9 +216,9 @@ private void setupFlashIcons()
     {
         currentFlashIconIndex = 0;
         flashIcons = new ArrayList<>();
-        flashIcons.add(R.drawable.ic_flash_auto_white_48dp);
-        flashIcons.add(R.drawable.ic_flash_on_white_48dp);
-        flashIcons.add(R.drawable.ic_flash_off_white_48dp);
+        flashIcons.add(R.drawable.ic_flash_auto_white_48sp);
+        flashIcons.add(R.drawable.ic_flash_on_white_48sp);
+        flashIcons.add(R.drawable.ic_flash_off_white_48sp);
     }
 
     private Camera.PictureCallback mPicture = new Camera.PictureCallback()
diff --git a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/products/dialog/ProductDialogFragment.java b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/products/dialog/ProductDialogFragment.java
index 97800bbd..26d60556 100644
--- a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/products/dialog/ProductDialogFragment.java
+++ b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/products/dialog/ProductDialogFragment.java
@@ -222,11 +222,11 @@ public void onClick(View view)
             {
                 if ( dialogCache.getExpandableLayout().getVisibility() == View.GONE )
                 {
-                    changePhotoThumbnailVisibility(R.drawable.ic_keyboard_arrow_up_white_48dp, View.VISIBLE);
+                    changePhotoThumbnailVisibility(R.drawable.ic_keyboard_arrow_up_white_48sp, View.VISIBLE);
                 }
                 else
                 {
-                    changePhotoThumbnailVisibility(R.drawable.ic_keyboard_arrow_down_white_48dp, View.GONE);
+                    changePhotoThumbnailVisibility(R.drawable.ic_keyboard_arrow_down_white_48sp, View.GONE);
                 }
             }
         });
@@ -429,9 +429,9 @@ private void startPhotoPreviewActivity()
         this.startActivityForResult(viewPhotoIntent, REQUEST_PHOTO_PREVIEW_FROM_DIALOG);
     }
 
-    private void changePhotoThumbnailVisibility(int ic_keyboard_arrow_up_white_48dp, int visible)
+    private void changePhotoThumbnailVisibility(int ic_keyboard_arrow_up_white_48sp, int visible)
     {
-        dialogCache.getExpandableImageView().setImageResource(ic_keyboard_arrow_up_white_48dp);
+        dialogCache.getExpandableImageView().setImageResource(ic_keyboard_arrow_up_white_48sp);
         dialogCache.getExpandableLayout().setVisibility(visible);
     }
 
@@ -466,7 +466,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data)
             dialogCache.getProductImage().setImageBitmap(imageBitmap);
             dto.setThumbnailBitmap(imageBitmap);
             dto.setDefaultImage(false);
-            changePhotoThumbnailVisibility(R.drawable.ic_keyboard_arrow_up_white_48dp, View.VISIBLE);
+            changePhotoThumbnailVisibility(R.drawable.ic_keyboard_arrow_up_white_48sp, View.VISIBLE);
         }
         else if ( requestCode == REQUEST_PHOTO_PREVIEW_FROM_DIALOG && resultCode == RESULT_OK )
         {
@@ -475,7 +475,7 @@ else if ( requestCode == REQUEST_PHOTO_PREVIEW_FROM_DIALOG && resultCode == RESU
 
             dialogCache.getProductImage().setImageBitmap(imageBitmap);
             dialogCache.setImageScheduledForDeletion(true);
-            changePhotoThumbnailVisibility(R.drawable.ic_keyboard_arrow_up_white_48dp, View.VISIBLE);
+            changePhotoThumbnailVisibility(R.drawable.ic_keyboard_arrow_up_white_48sp, View.VISIBLE);
         }
     }
 
diff --git a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/products/dialog/listeners/onFocusListener/ProductDialogFocusListener.java b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/products/dialog/listeners/onFocusListener/ProductDialogFocusListener.java
index 57671691..d6c798f3 100644
--- a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/products/dialog/listeners/onFocusListener/ProductDialogFocusListener.java
+++ b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/products/dialog/listeners/onFocusListener/ProductDialogFocusListener.java
@@ -23,7 +23,7 @@ public void onFocusChange(View view, boolean hasFocus)
         if ( hasFocus )
         {
             dialogCache.getExpandableLayout().setVisibility(View.GONE);
-            dialogCache.getExpandableImageView().setImageResource(R.drawable.ic_keyboard_arrow_down_white_48dp);
+            dialogCache.getExpandableImageView().setImageResource(R.drawable.ic_keyboard_arrow_down_white_48sp);
         }
     }
 }
diff --git a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/products/listadapter/ProductsItemViewHolder.java b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/products/listadapter/ProductsItemViewHolder.java
index d0703302..ee6f9355 100644
--- a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/products/listadapter/ProductsItemViewHolder.java
+++ b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/products/listadapter/ProductsItemViewHolder.java
@@ -134,13 +134,13 @@ public boolean onLongClick(View view)
             productItemCache.setDetailsVisible(!productItemCache.isDetailsVisible());
             if ( productItemCache.isDetailsVisible() )
             {
-                showDetailsButton.setImageResource(R.drawable.ic_keyboard_arrow_up_white_48dp);
+                showDetailsButton.setImageResource(R.drawable.ic_keyboard_arrow_up_white_48sp);
                 productItemCache.getDetailsLayout().setVisibility(View.VISIBLE);
 
             }
             else
             {
-                showDetailsButton.setImageResource(R.drawable.ic_keyboard_arrow_down_white_48dp);
+                showDetailsButton.setImageResource(R.drawable.ic_keyboard_arrow_down_white_48sp);
                 productItemCache.getDetailsLayout().setVisibility(View.GONE);
             }
         });
diff --git a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/shoppinglist/ListDialogFragment.java b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/shoppinglist/ListDialogFragment.java
index da3a989f..a2e9c3b1 100644
--- a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/shoppinglist/ListDialogFragment.java
+++ b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/shoppinglist/ListDialogFragment.java
@@ -144,7 +144,7 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b)
         if ( !StringUtils.isEmpty(dto.getDeadlineDate()) )
         {
             dialogCache.getDeadlineExpansionButton().setVisibility(View.VISIBLE);
-            dialogCache.getDeadlineExpansionButton().setImageResource(R.drawable.ic_keyboard_arrow_down_white_48dp);
+            dialogCache.getDeadlineExpansionButton().setImageResource(R.drawable.ic_keyboard_arrow_down_white_48sp);
 
             dialogCache.getCheckBox().setChecked(true);
             String language;
@@ -171,12 +171,12 @@ public void onClick(View view)
                 if ( dialogCache.getDeadlineLayout().getVisibility() == View.VISIBLE )
                 {
                     dialogCache.getDeadlineLayout().setVisibility(View.GONE);
-                    dialogCache.getDeadlineExpansionButton().setImageResource(R.drawable.ic_keyboard_arrow_down_white_48dp);
+                    dialogCache.getDeadlineExpansionButton().setImageResource(R.drawable.ic_keyboard_arrow_down_white_48sp);
                 }
                 else
                 {
                     dialogCache.getDeadlineLayout().setVisibility(View.VISIBLE);
-                    dialogCache.getDeadlineExpansionButton().setImageResource(R.drawable.ic_keyboard_arrow_up_white_48dp);
+                    dialogCache.getDeadlineExpansionButton().setImageResource(R.drawable.ic_keyboard_arrow_up_white_48sp);
                 }
             }
         });
@@ -197,7 +197,7 @@ public void onClick(View view)
                 if ( dialogCache.getCheckBox().isChecked() )
                 {
                     dialogCache.getDeadlineExpansionButton().setVisibility(View.VISIBLE);
-                    dialogCache.getDeadlineExpansionButton().setImageResource(R.drawable.ic_keyboard_arrow_up_white_48dp);
+                    dialogCache.getDeadlineExpansionButton().setImageResource(R.drawable.ic_keyboard_arrow_up_white_48sp);
                     dialogCache.getDeadlineLayout().setVisibility(View.VISIBLE);
                     dialogCache.getDateTextView().setText(DateUtils.getDateAsString(currentDate.getTimeInMillis(), datePattern, language));
                     dialogCache.getTimeTextView().setText(DateUtils.getDateAsString(currentDate.getTimeInMillis(), timePattern, language));
@@ -205,7 +205,7 @@ public void onClick(View view)
                 else
                 {
                     dialogCache.getReminderSwitch().setChecked(false);
-                    dialogCache.getDeadlineExpansionButton().setVisibility(View.GONE);
+                    dialogCache.getDeadlineExpansionButton().setVisibility(View.INVISIBLE);
                     dialogCache.getDateTextView().setText("");
                     dialogCache.getTimeTextView().setText("");
                     dialogCache.getDeadlineLayout().setVisibility(View.GONE);
diff --git a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/shoppinglist/listadapter/ListsItemViewHolder.java b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/shoppinglist/listadapter/ListsItemViewHolder.java
index 20031056..63415304 100644
--- a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/shoppinglist/listadapter/ListsItemViewHolder.java
+++ b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/shoppinglist/listadapter/ListsItemViewHolder.java
@@ -101,13 +101,13 @@ void processDto(ListDto dto)
             listItemCache.setDetailsVisible(!listItemCache.isDetailsVisible());
             if ( listItemCache.isDetailsVisible() )
             {
-                showDetailsButton.setImageResource(R.drawable.ic_keyboard_arrow_up_white_48dp);
+                showDetailsButton.setImageResource(R.drawable.ic_keyboard_arrow_up_white_48sp);
                 listItemCache.getListDetails().setVisibility(View.VISIBLE);
 
             }
             else
             {
-                showDetailsButton.setImageResource(R.drawable.ic_keyboard_arrow_down_white_48dp);
+                showDetailsButton.setImageResource(R.drawable.ic_keyboard_arrow_down_white_48sp);
                 listItemCache.getListDetails().setVisibility(View.GONE);
             }
         });
diff --git a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/shoppinglist/listeners/ListsDialogFocusListener.java b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/shoppinglist/listeners/ListsDialogFocusListener.java
index 035a92ba..bf330079 100644
--- a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/shoppinglist/listeners/ListsDialogFocusListener.java
+++ b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ui/shoppinglist/listeners/ListsDialogFocusListener.java
@@ -24,7 +24,7 @@ public void onFocusChange(View v, boolean hasFocus)
         if ( hasFocus )
         {
             dialogCache.getDeadlineLayout().setVisibility(View.GONE);
-            dialogCache.getDeadlineExpansionButton().setImageResource(R.drawable.ic_keyboard_arrow_down_white_48dp);
+            dialogCache.getDeadlineExpansionButton().setImageResource(R.drawable.ic_keyboard_arrow_down_white_48sp);
         }
     }
 }
diff --git a/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_info_black_24sp.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_info_black_24dp.png
rename to app/src/main/res/drawable-hdpi/ic_info_black_24sp.png
diff --git a/app/src/main/res/drawable-mdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_info_black_24sp.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_info_black_24dp.png
rename to app/src/main/res/drawable-mdpi/ic_info_black_24sp.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_info_black_24sp.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png
rename to app/src/main/res/drawable-xhdpi/ic_info_black_24sp.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_info_black_24sp.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png
rename to app/src/main/res/drawable-xxhdpi/ic_info_black_24sp.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_info_black_24sp.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp.png
rename to app/src/main/res/drawable-xxxhdpi/ic_info_black_24sp.png
diff --git a/app/src/main/res/drawable/button_disabled.xml b/app/src/main/res/drawable/button_disabled.xml
index 241836d7..8690e068 100644
--- a/app/src/main/res/drawable/button_disabled.xml
+++ b/app/src/main/res/drawable/button_disabled.xml
@@ -3,7 +3,7 @@
     <item>
         <shape>
             <solid android:color="@color/middlegrey"/>
-            <corners android:radius="6dp"/>
+            <corners android:radius="6sp"/>
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_fullwidth.xml b/app/src/main/res/drawable/button_fullwidth.xml
index 6b513240..25d44064 100644
--- a/app/src/main/res/drawable/button_fullwidth.xml
+++ b/app/src/main/res/drawable/button_fullwidth.xml
@@ -3,7 +3,7 @@
     <item>
         <shape>
             <solid android:color="@color/colorPrimaryDark"/>
-            <corners android:radius="6dp"/>
+            <corners android:radius="6sp"/>
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_highlighted.xml b/app/src/main/res/drawable/button_highlighted.xml
index d11deb71..e038375c 100644
--- a/app/src/main/res/drawable/button_highlighted.xml
+++ b/app/src/main/res/drawable/button_highlighted.xml
@@ -3,7 +3,7 @@
     <item>
         <shape>
             <solid android:color="@color/colorAccent"/>
-            <corners android:radius="6dp"/>
+            <corners android:radius="6sp"/>
 
             <stroke
                     android:width="10px"
diff --git a/app/src/main/res/drawable/button_highlighted_2.xml b/app/src/main/res/drawable/button_highlighted_2.xml
index 1be1fdfb..7040d4c4 100644
--- a/app/src/main/res/drawable/button_highlighted_2.xml
+++ b/app/src/main/res/drawable/button_highlighted_2.xml
@@ -3,7 +3,7 @@
     <item>
         <shape>
             <solid android:color="@color/colorAccent"/>
-            <corners android:radius="6dp"/>
+            <corners android:radius="6sp"/>
             <stroke
                     android:width="10px"
                     android:color="@color/black"/>
diff --git a/app/src/main/res/drawable/button_highlighted_3.xml b/app/src/main/res/drawable/button_highlighted_3.xml
index 3627b949..d64eea04 100644
--- a/app/src/main/res/drawable/button_highlighted_3.xml
+++ b/app/src/main/res/drawable/button_highlighted_3.xml
@@ -3,7 +3,7 @@
     <item>
         <shape>
             <solid android:color="@color/colorAccent"/>
-            <corners android:radius="6dp"/>
+            <corners android:radius="6sp"/>
             <stroke
                     android:width="10px"
                     android:color="@color/yellow"/>
diff --git a/app/src/main/res/drawable/button_highlighted_4.xml b/app/src/main/res/drawable/button_highlighted_4.xml
index 99a5cf33..d7ebbf87 100644
--- a/app/src/main/res/drawable/button_highlighted_4.xml
+++ b/app/src/main/res/drawable/button_highlighted_4.xml
@@ -3,7 +3,7 @@
     <item>
         <shape>
             <solid android:color="@color/colorAccent"/>
-            <corners android:radius="6dp"/>
+            <corners android:radius="6sp"/>
             <stroke
                     android:width="10px"
                     android:color="@color/middleblue"/>
diff --git a/app/src/main/res/drawable/button_middleblue.xml b/app/src/main/res/drawable/button_middleblue.xml
index f5d4ab58..c7539277 100644
--- a/app/src/main/res/drawable/button_middleblue.xml
+++ b/app/src/main/res/drawable/button_middleblue.xml
@@ -3,7 +3,7 @@
     <item>
         <shape>
             <solid android:color="@color/middleblue"/>
-            <corners android:radius="6dp"/>
+            <corners android:radius="6sp"/>
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_normal.xml b/app/src/main/res/drawable/button_normal.xml
index dad6e874..c49a2b41 100644
--- a/app/src/main/res/drawable/button_normal.xml
+++ b/app/src/main/res/drawable/button_normal.xml
@@ -3,7 +3,7 @@
     <item>
         <shape>
             <solid android:color="@color/colorAccent"/>
-            <corners android:radius="6dp"/>
+            <corners android:radius="6sp"/>
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/fab_tutorial.xml b/app/src/main/res/drawable/fab_tutorial.xml
index b0ec6165..cb6a833c 100644
--- a/app/src/main/res/drawable/fab_tutorial.xml
+++ b/app/src/main/res/drawable/fab_tutorial.xml
@@ -14,9 +14,9 @@
     </item>
     <item
             android:drawable="@drawable/ic_input_add_white"
-            android:bottom="20dp"
-            android:left="20dp"
-            android:right="20dp"
-            android:top="20dp"
+            android:bottom="20sp"
+            android:left="20sp"
+            android:right="20sp"
+            android:top="20sp"
     />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_camera_alt_white_48dp.png b/app/src/main/res/drawable/ic_camera_alt_white_48sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_camera_alt_white_48dp.png
rename to app/src/main/res/drawable/ic_camera_alt_white_48sp.png
diff --git a/app/src/main/res/drawable/ic_cancel_white_48dp.png b/app/src/main/res/drawable/ic_cancel_white_48sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_cancel_white_48dp.png
rename to app/src/main/res/drawable/ic_cancel_white_48sp.png
diff --git a/app/src/main/res/drawable/ic_check_white_48dp.png b/app/src/main/res/drawable/ic_check_white_48sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_check_white_48dp.png
rename to app/src/main/res/drawable/ic_check_white_48sp.png
diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.png b/app/src/main/res/drawable/ic_delete_white_24sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_delete_white_24dp.png
rename to app/src/main/res/drawable/ic_delete_white_24sp.png
diff --git a/app/src/main/res/drawable/ic_edit_custom_color.xml b/app/src/main/res/drawable/ic_edit_custom_color.xml
index aa6068e8..ab0131ef 100644
--- a/app/src/main/res/drawable/ic_edit_custom_color.xml
+++ b/app/src/main/res/drawable/ic_edit_custom_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/ic_edit_white_48dp"
+        android:src="@drawable/ic_edit_white_48sp"
         android:tint="@color/colorPrimaryDark"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_edit_white_48dp.png b/app/src/main/res/drawable/ic_edit_white_48sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_edit_white_48dp.png
rename to app/src/main/res/drawable/ic_edit_white_48sp.png
diff --git a/app/src/main/res/drawable/ic_error_black_24dp.png b/app/src/main/res/drawable/ic_error_black_24sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_error_black_24dp.png
rename to app/src/main/res/drawable/ic_error_black_24sp.png
diff --git a/app/src/main/res/drawable/ic_error_outline_white_24dp.png b/app/src/main/res/drawable/ic_error_outline_white_24sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_error_outline_white_24dp.png
rename to app/src/main/res/drawable/ic_error_outline_white_24sp.png
diff --git a/app/src/main/res/drawable/ic_flash_auto_white_48dp.png b/app/src/main/res/drawable/ic_flash_auto_white_48sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_flash_auto_white_48dp.png
rename to app/src/main/res/drawable/ic_flash_auto_white_48sp.png
diff --git a/app/src/main/res/drawable/ic_flash_off_white_48dp.png b/app/src/main/res/drawable/ic_flash_off_white_48sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_flash_off_white_48dp.png
rename to app/src/main/res/drawable/ic_flash_off_white_48sp.png
diff --git a/app/src/main/res/drawable/ic_flash_on_white_48dp.png b/app/src/main/res/drawable/ic_flash_on_white_48sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_flash_on_white_48dp.png
rename to app/src/main/res/drawable/ic_flash_on_white_48sp.png
diff --git a/app/src/main/res/drawable/ic_home_white_24dp.png b/app/src/main/res/drawable/ic_home_white_24sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_home_white_24dp.png
rename to app/src/main/res/drawable/ic_home_white_24sp.png
diff --git a/app/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml
index f932682a..9ac30dc1 100644
--- a/app/src/main/res/drawable/ic_info_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_info_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="24sp"
+        android:height="24sp"
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_insert_chart_white_24dp.png b/app/src/main/res/drawable/ic_insert_chart_white_24sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_insert_chart_white_24dp.png
rename to app/src/main/res/drawable/ic_insert_chart_white_24sp.png
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down_white_48dp.png b/app/src/main/res/drawable/ic_keyboard_arrow_down_white_48sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_keyboard_arrow_down_white_48dp.png
rename to app/src/main/res/drawable/ic_keyboard_arrow_down_white_48sp.png
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_left_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_left_black_24sp.xml
similarity index 83%
rename from app/src/main/res/drawable/ic_keyboard_arrow_left_black_24dp.xml
rename to app/src/main/res/drawable/ic_keyboard_arrow_left_black_24sp.xml
index 70f7d1fd..5bd8c619 100644
--- a/app/src/main/res/drawable/ic_keyboard_arrow_left_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_left_black_24sp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="24sp"
+        android:height="24sp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right_black_24sp.xml
similarity index 83%
rename from app/src/main/res/drawable/ic_keyboard_arrow_right_black_24dp.xml
rename to app/src/main/res/drawable/ic_keyboard_arrow_right_black_24sp.xml
index ee56cfa5..b8383bfb 100644
--- a/app/src/main/res/drawable/ic_keyboard_arrow_right_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_right_black_24sp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="24sp"
+        android:height="24sp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up_white_48dp.png b/app/src/main/res/drawable/ic_keyboard_arrow_up_white_48sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_keyboard_arrow_up_white_48dp.png
rename to app/src/main/res/drawable/ic_keyboard_arrow_up_white_48sp.png
diff --git a/app/src/main/res/drawable/ic_menu_help.xml b/app/src/main/res/drawable/ic_menu_help.xml
index d3f87e70..40520134 100644
--- a/app/src/main/res/drawable/ic_menu_help.xml
+++ b/app/src/main/res/drawable/ic_menu_help.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="24sp"
+        android:height="24sp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_menu_info.xml b/app/src/main/res/drawable/ic_menu_info.xml
index 17df0fba..95153530 100644
--- a/app/src/main/res/drawable/ic_menu_info.xml
+++ b/app/src/main/res/drawable/ic_menu_info.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="24sp"
+        android:height="24sp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_search_white_48dp.png b/app/src/main/res/drawable/ic_search_white_48sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_search_white_48dp.png
rename to app/src/main/res/drawable/ic_search_white_48sp.png
diff --git a/app/src/main/res/drawable/ic_sort_white_24dp.png b/app/src/main/res/drawable/ic_sort_white_24sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_sort_white_24dp.png
rename to app/src/main/res/drawable/ic_sort_white_24sp.png
diff --git a/app/src/main/res/drawable/ic_undo_white_48dp.png b/app/src/main/res/drawable/ic_undo_white_48sp.png
similarity index 100%
rename from app/src/main/res/drawable/ic_undo_white_48dp.png
rename to app/src/main/res/drawable/ic_undo_white_48sp.png
diff --git a/app/src/main/res/drawable/list_dialog_border.xml b/app/src/main/res/drawable/list_dialog_border.xml
index 7a8d18cf..11e32157 100644
--- a/app/src/main/res/drawable/list_dialog_border.xml
+++ b/app/src/main/res/drawable/list_dialog_border.xml
@@ -3,9 +3,9 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
 
-    <corners android:radius="5dp"/>
+    <corners android:radius="5sp"/>
 
     <stroke
-            android:width="1dp"
+            android:width="1sp"
             android:color="@color/colorAccent"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/search_border_style.xml b/app/src/main/res/drawable/search_border_style.xml
index 4c8105a1..3cb398a0 100644
--- a/app/src/main/res/drawable/search_border_style.xml
+++ b/app/src/main/res/drawable/search_border_style.xml
@@ -12,7 +12,7 @@
         <shape>
             <solid android:color="@android:color/transparent"/>
             <stroke
-                    android:width="1dp"
+                    android:width="1sp"
                     android:color="@color/colorAccent"/>
         </shape>
     </item>
diff --git a/app/src/main/res/layouts/about/layout/activity_about.xml b/app/src/main/res/layouts/about/layout/activity_about.xml
index 06276f0e..cac123ac 100644
--- a/app/src/main/res/layouts/about/layout/activity_about.xml
+++ b/app/src/main/res/layouts/about/layout/activity_about.xml
@@ -42,7 +42,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="20dp"
+                    android:layout_marginTop="20sp"
                     android:text="@string/app_name_long"/>
 
             <TextView
@@ -50,7 +50,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="5dp"
+                    android:layout_marginTop="5sp"
                     android:text="@string/version_number"/>
 
             <TextView
@@ -58,7 +58,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="5dp"
+                    android:layout_marginTop="5sp"
                     android:text="@string/about_developper"/>
 
             <TextView
@@ -66,7 +66,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="5dp"
+                    android:layout_marginTop="5sp"
                     android:text="@string/about_author_greb"/>
 
             <TextView
@@ -74,7 +74,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="5dp"
+                    android:layout_marginTop="5sp"
                     android:text="@string/about_author_cri"/>
 
 
@@ -83,7 +83,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="15dp"
+                    android:layout_marginTop="15sp"
                     android:text="@string/about_affiliation"
                     android:textStyle="bold"/>
 
@@ -97,7 +97,7 @@
             <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="10sp"
                     android:layout_gravity="center_horizontal"
                     android:text="@string/privacy_friendly"
                     android:gravity="center_horizontal"/>
@@ -107,7 +107,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:gravity="center"
-                    android:layout_marginTop="15dp"
+                    android:layout_marginTop="15sp"
                     android:text="@string/more_info"/>
 
             <TextView
diff --git a/app/src/main/res/layouts/camera/layout/camera_preview.xml b/app/src/main/res/layouts/camera/layout/camera_preview.xml
index 4ca1c624..036140c7 100644
--- a/app/src/main/res/layouts/camera/layout/camera_preview.xml
+++ b/app/src/main/res/layouts/camera/layout/camera_preview.xml
@@ -18,7 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:tint="@color/white"
-            android:src="@drawable/ic_camera_alt_white_48dp"
+            android:src="@drawable/ic_camera_alt_white_48sp"
 
             app:layout_anchorGravity="bottom|right|end"
             android:layout_gravity="right|bottom" android:layout_marginLeft="@dimen/fab_margin"
@@ -30,7 +30,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:tint="@color/white"
-            android:src="@drawable/ic_flash_auto_white_48dp"
+            android:src="@drawable/ic_flash_auto_white_48sp"
 
             app:layout_anchorGravity="bottom|right|end"
             android:layout_gravity="right|top" android:layout_marginLeft="@dimen/fab_margin"
@@ -43,7 +43,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:tint="@color/white"
-            android:src="@drawable/ic_undo_white_48dp"
+            android:src="@drawable/ic_undo_white_48sp"
 
             app:layout_anchorGravity="bottom|right|end"
             android:layout_gravity="left|bottom" android:layout_marginLeft="@dimen/fab_margin"
diff --git a/app/src/main/res/layouts/deletelists/layout/delete_lists_activity.xml b/app/src/main/res/layouts/deletelists/layout/delete_lists_activity.xml
index d28aaabe..31487a54 100644
--- a/app/src/main/res/layouts/deletelists/layout/delete_lists_activity.xml
+++ b/app/src/main/res/layouts/deletelists/layout/delete_lists_activity.xml
@@ -25,7 +25,7 @@
             android:layout_gravity="bottom|end"
             android:layout_margin="@dimen/fab_margin"
             android:tint="@color/white"
-            android:src="@drawable/ic_delete_white_24dp"
+            android:src="@drawable/ic_delete_white_24sp"
             app:layout_anchor="@id/recyclerView"
             app:layout_anchorGravity="bottom|right|end"
             app:layout_behavior=".ui.fab.ScrollAwareFabBehaviorForDeleteActivities"/>
diff --git a/app/src/main/res/layouts/deleteproducts/layout/delete_product_list_item.xml b/app/src/main/res/layouts/deleteproducts/layout/delete_product_list_item.xml
index 8a96c3c7..601aeb44 100644
--- a/app/src/main/res/layouts/deleteproducts/layout/delete_product_list_item.xml
+++ b/app/src/main/res/layouts/deleteproducts/layout/delete_product_list_item.xml
@@ -5,8 +5,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_margin="8dp"
-        card_view:cardCornerRadius="4dp">
+        android:layout_margin="8sp"
+        card_view:cardCornerRadius="4sp">
 
     <RelativeLayout
             android:layout_width="wrap_content"
@@ -16,7 +16,7 @@
                 android:id="@+id/textview_product_name"
                 android:text="@string/ph_product_name"
                 android:layout_width="wrap_content"
-                android:layout_height="?attr/listPreferredItemHeight"
+                android:layout_height="@dimen/listPreferredItemHeight"
                 android:gravity="center_vertical"
                 android:padding="@dimen/list_padding"
                 android:layout_marginLeft="@dimen/list_margin"
@@ -29,7 +29,7 @@
                 android:padding="@dimen/list_padding"
                 android:enabled="false"
                 android:buttonTint="@color/black"
-                android:layout_height="?attr/listPreferredItemHeight"
+                android:layout_height="@dimen/listPreferredItemHeight"
                 android:gravity="center_vertical"
                 android:layout_alignParentRight="true"/>
 
@@ -37,7 +37,7 @@
                 android:id="@+id/textview_prod_quantity"
                 android:text="@string/ph_list_nr_items"
                 android:layout_width="wrap_content"
-                android:layout_height="?attr/listPreferredItemHeight"
+                android:layout_height="@dimen/listPreferredItemHeight"
                 android:layout_toLeftOf="@id/checkbox_is_selected"
                 android:gravity="center_vertical"
                 android:layout_marginRight="@dimen/list_margin"
@@ -49,9 +49,9 @@
                 android:layout_width="match_parent"
                 android:background="@color/transparent"
                 android:backgroundTint="@color/transparent"
-                android:layout_height="?attr/listPreferredItemHeight"
+                android:layout_height="@dimen/listPreferredItemHeight"
                 android:layout_gravity="center"
-                card_view:cardCornerRadius="4dp"
+                card_view:cardCornerRadius="4sp"
         />
 
     </RelativeLayout>
diff --git a/app/src/main/res/layouts/deleteproducts/layout/delete_products_activity.xml b/app/src/main/res/layouts/deleteproducts/layout/delete_products_activity.xml
index 0b8c29c6..36984c08 100644
--- a/app/src/main/res/layouts/deleteproducts/layout/delete_products_activity.xml
+++ b/app/src/main/res/layouts/deleteproducts/layout/delete_products_activity.xml
@@ -25,7 +25,7 @@
             android:layout_gravity="bottom|end"
             android:layout_margin="@dimen/fab_margin"
             android:tint="@color/white"
-            android:src="@drawable/ic_delete_white_24dp"
+            android:src="@drawable/ic_delete_white_24sp"
             app:layout_anchor="@id/recyclerView"
             app:layout_anchorGravity="bottom|right|end"
             app:layout_behavior=".ui.fab.ScrollAwareFabBehaviorForDeleteActivities"/>
diff --git a/app/src/main/res/layouts/main/layout/app_bar_main.xml b/app/src/main/res/layouts/main/layout/app_bar_main.xml
index 226e4071..2cb91551 100644
--- a/app/src/main/res/layouts/main/layout/app_bar_main.xml
+++ b/app/src/main/res/layouts/main/layout/app_bar_main.xml
@@ -31,12 +31,12 @@
             android:id="@+id/insert_alert"
             android:orientation="horizontal"
             android:layout_margin="@dimen/fab_margin"
-            android:paddingRight="70dp"
+            android:paddingRight="70sp"
             android:gravity="center_vertical"
             app:layout_anchor="@id/fab_new_list"
             app:layout_anchorGravity="bottom|left"
             android:layout_width="wrap_content"
-            android:layout_height="50dp">
+            android:layout_height="50sp">
 
         <TextView
                 android:text="@string/alert_message_list"
@@ -48,7 +48,7 @@
 
         <ImageView
                 android:tint="@color/colorPrimary"
-                android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
+                android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
     </LinearLayout>
diff --git a/app/src/main/res/layouts/products/layout/product_dialog.xml b/app/src/main/res/layouts/products/layout/product_dialog.xml
index 2f8ef8f9..97d0c9b5 100644
--- a/app/src/main/res/layouts/products/layout/product_dialog.xml
+++ b/app/src/main/res/layouts/products/layout/product_dialog.xml
@@ -76,16 +76,16 @@
                     <Button
                             android:layout_marginRight="@dimen/dialog_margin_buttons"
                             style="?android:attr/buttonStyleSmall"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
+                            android:layout_width="30sp"
+                            android:layout_height="30sp"
                             android:background="@drawable/button_normal"
                             android:textColor="@color/white"
                             android:text="-"
                             android:id="@+id/product_button_minus"/>
                     <Button
                             style="?android:attr/buttonStyleSmall"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
+                            android:layout_width="30sp"
+                            android:layout_height="30sp"
                             android:background="@drawable/button_normal"
                             android:textColor="@color/white"
                             android:text="+"
@@ -161,14 +161,14 @@
                 <ImageButton
                         android:id="@+id/expand_button"
                         android:tint="@color/colorAccent"
-                        android:layout_width="50dp"
+                        android:layout_width="50sp"
                         android:layout_height="@dimen/icon_size"
-                        android:paddingLeft="15dp"
-                        android:paddingRight="15dp"
+                        android:paddingLeft="15sp"
+                        android:paddingRight="15sp"
                         android:scaleType="fitCenter"
                         android:layout_marginLeft="@dimen/list_margin_big"
                         android:background="?android:selectableItemBackground"
-                        android:src="@drawable/ic_keyboard_arrow_down_white_48dp"
+                        android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
                         android:layout_centerVertical="true"
                         android:layout_alignParentEnd="true"/>
             </RelativeLayout>
@@ -228,13 +228,13 @@
                             android:orientation="vertical">
 
                         <ImageButton
-                                android:layout_width="50dp"
-                                android:layout_height="50dp"
-                                android:padding="10dp"
+                                android:layout_width="50sp"
+                                android:layout_height="50sp"
+                                android:padding="10sp"
                                 android:scaleType="fitCenter"
                                 android:background="?android:selectableItemBackground"
                                 android:tint="@color/colorAccent"
-                                android:src="@drawable/ic_camera_alt_white_48dp"
+                                android:src="@drawable/ic_camera_alt_white_48sp"
                                 android:id="@+id/camera_button"
                                 android:layout_gravity="right"/>
 
diff --git a/app/src/main/res/layouts/products/layout/product_list_item.xml b/app/src/main/res/layouts/products/layout/product_list_item.xml
index 89b45770..b57dde6c 100644
--- a/app/src/main/res/layouts/products/layout/product_list_item.xml
+++ b/app/src/main/res/layouts/products/layout/product_list_item.xml
@@ -6,7 +6,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_margin="8dp"
+        android:layout_margin="8sp"
         card_view:cardCornerRadius="@dimen/card_corner_radius">
 
     <LinearLayout
@@ -17,14 +17,14 @@
         <RelativeLayout
                 android:id="@+id/summary_layout"
                 android:layout_width="wrap_content"
-                android:layout_height="?attr/listPreferredItemHeight">
+                android:layout_height="@dimen/listPreferredItemHeight">
 
             <TextView
                     android:id="@+id/textview_product_name"
                     android:text="@string/ph_product_name"
                     android:layout_width="match_parent"
-                    android:layout_height="?attr/listPreferredItemHeight"
-                    android:layout_marginRight="110dp"
+                    android:layout_height="@dimen/listPreferredItemHeight"
+                    android:layout_marginRight="110sp"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:gravity="center_vertical"
@@ -53,7 +53,7 @@
                     android:id="@+id/checkbox_is_selected"
                     android:layout_width="wrap_content"
                     android:padding="@dimen/list_padding"
-                    android:layout_height="?attr/listPreferredItemHeight"
+                    android:layout_height="@dimen/listPreferredItemHeight"
                     android:gravity="center_vertical"
                     android:buttonTint="?attr/colorAccent"
                     android:layout_alignParentTop="true"
@@ -61,22 +61,22 @@
 
             <ImageButton
                     android:id="@+id/expand_button_list"
-                    android:layout_width="50dp"
-                    android:layout_height="?attr/listPreferredItemHeight"
+                    android:layout_width="50sp"
+                    android:layout_height="@dimen/listPreferredItemHeight"
                     android:tint="?attr/colorAccent"
                     android:layout_centerVertical="true"
                     android:layout_alignParentRight="true"
-                    android:padding="15dp"
+                    android:padding="15sp"
                     android:scaleType="fitCenter"
                     android:background="?android:selectableItemBackground"
                     android:layout_toLeftOf="@+id/textview_prod_quantity"
-                    android:src="@drawable/ic_keyboard_arrow_down_white_48dp"/>
+                    android:src="@drawable/ic_keyboard_arrow_down_white_48sp"/>
 
             <TextView
                     android:id="@+id/textview_prod_quantity"
                     android:text="@string/ph_list_nr_items"
                     android:layout_width="wrap_content"
-                    android:layout_height="?attr/listPreferredItemHeight"
+                    android:layout_height="@dimen/listPreferredItemHeight"
                     android:layout_toLeftOf="@id/checkbox_is_selected"
                     android:gravity="center_vertical"
                     android:layout_marginRight="@dimen/list_margin"
diff --git a/app/src/main/res/layouts/products/layout/product_list_item_left_hand.xml b/app/src/main/res/layouts/products/layout/product_list_item_left_hand.xml
index 8c981171..70006d9f 100644
--- a/app/src/main/res/layouts/products/layout/product_list_item_left_hand.xml
+++ b/app/src/main/res/layouts/products/layout/product_list_item_left_hand.xml
@@ -6,7 +6,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_margin="8dp"
+        android:layout_margin="8sp"
         card_view:cardCornerRadius="@dimen/card_corner_radius">
 
     <LinearLayout
@@ -17,19 +17,19 @@
         <RelativeLayout
                 android:id="@+id/summary_layout"
                 android:layout_width="wrap_content"
-                android:layout_height="?attr/listPreferredItemHeight">
+                android:layout_height="@dimen/listPreferredItemHeight">
 
             <TextView
                     android:id="@+id/textview_product_name"
                     android:text="@string/ph_product_name"
                     android:layout_width="match_parent"
-                    android:layout_height="?attr/listPreferredItemHeight"
-                    android:layout_marginRight="30dp"
+                    android:layout_height="@dimen/listPreferredItemHeight"
+                    android:layout_marginRight="30sp"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:gravity="center_vertical"
                     android:padding="@dimen/list_padding"
-                    android:layout_marginLeft="90dp"
+                    android:layout_marginLeft="90sp"
                     android:textSize="@dimen/text_medium"
                     style="@style/Base.TextAppearance.AppCompat.Body2"/>
             <TextView
@@ -53,7 +53,7 @@
                     android:id="@+id/checkbox_is_selected"
                     android:layout_width="wrap_content"
                     android:padding="@dimen/list_padding"
-                    android:layout_height="?attr/listPreferredItemHeight"
+                    android:layout_height="@dimen/listPreferredItemHeight"
                     android:gravity="center_vertical"
                     android:buttonTint="?attr/colorAccent"
                     android:layout_toRightOf="@+id/expand_button_list"
@@ -61,13 +61,13 @@
 
             <ImageButton
                     android:id="@+id/expand_button_list"
-                    android:layout_width="50dp"
-                    android:layout_height="?attr/listPreferredItemHeight"
+                    android:layout_width="50sp"
+                    android:layout_height="@dimen/listPreferredItemHeight"
                     android:tint="?attr/colorAccent"
-                    android:padding="15dp"
+                    android:padding="15sp"
                     android:scaleType="fitCenter"
                     android:background="?android:selectableItemBackground"
-                    android:src="@drawable/ic_keyboard_arrow_down_white_48dp"
+                    android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
                     android:layout_alignParentTop="true"
                     android:layout_alignParentStart="true"
             />
@@ -76,7 +76,7 @@
                     android:id="@+id/textview_prod_quantity"
                     android:text="@string/ph_list_nr_items"
                     android:layout_width="wrap_content"
-                    android:layout_height="?attr/listPreferredItemHeight"
+                    android:layout_height="@dimen/listPreferredItemHeight"
                     android:gravity="center_vertical"
                     android:layout_marginRight="@dimen/list_margin"
                     android:textSize="@dimen/text_small"
diff --git a/app/src/main/res/layouts/products/layout/products_activity.xml b/app/src/main/res/layouts/products/layout/products_activity.xml
index 31e8ba6a..1756b622 100644
--- a/app/src/main/res/layouts/products/layout/products_activity.xml
+++ b/app/src/main/res/layouts/products/layout/products_activity.xml
@@ -14,16 +14,16 @@
             android:id="@+id/search_input_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
+            android:layout_margin="8sp"
             android:layout_toStartOf="@+id/cancel_search"
             android:layout_alignParentEnd="true">
         <AutoCompleteTextView
                 android:id="@+id/search_input_text"
                 android:inputType="text|textCapSentences"
-                android:paddingRight="50dp"
-                android:paddingLeft="8dp"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
+                android:paddingRight="50sp"
+                android:paddingLeft="8sp"
+                android:paddingTop="8sp"
+                android:paddingBottom="8sp"
                 android:background="@drawable/search_border_style"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -37,13 +37,13 @@
             android:id="@+id/cancel_search"
             android:tint="@color/colorAccent"
             android:background="?android:selectableItemBackground"
-            android:src="@drawable/ic_cancel_white_48dp"
-            android:layout_width="45dp"
-            android:layout_height="38dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginRight="6dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
+            android:src="@drawable/ic_cancel_white_48sp"
+            android:layout_width="45sp"
+            android:layout_height="38sp"
+            android:layout_marginTop="12sp"
+            android:layout_marginRight="6sp"
+            android:paddingLeft="10sp"
+            android:paddingRight="10sp"
             android:scaleType="fitCenter"
             android:layout_alignParentEnd="true"
             android:layout_alignTop="@+id/search_input_layout"/>
@@ -77,12 +77,12 @@
                 android:id="@+id/insert_alert"
                 android:orientation="horizontal"
                 android:layout_margin="@dimen/fab_margin"
-                android:paddingRight="70dp"
+                android:paddingRight="70sp"
                 android:gravity="center_vertical"
                 app:layout_anchor="@id/fab_new_product"
                 app:layout_anchorGravity="bottom|left"
                 android:layout_width="wrap_content"
-                android:layout_height="50dp">
+                android:layout_height="50sp">
 
             <TextView
                     android:text="@string/alert_message_product"
@@ -94,7 +94,7 @@
 
             <ImageView
                     android:tint="@color/colorPrimary"
-                    android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
+                    android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
         </LinearLayout>
diff --git a/app/src/main/res/layouts/products/layout/products_total_amount.xml b/app/src/main/res/layouts/products/layout/products_total_amount.xml
index 92255f65..f38b85ad 100644
--- a/app/src/main/res/layouts/products/layout/products_total_amount.xml
+++ b/app/src/main/res/layouts/products/layout/products_total_amount.xml
@@ -7,7 +7,7 @@
         android:orientation="horizontal"
         android:background="@color/colorPrimaryDark"
         android:layout_width="match_parent"
-        android:layout_height="?attr/listPreferredItemHeight"
+        android:layout_height="@dimen/listPreferredItemHeight"
         android:layout_weight="10"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true">
diff --git a/app/src/main/res/layouts/shoppinglist/layout/shopping_list_dialog.xml b/app/src/main/res/layouts/shoppinglist/layout/shopping_list_dialog.xml
index 0b41b6b8..2f4aa7ff 100644
--- a/app/src/main/res/layouts/shoppinglist/layout/shopping_list_dialog.xml
+++ b/app/src/main/res/layouts/shoppinglist/layout/shopping_list_dialog.xml
@@ -13,7 +13,7 @@
             android:textColor="@color/white"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dialog_title_height"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="10sp"
             android:textStyle="bold"/>
     <ScrollView
             android:fadeScrollbars="false"
@@ -29,7 +29,7 @@
 
             <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp">
+                    android:layout_height="wrap_content">
 
                 <android.support.design.widget.TextInputLayout
                         app:errorTextAppearance="@style/error_appearance"
@@ -55,10 +55,10 @@
                         android:id="@+id/imageview_statistics"
                         android:paddingTop="@dimen/icon_padding"
                         android:paddingBottom="@dimen/icon_padding"
-                        android:layout_width="24dp"
+                        android:layout_width="24sp"
                         android:layout_height="wrap_content"
                         android:tint="@color/colorPrimaryDark"
-                        android:src="@drawable/ic_insert_chart_white_24dp"
+                        android:src="@drawable/ic_insert_chart_white_24sp"
                         android:layout_alignParentTop="true" android:layout_toStartOf="@+id/switch_statistics"/>
 
                 <android.support.v7.widget.SwitchCompat
@@ -73,7 +73,7 @@
 
 
             <LinearLayout
-                    android:layout_marginTop="@dimen/negative_margin_normal"
+                    android:layout_marginTop="@dimen/negative_margin_big"
                     android:gravity="center_vertical"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -104,15 +104,15 @@
 
                 <ImageButton
                         android:id="@+id/expand_button_list"
-                        android:layout_width="50dp"
+                        android:layout_width="50sp"
                         android:layout_height="@dimen/icon_size"
-                        android:paddingLeft="15dp"
-                        android:paddingRight="15dp"
+                        android:paddingLeft="15sp"
+                        android:paddingRight="15sp"
                         android:scaleType="fitCenter"
                         android:tint="@color/colorAccent"
                         android:background="?android:selectableItemBackground"
-                        android:src="@drawable/ic_keyboard_arrow_down_white_48dp"
-                        android:visibility="gone"/>
+                        android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
+                        android:visibility="invisible"/>
             </LinearLayout>
 
             <LinearLayout
@@ -137,8 +137,8 @@
                             android:id="@+id/deadline_date">
 
                         <ImageView
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
+                                android:layout_width="30sp"
+                                android:layout_height="30sp"
                                 android:src="@drawable/ic_perm_group_calendar"
                                 android:tint="@color/colorAccent"/>
                         <TextView
@@ -157,8 +157,8 @@
                             android:id="@+id/deadline_time">
 
                         <ImageView
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
+                                android:layout_width="30sp"
+                                android:layout_height="30sp"
                                 android:tint="@color/colorAccent"
                                 android:src="@drawable/ic_perm_group_system_clock"
                                 android:adjustViewBounds="true"/>
@@ -191,8 +191,8 @@
                     </android.support.v7.widget.SwitchCompat>
 
                     <ImageView
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
+                            android:layout_width="30sp"
+                            android:layout_height="30sp"
                             android:tint="@color/colorAccent"
                             android:src="@drawable/ic_perm_group_device_alarms"
                             android:adjustViewBounds="true"/>
@@ -215,7 +215,7 @@
 
                     <android.support.design.widget.TextInputEditText
                             android:id="@+id/edittext_reminder"
-                            android:layout_width="40dp"
+                            android:layout_width="40sp"
                             android:layout_height="wrap_content"
                             android:inputType="number"
                             android:gravity="center"
@@ -227,7 +227,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:backgroundTint="@color/colorAccent"
-                            android:layout_marginLeft="5dp"/>
+                            android:layout_marginLeft="5sp"/>
 
                     <TextView
                             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item.xml b/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item.xml
index b5b0afe2..099f6a80 100644
--- a/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item.xml
+++ b/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item.xml
@@ -6,7 +6,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_margin="8dp"
+        android:layout_margin="8sp"
         card_view:cardCornerRadius="@dimen/card_corner_radius">
 
     <ImageView
@@ -24,13 +24,13 @@
         <RelativeLayout
                 android:id="@+id/summary_layout"
                 android:layout_width="wrap_content"
-                android:layout_height="?attr/listPreferredItemHeight">
+                android:layout_height="@dimen/listPreferredItemHeight">
             <TextView
                     android:id="@+id/textview_list_name"
                     android:text="@string/ph_list_name"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginRight="100dp"
+                    android:layout_marginRight="100sp"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:gravity="center_vertical"
@@ -68,22 +68,22 @@
             <ImageView
                     android:id="@+id/imageview_high_prio_icon"
                     android:tint="@color/yellow"
-                    android:src="@drawable/ic_error_black_24dp"
+                    android:src="@drawable/ic_error_black_24sp"
                     android:layout_width="@dimen/icon_size"
                     android:layout_height="@dimen/icon_size"
                     android:layout_centerVertical="true" android:layout_toStartOf="@+id/textview_prod_quantity"/>
             <ImageButton
                     android:id="@+id/expand_button_list"
-                    android:layout_width="50dp"
-                    android:layout_height="?attr/listPreferredItemHeight"
+                    android:layout_width="50sp"
+                    android:layout_height="@dimen/listPreferredItemHeight"
                     android:tint="?attr/colorAccent"
                     android:layout_centerVertical="true"
                     android:layout_alignParentRight="true"
-                    android:padding="15dp"
+                    android:padding="15sp"
                     android:scaleType="fitCenter"
                     android:background="?android:selectableItemBackground"
                     android:layout_toLeftOf="@+id/textview_prod_quantity"
-                    android:src="@drawable/ic_keyboard_arrow_down_white_48dp"/>
+                    android:src="@drawable/ic_keyboard_arrow_down_white_48sp"/>
             <TextView
                     android:id="@+id/textview_prod_quantity"
                     android:text="@string/ph_list_nr_items"
@@ -95,7 +95,7 @@
                     android:textSize="@dimen/text_small"
                     android:textColor="@color/middlegrey"
                     style="@style/Base.TextAppearance.AppCompat.Body2"
-                    android:layout_marginEnd="50dp"
+                    android:layout_marginEnd="50sp"
                     android:layout_alignParentEnd="true" android:layout_alignParentTop="true"/>
         </RelativeLayout>
 
diff --git a/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item_left_hand.xml b/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item_left_hand.xml
index ac0da475..6a85f70d 100644
--- a/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item_left_hand.xml
+++ b/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item_left_hand.xml
@@ -6,7 +6,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_margin="8dp"
+        android:layout_margin="8sp"
         card_view:cardCornerRadius="@dimen/card_corner_radius">
 
     <ImageView
@@ -24,18 +24,18 @@
         <RelativeLayout
                 android:id="@+id/summary_layout"
                 android:layout_width="wrap_content"
-                android:layout_height="?attr/listPreferredItemHeight">
+                android:layout_height="@dimen/listPreferredItemHeight">
             <TextView
                     android:id="@+id/textview_list_name"
                     android:text="@string/ph_list_name"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginRight="50dp"
+                    android:layout_marginRight="50sp"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:gravity="center_vertical"
                     android:padding="@dimen/list_padding"
-                    android:layout_marginLeft="50dp"
+                    android:layout_marginLeft="50sp"
                     android:textSize="@dimen/text_medium"
                     style="@style/Base.TextAppearance.AppCompat.Body2"/>
             <LinearLayout
@@ -68,19 +68,19 @@
             <ImageView
                     android:id="@+id/imageview_high_prio_icon"
                     android:tint="@color/yellow"
-                    android:src="@drawable/ic_error_black_24dp"
+                    android:src="@drawable/ic_error_black_24sp"
                     android:layout_width="@dimen/icon_size"
                     android:layout_height="@dimen/icon_size"
                     android:layout_centerVertical="true" android:layout_toStartOf="@+id/textview_prod_quantity"/>
             <ImageButton
                     android:id="@+id/expand_button_list"
-                    android:layout_width="50dp"
-                    android:layout_height="?attr/listPreferredItemHeight"
+                    android:layout_width="50sp"
+                    android:layout_height="@dimen/listPreferredItemHeight"
                     android:tint="?attr/colorAccent"
-                    android:padding="15dp"
+                    android:padding="15sp"
                     android:scaleType="fitCenter"
                     android:background="?android:selectableItemBackground"
-                    android:src="@drawable/ic_keyboard_arrow_down_white_48dp" android:layout_alignParentTop="true"
+                    android:src="@drawable/ic_keyboard_arrow_down_white_48sp" android:layout_alignParentTop="true"
                     android:layout_alignParentStart="true"/>
             <TextView
                     android:id="@+id/textview_prod_quantity"
@@ -93,7 +93,7 @@
                     android:textSize="@dimen/text_small"
                     android:textColor="@color/middlegrey"
                     style="@style/Base.TextAppearance.AppCompat.Body2"
-                    android:layout_marginEnd="10dp"
+                    android:layout_marginEnd="10sp"
                     android:layout_alignParentEnd="true" android:layout_alignParentTop="true"/>
         </RelativeLayout>
 
diff --git a/app/src/main/res/layouts/statistics/layout/statistics_diagramm.xml b/app/src/main/res/layouts/statistics/layout/statistics_diagramm.xml
index a5006df4..737effd8 100644
--- a/app/src/main/res/layouts/statistics/layout/statistics_diagramm.xml
+++ b/app/src/main/res/layouts/statistics/layout/statistics_diagramm.xml
@@ -10,7 +10,7 @@
 
     <TextView
             android:id="@+id/textview_stats_title"
-            android:padding="16dp"
+            android:padding="16sp"
             android:text="@string/ph_stats_title"
             android:textColor="@color/colorPrimaryDark"
             android:textSize="@dimen/text_medium"
diff --git a/app/src/main/res/layouts/statistics/layout/statistics_marker_view.xml b/app/src/main/res/layouts/statistics/layout/statistics_marker_view.xml
index 86464be3..a8c30e84 100644
--- a/app/src/main/res/layouts/statistics/layout/statistics_marker_view.xml
+++ b/app/src/main/res/layouts/statistics/layout/statistics_marker_view.xml
@@ -2,7 +2,7 @@
 <RelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
-        android:layout_height="40dp"
+        android:layout_height="40sp"
         android:backgroundTint="@color/yellow"
         android:background="@drawable/chart_marker">
 
@@ -11,7 +11,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="7dp"
+            android:layout_marginTop="7sp"
             android:paddingRight="@dimen/statistics_padding"
             android:paddingLeft="@dimen/statistics_padding"
             android:text="@string/ph_total_amount"
diff --git a/app/src/main/res/layouts/tutorials/layout/delete_tutorial.xml b/app/src/main/res/layouts/tutorials/layout/delete_tutorial.xml
index 72462c54..fd0a2a3e 100644
--- a/app/src/main/res/layouts/tutorials/layout/delete_tutorial.xml
+++ b/app/src/main/res/layouts/tutorials/layout/delete_tutorial.xml
@@ -15,7 +15,7 @@
                 android:textColor="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dialog_title_height"
-                android:layout_marginBottom="10dp"
+                android:layout_marginBottom="10sp"
                 android:textStyle="bold"/>
 
         <LinearLayout
@@ -38,7 +38,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/fab_margin"
                 android:tint="@color/white"
-                android:src="@drawable/ic_delete_white_24dp"/>
+                android:src="@drawable/ic_delete_white_24sp"/>
 
 
     </LinearLayout>
diff --git a/app/src/main/res/layouts/tutorials/layout/products_tutorial.xml b/app/src/main/res/layouts/tutorials/layout/products_tutorial.xml
index 4bc357b2..3e9e1071 100644
--- a/app/src/main/res/layouts/tutorials/layout/products_tutorial.xml
+++ b/app/src/main/res/layouts/tutorials/layout/products_tutorial.xml
@@ -11,7 +11,7 @@
             android:textColor="@color/white"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dialog_title_height"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="10sp"
             android:textStyle="bold"/>
     <ScrollView
             android:layout_width="match_parent"
@@ -42,7 +42,7 @@
                         android:layout_alignParentTop="true" android:layout_alignParentEnd="true"/>
                 <ImageView
                         android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
+                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:tint="@color/colorPrimaryDark"
@@ -65,7 +65,7 @@
                     android:layout_below="@+id/textView" android:layout_alignParentStart="true">
                 <ImageView
                         android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
+                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:tint="@color/colorPrimaryDark"
@@ -87,7 +87,7 @@
                         android:layout_marginLeft="@dimen/fab_margin"
                         android:layout_marginRight="@dimen/fab_margin"
                         android:padding="@dimen/tutorial_icon_padding"
-                        android:src="@drawable/ic_delete_white_24dp"
+                        android:src="@drawable/ic_delete_white_24sp"
                         android:background="@color/colorPrimaryDark"
                         android:layout_width="@dimen/tutorial_icon_size"
                         android:layout_height="@dimen/tutorial_icon_size"
@@ -100,7 +100,7 @@
                     android:layout_height="match_parent">
                 <ImageView
                         android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
+                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:tint="@color/colorPrimaryDark"
@@ -119,7 +119,7 @@
                         android:layout_marginLeft="@dimen/fab_margin"
                         android:layout_marginRight="@dimen/fab_margin"
                         android:padding="@dimen/tutorial_icon_padding"
-                        android:src="@drawable/ic_sort_white_24dp"
+                        android:src="@drawable/ic_sort_white_24sp"
                         android:background="@color/colorPrimaryDark"
                         android:layout_width="@dimen/tutorial_icon_size"
                         android:layout_height="@dimen/tutorial_icon_size"
@@ -132,7 +132,7 @@
                     android:layout_height="match_parent">
                 <ImageView
                         android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
+                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:tint="@color/colorPrimaryDark"
@@ -143,7 +143,7 @@
                         android:layout_marginLeft="@dimen/fab_margin"
                         android:layout_marginRight="@dimen/fab_margin"
                         android:padding="@dimen/tutorial_icon_padding"
-                        android:src="@drawable/ic_keyboard_arrow_down_white_48dp"
+                        android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
                         android:layout_width="@dimen/tutorial_icon_size"
                         android:layout_height="@dimen/tutorial_icon_size"
                         android:tint="@color/colorAccent"
@@ -173,7 +173,7 @@
                         android:id="@+id/textView5"/>
                 <ImageView
                         android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
+                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:tint="@color/colorPrimaryDark"
@@ -185,7 +185,7 @@
 
                         android:layout_gravity="center"
                         android:padding="@dimen/tutorial_icon_padding"
-                        android:layout_width="35dp"
+                        android:layout_width="35sp"
                         android:layout_height="@dimen/tutorial_icon_size"
                         android:backgroundTint="@color/colorAccent"
                         android:layout_alignParentTop="true"
diff --git a/app/src/main/res/layouts/tutorials/layout/shopping_list_tutorial.xml b/app/src/main/res/layouts/tutorials/layout/shopping_list_tutorial.xml
index 56574829..d267e90f 100644
--- a/app/src/main/res/layouts/tutorials/layout/shopping_list_tutorial.xml
+++ b/app/src/main/res/layouts/tutorials/layout/shopping_list_tutorial.xml
@@ -20,7 +20,7 @@
                     android:textColor="@color/white"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dialog_title_height"
-                    android:layout_marginBottom="10dp"
+                    android:layout_marginBottom="10sp"
                     android:textStyle="bold"/>
             <TextView
                     android:text="@string/tutorial_how_to"
@@ -43,7 +43,7 @@
                         android:layout_alignParentTop="true" android:layout_alignParentEnd="true"/>
                 <ImageView
                         android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
+                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:tint="@color/colorPrimaryDark"
@@ -66,7 +66,7 @@
                     android:layout_below="@+id/textView" android:layout_alignParentStart="true">
                 <ImageView
                         android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
+                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:tint="@color/colorPrimaryDark"
@@ -88,7 +88,7 @@
                         android:layout_marginLeft="@dimen/fab_margin"
                         android:layout_marginRight="@dimen/fab_margin"
                         android:padding="@dimen/tutorial_icon_padding"
-                        android:src="@drawable/ic_delete_white_24dp"
+                        android:src="@drawable/ic_delete_white_24sp"
                         android:background="@color/colorPrimaryDark"
                         android:layout_width="@dimen/tutorial_icon_size"
                         android:layout_height="@dimen/tutorial_icon_size"
@@ -101,7 +101,7 @@
                     android:layout_height="match_parent">
                 <ImageView
                         android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
+                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:tint="@color/colorPrimaryDark"
@@ -120,7 +120,7 @@
                         android:layout_marginLeft="@dimen/fab_margin"
                         android:layout_marginRight="@dimen/fab_margin"
                         android:padding="@dimen/tutorial_icon_padding"
-                        android:src="@drawable/ic_sort_white_24dp"
+                        android:src="@drawable/ic_sort_white_24sp"
                         android:background="@color/colorPrimaryDark"
                         android:layout_width="@dimen/tutorial_icon_size"
                         android:layout_height="@dimen/tutorial_icon_size"
@@ -133,7 +133,7 @@
                     android:layout_height="match_parent">
                 <ImageView
                         android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
+                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:tint="@color/colorPrimaryDark"
@@ -144,7 +144,7 @@
                         android:layout_marginLeft="@dimen/fab_margin"
                         android:layout_marginRight="@dimen/fab_margin"
                         android:padding="@dimen/tutorial_icon_padding"
-                        android:src="@drawable/ic_keyboard_arrow_down_white_48dp"
+                        android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
                         android:layout_width="@dimen/tutorial_icon_size"
                         android:layout_height="@dimen/tutorial_icon_size"
                         android:tint="@color/colorAccent"
@@ -179,7 +179,7 @@
                     <ImageView
                             android:id="@+id/imageview_high_prio_icon"
                             android:tint="@color/yellow"
-                            android:src="@drawable/ic_error_black_24dp"
+                            android:src="@drawable/ic_error_black_24sp"
                             android:layout_width="@dimen/icon_size"
                             android:layout_height="@dimen/icon_size"/>
                     <TextView
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 4ea43abe..1bd6b723 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -5,11 +5,11 @@
            android:checkableBehavior="all">
         <item
                 android:id="@+id/nav_main"
-                android:icon="@drawable/ic_home_white_24dp"
+                android:icon="@drawable/ic_home_white_24sp"
                 android:title="@string/action_main"/>
         <item
                 android:id="@+id/nav_statistics"
-                android:icon="@drawable/ic_insert_chart_white_24dp"
+                android:icon="@drawable/ic_insert_chart_white_24sp"
                 android:title="@string/statistics"/>
     </group>
 
diff --git a/app/src/main/res/menu/lists_menu.xml b/app/src/main/res/menu/lists_menu.xml
index 9e98d97e..38434fa5 100644
--- a/app/src/main/res/menu/lists_menu.xml
+++ b/app/src/main/res/menu/lists_menu.xml
@@ -5,13 +5,13 @@
 
     <item
             android:id="@+id/imageview_sort"
-            android:icon="@drawable/ic_sort_white_24dp"
+            android:icon="@drawable/ic_sort_white_24sp"
             android:title="@string/sort_options"
             app:showAsAction="ifRoom"/>
 
     <item
             android:id="@+id/imageview_delete"
-            android:icon="@drawable/ic_delete_white_24dp"
+            android:icon="@drawable/ic_delete_white_24sp"
             android:title="@string/delete"
             app:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/photopreview_menu.xml b/app/src/main/res/menu/photopreview_menu.xml
index 0416f03c..12b92a60 100644
--- a/app/src/main/res/menu/photopreview_menu.xml
+++ b/app/src/main/res/menu/photopreview_menu.xml
@@ -5,7 +5,7 @@
 
     <item
             android:id="@+id/imageview_delete"
-            android:icon="@drawable/ic_delete_white_24dp"
+            android:icon="@drawable/ic_delete_white_24sp"
             android:title="@string/delete"
             app:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/products_menu.xml b/app/src/main/res/menu/products_menu.xml
index a0372dc8..e9b674a0 100644
--- a/app/src/main/res/menu/products_menu.xml
+++ b/app/src/main/res/menu/products_menu.xml
@@ -5,19 +5,19 @@
 
     <item
             android:id="@+id/imageview_search"
-            android:icon="@drawable/ic_search_white_48dp"
+            android:icon="@drawable/ic_search_white_48sp"
             android:title="@string/search"
             app:showAsAction="ifRoom"/>
 
     <item
             android:id="@+id/imageview_sort"
-            android:icon="@drawable/ic_sort_white_24dp"
+            android:icon="@drawable/ic_sort_white_24sp"
             android:title="@string/sort_options"
             app:showAsAction="ifRoom"/>
 
     <item
             android:id="@+id/imageview_delete"
-            android:icon="@drawable/ic_delete_white_24dp"
+            android:icon="@drawable/ic_delete_white_24sp"
             android:title="@string/delete"
             app:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index 63fc8164..76fc4d93 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -2,5 +2,5 @@
     <!-- Example customization of dimensions originally defined in res/values/dimens.xml
          (such as screen margins) for screens with more than 820dp of available width. This
          would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
+    <dimen name="activity_horizontal_margin">64sp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 62100948..7116d72e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,53 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <dimen name="menu_width">240dp</dimen>
+    <dimen name="menu_width">240sp</dimen>
 
-    <dimen name="text_medium">16dp</dimen>
-    <dimen name="text_small">12dp</dimen>
-    <dimen name="text_space_padding">4dp</dimen>
-    <dimen name="negative_margin_big">-25dp</dimen>
-    <dimen name="negative_margin_normal">-10dp</dimen>
-    <dimen name="negative_margin_small">-5dp</dimen>
+    <dimen name="text_medium">16sp</dimen>
+    <dimen name="text_small">12sp</dimen>
+    <dimen name="text_space_padding">4sp</dimen>
+    <dimen name="negative_margin_big">-25sp</dimen>
+    <dimen name="negative_margin_normal">-10sp</dimen>
+    <dimen name="negative_margin_small">-5sp</dimen>
+    <dimen name="listPreferredItemHeight">64sp</dimen>
 
     <!-- Statistics -->
-    <dimen name="statistics_padding">12dp</dimen>
-    <dimen name="statistics_padding_small">4dp</dimen>
+    <dimen name="statistics_padding">12sp</dimen>
+    <dimen name="statistics_padding_small">4sp</dimen>
 
     <!-- Lists -->
-    <dimen name="list_margin">16dp</dimen>
-    <dimen name="list_margin_big">32dp</dimen>
-    <dimen name="list_padding">8dp</dimen>
-    <dimen name="icon_padding">16dp</dimen>
-    <dimen name="icon_size">20dp</dimen>
-    <dimen name="foto_preview_size">50dp</dimen>
-    <dimen name="dialog_title_height">50dp</dimen>
-    <dimen name="card_corner_radius">4dp</dimen>
-    <dimen name="status_corner_radius">0dp</dimen>
-    <dimen name="status_width">4dp</dimen>
+    <dimen name="list_margin">16sp</dimen>
+    <dimen name="list_margin_big">32sp</dimen>
+    <dimen name="list_padding">8sp</dimen>
+    <dimen name="icon_padding">16sp</dimen>
+    <dimen name="icon_size">20sp</dimen>
+    <dimen name="foto_preview_size">50sp</dimen>
+    <dimen name="dialog_title_height">50sp</dimen>
+    <dimen name="card_corner_radius">4sp</dimen>
+    <dimen name="status_corner_radius">0sp</dimen>
+    <dimen name="status_width">4sp</dimen>
 
     <!-- Tutorial -->
-    <dimen name="tutorial_icon_padding">10dp</dimen>
-    <dimen name="tutorial_icon_size">40dp</dimen>
+    <dimen name="tutorial_icon_padding">10sp</dimen>
+    <dimen name="tutorial_icon_size">40sp</dimen>
 
     <!-- Sort Dialog -->
-    <dimen name="dialog_padding">20dp</dimen>
+    <dimen name="dialog_padding">20sp</dimen>
 
     <!-- Products-->
-    <dimen name="total_padding">16dp</dimen>
+    <dimen name="total_padding">16sp</dimen>
 
     <!-- Products Dialog -->
-    <dimen name="dialog_padding_top">12dp</dimen>
-    <dimen name="dialog_padding_vertical">4dp</dimen>
-    <dimen name="dialog_padding_horizontal">8dp</dimen>
-    <dimen name="dialog_padding_horizontal_big">32dp</dimen>
-    <dimen name="dialog_margin_buttons">8dp</dimen>
+    <dimen name="dialog_padding_top">12sp</dimen>
+    <dimen name="dialog_padding_vertical">4sp</dimen>
+    <dimen name="dialog_padding_horizontal">8sp</dimen>
+    <dimen name="dialog_padding_horizontal_big">32sp</dimen>
+    <dimen name="dialog_margin_buttons">8sp</dimen>
 
     <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="nav_header_vertical_spacing">16dp</dimen>
-    <dimen name="nav_header_height">160dp</dimen>
+    <dimen name="nav_header_vertical_spacing">16sp</dimen>
+    <dimen name="nav_header_height">160sp</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="activity_horizontal_margin">16sp</dimen>
+    <dimen name="activity_vertical_margin">16sp</dimen>
+    <dimen name="fab_margin">16sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml
index b568962b..3416f3ac 100644
--- a/app/src/main/res/xml/pref_headers.xml
+++ b/app/src/main/res/xml/pref_headers.xml
@@ -4,7 +4,7 @@
 
     <header
             android:fragment="privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist.ui.settings.SettingsActivity$GeneralPreferenceFragment"
-            android:icon="@drawable/ic_info_black_24dp"
+            android:icon="@drawable/ic_info_black_24sp"
             android:title="@string/pref_header_general"/>
 
 </preference-headers>