diff --git a/app/src/main/java/om/sstvencoder/EditTextActivity.java b/app/src/main/java/om/sstvencoder/EditTextActivity.java
index a01c72b..61a3d02 100644
--- a/app/src/main/java/om/sstvencoder/EditTextActivity.java
+++ b/app/src/main/java/om/sstvencoder/EditTextActivity.java
@@ -38,7 +38,7 @@ public class EditTextActivity extends AppCompatActivity implements AdapterView.O
     public static final String EXTRA = "EDIT_TEXT_EXTRA";
     private EditText mEditText;
     private ColorPaletteView mColorPaletteView;
-    private float mTextSize;
+    private float mTextSize, mBorderSize;
     private FontFamilySet mFontFamilySet;
     private FontFamilySet.FontFamily mSelectedFontFamily;
     private List<String> mFontFamilyNameList;
@@ -67,6 +67,7 @@ public class EditTextActivity extends AppCompatActivity implements AdapterView.O
         initFontFamilySpinner(label.getFamilyName());
         updateBoldAndItalic();
         mEditBorder.setChecked(label.getBorder());
+        initBorderSizeSpinner(label.getBorderSize());
     }
 
     private void initFontFamilySpinner(String familyName) {
@@ -90,10 +91,21 @@ public class EditTextActivity extends AppCompatActivity implements AdapterView.O
         editTextSize.setSelection(textSizeToPosition(textSize));
     }
 
+    private void initBorderSizeSpinner(float borderSize) {
+        mBorderSize = borderSize;
+        Spinner editBorderSize = (Spinner) findViewById(R.id.edit_border_size);
+        editBorderSize.setOnItemSelectedListener(this);
+        String[] borderSizeList = new String[]{"Thin", "Normal", "Thick"};
+        editBorderSize.setAdapter(new ArrayAdapter<>(this,
+                android.R.layout.simple_spinner_dropdown_item, borderSizeList));
+        editBorderSize.setSelection(borderSizeToPosition(borderSize));
+    }
+
     private int textSizeToPosition(float textSize) {
         int position = (int) (textSize - 1f);
         if (0 <= position && position <= 3)
             return position;
+        mTextSize = Label.TEXT_SIZE_NORMAL;
         return 1;
     }
 
@@ -101,12 +113,27 @@ public class EditTextActivity extends AppCompatActivity implements AdapterView.O
         return position + 1f;
     }
 
+    private int borderSizeToPosition(float borderSize) {
+        int position = (int) (borderSize * 2f / Label.BORDER_SIZE_NORMAL - 1f);
+        if (0 <= position && position <= 2)
+            return position;
+        mBorderSize = Label.BORDER_SIZE_NORMAL;
+        return 1;
+    }
+
+    private float positionToBorderSize(int position) {
+        return Label.BORDER_SIZE_NORMAL * 0.5f * (position + 1f);
+    }
+
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
         switch (parent.getId()) {
             case R.id.edit_text_size:
                 mTextSize = positionToTextSize(position);
                 break;
+            case R.id.edit_border_size:
+                mBorderSize = positionToBorderSize(position);
+                break;
             case R.id.edit_font_family:
                 String displayName = mFontFamilyNameList.get(position);
                 mSelectedFontFamily = mFontFamilySet.getFontFamilyFromDisplayName(displayName);
@@ -162,8 +189,9 @@ public class EditTextActivity extends AppCompatActivity implements AdapterView.O
         label.setFamilyName(mSelectedFontFamily.name);
         label.setItalic(mEditItalic.isChecked());
         label.setBold(mEditBold.isChecked());
-        label.setBorder(mEditBorder.isChecked());
         label.setForeColor(mColorPaletteView.getColor());
+        label.setBorder(mEditBorder.isChecked());
+        label.setBorderSize(mBorderSize);
         return label;
     }
 }
diff --git a/app/src/main/java/om/sstvencoder/TextOverlay/Label.java b/app/src/main/java/om/sstvencoder/TextOverlay/Label.java
index adf53b1..df46514 100644
--- a/app/src/main/java/om/sstvencoder/TextOverlay/Label.java
+++ b/app/src/main/java/om/sstvencoder/TextOverlay/Label.java
@@ -20,6 +20,8 @@ import android.graphics.Color;
 import java.io.Serializable;
 
 public class Label implements Serializable {
+    public static final float TEXT_SIZE_NORMAL = 2f;
+    public static final float BORDER_SIZE_NORMAL = 0.05f;
     private String mText;
     private float mTextSize, mBorderSize;
     private String mFamilyName;
@@ -28,14 +30,14 @@ public class Label implements Serializable {
 
     public Label() {
         mText = "";
-        mTextSize = 2.0f;
+        mTextSize = TEXT_SIZE_NORMAL;
         mFamilyName = null;
         mBold = true;
         mItalic = false;
         mForeColor = Color.BLACK;
         mBackColor = Color.TRANSPARENT;
         mBorder = true;
-        mBorderSize = 0.05f;
+        mBorderSize = BORDER_SIZE_NORMAL;
         mBorderColor = Color.WHITE;
     }
 
diff --git a/app/src/main/res/layout/activity_edit_text.xml b/app/src/main/res/layout/activity_edit_text.xml
index 7c677f4..3210cad 100644
--- a/app/src/main/res/layout/activity_edit_text.xml
+++ b/app/src/main/res/layout/activity_edit_text.xml
@@ -53,17 +53,31 @@
             android:id="@+id/edit_bold"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="0.3"
+            android:layout_weight="0.7"
             android:checked="true"
             android:text="@string/bold"/>
 
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
         <CheckBox
             android:id="@+id/edit_border"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="0.4"
+            android:layout_weight="0.3"
             android:text="@string/border"/>
 
+        <Spinner
+            android:id="@+id/edit_border_size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.7"
+            android:minHeight="32sp"/>
+
     </LinearLayout>
 
     <om.sstvencoder.ColorPalette.ColorPaletteView