diff --git a/app/src/main/assets/databases/exercises.sqlite b/app/src/main/assets/databases/exercises.sqlite
index 18f7578..974576c 100644
Binary files a/app/src/main/assets/databases/exercises.sqlite and b/app/src/main/assets/databases/exercises.sqlite differ
diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java
index d3087d5..147d206 100644
--- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java
@@ -479,7 +479,7 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo
 
     private boolean nextExercisePart() {
         if(set != null) {
-            if(set.size() != 0) {
+            if(set.size() != 0 && currentExercise < set.size()) {
                 int[] images = set.get(currentExercise).getImageResIds(this);
 
                 currentExercisePart = (currentExercisePart + 1);
@@ -518,7 +518,7 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo
 
         executionText.setText(e.getExecution());
         descriptionText.setText(e.getDescription());
-        sectionText.setText(e.getSection());
+        sectionText.setText(e.getSection(this));
         exerciseImage.setImageResource(e.getImageResIds(this)[image]);
         exerciseImage.setOnClickListener(infoClickListener);
         exerciseInfoButton.setOnClickListener(infoClickListener);
diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetAdapter.java b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetAdapter.java
index 3c78bde..4294d65 100644
--- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetAdapter.java
+++ b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetAdapter.java
@@ -46,7 +46,7 @@ public class ExerciseSetAdapter extends RecyclerView.Adapter<ViewHolder> {
         vh.image.setImageResource(exercise.getImageResIds(mContext)[0]);
         vh.executionText.setText(exercise.getExecution());
         vh.descriptionText.setText(exercise.getDescription());
-        vh.section.setText(exercise.getSection());
+        vh.section.setText(exercise.getSection(mContext));
     }
 
     @Override
diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetListAdapter.java b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetListAdapter.java
index fe85a5e..e4aa079 100644
--- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetListAdapter.java
+++ b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetListAdapter.java
@@ -12,6 +12,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+
 import org.secuso.privacyfriendlybreakreminder.R;
 import org.secuso.privacyfriendlybreakreminder.activities.EditExerciseSetActivity;
 import org.secuso.privacyfriendlybreakreminder.activities.ManageExerciseSetsActivity;
@@ -123,7 +125,8 @@ public class ExerciseSetListAdapter extends RecyclerView.Adapter<RecyclerView.Vi
             View view = LayoutInflater.from(mContext).inflate(R.layout.layout_round_exercise_image, null, false);
             ImageView image = (ImageView) view.findViewById(R.id.exercise_image);
 
-            image.setImageResource(set.get(i).getImageResIds(mContext)[0]);
+            Glide.with(mContext).load(set.get(i).getImageResIds(mContext)[0]).into(image);
+
             vh.exerciseList.addView(view);
         }
 
diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetSpinnerAdapter.java b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetSpinnerAdapter.java
index a83fba0..0ae0b88 100644
--- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetSpinnerAdapter.java
+++ b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetSpinnerAdapter.java
@@ -13,6 +13,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+
 import org.secuso.privacyfriendlybreakreminder.R;
 import org.secuso.privacyfriendlybreakreminder.database.data.ExerciseSet;
 
@@ -73,7 +75,7 @@ public class ExerciseSetSpinnerAdapter extends ArrayAdapter<ExerciseSet> {
             View view = LayoutInflater.from(getContext()).inflate(R.layout.layout_round_exercise_image, null, false);
             ImageView image = (ImageView) view.findViewById(R.id.exercise_image);
 
-            image.setImageResource(set.get(i).getImageResIds(getContext())[0]);
+            Glide.with(getContext()).load(set.get(i).getImageResIds(getContext())[0]).into(image);
 
             exerciseList.addView(view);
         }
diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/old/BreakActivity.java b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/old/BreakActivity.java
index 28f73e8..31dab96 100644
--- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/old/BreakActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/old/BreakActivity.java
@@ -287,7 +287,7 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
         side_repetition.setText(R.string.exercise_break);
 
         break_exercise_type = (TextView) findViewById(R.id.break_exercise_type);
-        break_exercise_type.setText(exerciseList.get(currentExercise).getSection());
+        break_exercise_type.setText(exerciseList.get(currentExercise).getSection(this));
 
         setExerciseImage();
     }
diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseColumns.java b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseColumns.java
index ce5a19d..c11c056 100644
--- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseColumns.java
+++ b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseColumns.java
@@ -34,18 +34,5 @@ public final class ExerciseColumns {
         return e;
     }
 
-    public static ContentValues getValues(Exercise record) {
-        ContentValues values = new ContentValues();
-        if(record.getId() != -1) {
-            values.put(ExerciseColumns._ID, record.getId());
-        }
-        values.put(ExerciseColumns.SECTION, record.getSection());
-        values.put(ExerciseColumns.IMAGE_ID, record.getImageID());
-
-        values.putAll(ExerciseLocalColumns.getValues(record));
-
-        return values;
-    }
-
     private ExerciseColumns() {}
 }
diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/data/Exercise.java b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/data/Exercise.java
index 504929f..774d4ee 100644
--- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/data/Exercise.java
+++ b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/data/Exercise.java
@@ -5,6 +5,8 @@ import android.content.Context;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.IdRes;
 
+import org.secuso.privacyfriendlybreakreminder.exercises.ExerciseSections;
+
 public class Exercise {
     private int id;
     private int localId;
@@ -65,7 +67,13 @@ public class Exercise {
         return result;
     }
 
-    public String getSection() {
+    public String getSection(Context context) {
+        String section = this.section;
+
+        for(ExerciseSections es : ExerciseSections.getSectionList()) {
+            section = section.replaceAll(es.name(), es.getLocalName(context));
+        }
+
         return section;
     }
     public void setSection(String section) {
diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/dialog/ExerciseDialog.java b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/dialog/ExerciseDialog.java
index f7e6eac..9535d94 100644
--- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/dialog/ExerciseDialog.java
+++ b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/dialog/ExerciseDialog.java
@@ -41,7 +41,7 @@ public final class ExerciseDialog {
         if(descriptionText != null)
             descriptionText.setText(e.getDescription());
         if(sectionText != null)
-            sectionText.setText(e.getSection());
+            sectionText.setText(e.getSection(context));
         if(exerciseImage != null) {
             exerciseImage.setOnClickListener(new View.OnClickListener() {
                 int currentlyShownExercise = 0;
diff --git a/app/src/main/res/layout/activity_edit_exercise_set.xml b/app/src/main/res/layout/activity_edit_exercise_set.xml
index ba7acdd..16bc613 100644
--- a/app/src/main/res/layout/activity_edit_exercise_set.xml
+++ b/app/src/main/res/layout/activity_edit_exercise_set.xml
@@ -94,7 +94,7 @@
         android:onClick="onClick"
         app:fabSize="normal"
         app:layout_anchor="@id/constraintLayout2"
-        app:layout_anchorGravity="bottom|right|end"
+        app:layout_anchorGravity="bottom|end"
         app:srcCompat="@drawable/ic_edit_white_24dp" />
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_exercise.xml b/app/src/main/res/layout/activity_exercise.xml
index 2ba4dbc..748ac14 100644
--- a/app/src/main/res/layout/activity_exercise.xml
+++ b/app/src/main/res/layout/activity_exercise.xml
@@ -286,7 +286,7 @@
             android:id="@+id/progressBarBig"
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="0dp"
-            android:layout_height="16dp"
+            android:layout_height="0dp"
             android:layout_centerHorizontal="true"
             android:max="100"
             android:onClick="onClick"
diff --git a/app/src/main/res/layout/dialog_exercise.xml b/app/src/main/res/layout/dialog_exercise.xml
index e4bdecd..19d24d1 100644
--- a/app/src/main/res/layout/dialog_exercise.xml
+++ b/app/src/main/res/layout/dialog_exercise.xml
@@ -20,7 +20,7 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/execution"
-        app:srcCompat="@drawable/exercise_0" />
+        app:srcCompat="@drawable/breakreminder_0" />
 
     <TextView
         android:id="@+id/execution_title"
diff --git a/app/src/main/res/layout/layout_round_exercise_image.xml b/app/src/main/res/layout/layout_round_exercise_image.xml
index ea8b9c2..7b7b964 100644
--- a/app/src/main/res/layout/layout_round_exercise_image.xml
+++ b/app/src/main/res/layout/layout_round_exercise_image.xml
@@ -4,7 +4,7 @@
     android:orientation="vertical"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
-    <android.support.v7.widget.CardView
+    <!-- <android.support.v7.widget.CardView
         android:id="@+id/exercise_image_card"
         android:layout_width="48dp"
         android:layout_height="48dp"
@@ -12,14 +12,14 @@
         android:shape="ring"
         android:thicknessRatio="1.9"
         app:cardCornerRadius="24dp"
-        app:cardElevation="0dp">
+        app:cardElevation="0dp"> -->
 
         <ImageView
             android:id="@+id/exercise_image"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/exercise_0" />
+            app:srcCompat="@drawable/breakreminder_0" />
 
-    </android.support.v7.widget.CardView>
+    <!-- </android.support.v7.widget.CardView> -->
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 017b43c..fa284f6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -57,6 +57,7 @@
     <string name="save">Speichern</string>
     <string name="settings_break_summary">Derzeitiger Wert ist $1</string>
     <string name="settings_dialog_message">Wählen Sie ihre Arbeitszeit aus</string>
+    <string name="dialog_add_exercise_set_title">Neues Übungsset hinzufügen</string>
     <string name="settings_break_title">Wählen Sie ihre Pausenzeit aus</string>
     <string name="settings_doubleName">Die Änderungen konnten nicht gespeichert werden, da das dieser Profilname bereits existiert!</string>
     <string name="settings_emptyName">Die Änderungen konnten nicht gespeichert werden, da das Feld für den Profilnamen leer ist! </string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 00642bc..501a431 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -232,7 +232,7 @@
     <string name="set_contains_no_exercises">This set contains no exercises.</string>
     <string name="take_a_break_now">Take a break now! Click here to do your chosen exercises.</string>
 
-    <string name="numberpicker_formatter">%02d</string>
+    <string name="numberpicker_formatter" translatable="false">%02d</string>
     <string name="pref_exercise_time">Exercise time (in Seconds)</string>
     <string name="pref_keep_screen_on_during_exercise">Keep screen on during exercise</string>