diff --git a/Classes/BITFeedbackActivity.m b/Classes/BITFeedbackActivity.m
index 2277eb6730..02315334df 100644
--- a/Classes/BITFeedbackActivity.m
+++ b/Classes/BITFeedbackActivity.m
@@ -47,12 +47,18 @@
 }
 
 - (NSString *)activityTitle {
+  if ([BITHockeyManager sharedHockeyManager].feedbackManager.activityTitle)
+    return [BITHockeyManager sharedHockeyManager].feedbackManager.activityTitle;
+  
   NSString *appName = bit_appName(BITHockeyLocalizedString(@"HockeyFeedbackActivityAppPlaceholder"));
   
   return [NSString stringWithFormat:BITHockeyLocalizedString(@"HockeyFeedbackActivityButtonTitle"), appName];
 }
 
 - (UIImage *)activityImage {
+  if ([BITHockeyManager sharedHockeyManager].feedbackManager.activityImage)
+    return [BITHockeyManager sharedHockeyManager].feedbackManager.activityImage;
+
   return bit_imageNamed(@"feedbackActiviy.png", BITHOCKEYSDK_BUNDLE);
 }
 
diff --git a/Classes/BITFeedbackManager.h b/Classes/BITFeedbackManager.h
index 1c80a66014..7d1e8ce433 100644
--- a/Classes/BITFeedbackManager.h
+++ b/Classes/BITFeedbackManager.h
@@ -92,4 +92,30 @@ typedef enum {
  */
 - (BITFeedbackComposeViewController *)feedbackComposeViewController;
 
+
+///-----------------------------------------------------------------------------
+/// @name BITFeedbackActivity settings
+///-----------------------------------------------------------------------------
+
+
+/**
+ Define the image shown when using `BITFeedbackActivity`
+ 
+ If not set a default icon is being used.
+ 
+ @see activityTitle
+ */
+@property (nonatomic, retain) UIImage *activityImage;
+
+
+/**
+ Define the title shown when using `BITFeedbackActivity`
+ 
+ If not set, a default string is shown by using the apps name
+ and adding the localized string "Feedback" to it.
+ 
+ @see activityImage
+ */
+@property (nonatomic, retain) NSString *activityTitle;
+
 @end
diff --git a/Classes/BITFeedbackManager.m b/Classes/BITFeedbackManager.m
index cf690b1b7c..0e096fbf31 100644
--- a/Classes/BITFeedbackManager.m
+++ b/Classes/BITFeedbackManager.m
@@ -79,6 +79,9 @@
     _token = nil;
     _lastMessageID = nil;
     
+    _activityImage = nil;
+    _activityTitle = nil;
+    
     self.feedbackList = [NSMutableArray array];
 
     _fileManager = [[NSFileManager alloc] init];
@@ -124,6 +127,9 @@
   [_feedbackDir release], _feedbackDir = nil;
   [_settingsFile release], _settingsFile = nil;
   
+  [_activityImage release];
+  [_activityTitle release];
+  
   [super dealloc];
 }